Corrected Slotting and versioning, thanks leio spotting that

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

7 files changed, 55 insertions, 36 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index cd55d869c965..8ef444454887 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # 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.274 2011/11/12 11:13:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.275 2011/11/12 13:55:52 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:
+  Corrected Slotting and versioning, thanks leio spotting that
 
   12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.9.1.1.ebuild:
   Import prefix changes, all are triggered by USE=aqua
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 6f66ed1196d0..9959af85a91a 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -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 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 4174 RMD160 e48520308060a63574982360becaaef4dab6c3d9 SHA1 50ae412297b37414f296d6f76483f02d0e436b46 SHA256 7cd86e0f512790c49ff781d00dd836c42f788536f40078b8c5bc9d96a756f387
-MISC ChangeLog 42939 RMD160 6d1ed24a7a4d683f9a64a3946c7cae8783e3dd9e SHA1 70e250b057c945a5323fa701d6b07f6e8a3d0038 SHA256 78a6e40596cd2edbc6fb9c12a36c4a273c4fb2d5809f949d876b63cf71eb73e0
+EBUILD wxGTK-2.6.4.0-r6.ebuild 5079 RMD160 355f1a2077d296254dfd172d914555407d460be5 SHA1 f14398400cf3673516a2b7118c75e37002994771 SHA256 8110dd38ac23024b58d3d58259c4e1ee5a668d6e842626e3b74019c8032225e7
+EBUILD wxGTK-2.8.10.1-r5.ebuild 3926 RMD160 9cc04b3f0255c49488911accb69601115cc2c4f2 SHA1 7bed4bdc40b2dd1be40a4e40f58cb3d23a4de29a SHA256 14dba1c1b87c2d363e87668623923c1d69e804ef5fb1ba1263d2ef078689b1d8
+EBUILD wxGTK-2.8.11.0.ebuild 3607 RMD160 6c432fdde32ef01a5ea96101e78e4b0df950b260 SHA1 8d982b93d53c1829048d857b38fe6cdd4aa0bdec SHA256 468ea1693f80687de7cabf75f93a1a2b6c8588cf8d012be1489b8ada9e58a424
+EBUILD wxGTK-2.8.12.0.ebuild 3979 RMD160 717015350f482fb45d264c46cadf74642422106a SHA1 7c930fc1f126bd93950a0fac183bc94b1fc019c8 SHA256 7797afed776dfa65b7dc0446c5ff86bdbdb0f2587cc9f6df8e7e7a3cfe38912a
+EBUILD wxGTK-2.9.1.1.ebuild 4173 RMD160 146b9a46d5f274e048d17620aadcf278c85ff2cd SHA1 aaa2dc23d443ebaadedfba1e5fe7859309e169b8 SHA256 1a37870888dcff024271330dfd4d2251a82c6a61211ebd390c04c5281e4e18c2
+MISC ChangeLog 43173 RMD160 be2fd64df1050598a1f7f98e3c3b7eedc05a61af SHA1 15b01651a6d2c943b2a8213853f8f2e2e68c7721 SHA256 2e7b16f132aaf47029179aab3d5c8d3540af2cf6872be80b8141ff2e99838f6b
 MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6+VPAACgkQgAnW8HDreRapXQCgo7bAa0z5+v//NUrUyafpzQJZ
-XzkAnjwTSdV7/oIW8+xSHpLnj1J+1WQM
-=bnmd
+iEYEAREKAAYFAk6+evUACgkQgAnW8HDreRayoACfUbzuQAqy5r+W2uf6wkIYCK2p
+atUAoLWNQXs26tza8qQ0u2IDG++3uBnt
+=1n60
 -----END PGP SIGNATURE-----
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 d6f41293d2cc..86d32a18f4ff 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.13 2011/11/12 11:09:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r6.ebuild,v 1.14 2011/11/12 13:55:52 jlec Exp $
 
 EAPI=1
 inherit eutils versionator flag-o-matic
