gentoo resync : 22.04.2018

5 files changed, 4 insertions, 20 deletions

diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 787cde06743b..1e21653752e9 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -3,8 +3,8 @@ AUX cairo-respect-fontconfig.patch 538 BLAKE2B 7cc137277ccb2e1d641fd8ca39ee7ccd0
 DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e4b6f0eaeaa3f3eec6b26935c073590a32f17b6268d99bb297ba516da7debe7e3e0abf16d36e012e761dbc7ecada SHA512 a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
-EBUILD cairo-1.14.10.ebuild 3948 BLAKE2B 1d0341e593ec6a05f3d085e794e78e80d8e77c97d48ed18a48531a40afa1976c24128942ed44059616597816f9eeb812d091740279eb3ecb7e5246ed48de85a9 SHA512 c7a336a2ac1479f437b8004c5ad4b38756b1056f1cb9d0ab4dcca97e1eb61c240114f867ee66e9cff1273156f5c6a472cca1c7ccbfac7a7b283c98c03c1d4a62
-EBUILD cairo-1.14.12.ebuild 3938 BLAKE2B 0c8f0e5cedd006f2fc75fb97fab1fa0e81125844223218ef30108089aa344a72a61138d136b4957e2ee0e108ec6529bd46571cf6bd4f90cac543c913bbaa6c56 SHA512 52c28b5ff5004cf791084195165e889fabf6b0469a76efaca5a0a52df1325e2fac29a281260f8d0e3cbbb79a8ae598ecdb3c7dceb531b91b38a87f3500fd4e65
-EBUILD cairo-1.14.8.ebuild 3969 BLAKE2B 446cac4d88e0805ded1a3ca9702eb58ff0b78c5c7038dc4a4671f8677b1ef8d0e88c75d94e16a0366652835f83c542e5841c645160203ce3f3fa4006b16c5f4c SHA512 32250d74eb8508f601bb35096c2446bcf67494bad7d7e4402173044e46d9842c5c8c00361b8884a05fb7f2f5b58f90283e0a0a11036ec71814c4853676d66f97
-EBUILD cairo-9999.ebuild 3997 BLAKE2B ab2fb119f30ab78b474e42a342893dbf0157c89b37cef389d17abe614fc349de707e29b71f27c3aa46c1e84ab4f9c308636a444296cfea459ceeedd0f2e4345a SHA512 5ba225067a8b9def6881f0eb57f57dc2916d0f695bd74d48f2d2def24f413a18dcb37b81879193adf63e949e719c997cc11f6fd4ff5b746cf944f9757e03ee7a
+EBUILD cairo-1.14.10.ebuild 3820 BLAKE2B c38924f9d4debbee038b921a580fc301a85cb8883789e585ac6c26ad3cb67a6e5e537bb1f7d01e9da28e8d73b3cef12d5718a82aff3be49dfbafa13c61a91c1f SHA512 ffc989dcbcdaa765f27bde1c515d91ea27abebe70e52bf76fa957747d6e7284bb43ac4dcb32f306bdc8c7abc8b9293103d593ce20309db75a56f931a63fe388a
+EBUILD cairo-1.14.12.ebuild 3810 BLAKE2B 35e3a19697b85b9dc1cfefa4e1602b350db317be4dbc031253f0db49f8fb5e66629c7dedaeeaabeab7bab1195f0082f32caded5d9bd0467f4ff6613a52c4b32f SHA512 38b270e67abe11fbb71e192b1eb52d420c8158db5da1da8cfc3f3804d6fe8e3457084ffa836d1bce63b791c8ea3327e475655548384d87c24dc84343e0f4991f
+EBUILD cairo-1.14.8.ebuild 3841 BLAKE2B 4d27c8093de44a933e7dd6df6c906e5f1420534e16f1a3693fd6c69d31aec4be2e72410db1059f3249713302509453aeb7951a95fae6a7e45311205695d3e890 SHA512 70a4c769defec2e3c02b33fb207c5f76b50831fdeca41536ef4ba44597b4b8b5903d4ddf4967a6320faa6aa31cb85bf2d262f144282f088af103ff30011765c5
+EBUILD cairo-9999.ebuild 3869 BLAKE2B 22870a457ce5d15f3b8a3863d0a8b0065d7e63dc672d6f1b7208f51b316fa626c4ada84ecd2bc5b0ac29e0c7f9ae7a3aea43f2385907102e88e11dc9c9e769a1 SHA512 c5edad1ee9ded398aceee30f58403c60aa5438c992388251c4cf568ab05964e5ff36a155f29597fa168529a255d0381904735da5ba77b92c4072d7e41274f8ee
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
index a6ea82e1c364..5aaa2fe51429 100644
--- a/x11-libs/cairo/cairo-1.14.10.ebuild
+++ b/x11-libs/cairo/cairo-1.14.10.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 37c94b9168c5..b6e16c5bd43c 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
index 0d661077e6fd..d09ee28f1531 100644
--- a/x11-libs/cairo/cairo-1.14.8.ebuild
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 7f294e891d56..278ea13a4cdc 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -43,10 +43,6 @@ RDEPEND="
 	)
 	xcb? (
 		>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-	)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig