gentoo resync : 27.03.2018

4 files changed, 23 insertions, 19 deletions

diff --git a/app-accessibility/flite/Manifest b/app-accessibility/flite/Manifest
index 1e00aa7950c5..55b4187e0d26 100644
--- a/app-accessibility/flite/Manifest
+++ b/app-accessibility/flite/Manifest
@@ -1,8 +1,8 @@
-AUX flite-1.4-audio-interface.patch 520 BLAKE2B 065aed446b775ca66e8a637894a1e0c70f730bd2a3834552d7e7cbc67e114a63c9470764c641abadd6cb3c5f240bdb7c56c9c8461be010e1a46c151955872330 SHA512 06fea693abbb186e039cc371ce5cde2b77979964778a7c24d9d2d2de9994898fa8a8f2ff0a341fc97f813f61d6c9e7a011caa0963467398176ec04d69c750283
+AUX flite-1.4-audio-interface.patch 452 BLAKE2B c4d2a9f1368ee93802e004a1573ada68e0420034dd9f48d508e9f250bded341bcaa223ae12edd202d6185c9ac14cb00f9ce43c4c805e473dafb5d06185255646 SHA512 f2eb669767c9db9c5c5a8836491d8174bfc13b53b7de575a4dfa34bcdee428fce6d3d65829a523bd96b297015f7fa5815e93f119e91bfc7ae21cff7c274961a7
 AUX flite-1.4-fix-parallel-builds.patch 599 BLAKE2B 0176441ade2c4290f8e1f700d98b9fd2a15329fdcd68c5c877c60e632c829f25f81924c0f8367009a354bb5e1f4b735a80b964192014755d13d16d06cb0ac207 SHA512 5adf675aadc3493ad70b1e7f447a1d7c0ff9c11a7dce90afbc6ccc7c811cc7226a7b1591a1a819209b26e93bf48c11cdaa8db1cfd55eb884a66b054c79590509
-AUX flite-1.4-ldflags.patch 1806 BLAKE2B 9244bb6bb2ccbd74240bad4557eeda0e05de0885429513fe56c6c2bda28c3d3ba220e92e8304877e52465bb65785c4caf7490404906c3296b60909cf30d6d54d SHA512 87c91fca91e3edb84ef6e6fcffcb67ab9043547fded84ac2f407d02b880350223e860d976564e273ae5efebd9990e303bdd6818291d03fd74118e86c12aa59c5
+AUX flite-1.4-ldflags.patch 1488 BLAKE2B 8c245691783f0c573fbed6759a59379c32eaf14d369cb04be5072f1ab8ffb97a6aa6c1faa938362454794059ed0aeca2e2517eff60ee64085e2d4b888a92310e SHA512 3672edd25ec7062b3736fa297a5805d85854c0a1668c2648b93a07d8e09c970f0f8147f788a916221e8e6a20decb8b8681e8315e07b335cb89a185f0b65f805c
 AUX flite-1.4-respect-destdir.patch 1902 BLAKE2B 115d000bfb5f1a2a5764fa47c934889312bf1b3d955c15b089b1bebe3085af8d20b176611c8428f3788b46ca80f793f9610d3562128cfa59d1df985754f44dd8 SHA512 acc37971361eda4ce91cf605e3ff7878842d605d12973c37ab80451e6a1f9dea96b54cbd39a9ca281f36f6ed6ec1e79af712692639f541c59a7cedad2af47de7
 AUX flite-1.4-tempfile.patch 1413 BLAKE2B 4e87ce5acc26a69148107b0c1d31c62871917a200d6235bb34516456d8a1f30ed17847298e8e002d83c076c08196c2dfe9da49058e68647d3ae52027feddcafb SHA512 ebf09b9067eb2e97486950bbc93f8d428fee3b762483cb6332fb93d17c1b444a1d2e2c07ee3d874415ef50449b7800dccb19d16924e124cd158b93a5340531df
 DIST flite-1.4-release.tar.bz2 15163897 BLAKE2B 34b721ecd98a5699c352346528374df1c1e8395b815ea9026dbc6e4de7584bd93efb83d64fe1ec32bef03311c19920b18b198e2543dd2f010b0a3ca229337ad0 SHA512 eec1022077fb7a47db3848ae6944509e18a6c86a25aa24f921b8b6c2af708fc9811b287e76d96cf64fc68f8e1d0a43b7e878659f15bfcf76957eddd75e599112
