--- ../../../../../portage/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild 2014-10-06 05:06:16.000000000 +0400 +++ ./wxGTK-3.0.1.1.ebuild 2014-10-07 21:12:03.782593080 +0400 @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils flag-o-matic +inherit eutils flag-o-matic multilib-minimal DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit" HOMEPAGE="http://wxwidgets.org/" @@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~amd64 ~x86" IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" SLOT="3.0" -RDEPEND=" +NATIVE_DEPEND=" dev-libs/expat sdl? ( media-libs/libsdl ) X? ( @@ -39,21 +39,103 @@ opengl? ( virtual/opengl ) tiff? ( media-libs/tiff:0 ) webkit? ( net-libs/webkit-gtk:2 ) - ) + ) aqua? ( >=x11-libs/gtk+-2.4[aqua=] virtual/jpeg tiff? ( media-libs/tiff:0 ) - )" + ) +" + +RDEPEND=" + !amd64? ( ${NATIVE_DEPEND} ) + amd64? ( + abi_x86_64? ( ${NATIVE_DEPEND} ) + abi_x86_32? ( + || ( + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ( + dev-libs/expat[abi_x86_32] + X? ( + >=dev-libs/glib-2.22:2[abi_x86_32] + media-libs/libpng:0=[abi_x86_32] + sys-libs/zlib[abi_x86_32] + virtual/jpeg[abi_x86_32] + tiff? ( media-libs/tiff:0[abi_x86_32] ) + ) + ) + ) + sdl? ( || ( + app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + media-libs/libsdl[abi_x86_32] + ) ) + X? ( + || ( + app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + ( + >=x11-libs/gtk+-2.18:2[abi_x86_32] + x11-libs/gdk-pixbuf[abi_x86_32] + x11-libs/pango[X,abi_x86_32] + libnotify? ( x11-libs/libnotify ) + ) + ) + + || ( + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + ( + x11-libs/libSM[abi_x86_32] + x11-libs/libXxf86vm[abi_x86_32] + ) + ) + + gstreamer? ( || ( + app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + ( + media-libs/gstreamer:0.10[abi_x86_32] + media-libs/gst-plugins-base:0.10[abi_x86_32] + ) + ) ) + opengl? ( || ( + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + virtual/opengl[abi_x86_32] + ) ) + webkit? ( net-libs/webkit-gtk:2[abi_x86_32] ) + ) + aqua? ( + || ( + app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + >=x11-libs/gtk+-2.4[abi_x86_32,aqua=] + ) + + || ( + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ( + virtual/jpeg[abi_x86_32] + tiff? ( media-libs/tiff:0[abi_x86_32] ) + ) + ) + ) + ) + ) +" DEPEND="${RDEPEND} - virtual/pkgconfig - opengl? ( virtual/glu ) + !amd64? ( virtual/glu ) + amd64? ( + abi_x86_64? ( virtual/glu ) + abi_x86_32? ( + opengl? ( || ( + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + virtual/glu[abi_x86_32] + ) ) + ) + ) + virtual/pkgconfig[${MULTILIB_USEDEP}] X? ( - x11-proto/xproto - x11-proto/xineramaproto - x11-proto/xf86vidmodeproto - )" + x11-proto/xproto[${MULTILIB_USEDEP}] + x11-proto/xineramaproto[${MULTILIB_USEDEP}] + x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] + )" PDEPEND=">=app-admin/eselect-wxwidgets-20131230" @@ -65,15 +147,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch - - # https://bugs.gentoo.org/421851 - # https://bugs.gentoo.org/499984 - sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die - epatch_user } -src_configure() { +multilib_src_configure() { local myconf # X independent options @@ -128,22 +205,24 @@ --disable-gui" fi - mkdir "${S}"/wxgtk_build - cd "${S}"/wxgtk_build - ECONF_SOURCE="${S}" econf ${myconf} } -src_compile() { - cd "${S}"/wxgtk_build - emake +multilib_src_compile() { + default } -src_install() { - cd "${S}"/wxgtk_build +multilib_src_install() { + default - emake DESTDIR="${D}" install + if multilib_is_native_abi; then + # Stray windows locale file, causes collisions + local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" + [[ -e ${wxmsw} ]] && rm "${wxmsw}" + fi +} +multilib_src_install_all() { cd "${S}"/docs dodoc changes.txt readme.txt newdoc base/readme.txt base_readme.txt @@ -152,10 +231,6 @@ if use doc; then dohtml -r "${S}"/docs/doxygen/out/html/* fi - - # Stray windows locale file, causes collisions - local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo" - [[ -e ${wxmsw} ]] && rm "${wxmsw}" } pkg_postinst() {