[patch] Patch against wxGTK-3.0.2.0-r1.ebuild

wxGTK-3.0.2.0-multilib.patch (text/plain), 3.74 KB, created by nE0sIghT on 2015-03-29 14:31:43 UTC

--- ../../../gentoo/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild	2015-03-09 12:18:30.000000000 +0300
+++ ./wxGTK-3.0.2.0-r3.ebuild	2015-03-29 16:27:53.325884779 +0300
@@ -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/"
@@ -20,40 +20,40 @@
 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 )
+			media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+			media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
 		webkit? ( net-libs/webkit-gtk:2 )
 		)
 	aqua? (
-		>=x11-libs/gtk+-2.4[aqua=]
-		virtual/jpeg
-		tiff?   ( media-libs/tiff:0 )
+		>=x11-libs/gtk+-2.4[aqua=,${MULTILIB_USEDEP}]
+		virtual/jpeg[${MULTILIB_USEDEP}]
+		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
 		)"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	opengl? ( virtual/glu )
+	virtual/glu[${MULTILIB_USEDEP}]
+	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,20 +65,23 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
-
-	# https://bugs.gentoo.org/421851
-	# https://bugs.gentoo.org/499984
-	# https://bugs.gentoo.org/536004
-	sed \
-		-e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
-		-e 's:3\.0\.1:3.0.2:g' \
-		-e 's:^wx_release_number=1$:wx_release_number=2:' \
-		-i configure || die
-
 	epatch_user
+
+	multilib_prepare() {
+		# https://bugs.gentoo.org/421851
+		# https://bugs.gentoo.org/499984
+		# https://bugs.gentoo.org/536004
+		sed \
+			-e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
+			-e 's:3\.0\.1:3.0.2:g' \
+			-e 's:^wx_release_number=1$:wx_release_number=2:' \
+			-i "${BUILD_DIR}"/configure || die
+	}
+	multilib_copy_sources
+	multilib_parallel_foreach_abi multilib_prepare
 }
 
-src_configure() {
+multilib_src_configure() {
 	local myconf
 
 	# X independent options
@@ -111,7 +114,7 @@
 			--with-libjpeg=sys
 			--without-gnomevfs
 			$(use_enable gstreamer mediactrl)
-			$(use_enable webkit webview)
+			$(multilib_native_use_enable webkit webview)
 			$(use_with libnotify)
 			$(use_with opengl)
 			$(use_with tiff libtiff sys)"
@@ -133,22 +136,10 @@
 			--disable-gui"
 	fi
 
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
 	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
-src_compile() {
-	cd "${S}"/wxgtk_build
-	emake
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install
-
+multilib_src_install_all() {
 	cd "${S}"/docs
 	dodoc changes.txt readme.txt
 	newdoc base/readme.txt base_readme.txt