@@ -24,17 +24,16 @@ RDEPEND="
 	odbc?	( dev-db/unixODBC )
 	sdl?	( media-libs/libsdl )
 	X?	(
-		>=dev-libs/glib-2.22:2
+		dev-libs/glib:2
 		media-libs/libpng:0
+		media-libs/tiff:0
 		sys-libs/zlib
 		virtual/jpeg
-		>=x11-libs/gtk+-2.18:2
-		media-libs/tiff:0
+		x11-libs/gtk+:2
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
-		x11-libs/pango
-		gnome? ( gnome-base/libgnomeprintui )
+		gnome?	( gnome-base/libgnomeprintui )
 		opengl?	( virtual/opengl )
 		)"
 
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 d3935b381dae..bc9359b2a2ef 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.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.8.10.1-r5.ebuild,v 1.12 2011/11/12 11:09:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.10.1-r5.ebuild,v 1.13 2011/11/12 13:55:52 jlec Exp $
 
 EAPI="2"
 
@@ -24,16 +24,16 @@ RDEPEND="
 	odbc?   ( dev-db/unixODBC )
 	sdl?    ( media-libs/libsdl )
 	X?  (
-		>=dev-libs/glib-2.22:2
+		dev-libs/glib:2
 		media-libs/libpng:0
 		sys-libs/zlib
 		virtual/jpeg
-		>=x11-libs/gtk+-2.18:2
+		x11-libs/gtk+:2
 		media-libs/tiff:0
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
-		x11-libs/pango
+		x11-libs/pango[X]
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
diff --git a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
index 3432a11bd35f..dc705437fcbb 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.11.0.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.8.11.0.ebuild,v 1.13 2011/11/12 11:09:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.11.0.ebuild,v 1.14 2011/11/12 13:55:52 jlec Exp $
 
 EAPI="2"
 
@@ -24,15 +24,15 @@ RDEPEND="
 	odbc?   ( dev-db/unixODBC )
 	sdl?    ( media-libs/libsdl )
 	X?  (
-		>=dev-libs/glib-2.22:2
+		dev-libs/glib:2
 		media-libs/libpng:0
 		sys-libs/zlib
 		virtual/jpeg
-		>=x11-libs/gtk+-2.18:2
+		x11-libs/gtk+:2
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
-		x11-libs/pango
+		x11-libs/pango[X]
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
index 2d9039f86f5a..0737fe4cc85c 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.0.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.8.12.0.ebuild,v 1.3 2011/11/12 11:09:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.0.ebuild,v 1.4 2011/11/12 13:55:52 jlec Exp $
 
 EAPI="2"
 
@@ -16,23 +16,23 @@ BASE_P="${PN}-${BASE_PV}"
 # 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 ~x86-fbsd"
-IUSE="X doc debug gnome gstreamer odbc opengl pch sdl tiff"
+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"
+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.22:2
+		dev-libs/glib:2
 		media-libs/libpng:0
 		sys-libs/zlib
 		virtual/jpeg
-		>=x11-libs/gtk+-2.18:2
+		x11-libs/gtk+:2
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
-		x11-libs/pango
+		x11-libs/pango[X]
 		gnome?  ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
@@ -40,6 +40,11 @@ RDEPEND="
 			>=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}
@@ -102,10 +107,21 @@ src_configure() {
 			$(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
-	use X || \
+	if use !X && use !aqua ; then
 		myconf="${myconf}
 			--disable-gui"
+	fi
 
 	mkdir "${S}"/wxgtk_build
 	cd "${S}"/wxgtk_build
@@ -144,7 +160,7 @@ src_install() {
 	fi
 
 	# We don't want this
-	rm "${D}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+	rm "${ED}"usr/share/locale/it/LC_MESSAGES/wxmsw.mo
 }
 
 pkg_postinst() {
diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
index d6abe87086af..94f10d6898b6 100644
--- a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.9.1.1.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.9.1.1.ebuild,v 1.6 2011/11/12 11:13:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild,v 1.7 2011/11/12 13:55:52 jlec Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ RDEPEND="
 		x11-libs/libSM
 		x11-libs/libXinerama
 		x11-libs/libXxf86vm
-		x11-libs/pango
+		x11-libs/pango[X]
 		gnome? ( gnome-base/libgnomeprintui:2.2 )
 		gstreamer? (
 			gnome-base/gconf:2
@@ -40,7 +40,7 @@ RDEPEND="
 		)
 	aqua? (
 		>=x11-libs/gtk+-2.4[aqua=]
-		media-libs/jpeg
+		virtual/jpeg
 		tiff?   ( media-libs/tiff:0 )
 		)"
 
@@ -65,7 +65,6 @@ S="${WORKDIR}/wxPython-src-${PV}"
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-collision.patch
 	epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch
-
 }
 
 src_configure() {