Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as

well (bug #499984).

Signed-off-by: Ryan Hill <rhill@gentoo.org>
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

5 files changed, 24 insertions, 199 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index fad49a5ea7d0..ecef9b67f4e4 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.313 2014/03/19 16:14:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.314 2014/05/23 08:21:26 rhill Exp $
+
+  23 May 2014; Ryan Hill <rhill@gentoo.org> -wxGTK-2.8.12.1.ebuild,
+  wxGTK-2.8.12.1-r1.ebuild, wxGTK-3.0.0.0.ebuild:
+  Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as
+  well (bug #499984).
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxGTK-2.8.12.1-r1.ebuild:
   Stable for alpha, wrt bug #499476
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 560288c9cbf2..7fa676ab2fb4 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -14,26 +14,19 @@ DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e94
 DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
 DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
 DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
-EBUILD wxGTK-2.8.12.1-r1.ebuild 4259 SHA256 c07f6926985266d0885cbdb1ca3ce7ff02eb430caa7fc4bd45c180cee6e08c5b SHA512 09215de3e3c1cb8f178cf4a9d02c7f4674ca9268c66ff76a403b8eb3886cd2606b312a8dff90ee12bcfb85ba0178d6ac94f19005e1ab86fbe58e73a2af4be109 WHIRLPOOL 8ea125a941770d2715417b40844e331c0a91717ee01e7686c47940ede60f793163545da241cbee0a4bf8f0d8d5201d5e359676e176098d15d5670394bbe2c71d
-EBUILD wxGTK-2.8.12.1.ebuild 4096 SHA256 b3f9aaca23b275298b02ba46c1660ffa929162de10da3909ed76e0e6a4c25699 SHA512 7d092fa5e5a7c6538dfabf39e5d8fcd4954f24b9f6b4aca667371075e845f32648193e514e20c1eceac5cd1db784df9f362d231f79ad0f753281723f60fbd3ce WHIRLPOOL 0499f5c935d386bb598775ab484b9a53b732578e3a0efb541e8d80d6e01cab3aac19e1a25bcbd80209cbaf66041fd2bb5d01b07c4accbb41fa23c4451e9083b3
+EBUILD wxGTK-2.8.12.1-r1.ebuild 4283 SHA256 a49d689c730ed51e3d63ca2725942a48fe9bda448537a19a1d1b11df41290dc5 SHA512 d7291a3ff12b963bbc3aa223ad5a1595546e0c1b5cd4eab24eb8b44f4d56c5c9d305a0b7702dbf83cbe1c2bb99d32d33d776375c5b341874396285526f705f19 WHIRLPOOL 2b4a208d3ef288a8561cce345ea2992d298b9d3906538968609ff52cdf7fba4b57d1942efd712329655e6284a6140cc3cd00d4c3ffe68b41d1ea953eadad82db
 EBUILD wxGTK-2.9.4.1-r1.ebuild 4429 SHA256 273c5ecd1b39f848dc92d8a31ab6e0a4426de8d04d1252feb0c1bc67a876333d SHA512 034f9b9054daed770e0e749f88f16faeb53c378e1dd989daaebacfb7b6f8da5f2d7ebc19105f49ec5ade803b8b8d2685e9da51813ea84f740f9f0138f4d595ca WHIRLPOOL 98a45e0c80b1bf5fddc2109d7bccdbff1012ecb9fdc58fdebdddff3385958f51679fc6439801ded6f9cc1cfb09809629765aa5a71c27667549d6b76cb9a20f3f
-EBUILD wxGTK-3.0.0.0.ebuild 3915 SHA256 c2cf4aa6692e5def90a026b288f708c9c39f83e779f78ed226cad970f9c453da SHA512 bc2bea46f9d212ef9ba6a1c0050c2a330b4d67841b4d5ce14cdef67746171ed7076f268a17e7dc99acf83a9a95f7b04c2747b407d6329fd17f1270fe4a74b393 WHIRLPOOL 1dcbf0aa78f3dd2f7eaa461e54d7e98f1d6f537c2ef6e45860a37cf2a4fcb29d5c26b80d32ba6d2142603f11423680fd1647ffee0a9400c60ca1007cd524c648
-MISC ChangeLog 49104 SHA256 a1f0aa1c20ce0659a4f071e2c1a9aab95437af60884eec8e9f1187970af30f1b SHA512 be88f5370483bdafe8fb059057c476d40fac74f53ae7bf535be8a8507fa962271701d5a3dfbab0cc543e06eb5e71c45bfb74b81df3d3a50af147367c8692af2f WHIRLPOOL ca7e3a3727e0505878dbe8111a827b7e4e34365b78efffe8c3968643f9e537e152b7a9e54cf2a9f2b888d4a113d8c9d4e405b7fcf9ae0132fe5ad7abb05e7f32
+EBUILD wxGTK-3.0.0.0.ebuild 4053 SHA256 4a8505666e109f4a2122870022977c556540a6cc88d9e08d13fe83747f443ca5 SHA512 574e0d41210a346bd576b55e04009ed2b2931b60f82950dff6ab83603b459d23e5cc2dc74c591f44e59e51f565ebc5a9a637b4cb003550587f8b42c75845e65c WHIRLPOOL a6e3fa63abcce49ea1415ca99527e5a30ea7531d228eb387592f78273cbf19cceedc8afbcedf4cbab4572b4beaed1329a0ff75db80ef2be8bed370b7760c7b01
+MISC ChangeLog 49322 SHA256 c0c6e4f23998fff0fcfd323eb07a74d3e23412dfb83a7e43b61f8eb9b96ecc33 SHA512 c00b89435255cb07c74d06210f9d806aca8cc19d429b32182bd616a615872623da657fbe3cf64cb435981f6adcdd79c74a0d55e2ff101899c9b604c3866a3a74 WHIRLPOOL d29913aad82c7eb4080964c3d8bfbea3c4b386492ebccc6afa3ca1bc40d540e9688f73d55cad363fa2ffbf070402a2e24b0d17df6800f944e697b7f3d5428f6d
 MISC metadata.xml 670 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75 SHA512 37ec56d00b488857a285a61c894f8c28dde61efce48d79b7767a207f5c533ad01f2ef09ebecc98dd5b803b4545e1d7f513ffb48e5ead4818ecb607129339c907 WHIRLPOOL cbcc9d2aea988f0b8e1a0615918903cf332976b192156296051c9f5ac5563e9ab512376453a52ad02db0fe3465b9b30d88d6808e38bea52bb58abe6fed316586
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKcJlAAoJELp701BxlEWfbFMQAITwIV9g/n97+EIXFGksUbpn
-HHYx8dngkMR12EfQvJTChBWLfqR0lepm4c/li7XqsEgXWcjbLIZznhzv+ogBrBnc
-A8FTrkQoSWSpaZUW9N92rqnRgaA/phRJcwvhHq/YzYy+9f1shTvvo9Y4OGCIO08H
-7qx+88HIlSCzZRBsy52hriN39SWavuUPBES+oc8Ja/oH2DSRC587GkQpuIJKv0U1
-46N4A05uAjBFADrl12o+rIT26GYansZetNVWTA0hZofPxppcbS0VXd2XC4X+5DZw
-VgLbScW2ja8Io4aypvr4Wz/MfD14EB2GRpl5fObBVw7BEw729a+mkhKuBHOLd/2m
-QoCEURnk7RrtLKDMimgN/zICwL5CZJIpRPYL6qao3edIJ3WCVdka90CBp3k5Ctgd
-qlZxAsAbozgii3Wxi9zbggUgQotXRGtnXhnAhNPlWBEwYLEPMzEkVhG77kPk+3sr
-eZPgjvVv2N2ZQRQBvq+CHD0J82qalI9pv/BRr9+p4a01Jm71l0+SmKAcFSSgznrA
-5E8UBtx5Vis76h3k2huZbIep9WKM6bADKFSQdLMTbWIRP1q/9MvqYrx+dLJWTO41
-6dLXa5HleAXCauNySyoCZmpAA5yudr342e+zM4OLDqRQFSKWbOLmsl0KYuaG46Nu
-Hht/PtJBKCGjvPhET/DY
-=qV6M
+iQEcBAEBCAAGBQJTfwUOAAoJEO04vUmVeoRjvB4H/0tClLAx/obrsB7aLQwsPx2+
+cuGfLbPhwb1/xAJW2860J2KLcUOyJjGM1J+oC+LzNYhY4DelejlMrYNibP6mBiUI
+Egz1BUb04HExSfSWucOObtFUrM4GHmMwofCvXlSAb7AtcXXCge+ATzkpS3daNABB
+r9cW+pdbUUDaF5lqZmNYVsq/mBXXK9/5fbUa9KN6BGkRpCUkZsSlt9gbV04H6G4n
+f7jcnuvvGGu7P/yokylNlMPwp/cKisMXlVABp9V1roVX0whsijwUUCJSzagrbNQG
+/Zr67eV7Z6JaLr8wyNU5eeNnq9LhR4ThPXbDsftsXZARZbR3jiE1RkqJxrnwKMQ=
+=7J5W
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
index b01b7daa80c1..1091fac84580 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.8.12.1-r1.ebuild,v 1.11 2014/03/19 16:14:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v 1.12 2014/05/23 08:21:26 rhill Exp $
 
 EAPI="5"
 
@@ -37,6 +37,7 @@ RDEPEND="
 		x11-libs/pango[X]
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
+			gnome-base/gconf:2
 			media-libs/gstreamer:0.10
 			media-libs/gst-plugins-base:0.10 )
 		opengl? ( virtual/opengl )
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
deleted file mode 100644
index 8cc764668016..000000000000
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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-2.8.12.1.ebuild,v 1.17 2014/01/27 17:35:05 dirtyepic Exp $
-
-EAPI="4"
-
-inherit eutils versionator flag-o-matic multilib
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="http://wxwidgets.org/"
-
-BASE_PV="$(get_version_component_range 1-3)"
-BASE_P="${PN}-${BASE_PV}"
-
-# we use the wxPython tarballs because they include the full wxGTK sources and
-# docs, and are released more frequently than wxGTK.
-SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64	~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
-
-RDEPEND="
-	dev-libs/expat
-	odbc?   ( dev-db/unixODBC )
-	sdl?    ( media-libs/libsdl )
-	X?  (
-		dev-libs/glib:2
-		media-libs/libpng:0
-		sys-libs/zlib
-		virtual/jpeg
-		x11-libs/gtk+:2
-		x11-libs/libSM
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		gnome?  ( gnome-base/libgnomeprintui:2.2 )
-		gstreamer? (
-			media-libs/gstreamer:0.10
-			media-libs/gst-plugins-base:0.10 )
-		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff:0 )
-		)
-	aqua? (
-		>=x11-libs/gtk+-2.4[aqua=]
-		virtual/jpeg
-		tiff?   ( media-libs/tiff:0 )
-		)"
-
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		opengl? ( virtual/glu )
-		X?  (
-			x11-proto/xproto
-			x11-proto/xineramaproto
-			x11-proto/xf86vidmodeproto
-			)"
-
-PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
-
-SLOT="2.8"
-LICENSE="wxWinLL-3
-		GPL-2
-		odbc?	( LGPL-2 )
-		doc?	( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxPython-src-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
-	epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
-	epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch              # Bug #174874
-	epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch     # Bug #310923
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
-		-i configure || die "sed on configure failed"
-}
-
-src_configure() {
-	local myconf
-
-	append-flags -fno-strict-aliasing
-
-	# X independent options
-	myconf="--enable-compat26
-			--enable-shared
-			--enable-unicode
-			--with-regex=builtin
-			--with-zlib=sys
-			--with-expat=sys
-			$(use_enable debug)
-			$(use_enable pch precomp-headers)
-			$(use_with odbc odbc sys)
-			$(use_with sdl)
-			$(use_with tiff libtiff sys)"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			$(use_enable gstreamer mediactrl)
-			$(use_enable opengl)
-			$(use_with opengl)
-			$(use_with gnome gnomeprint)
-			--without-gnomevfs"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	mkdir "${S}"/wxgtk_build
-	cd "${S}"/wxgtk_build
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}"/wxgtk_build
-
-	emake
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake
-	fi
-}
-
-src_install() {
-	cd "${S}"/wxgtk_build
-
-	emake DESTDIR="${D}" install
-
-	if [[ -d contrib/src ]]; then
-		cd contrib/src
-		emake DESTDIR="${D}" install
-	fi
-
-	cd "${S}"/docs
-	dodoc changes.txt readme.txt todo30.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	if use doc; then
-		dohtml -r "${S}"/docs/html/*
-	fi
-
-	# We don't want this
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-admin/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
index 4ae675fb62c8..8eea9a111748 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2014/01/27 17:35:05 dirtyepic Exp $
+# $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 $
 
 EAPI="5"
 
@@ -65,6 +65,11 @@ S="${WORKDIR}/wxPython-src-${PV}"
 
 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
 }