gentoo resync : 28.04.2018

2 files changed, 30 insertions, 31 deletions

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index fc9ecb4515eb..ee9536ec91bb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -12,5 +12,5 @@ DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fa
 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
+EBUILD freetype-9999.ebuild 6391 BLAKE2B 692190bd0f74bde9a86e436078584c9e70e672ad409c72ff6c5712948214464da971998a0a8146906a45ca19ac9bc39d5f90ac8a58f735c60003aaa37adb7b5e SHA512 87c1df557644d23949a44c511396e9c91da84a2aa8e53ac8c36d8d416c9619cc106f1796d6a41b204638d4b9d0fe963ad1c8b9160195b2d2fcaaca26e8bf9786
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4fa091f67693..ba2ddfe1a614 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -3,17 +3,11 @@
 
 EAPI=6
 
-SCM=
-[[ "${PV}" = 9999 ]] && SCM="autotools git-r3"
-inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs ${SCM}
-unset SCM
-
-INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="https://www.freetype.org/"
-IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz
-	infinality png static-libs utils"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
@@ -23,7 +17,9 @@ if [[ "${PV}" != 9999 ]] ; then
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-	IUSE+="doc"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
 fi
 
 LICENSE="|| ( FTL GPL-2+ )"
@@ -52,33 +48,37 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
 )
 
-src_fetch() {
+_egit_repo_handler() {
 	if [[ "${PV}" = 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
 		local EGIT_REPO_URI
 		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
-		git-r3_src_fetch
+		git-r3_src_${phase}
 		if use utils ; then
 			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
-			git-r3_src_fetch
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
 		fi
 	else
 		default
 	fi
 }
 
+src_fetch() {
+	_egit_repo_handler fetch
+}
+
 src_unpack() {
-	if [[ "${PV}" = 9999 ]] ; then
-		local EGIT_REPO_URI
-		EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2.git"
-		git-r3_src_unpack
-		if use utils ; then
-			EGIT_REPO_URI="http://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
-			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
-			git-r3_src_unpack
-		fi
-	else
-		default
-	fi
+	_egit_repo_handler unpack
 }
 
 src_prepare() {
@@ -174,8 +174,7 @@ multilib_src_configure() {
 		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
 	)
 
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -199,7 +198,7 @@ multilib_src_install() {
 		local ft2demo
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
 			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
-				"${ED}"/usr/bin || die
+				"${ED%/}"/usr/bin || die
 		done
 	fi
 }
@@ -211,8 +210,8 @@ multilib_src_install_all() {
 		local header
 		find src/truetype include/freetype/internal -name '*.h' | \
 		while read header; do
-			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
-			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
 		done
 	fi
 
@@ -222,5 +221,5 @@ multilib_src_install_all() {
 		dodoc -r docs/*
 	fi
 
-	prune_libtool_files --all
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }