gentoo resync : 09.03.2018

5 files changed, 32 insertions, 236 deletions

diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index f5c22831e88c..f861aa078930 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,12 +1,8 @@
-DIST harfbuzz-1.4.5.tar.bz2 1474461 BLAKE2B 8f2fb5c20c92afe3fb344bf4d4024090d68ab60c6d899c9805eec0bc6d0a714a3d98bfb6718ea4225da68b19e95db357c744dcba310076f4c56ed590985c9d1d SHA512 dd505ef950ef1d702a820987d8e93097e4c4fd9f725d18e69dd756ea21d4d5624eb2edfc8563f89947e3913bf5efa1834092e06ea02821744b0b588ce2ceb00e
-DIST harfbuzz-1.4.6.tar.bz2 1475086 BLAKE2B 8fb082016bc50e8ae2ab9244ae2ac0b01dc5967ab14ec6aeba52a66b4926327f6c0cb7bce0020cd8183c07c57a41de1255a5782218fda87290cbad2c29d08860 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096
 DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
-DIST harfbuzz-1.7.4.tar.bz2 1718260 BLAKE2B 9a1ded92df7682b161a3db8ee9de80d0a2bc7d6b28f3318bad37c9efe45d7b13b8e268346dc814d7875e739d22eb264c0e7e75b24c931be416e8dca4b7f6e9d9 SHA512 d5343822f2e7ed33b34f0ecb470d219be161ebb4d2349833a8fcd909cec18a97aed6ca51a97fd73407d5d70ebfc61cafb71bd13ce96c9a278c720681a04f47df
 DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506f07dbecf04ca85fb96b2b3c4bba46245c2326c1414811ba5d312cc21ac21dd7efe595665f134812b719c24ee9e49 SHA512 c2c13fc97bb74f0f13092b07804f7087e948bce49793f48b62c2c24a5792523acc0002840bebf21829172bb2e7c3df9f9625250aec6c786a55489667dd04d6a0
-EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
-EBUILD harfbuzz-1.4.6-r2.ebuild 3167 BLAKE2B 7f7ed68df05d3d71c1977e253a8ba7da7ac28d65467b255e7076f39a47e46e91e558ecc5a30069c75f47d9933163ae2a661c3c11c9937dd768cc082136c14797 SHA512 e20d4f4d7573ddbf45eda1df6ac1302ef262e1023a02da03e9202c274681fe2fa7355afeec0edeee36898aa8e61195ecb2f3afbccea230b21d5c7c6bc1a38eeb
-EBUILD harfbuzz-1.7.2.ebuild 3197 BLAKE2B 86cd2be07eaad3f806a85f6dc10bf3a4e616033c8958d91203010f5654be472eebceaa8eccbb0349b388803dc337238c0c88d0f83be32e2b92eb01f7275ad3d2 SHA512 5f4d009a51e1549b19e938d3fe8b745ac29931dc00cd33aad370eb8d62ba1e68e079e63ee4c75d50ee38cf919d8ea0abcc35e5d9b9e3429323a8aa8684c4436d
-EBUILD harfbuzz-1.7.4.ebuild 3206 BLAKE2B 273eeb600ce847f89ad191d0356f969a210c44923184adbeb7357ffdf234785757323c2af506e55f4c4a1c5ab1fc1c4fcc7f61ba75372ecc645019e622130ca8 SHA512 4a4db7d9d1ab32e36379e4d4519adc7df00c0ba824ee83d18d2cb71aeca2195d0ba1165dbb5b3f4a579740268057ac595d4e2ae58a592da6328a46852d13292f
+DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
+EBUILD harfbuzz-1.7.2.ebuild 3196 BLAKE2B 9e5fd81a09a5af0195bd40bfac953e3f974a7433c9dd7b7d21954ef043bf94e9aeb7d408021f3f7697eaf6a4d5bf65dd0f147a5978e6936e8d77cfa211d6b40a SHA512 52b2c7acee286bd2ad9e1e934408cc4b3d3b6f24b35e736cbe537da2ef0a41e755329ff76e2d5c9cdb9127a1a55730fcddd8fe01767240baa2d4179acf2f8495
 EBUILD harfbuzz-1.7.5.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
+EBUILD harfbuzz-1.7.6.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 EBUILD harfbuzz-9999.ebuild 3212 BLAKE2B f49d9fada1aaf936aeeef3448b1951243d8e6db46ccadf147f66fc20b5930c4ea1f3978c005ada123bd59777fe6c51e40269f78d49d634e3c3d512bba5a0aab9 SHA512 ef8a80e51fae481b7b1e94fcf51367a4ad844b153a6599fe629a506d56e12650a85f11c987b1f900c928571f01b3d4f155b8161f50a47a0d94ad983a764e721e
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
deleted file mode 100644
index 52c659cce124..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.4.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/harfbuzz/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild b/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
deleted file mode 100644
index 9dc93543a438..000000000000
--- a/media-libs/harfbuzz/harfbuzz-1.4.6-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/harfbuzz/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:= )
-	fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
-	glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
-	graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-# eautoreconf requires gobject-introspection-common
-# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-	if ! use debug ; then
-		append-cppflags -DHB_NDEBUG
-	fi
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
-		# on Darwin/Solaris we need to link with g++, like automake defaults
-		# to, but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-		sed -i \
-			-e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
-			test/api/Makefile.in || die
-	fi
-
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize # for Solaris
-
-	# failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
-	sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
-		$(use_with truetype freetype)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
index bc500d82e55c..faf79815e167 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 54a876d4a141..81bf676d86a2 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=6
 
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
-
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+if [[ ${PV} = 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
 
 LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 
 IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
 REQUIRED_USE="introspection? ( glib )"
@@ -38,10 +40,12 @@ DEPEND="${RDEPEND}
 "
 # eautoreconf requires gobject-introspection-common
 # ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	>=dev-libs/gobject-introspection-common-1.34
-	dev-util/ragel
-"
+if [[ ${PV} = 9999 ]] ; then
+	DEPEND+="
+		>=dev-libs/gobject-introspection-common-1.34
+		dev-util/ragel
+	"
+fi
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -81,20 +85,21 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
 	# harfbuzz-gobject only used for instrospection, bug #535852
-	econf \
-		--without-coretext \
-		--without-uniscribe \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_with cairo) \
-		$(use_with fontconfig) \
-		$(use_with glib) \
-		$(use_with introspection gobject) \
-		$(use_with graphite graphite2) \
-		$(use_with icu) \
-		$(multilib_native_use_enable introspection) \
+	local myeconfargs=(
+		--without-coretext
+		--without-uniscribe
+		$(use_enable static-libs static)
+		$(multilib_native_use_with cairo)
+		$(use_with fontconfig)
+		$(use_with glib)
+		$(use_with introspection gobject)
+		$(use_with graphite graphite2)
+		$(use_with icu)
+		$(multilib_native_use_enable introspection)
 		$(use_with truetype freetype)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
 	if multilib_is_native_abi; then
 		ln -s "${S}"/docs/html docs/html || die