Update to EAPI5. Switch to global introspection USE flag.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 53 insertions, 58 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index b7a81e1aec19..be3e78cd2038 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.624 2012/12/06 06:13:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.625 2012/12/16 06:40:24 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-2.24.14.ebuild,
+  gtk+-3.6.2.ebuild, metadata.xml:
+  Update to EAPI5. Switch to global introspection USE flag.
 
 *gtk+-2.24.14 (06 Dec 2012)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 312b04c205b7..415480f29140 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -32,20 +32,20 @@ DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c
 EBUILD gtk+-1.2.10-r12.ebuild 2393 SHA256 1375c5850b23a82e3724f3ad23be8058dcf1c164e146aab6d8b60dd55f3c694d SHA512 4fffd0ed56f05583f5d12fafb47bfd90c84cd81d568d0f425620b3b867fa33e746bfdff528cc798c524781689ed55017b823a31b168b53447950e8abaca14d62 WHIRLPOOL 03b4508a09c1f18ce53bea5aac93658f3205e6fd727acc93903a7af23dc970defcc6e819eaccc2d4cb7793b7bdd0d13fdbbf535ec7d7ddf5178202e2e4571850
 EBUILD gtk+-2.24.12.ebuild 8395 SHA256 bb0df7d6771c06c2195df54a48d1b006b32a5d21aa493a4b8bad9d16c220eed6 SHA512 5ba4f233729d17ea3f4b0d6cef446f6e5d2bb939daec1b81d3d3055ff79c2b54402a59a8c6c7e28d5e316b0e51b4426f0d860c1996848dcea6b7c44043dacf57 WHIRLPOOL 177555bdcea980e48a2d037fbaa4ec607093271ab63908c12c4afb57f1ae684b3206bd0e913ed78981a59df6379ee2470fb08bdb4be3c5a269c6d9dbdcd31735
 EBUILD gtk+-2.24.13-r1.ebuild 8374 SHA256 3c78cb94cbf962896449a7c564a1ee54fbd22c789f906a89e4e63e31d89f5a92 SHA512 fa4d1adf469c68eb28ab3ddaafb44b40ea31dcbdc12914f5a63907f63e91275e5ee4b91bd859dcec7eadf050a2017f086f11ee6bb136ede64571cd2dc22b3bf7 WHIRLPOOL 5a11e4065089884a9a818432e306cf79607285bfe70aab5da8646c2ec9947194ae38eb2571a61d00e39a4e67a3d7004e0c1014293fb1810cc1e804db21250fbd
-EBUILD gtk+-2.24.14.ebuild 8453 SHA256 fd900269ab5fc0f82d4eb295f4c6568227388adf1d6c1c47bec023b839abdfc8 SHA512 6523eadf090c09fb2634301b565a71c346e30cc956797c5ba3ef793beac06c478836ec960d0b42d883427a71f585bf726a105b86d4c36b3c8e7078157e595643 WHIRLPOOL 4311d898c046df7ea4bdb1d8999dc4ef6d4f1550db4d3b6ca308cf40fa1cd683d85be9433735c108c2783c3c33178fd06d5595cb3701f499aac53ae7d41e7e78
+EBUILD gtk+-2.24.14.ebuild 8395 SHA256 dbc956990101408216e2f0e79e11d8157cb186619a76203d282a79a0b81f45ab SHA512 6bdb023528fc9d42209d1c9b0ad4bb5e138905e16eee682913162dc49870ff704f9a98a409c34999d9436fcd066b4fcb6fdbcbf6e9bef9e43e30ee4f4bee2349 WHIRLPOOL d3a24d8e7c54b3a8d5675df4c57bacac14035192fdae24a08fb6e57222718624f129aa823de2347a9109cf8f40093b98118737ede771832351b6b5134e87c596
 EBUILD gtk+-3.2.4-r1.ebuild 6922 SHA256 a5a138e1243cc1a25f6d6a29f9a1f3fcffabc939b4c12cb4c6fbfd46f1059299 SHA512 0a67fb5b8114ad8fedcc54dbc0d0ab9db1ec7252d7cc4f6bd092f770fa8c85de9bd743738d1da2824c18382e065dab95e27f1acd8b1347203777ee6a22ef65af WHIRLPOOL ffabadedaea7bbc5807ec2304c45d758156f9c40e3319a1c88eea4600221f3cbe35e27b1d4a1d05f0985117b715152c46da8bbb9b7f20cfef6c3fba726bf6178
 EBUILD gtk+-3.4.4.ebuild 7094 SHA256 928b0f6acf86fba5109d8e8f4d5bc1b365d19ec8092b2b7103f5c8ff005cda27 SHA512 2df2bf8b4c9d1535a2c4ca3a27f2324de4eff6ec79f712ff4cef72849fdb0b0fc6a7cb8a5084483881d97e55032c177e3c59f92f60444d0701c53b76224b1ac5 WHIRLPOOL 745c204b2459e94a6fa225a4d19a99581ff3f71713a3559cdd9a6871f8fff80c6c7e5c673059a2377145b16dda5ffb1371ad0c9bb0bf0eb806000a3e49d1f6bb