-EBUILD flite-1.4-r4.ebuild 1676 BLAKE2B 84e4515c0fd0f7b500468d078eb81cc841676b69bbf023807217aa64e5a995a3bd64ff1a46316c7cb281fa8c31fe671c8a7bf00e24791a9c810c41ffbaf54aaa SHA512 146158506c52445b1552fc0e5fc069acbfd561ca9864d4100b4c35c54d6a4c177aaed0e4bffffd0cce2fcd6b47b70f51c1c4f5388791ae79060a586398e52e99
+EBUILD flite-1.4-r4.ebuild 1713 BLAKE2B 2bf9fe611d3f02058525665658afe45e31a83a1e1fd3189a557b55d986a8c9ff8d928cf1f21cee9bbb9160a4d09161200b280ab797d721afea68285877cd02bc SHA512 169dc7d49d84ca0378b2392f0b21ff8d4d15d06bda1507eda3b742d00dbe55a63dfdfec44a1f488608ceca83c1a613cc09506fb41f9f0638feb9abb47f1e81c7
 MISC metadata.xml 375 BLAKE2B 53b765bc4fadaebf85eb9f48a7613a0ca9a9280ffa716accabeadbbf41eca5001f1c70f1ea7b5731345e375adbbb386669c201a7658485d30b296144eb2d98fb SHA512 affeb58d8d6f6659fc2d00b01bb627307920575589c7c78358b26074c94831af9a40bc2b0ba9e55758f968adf7b6a15bbc1542db83b1457107fd9fbdd2a3d224
diff --git a/app-accessibility/flite/files/flite-1.4-audio-interface.patch b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
index bc8d25b89bc3..d50428edd5af 100644
--- a/app-accessibility/flite/files/flite-1.4-audio-interface.patch
+++ b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
@@ -1,5 +1,5 @@
---- configure.in	2009-08-15 06:46:38.000000000 +1000
-+++ configure.in	2011-08-30 00:53:26.000000000 +1000
+--- a/configure.in
++++ b/configure.in
 @@ -304,7 +304,6 @@
  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
          AUDIODRIVER=$with_audio )
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch b/app-accessibility/flite/files/flite-1.4-ldflags.patch
index f9295fb853b7..fd8f49059e76 100644
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch
+++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch
@@ -1,6 +1,5 @@
-diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/config/common_make_rules
---- flite-1.4-release/config/common_make_rules	2009-07-30 14:52:56.000000000 +0000
-+++ flite-1.4-release.new/config/common_make_rules	2011-03-26 20:22:59.000000000 +0000
+--- a/config/common_make_rules
++++ b/config/common_make_rules
 @@ -68,7 +68,7 @@
  
  FLITELIBS = $(BUILDDIR)/lib/libflite.a
@@ -19,8 +18,8 @@ diff -Naur flite-1.4-release/config/common_make_rules flite-1.4-release.new/conf
  	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
  	@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
  	@ rm -rf shared_os
---- flite-1.4-release/tools/Makefile~	2009-08-22 20:19:01.000000000 +0100
-+++ flite-1.4-release.new/tools/Makefile	2013-01-20 20:06:34.259527220 +0000
+--- a/tools/Makefile
++++ b/tools/Makefile
 @@ -62,9 +62,9 @@
  LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
  
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild b/app-accessibility/flite/flite-1.4-r4.ebuild
index 536b8f83eea6..54ce1000b6a8 100644
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils multilib-minimal
+EAPI=6
+inherit autotools multilib-minimal
 
 DESCRIPTION="Flite text to speech engine"
 HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html"
@@ -18,6 +18,14 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P}-release
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-tempfile.patch
+	"${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch
+	"${FILESDIR}"/${PN}-1.4-respect-destdir.patch
+	"${FILESDIR}"/${PN}-1.4-ldflags.patch
+	"${FILESDIR}"/${PN}-1.4-audio-interface.patch
+)
+
 get_audio() {
 	if use alsa; then
 		echo alsa
@@ -29,11 +37,8 @@ get_audio() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tempfile.patch
-	epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
-	epatch "${FILESDIR}"/${P}-respect-destdir.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-audio-interface.patch
+	default
+
 	sed -i main/Makefile \
 		-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
 		|| die
@@ -61,7 +66,7 @@ multilib_src_install_all() {
 	dodoc ACKNOWLEDGEMENTS README
 
 	if ! use static-libs; then
-		rm -rf "${D}"/usr/lib*/*.a
+		find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
 	fi
 }