Import prefix changes, all are triggered by USE=aqua

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

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index f1afea0e2cc1b45146233cac483c04a4b447c0f8..cd55d869c965607212790af74cf07441a15d84b3 100644 (file)
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
 # 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.273 2011/11/12 11:09:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.274 2011/11/12 11:13:41 jlec Exp $
+
+  12 Nov 2011; Justin Lecher <jlec@gentoo.org> wxGTK-2.9.1.1.ebuild:
+  Import prefix changes, all are triggered by USE=aqua
 
   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,

diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index b91437df06f9c3cefcef1a640e691c06c3da3705..6f66ed1196d04ac857b53cbfe34a6d901c977319 100644 (file)
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -26,13 +26,13 @@ EBUILD wxGTK-2.6.4.0-r6.ebuild 5110 RMD160 c4c47b25041a892141d29b58f930514000c26
 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
+EBUILD wxGTK-2.9.1.1.ebuild 4174 RMD160 e48520308060a63574982360becaaef4dab6c3d9 SHA1 50ae412297b37414f296d6f76483f02d0e436b46 SHA256 7cd86e0f512790c49ff781d00dd836c42f788536f40078b8c5bc9d96a756f387
+MISC ChangeLog 42939 RMD160 6d1ed24a7a4d683f9a64a3946c7cae8783e3dd9e SHA1 70e250b057c945a5323fa701d6b07f6e8a3d0038 SHA256 78a6e40596cd2edbc6fb9c12a36c4a273c4fb2d5809f949d876b63cf71eb73e0
 MISC metadata.xml 670 RMD160 af633c7a38fd8d4fce77e2e05836d38c3ecccf54 SHA1 a463ce81e4784cb35f53a5fb7551a508fa5fce19 SHA256 59d453a10e6134a232d4478f326b35a9d693341cc29c013971ddf6b308347e75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6+U+MACgkQgAnW8HDreRYwmQCfdXKeU6Shx8kvt82j8kIrTUVy
-pCwAoMFnsvoHL0jyjAus6upMkBKoZQ7k
-=eg8O
+iEYEAREKAAYFAk6+VPAACgkQgAnW8HDreRapXQCgo7bAa0z5+v//NUrUyafpzQJZ
+XzkAnjwTSdV7/oIW8+xSHpLnj1J+1WQM
+=bnmd
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.1.1.ebuild
index c0f00f3e09b07a1bd8e1fefafe8f274664bec2b9..d6abe87086af7cd88a3d012705591c9f82e1bfa6 100644 (file)
--- 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.5 2011/11/12 11:09:11 jlec Exp $
+# $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 $
 
 EAPI="3"
 
@@ -14,8 +14,8 @@ HOMEPAGE="http://wxwidgets.org/"
 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"
-IUSE="X doc debug gnome gstreamer 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 opengl pch sdl tiff"
 
 RDEPEND="
        dev-libs/expat
@@ -37,6 +37,11 @@ RDEPEND="
                        >=media-libs/gst-plugins-base-0.10 )
                opengl? ( virtual/opengl )
                tiff?   ( media-libs/tiff:0 )
+               )
+       aqua? (
+               >=x11-libs/gtk+-2.4[aqua=]
+               media-libs/jpeg
+               tiff?   ( media-libs/tiff:0 )
                )"
 
 DEPEND="${RDEPEND}
@@ -60,6 +65,7 @@ S="${WORKDIR}/wxPython-src-${PV}"
 src_prepare() {
        epatch "${FILESDIR}"/${P}-collision.patch
        epatch "${FILESDIR}"/${PN}-2.8.11-libpng15.patch
+
 }
 
 src_configure() {
@@ -104,10 +110,22 @@ src_configure() {
                        $(use_with !gnome gtkprint)
                        $(use_with tiff libtiff sys)"
 
+       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