Corrected slotting for png and tiff, resorted ebuild to fit common sense order, removed unnessesary die

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

8 files changed, 65 insertions, 45 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index d0527d6c5132..f1afea0e2cc1 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.272 2011/10/25 04:06:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.273 2011/11/12 11:09:11 jlec Exp $
+
+  12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.6.4.0-r6.ebuild,
+  wxGTK-2.8.10.1-r5.ebuild, wxGTK-2.8.11.0.ebuild, wxGTK-2.8.12.0.ebuild,
+  wxGTK-2.9.1.1.ebuild, metadata.xml:
+  Corrected slotting for png and tiff, resorted ebuild to fit common sense
+  order, removed unnessesary die
 
   25 Oct 2011; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.9.1.1.ebuild:
   Apply libpng-1.5 patch to 2.9 as well.
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 087147406915..b91437df06f9 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
@@ -22,17 +22,17 @@ DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a8720
 DIST wxPython-src-2.8.12.0.tar.bz2 31156191 RMD160 6420a8e6e59386b344ac058435a4ae6693c2c04b SHA1 f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4 SHA256 6d5e82772b87981c2a0d78d7a08b3a4498529127be2f05016892e8866e98babd
 DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
-EBUILD wxGTK-2.6.4.0-r6.ebuild 5081 RMD160 38cc13a487641134bce1c381c14249815c4cc8ff SHA1 e76cb35e1e25849155952f2c4451f7de6b7b5810 SHA256 f18ab0607de6055725b97dc81fadb80324304cd8e8923059cc76f0fcaf3a9ee2
-EBUILD wxGTK-2.8.10.1-r5.ebuild 3911 RMD160 a6789613db3edb542a6ac8a26a2d3c19375c70a7 SHA1 566cbd5fae5564534bfb9600b96a1911416c9745 SHA256 47a6d6fc2145160b4a5240568aca10dde15586e166f9916a956608928266ce68
-EBUILD wxGTK-2.8.11.0.ebuild 3593 RMD160 5e8aa42e27ee630ffd2896f01a484772e430dda8 SHA1 e4fff06d03f5332bf84c8736d8e8908129038101 SHA256 641af41063c7adfebc6356bb0dec01a06df65ed96150ddfb05127993ebb90fba
-EBUILD wxGTK-2.8.12.0.ebuild 3565 RMD160 bbcf7f17f7b44f9d50b6e59efd54f709bbdc0af7 SHA1 2a150047003d83de600a06ad18285e505c760a62 SHA256 0f34a2d9f1b49e02378904fbc3063e5ec5d61eb3997fced519820ab253bf0ce9
-EBUILD wxGTK-2.9.1.1.ebuild 3746 RMD160 e40ab6696f141305a491d3607abc821b0a287266 SHA1 2b8b0073824536446903de0bc2600411c10b355a SHA256 fd394a27d71771bd5be69dce7567938ae257f3b69de3f049fca383c2e1c89e68
-MISC ChangeLog 42526 RMD160 e228ff7d957cf0a9058ee6250af2874e9b09cf7a SHA1 ab4346df6c478905d9d91267c571e248467c1d61 SHA256 feee02729d79e73b78b24c73be6fbdeba40ab13cb363c82119f50837a8307c53
-MISC metadata.xml 670 RMD160 fd336b73e871568e6ac86023a36923f497ee07f3 SHA1 e6a2a8aba2e72a9cb5020e36852742f85b20a5f0 SHA256 942586d9bdc5d1da6dbb785f62a2977cb6c2f710f34591a7b8861a9672a98296
+EBUILD wxGTK-2.6.4.0-r6.ebuild 5110 RMD160 c4c47b25041a892141d29b58f930514000c2689d SHA1 c3100955de2f03eaaf2d39704f9827c78e81daa6 SHA256 fe3e61c99b80612669a43272256c9430732320d5ec8a930b884446ff3606b4c7
+EBUILD wxGTK-2.8.10.1-r5.ebuild 3937 RMD160 b2b55785dfc17659ff1594ba43e9b28245e84e3d SHA1 e5eaf5e2a587dbeba5bb3e5c1049bc22c8317e9c SHA256 6245ba2255f713856162a9fa7dd5ddf7a4959f880877d44bc232643509d7ace8
+EBUILD wxGTK-2.8.11.0.ebuild 3618 RMD160 dbecf34a91fc528b12305ad0b60f8d03aabcfb59 SHA1 d1393d7d588255f6631734ddeb7714ae47424dfb SHA256 281872aa6ad51575628f24c961ed518748d87c8e8613e10dfa7f2ca2858dfe3b
+EBUILD wxGTK-2.8.12.0.ebuild 3591 RMD160 136eb462736d91c03bd059aa8271f69ab171c0ec SHA1 ff4dab1f13458d78753732e464d72d8d74490be0 SHA256 c97924d095a3439203cba68b1c9aa6c578150f83a6b3948c78344ef41ad80395
+EBUILD wxGTK-2.9.1.1.ebuild 3770 RMD160 7d47db8131c962583a4ea3442b3908f52c3e6b32 SHA1 1e4f5dac6df00b7400964b4ed3102d04ab2f1a76 SHA256 c7ef49ef52244b1a4f109868367ec1bae371b2b9e53889ff2b6686113138b52d
+MISC ChangeLog 42814 RMD160 4a3588551378b0d41a6fa881c45ef6928657c1a7 SHA1 55e22e4249765215b760746f5a8ec9d2853819a4 SHA256 5431a5d7d072dcca9e51b3aaa4ac2368f9cad25b76e03e0d51fc5d76a33da883
+MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6mOCQACgkQiqiDRvmkBmL0bwCfVxHZQ6rVu2qJwKNr4oKFEPK1
-O8QAni5oddh06qAkaH+oL2EdcTgl0d7o
-=eWyE
+iEYEAREKAAYFAk6+U+MACgkQgAnW8HDreRYwmQCfdXKeU6Shx8kvt82j8kIrTUVy
+pCwAoMFnsvoHL0jyjAus6upMkBKoZQ7k
+=eg8O
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
index 6cc9203f7644..a2a438661a2f 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/metadata.xml
@@ -7,14 +7,14 @@
 		<description>All modifications to this package must be approved by the wxwidgets herd.</description>
 	</maintainer>
 	<use>
