gentoo resync : 22.04.2018

5 files changed, 12 insertions, 19 deletions

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index 45693709d623..fc9ecb4515eb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -9,8 +9,8 @@ DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42
 DIST ft2demos-2.8.1.tar.bz2 228934 BLAKE2B a8ff102ec9e526791a83bed42eb5fc289b96f030ebcdbe5bdb4508676d81074ff16120664adeaf95e9d04004e2aba5c86a2b3f5410133344d1ebaf5d4c33cb46 SHA512 f3a3216448df7b9bebb875a69587f31d0548f4b7e1b1bd70b0f06b3c4a43b3f5ca99ac2fcfecb32909b16b32a466fff24d1a6407e5fd6c2145fd64d2a156429a
 DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
-EBUILD freetype-2.8.1.ebuild 5387 BLAKE2B fb2c13fc5568f95a82f44ca99a71e2c2d6c13a97cce5dfa822bb22dac93f611d213c0ca7bafca26ac0dad4993f06a6d9209119c56a0a34621f90e1001bf8afd4 SHA512 dcb6f589a27e3dc075afdff30ff13bb4dbcc2fb9da7793b9413a2875b3a4dbaa49451f15ff1cf8e650c86e6ae7f70d13b98f6b6693c263bb277b0dc6f7593403
-EBUILD freetype-2.8.ebuild 5377 BLAKE2B 32900ee9d5b0ad59350971b1d6a2ce006d57b2fc5a29b001373ad9af5132d4c45310893abe4bad9fdce6b2a95491b93f432f2944b9f650272530c08e1bbd2194 SHA512 79882b9b244d5fbdf1c3f981a2165642e3239ca4c490cfc173da6e594f08ae6bcdf60670d801ede3610c60f40eaff7e6c900e463088572161092069450717f82
-EBUILD freetype-2.9.ebuild 5389 BLAKE2B 0a61495616ce66d0fc1bbfc096eeeb723ba4c383301fdc4eb6886f9e6a758aadb60a177ded65c53fc2bb3a9d21ef10ecae0350436cb39a83d916c8a983f8a5b7 SHA512 a7e34c1f283d6df565e0ee72afe64d2a938f7ebda3553cc50cc7d311e82098e34e0332dddb7350735e13d0e69510ecdcca4337225747f2c2098d7ad590aba314
-EBUILD freetype-9999.ebuild 6514 BLAKE2B 23d06cda3bcd659f556da00bab4926bb0c6dd9b8f13203225a5781c8245bd1021d73b31db8b385ab7560f570dcd01ebf66ae8246a01cb2edc0c086b10c61b939 SHA512 974715a2cf7f260bcedf64664416bdbbc4d1e4de017a240900b5bdf9a924b042ee16d4c77fc67bf016de6a0ef0af26f2ac526c5c7aebf769b09c3f3ece23c7f2
+EBUILD freetype-2.8.1.ebuild 5286 BLAKE2B 111b52cc01d22c50ee59f12e022026420883123aa8a83ad4aff9fc88f3e9716d98f82e66308edfef966bc5f4830d2a147539b65818e65dc7816e1f38cd1b5e20 SHA512 e983b5d145fd2357b7cfaa8887fab2a6e124657f3ffb8b7358d6957c07b248ae79dce45a816cffadb2a35f5c654ff707da6dc9a92648e254f42493278b1a0793
+EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
+EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
+EBUILD freetype-9999.ebuild 6493 BLAKE2B 1c7aac501a5527fcdfb1e02947affa657f26bcb5e5fae2d51af2dc0c82059d76c22f7e9cb198758ea7075b87ec0bc1c7db86592c082731f634f1eeaeb4e06196 SHA512 83a558d45129dec28baa26192e03c2b156a17baa60ddb857cee8973505c7ecfd4c938fa1c50b047bdb3a805d39dfd7f2b5feb427972bc9e958b768c8ba1d7fe5
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild
index baa5cd66018c..03294bc1c4ef 100644
--- a/media-libs/freetype/freetype-2.8.1.ebuild
+++ b/media-libs/freetype/freetype-2.8.1.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index 20b26eccba27..4dfd2a7b4962 100644
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index cd02458948fa..4d9867d2f4f4 100644
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
 	infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4288d7cd6397..4fa091f67693 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -30,7 +30,7 @@ LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
 	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -41,9 +41,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
 		)
 	)"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(