Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug #513718.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

5 files changed, 85 insertions, 78 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 5dec9a58d895..53ae56756bcb 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.380 2014/06/10 01:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.381 2014/06/18 21:00:27 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> cairo-1.12.16-r2.ebuild,
+  cairo-1.12.16-r3.ebuild, cairo-9999.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
   10 Jun 2014; Mike Frysinger <vapier@gentoo.org> cairo-1.12.16-r2.ebuild,
   cairo-1.12.16-r3.ebuild, cairo-1.12.16.ebuild, cairo-9999.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 30d1e1adda28..7489cb1533a6 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -21,26 +21,28 @@ DIST cairo-1.12.14.tar.xz 42132464 SHA256 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1
 DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0
 EBUILD cairo-1.10.2-r3.ebuild 4381 SHA256 1780bb903d52e084bde89324d1ddf65b3484ff3697be976af0ca69e5159ed01c SHA512 a5867da983f05a785200d6b092df79a63440d31a2221d33647e148237f688ecf0a450442d29c4d28f40859a5e384acac8144cb2fb3b1afd8daa39e65f87a0bb1 WHIRLPOOL 2d0f5b20d09d17948f1ef3f963654372a0c9e8d4a248274f11e8d5d09c4f9cb34aa82b3fb2b3ccf30a733c17bb70530438b372d470d022f7cfa0bc4f198645ad
 EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 f83317c97cd971a6f2fa4901072dc7636463147731224dae79a883b2c3f44e03 SHA512 412b4a5faf0a6b4afdda3693352c38d922e764ff3dd75db1df5ebfd44647f213b4010f21586fbe2296dd382a152bb98dd4353a97b5f19d87c94aa2144bd058d0 WHIRLPOOL f47d638f92bb6647951ac21eebca5c3e576f2906ee35fc2d70242bbd91d35748c672ce3b7274723819eeaef1a2ba35e41078e14ca9aa980b56149373df052871
-EBUILD cairo-1.12.16-r2.ebuild 5351 SHA256 ef2341947c72fa22bd8c7e2c7073f8b03a5c685b1be6a8f463ed3731ed667508 SHA512 88969da52a3604f378b507b4098f208d58547e2e318ec77271a9a885765748293b695d6f33fe40f9efd1006b446a260325c43407065c3053fdf1df67fbdc4972 WHIRLPOOL 125509a9581f9466e22836c0a2d9c1bef618772270217d9d1d361897fc1f1ced28902c6d0bff5fea0963a4d02639e2ca853f199442d0a4b902cfefdb1e155b0a
-EBUILD cairo-1.12.16-r3.ebuild 6160 SHA256 467f729ecddc9e176781d40c08fabf33ac2198b4bb5c15dc2e978a2ecab8df78 SHA512 8cc3a87080270ec5f7a00a412158a3a20a3ba70a92aeccaeabb14bb54d499f782d0900aa8867864c8770b130fe8502b210a5f08f5942ca1aa36b9e61d45e4d9f WHIRLPOOL c12edbbab1bb17472e782debb2d1b513a4c3e307f771f14c2857c7dee982f2b87b27a22cf01cbb0483abb8362455912b422b8366918f730757173faf71ca4160
+EBUILD cairo-1.12.16-r2.ebuild 5491 SHA256 262fd3812e537d146142b82323dc58dfc542544e1d647d5c008d6823bb727099 SHA512 a329fee55b089bba4ebddb759d90a8d57d2d74e86cbe3ee2ee57c5d347b1a06e24d650c0c183ff953637e4d5536463c53a9464bd17a08cc6706919fe11125e4c WHIRLPOOL 27c492bf5426b28ef1a875e9577038672e7768065a251d452bdf5ef09e6e15a1e172d5ee3cd9c546a379db29b3ea7bd5ff83f070376becf43f76fb88fb8054c6
+EBUILD cairo-1.12.16-r3.ebuild 6300 SHA256 ca7b01edcc83587bea19d3d3e8ae0adcfce505216d8ab7fc9ff9feff90eccb92 SHA512 81b0e803b5960ab4185e75328531566264f1373b2f201c2ba7a338a6aa84d0b0728cfd3636b5ae6937010e70190a175e471b5b27feac521cc6c4b66f5128e33d WHIRLPOOL 9123382ac05f3752906104b5c3d974bd7fcc512c94339b7cc73981b64468fedd01090ff011eb2543bc542e5a0f3e91ed1890d15c91f9412d56d899b6d6e02c21
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
-EBUILD cairo-9999.ebuild 5937 SHA256 b22a682b6347f6aac7212c17ef329ec763c79eec5288a34646275c0c6a12f37d SHA512 6ca4f4f6b745bf984e5260b5768aca58618e1c42d44da1059855a875ed96a2c2a08d3e3d075365ed9eaeff04ca244add567bfeb163f5b303c045957fc119672a WHIRLPOOL add6cfe955722f4f3fc10aee4b2cd54900f77659ba2d3470115522675f3aa62041a7a6a3c2dd67c19517f127bcb10659a5e835815ccea1532af4363a8fecc39e
-MISC ChangeLog 56580 SHA256 f56aa01132809feb381889c037f98fbf5ae60c29da322ca973e4cb4e0ead935e SHA512 d87e10277e48396308ef3a8f73db3b3f0bfc9e7733b920916f19d21fc9615f030752a08b38e988d7301d712d347009801a8bf2d87a3bd9e163199f27173f29ee WHIRLPOOL df1e7d054b52e08aa4e567c85ff95b13136d554b2d3aaa62d487e56296545d6db7abc77e14a4d23b8d79649f6b670cbb03576565611b9b24bdbf4981ae7020cd
+EBUILD cairo-9999.ebuild 6077 SHA256 7768be1e975de2055c3b8cffdab4e4549f44fe47398825895f74742743c183b4 SHA512 45b8c7eb3cc4e7d6a24a4aac482f54c1b0532d59790ba14e91c4b3acf71349e3d4e448384329860825af4ed62e0a6e6fc4814148f488b5e101831a2b0803e78d WHIRLPOOL 16fd8f429ccdcad1c9d2c2ebb150eb378c2e5bde66517eefd804d05d1a2ef5e94af22bdd8a9e8cca40a9c611d97fda1fe9c9252822a2416f53fbccbaf05ebe29
+MISC ChangeLog 56789 SHA256 7b3c4b8ae6ac0683f85b52f7b3cb843a5e2ce8acdef90604cf317456213d2f4a SHA512 109aabf0a92ce5c999b135093822ac2d44b45b542a96e3fefca12be1533d84d8226bf10aa617e2473084a8c4cd87952d3c816b93339e3f4eb2d0edf6a65409cc WHIRLPOOL fb6ce27fc810131949ecdd9368fd31b23d4e78645bb0f4cd3b5fdea346279d1c42e8b87ac8d46b60c50989e1f978877f1aa27eae04fc2e58617141418363f22d
 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTlllYAAoJEPGu1DbS6WIAW/MQAIIx/sw3bD2wzvhfuZi7UB4V
