--- ../../../../../portage/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild 2014-05-23 12:21:26.000000000 +0400 +++ ./wxGTK-3.0.0.0.ebuild 2014-08-30 14:52:47.516341161 +0400 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.4 2014/05/23 08:21:26 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.3 2014/01/27 17:35:05 dirtyepic Exp $ 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,45 +14,51 @@ 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=" - dev-libs/expat - sdl? ( media-libs/libsdl ) + dev-libs/expat[${MULTILIB_USEDEP}] + sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] ) X? ( - >=dev-libs/glib-2.22:2 - media-libs/libpng:0= - sys-libs/zlib - virtual/jpeg - >=x11-libs/gtk+-2.18:2 - x11-libs/gdk-pixbuf - x11-libs/libSM - x11-libs/libXxf86vm - x11-libs/pango[X] + >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}] + media-libs/libpng:0=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg[${MULTILIB_USEDEP}] + >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}] + x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] + x11-libs/libSM[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + x11-libs/pango[X,${MULTILIB_USEDEP}] gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - libnotify? ( x11-libs/libnotify ) - opengl? ( virtual/opengl ) - tiff? ( media-libs/tiff:0 ) - webkit? ( net-libs/webkit-gtk:2 ) + media-libs/gstreamer:0.10[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] + ) + libnotify? ( + x11-libs/libnotify + amd64? ( + app-emulation/emul-linux-x86-gtklibs + ) + ) + opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + webkit? ( net-libs/webkit-gtk:2[${MULTILIB_USEDEP}] ) ) aqua? ( - >=x11-libs/gtk+-2.4[aqua=] - virtual/jpeg - tiff? ( media-libs/tiff:0 ) + >=x11-libs/gtk+-2.4[${MULTILIB_USEDEP},aqua=] + virtual/jpeg[${MULTILIB_USEDEP}] + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} - virtual/pkgconfig - opengl? ( virtual/glu ) + virtual/pkgconfig[${MULTILIB_USEDEP}] + opengl? ( virtual/glu[${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 +71,10 @@ src_prepare() { epatch "${FILESDIR}"/${P}-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 +129,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 +155,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() {