x11-libs/gtk+: two small changes

First, this adds '>='-versioning to all the neccesary atoms that lack it
(but, I did this quite hastily and without consideration for how this
might impact non-overlay users with upstream's masking and keywording)

Second, it adds a hack (not a pretty one) to set the CUPS_CONFIG
variable when running configure as otherwise, gtk+ now ends up dying
(late) at compile-time for non-native abi's due to cups-config no longer
being @wrapped (as the downstream ebuild has been dropped).

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 51 insertions, 36 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 855aa8c..5e41529 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -22,8 +22,8 @@ AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb7
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
 DIST gtk+-3.10.8.tar.xz 14187652 SHA256 5fd28b35ab475d521751fa6ae91318bf58f69cd34e71363f24e23d3ea406b684 SHA512 b96ef832fb76c0d35f8e9a2db48c4d65229dda5a5755f8f0010e3d5731322dc8a6a01d9d0ee10e93e19b5102ad8025286cf7f1caa9466279d1daf9ec52d98b34 WHIRLPOOL 554e1e34a55103be0cfa8d0af00026dd3dc1b4a8666ba99e298ff2004b2da4971a57ddf891110b825f75aa57967c5fbc338c2752ad9b393d1515b8ad148ac79d
 DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
-EBUILD gtk+-3.10.8-r1.ebuild 7405 SHA256 573504efe962099c3d91981f662fc4baaf1cb12df97fcf9a5f83a0a764fc9c05 SHA512 268231ccb99fa8feeeb251347ab2d255edf142f74fe2c72d8dc7b9d416f0bc6acfae0afc3ab82cbe489a8c7154b1ab1a01ecb581b88037001c7aee560510b62a WHIRLPOOL c63daa5de6e66c334e8fcd5ab4094766c274c2772e2fff81bba12163fa44beabca87c2e737d240d2e7d1ff3e332682ff3c675fed14c086b19ccc6edea50c636e
-EBUILD gtk+-3.12.2-r1.ebuild 7475 SHA256 f857bbb24a43b2e08e392f9dea96936ebda5d0160c4b97ddcd470b3768e4dea7 SHA512 23a3f23c49ea503286b3141b7ebf17e2c05e4cadc47ad9644de878c86d72a509c0d57cc6b967ade26a291f4d33f1eaf3bcd6c5ea11a538d4a7e06beac25f7363 WHIRLPOOL 7a7c1028fea698e0d1fb1fb37352161b12a77b7e7146a36c536dcd3ca4cd1869704ce943f61c085aa6dcb35f63c6873df60a60b54df76560301828e9d52c1666
+EBUILD gtk+-3.10.8-r1.ebuild 7746 SHA256 657a635e43fa4a27729a5717cd2adbc563658a9d5394f0aaf869ec99fda4a038 SHA512 dba2450f47724963ad72200b13e9a023b1653afaca6d29d326f33bc87283e8f018c6b1325b818273d2c637d890671fb0dd9daee6e96410108ca1e71390ee3a39 WHIRLPOOL 523e8a332dfc9ec746e59fdd38d20c03fb686bf2c9465c5ef96c923fb9839b603d993aa0a62c0918f38af1b274b8fe1716a120d5bf0ed24dbe03d5d99eba142a
+EBUILD gtk+-3.12.2-r1.ebuild 7817 SHA256 1eef98421f26e53a0640988f050c814d33a990660f0eabfdfe7dcc55ffe914da SHA512 c12dd3f5b27d8b24e4fe72a28c1a95bf0b744f9aeb47f69f85521bdef93552a24353a946e1a7679811d3affa5531c0b4d7a4290413de73ee3bf6893c7efc7905 WHIRLPOOL 0e0286bfade10e81714bd10db947dbd5e0b7d6e86e1fee4e4b39ce3222cfd0678be6094de7eea329a69b57ff01f8a3859c66adf244eb601ade0e9fb830cc6fa5
 MISC ChangeLog 14075 SHA256 f95e7911d346970c3e8041ada1158d6194daec8013686b57f7b112e14d1780bd SHA512 8afe64622ff6483de17dea82214e04bebaa85939d7711bf4b6b7e21d354670922e5ee9ab46e4b805bfa8e52f64087a8533d60dab338ce56b2c353cb9a6389439 WHIRLPOOL 718eb64e4721a7771daa39257c5f3e7b4c54a08e415beaf38caf3e3247f14a1bacc795f7cd235238e78d0f6fc25d835189e90f06c5e990bd233eeaa2e1035205
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
diff --git a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild
index 4a62832..b835700 100644
--- a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild
@@ -39,25 +39,25 @@ COMMON_DEPEND="
 	x11-misc/shared-mime-info
 
 	colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.7.3[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.32[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.2[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-10.2.1[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
 	)
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
@@ -67,17 +67,17 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt[${MULTILIB_USEDEP}]
+	>=dev-libs/libxslt-1.1.28-r2[${MULTILIB_USEDEP}]
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.20
-	sys-devel/gettext[${MULTILIB_USEDEP}]
+	>=sys-devel/gettext-0.19.1[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+		>=x11-proto/xextproto-7.3.0[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.26[${MULTILIB_USEDEP}]
+		>=x11-proto/inputproto-2.3.1[${MULTILIB_USEDEP}]
+		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
 	)
 	test? (
 		media-fonts/font-misc-misc
@@ -155,6 +155,13 @@ src_configure() {
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
 		--libdir="${EPREFIX}/usr/@GET_LIBDIR@"
+
+	unset CUPS_CONFIG
+}
+
+ehook gnome2-multilib-per-abi-pre_src_configure my_abi_pre_configure
+my_abi_pre_configure() {
+	use cups && export CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
 }
 
 ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
diff --git a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
index 047985a..c7e1497 100644
--- a/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
@@ -43,25 +43,25 @@ COMMON_DEPEND="
 		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
 		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
 	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-1.7.3[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39[${MULTILIB_USEDEP}] )
 	wayland? (
 		>=dev-libs/wayland-1.3.90[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=media-libs/mesa-10.2.1[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
 	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
 	)
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
@@ -71,17 +71,17 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt[${MULTILIB_USEDEP}]
+	>=dev-libs/libxslt-1.1.28-r2[${MULTILIB_USEDEP}]
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.20
-	sys-devel/gettext[${MULTILIB_USEDEP}]
+	>=sys-devel/gettext-0.19.1[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+		>=x11-proto/xextproto-7.3.0[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.26[${MULTILIB_USEDEP}]
+		>=x11-proto/inputproto-2.3.1[${MULTILIB_USEDEP}]
+		>=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
 	)
 	test? (
 		media-fonts/font-misc-misc
@@ -158,6 +158,14 @@ src_configure() {
 		--enable-gtk2-dependency \
 		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
 		--libdir="${EPREFIX}"/usr/@GET_LIBDIR@
+
+	unset CUPS_CONFIG
+}
+
+
+ehook gnome2-multilib-per-abi-pre_src_configure my_abi_pre_configure
+my_abi_pre_configure() {
+	use cups && export CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
 }
 
 ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test