-BY0XmgyUA7nHYMVD/x0vFC1EqMPWDT3Ug3Rs+04SHWa6vgfdB9aSR0ZfSjjurkwa
-7X8wyNqQj2rQMmM96+C6y2Y/kd644dJ86iFWb9RcoWZGKQ+IYdpc32PTv9OgIhWo
-5IfgPLD7Fg4yruLS3jt1zr9opjpuP8x39LfEEW149QcIpt1RdwAe8tQLUpYTzRuY
-XQIERGpAGwndwzOSR59Y3q6oduQjOUD/TU6kvcJQZ6rXQ2j98mxHFguujP8Y6uY7
-fDVuVbVARjP4UDGh019W9EYC6uH/QJceB6G9pIheA9jI2dSQtYKZAMIzy4ANMkVW
-AA0IywmQGT/TpN/sV7lSNyOWfEQU2tFlojUVwWuVlkwUm/LG12Xc5zZvYUYgnOyG
-736iSqRAeKKVZ5++gTpYcyaWPcH8tDSLI9yHV72RP1YZcXURYZuUwjwsfUJxjBp2
-JZoQISrJ7enOcHCrV5TFUAZgetl886NMfL8nWMYQYrw2smoOYdZQy7eaR/hEKYmS
-I48Z+kRGFPxOw3mntgROFFyDO9N50AKwWz8RlonH7xOAnkOudl1y7ggkPHWW1Z8r
-nccv/edxnpB8hhwKWZsKp0R9VL7VYZnXAfDjzwFagOZ62jWuotxuUIDKOWHu/3xR
-HdeRIEEVvSQS2k7gQLgl
-=A+QE
+iQJ8BAEBCABmBQJTof3wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFQoP/RMp1Qe5bgTKflFxNCh1kqj0
+7sa7Q3LOn35sy3J7nPwz6VxFxy+6vuApk3BmpPxIntnyTmmwiapE8Lrv1cx+267f
+IdNmevLAB19Dt+lrh56xMBZv6rNlgHf5nXW6VmraoQ2QRjaKC24t6tfkZW3cVhW9
+xcZ4BpBS45KYv5foy+MP2hlvowc9USz0i775rzFCcxOyNwOW75DTVks5Uch9zX00
+HTITdLTdAsPBaHPO0APmiOLsI8m0qU7SalDIfz3jCvn2kgZ6dwfI/hobfb68WQhS
+l0cmTrzBMgM4G6n+SCzuRzRbk9w2o7jotGjvrBQ/T8kP8XXezW9z4YE3i2QRopic
+KFUoIMuHKv76bug8L99qaY3G6RmUDTiEpW5226akCc55KwcRUPq296SFOs5ZYu4Z
+9s+qejHlWs4bexnmInGM4DAZW3LJzYVFm2dADzIK9hHOrPakmCea/ycbr9GAy3O/
+e/BsW4Zp1/gIpNE3STneXhgAxks6yafO1hDV4zBTDIVt59hpGqMN0qQw/XxOgyH3
+ooVjYO6cKFjTiU4IQA4fS4O5cULhdI2XKiR9MlWUONEEOKrHmmN2MciVY0X+Cfps
+C4q8fFcstFNQfc43aPA8VFg/O3Ok5pFjFOhVQeSpat7+ySvRurtFAVCYBsjrTvDq
+vaKGZ0eS6+xi/aLM8JZ7
+=Cc0K
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.16-r2.ebuild b/x11-libs/cairo/cairo-1.12.16-r2.ebuild
index ec9a5c24dbb5..e016d59266a2 100644
--- a/x11-libs/cairo/cairo-1.12.16-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.5 2014/06/10 01:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r2.ebuild,v 1.6 2014/06/18 21:00:27 mgorny Exp $
 
 EAPI=5
 