-EBUILD gtk+-3.6.2.ebuild 6955 SHA256 c80891639e27f1614d86be05acf533620ca16963f5a51f3f7285e2b5728945f8 SHA512 a9eabbacbb1298c992bad36ea28e26ed53f85bae830a3eea7c941619dc26e61d28a4ca520c6398a3c5e538cee46fb3e4ff00aa8919d25e0383438c8865c86a38 WHIRLPOOL 27d101f6c4502f0c89cf7adeaf739a4bf304c3faa76e05281174d2c2ff967e80bdb1b1e6adcc55e4f2df4a0fdf0f7dc797ad7f652ec179385d7b80163d48f0d9
-MISC ChangeLog 98462 SHA256 a926527afcf0bee347a90f2cce1db56d72548b1995b8ff054665b8b1693942a0 SHA512 4097b93278b76f4b59c6985b3e951ba97a45c5e44069b3264d9b4d616695ea812396793e9c86616a04c7d81d7f93d260c1b74ffe2406b18756c16e86b5e6d9f2 WHIRLPOOL b8341c04ac0a1bac3d99a2a55dac51bfaf04b401e0f29c4450d8bbc9001b90b4af6c51e7de461d271517f5179f47514e814b470f27364179f730c93edfe268e8
-MISC metadata.xml 927 SHA256 9752fc68dfd0f6b5f432e014e38bfc4e19fd1179c969d5a3fe92ac626b699199 SHA512 d7f776dab10659c02a50583c617cacd4b72117726c9c31af81310b8a71a721be140d57ebda752ebcbff74722783878012889912d150577d4e44a148826b25d71 WHIRLPOOL 98a2c04f6566db01d83bc319710241a0cac8c0d56e99c6d961ba6e1c21d8207095c8415d56f9b790d04b8dc2b712af4e3f4f9b98f22fe38ad091c0a63dda5013
+EBUILD gtk+-3.6.2.ebuild 6944 SHA256 a7b15f7a845fe7aa668044d53704c3b0f8d78b7099e2f16fbb7bebe9c9bbb99b SHA512 5340d2895162199b56263cb10b145edaf2311e42eaeaf6414648f4280194497f683363c2824385a02faaf065ddbcbc04773ea1f20a7465a39417e4e23b695cb4 WHIRLPOOL 4312c513cc944fca3a296d268e7823f09991f35539d1de61a293a3a7fac165b212dd8cd128f34aea730be689ffb0399b3b2d6ec3f7697c4657a5e7d5cb96c83e
+MISC ChangeLog 98638 SHA256 d5dca3e205f91e4495080375ca85f130dfa10e0a3ecdd2e404af3950e3fb4fdd SHA512 24963a79b0b7167148f53b14db2a06cdfe2d4d78249e9f9bd18fb872331131f97aa74441739cb68c89015d8b259e4aa18f49919ab6e4b1dc8dd6045936f89f69 WHIRLPOOL 742c219fd8c5abd452ad8f5fcc69289fa2c71743c23199c3fc18928db2101b4350296663a4ade43a0bbbadf356c654799b466f2ea87b2db4263dd69b51aebf64
+MISC metadata.xml 819 SHA256 209dfda45798143d24e44a476d11c0c1b6d714069cbdb45e1eda91384d316266 SHA512 2c67e6ef20846e825c2b9f90a4f1d8d69d20bcaeae0b27b4d318944653259e4f0afe4107ed457471f36cb832eefed007bde17f4aa59d8c97062fb641f4adc9d0 WHIRLPOOL cb99e984950e6144a68886606962b66004dc2b97e6930fe350ddb7a0a5bb0e2f4af671f9c9292be803629a05ce7fe4dc2a9ebef422951568e8c2f20aa53b378a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQwDeRAAoJEJ0WA1zPCt1hZp4H/2YgmS4h+afLHJRJL4LBRH6L
-eGQRhJTqfzGh618FuqAQL9A9OjZp3lbC72zAPPqCjnOwYSDLkrfvGBT5upSeqVZS
-63tTJeqv2+daIiwjKEHRc1VrfvnuPNjHsPis8tNBD6RFettAXpK59/lMh+UOmMqr
-uwtbg2TW9NorxeoJe0ACGatWoBQP1yvqcuSu/hoFlfCz9RYzoJb9uy5IczxyoZhU
-ZU8PHvCkM1HnC/lEq97O0DlU8c9Fi3MkzWQXkByOJfc3djO1+xQGCL2hI6vO7OZ1
-bXniPcqPF2lRhFUxzfVW/R+kDCKdlY/Q5l+dW58yWuVN2rWtBc/W9BtpeZtIbtk=
-=3eB2
+iQEcBAEBCAAGBQJQzWzZAAoJEJ0WA1zPCt1hF3IIAInzY7Sg9eOQZcA7w2ltteze
+wzYFcCbTkyoArkwxBF5lUQJvC6+8lRZLa1gopqAdjLcrcoa/OxCxOVTB1IbbRWIJ
+730n7jRCY5Sz7JqbenLjNoCHA76F3VrNIzP38Vg6ucokl3paFqCpgDoULk1PNacH
+LZ1Q16Gkt96HlrsisWMXfMzpYjvyZsIlFiGG4mZ7naBnx5mCZAS/z9h30nXGYdoD
+x5GoCq5WYD71G0ImCQT6Hcpfuol6v6vcrUFvUkVpO3JxAsjOQ2ydyIQ+yE0DtNH+
+TLXu56gkO5zQW9HcEZxYYdPlvKaCUs20Z/hn2YmAyervHD5+381cAaLmq25cKZs=
+=dxtc
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.24.14.ebuild b/x11-libs/gtk+/gtk+-2.24.14.ebuild
index 89fa840fa523..874e20e813cc 100644
--- a/x11-libs/gtk+/gtk+-2.24.14.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.14.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.14.ebuild,v 1.1 2012/12/06 06:13:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.14.ebuild,v 1.2 2012/12/16 06:40:24 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic gnome.org virtualx autotools
 