-		<flag name='gstreamer'>
+		<flag name="gstreamer">
 			Enable the wxMediaCtrl class for playing audio and video through
 			gstreamer.
 		</flag>
-		<flag name='gnome'>
+		<flag name="gnome">
 			Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks.
 		</flag>
-		<flag name='sdl'>
+		<flag name="sdl">
 			Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for
 			audio.
 		</flag>
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
index c783fa6c8747..d6f41293d2cc 100644
--- a/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.12 2011/09/15 19:24:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.13 2011/11/12 11:09:11 jlec Exp $
 
 EAPI=1
 inherit eutils versionator flag-o-matic
@@ -24,14 +24,17 @@ RDEPEND="
 	odbc?	( dev-db/unixODBC )
 	sdl?	( media-libs/libsdl )
 	X?	(
-		x11-libs/gtk+:2
-		dev-libs/glib:2
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
 		virtual/jpeg
-		media-libs/tiff
+		>=x11-libs/gtk+-2.18:2
+		media-libs/tiff:0
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
-		gnome?	( gnome-base/libgnomeprintui )
+		x11-libs/pango
+		gnome? ( gnome-base/libgnomeprintui )
 		opengl?	( virtual/opengl )
 		)"
 
@@ -201,8 +204,7 @@ build_wx() {
 
 	ECONF_SOURCE="${S}" econf \
 		${myconf} \
-		${build_wx_conf} \
-		|| die "Failed to configure $1."
+		${build_wx_conf}
 
 	emake || die "Failed to make $1."
 
diff --git a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
index 5260b58d7f49..d3935b381dae 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.11 2011/02/27 14:32:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.12 2011/11/12 11:09:11 jlec Exp $
 
 EAPI="2"
 
 inherit eutils versionator flag-o-matic
 
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://wxwidgets.org/"
 
 BASE_PV="$(get_version_component_range 1-3)"
@@ -24,13 +24,16 @@ RDEPEND="
 	odbc?   ( dev-db/unixODBC )
 	sdl?    ( media-libs/libsdl )
 	X?  (
-		>=x11-libs/gtk+-2.4:2
-		>=dev-libs/glib-2.4:2
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
 		virtual/jpeg
-		media-libs/tiff
+		>=x11-libs/gtk+-2.18:2
+		media-libs/tiff:0
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
+		x11-libs/pango
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
@@ -116,7 +119,7 @@ src_configure() {
 	mkdir "${S}"/wxgtk_build
 	cd "${S}"/wxgtk_build
 
-	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
 src_compile() {
diff --git a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
index 995d48a9b821..3432a11bd35f 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.12 2011/07/16 09:32:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.13 2011/11/12 11:09:11 jlec Exp $
 
 EAPI="2"
 
 inherit eutils versionator flag-o-matic
 
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://wxwidgets.org/"
 
 BASE_PV="$(get_version_component_range 1-3)"
@@ -24,18 +24,21 @@ RDEPEND="
 	odbc?   ( dev-db/unixODBC )
 	sdl?    ( media-libs/libsdl )
 	X?  (
-		>=x11-libs/gtk+-2.4:2
-		>=dev-libs/glib-2.4:2
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
 		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
+		x11-libs/pango
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
 			>=media-libs/gstreamer-0.10 )
 		opengl? ( virtual/opengl )
-		tiff?   ( media-libs/tiff )
+		tiff?   ( media-libs/tiff:0 )
 		)"
 
 DEPEND="${RDEPEND}
@@ -107,7 +110,7 @@ src_configure() {
 	mkdir "${S}"/wxgtk_build
 	cd "${S}"/wxgtk_build
 
-	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
 src_compile() {
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
index 8af62d97ac14..2d9039f86f5a 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.0.ebuild,v 1.2 2011/10/09 10:27:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild,v 1.3 2011/11/12 11:09:11 jlec Exp $
 
 EAPI="2"
 
 inherit eutils versionator flag-o-matic
 
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://wxwidgets.org/"
 
 BASE_PV="$(get_version_component_range 1-3)"
@@ -24,19 +24,22 @@ RDEPEND="
 	odbc?   ( dev-db/unixODBC )
 	sdl?    ( media-libs/libsdl )
 	X?  (
-		>=x11-libs/gtk+-2.4:2
-		>=dev-libs/glib-2.4:2
+		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
 		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
+		x11-libs/pango
 		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 )
-		tiff?   ( media-libs/tiff )
+		tiff?   ( media-libs/tiff:0 )
 		)"
 
 DEPEND="${RDEPEND}
@@ -107,7 +110,7 @@ src_configure() {
 	mkdir "${S}"/wxgtk_build
 	cd "${S}"/wxgtk_build
 
-	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
 src_compile() {
diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
index 79a647b85cb5..c0f00f3e09b0 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.4 2011/10/25 04:06:33 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.5 2011/11/12 11:09:11 jlec Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic
 
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
 HOMEPAGE="http://wxwidgets.org/"
 
 # we use the wxPython tarballs because they include the full wxGTK sources and
@@ -21,19 +21,22 @@ RDEPEND="
 	dev-libs/expat
 	sdl?    ( media-libs/libsdl )
 	X?  (
-		>=x11-libs/gtk+-2.18:2
 		>=dev-libs/glib-2.22:2
+		media-libs/libpng:0
+		sys-libs/zlib
 		virtual/jpeg
+		>=x11-libs/gtk+-2.18:2
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
+		x11-libs/pango
 		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 )
-		tiff?   ( media-libs/tiff )
+		tiff?   ( media-libs/tiff:0 )
 		)"
 
 DEPEND="${RDEPEND}
@@ -109,7 +112,7 @@ src_configure() {
 	mkdir "${S}"/wxgtk_build
 	cd "${S}"/wxgtk_build
 
-	ECONF_SOURCE="${S}" econf ${myconf} || die "configure failed."
+	ECONF_SOURCE="${S}" econf ${myconf}
 }
 
 src_compile() {