@@ -26,29 +26,29 @@ IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers opengl openvg
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
 
-RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.28.0[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	directfb? ( dev-libs/DirectFB )
-	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
-	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
 	qt4? ( >=dev-qt/qtgui-4.8:4 )
 	X? (
-		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		drm? (
-			>=virtual/udev-136[${MULTILIB_USEDEP}]
-			gallium? ( media-libs/mesa[gallium,${MULTILIB_USEDEP}] )
+			>=virtual/udev-208-r2[${MULTILIB_USEDEP}]
+			gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
 		)
 	)
 	xcb? (
-		x11-libs/libxcb[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	)
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
@@ -58,10 +58,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/libtool-2
 	X? (
-		x11-proto/renderproto[${MULTILIB_USEDEP}]
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
 		drm? (
-			x11-proto/xproto[${MULTILIB_USEDEP}]
-			>=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}]
+			>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+			>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
 #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
diff --git a/x11-libs/cairo/cairo-1.12.16-r3.ebuild b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
index e1ac09b6b508..7c650f6fa630 100644
--- a/x11-libs/cairo/cairo-1.12.16-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.12.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.3 2014/06/10 01:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.16-r3.ebuild,v 1.4 2014/06/18 21:00:27 mgorny Exp $
 
 EAPI=5
 
@@ -26,29 +26,29 @@ IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl op
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
 
-RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.28.0[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	directfb? ( dev-libs/DirectFB )
-	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
-	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
 	qt4? ( >=dev-qt/qtgui-4.8:4 )
 	X? (
-		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		drm? (
-			>=virtual/udev-136[${MULTILIB_USEDEP}]
-			gallium? ( media-libs/mesa[gallium,${MULTILIB_USEDEP}] )
+			>=virtual/udev-208-r2[${MULTILIB_USEDEP}]
+			gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
 		)
 	)
 	xcb? (
-		x11-libs/libxcb[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	)
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
@@ -58,10 +58,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/libtool-2
 	X? (
-		x11-proto/renderproto[${MULTILIB_USEDEP}]
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
 		drm? (
-			x11-proto/xproto[${MULTILIB_USEDEP}]
-			>=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}]
+			>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+			>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
 #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index b2cc9afd5161..7d017ad4bd48 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.45 2014/06/10 01:03:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-9999.ebuild,v 1.46 2014/06/18 21:00:27 mgorny Exp $
 
 EAPI=5
 
@@ -26,29 +26,29 @@ IUSE="X aqua debug directfb drm gallium gles2 +glib legacy-drivers lto opengl op
 # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
 RESTRICT="test"
 
-RDEPEND="dev-libs/lzo[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	>=x11-libs/pixman-0.30.0[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
 	directfb? ( dev-libs/DirectFB )
-	gles2? ( media-libs/mesa[gles2,${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.28.6:2[${MULTILIB_USEDEP}] )
-	opengl? ( || ( media-libs/mesa[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
-	openvg? ( media-libs/mesa[openvg,${MULTILIB_USEDEP}] )
+	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+	glib? ( >=dev-libs/glib-2.38.2-r1:2[${MULTILIB_USEDEP}] )
+	opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
 	qt4? ( >=dev-qt/qtgui-4.8:4 )
 	X? (
-		>=x11-libs/libXrender-0.6[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		drm? (
-			>=virtual/udev-136[${MULTILIB_USEDEP}]
-			gallium? ( media-libs/mesa[gallium,${MULTILIB_USEDEP}] )
+			>=virtual/udev-208-r2[${MULTILIB_USEDEP}]
+			gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
 		)
 	)
 	xcb? (
-		x11-libs/libxcb[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
 	)
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
@@ -58,10 +58,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/libtool-2
 	X? (
-		x11-proto/renderproto[${MULTILIB_USEDEP}]
+		>=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
 		drm? (
-			x11-proto/xproto[${MULTILIB_USEDEP}]
-			>=x11-proto/xextproto-7.1[${MULTILIB_USEDEP}]
+			>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+			>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
 #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}