@@ -27,11 +27,11 @@ COMMON_DEPEND="!aqua? (
 		x11-libs/libXfixes
 		x11-libs/libXcomposite
 		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6[X,svg]
+		>=x11-libs/cairo-1.6:=[X,svg]
 		x11-libs/gdk-pixbuf:2[X,introspection?]
 	)
 	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
+		>=x11-libs/cairo-1.6:=[aqua,svg]
 		x11-libs/gdk-pixbuf:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
@@ -40,7 +40,7 @@ COMMON_DEPEND="!aqua? (
 	>=dev-libs/atk-1.29.2[introspection?]
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
-	cups? ( net-print/cups )
+	cups? ( net-print/cups:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	!<gnome-base/gail-1000"
 DEPEND="${COMMON_DEPEND}
@@ -158,20 +158,15 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="$(use_enable xinerama)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		--disable-papi"
-	if use aqua; then
-		myconf="${myconf} --with-gdktarget=quartz"
-	else
-		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
-	fi
-
 	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	econf ${myconf}
+	econf \
+		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+		$(usex aqua "" --with-xinput) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable cups cups auto) \
+		$(use_enable introspection) \
+		$(use_enable xinerama) \
+		--disable-papi
 }
 
 src_test() {
diff --git a/x11-libs/gtk+/gtk+-3.6.2.ebuild b/x11-libs/gtk+/gtk+-3.6.2.ebuild
index 522c0d0e3a7d..bec32d1d9f64 100644
--- a/x11-libs/gtk+/gtk+-3.6.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.6.2.ebuild,v 1.2 2012/12/06 06:13:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.6.2.ebuild,v 1.3 2012/12/16 06:40:24 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 
@@ -49,13 +49,13 @@ COMMON_DEPEND="X? (
 	>=dev-libs/glib-2.33.1
 	>=x11-libs/pango-1.30[introspection?]
 	>=dev-libs/atk-2.5.3[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
+	>=x11-libs/cairo-1.10.0:=[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
 	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
+	cups? ( >=net-print/cups-1.2:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
@@ -133,31 +133,29 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-man
-		--enable-gtk2-dependency"
-
-	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
-
 	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
 	# need libdir here to avoid a double slash in a path that libtool doesn't
 	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+	econf \
+		$(use_enable aqua quartz-backend) \
+		$(usex wayland $(use_enable egl wayland-cairo-gl) "") \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_test() {
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index d4946dd47eca..2652778e9ba1 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -13,8 +13,6 @@
 	  in printing</flag>
 	<flag name="egl">Use EGL surfaces and Cairo GL in the wayland
 	  backend. This flag has no effect on X or aqua backends.</flag>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-      for introspection</flag>
     <flag name="packagekit">Enable support for the distro-neutral package
 	  manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag>
   </use>