gentoo resync : 02.06.2018

7 files changed, 35 insertions, 41 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index ec3450bc4a6c..eb7a43ea5a71 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/yasr/Manifest b/app-accessibility/yasr/Manifest
index b2d64f04a710..0e88931a8fe2 100644
--- a/app-accessibility/yasr/Manifest
+++ b/app-accessibility/yasr/Manifest
@@ -1,7 +1,7 @@
-AUX yasr-0.6.9-automake113.patch 421 BLAKE2B a7cb0b57821f7a0b1f95caf370154d150d8d90e8ff1e8cfea2d37b735fe96e9e114f73e088debbc7ddc8d94e56e2389704352ea9bde4d4ab868028459db0433f SHA512 dd7ed04dd5706819f0abafe6d96ef1beffa2e9161b2b395cff8c0c3a8394f56edd9e41043494cfc245cb643ec69f2fcb016b2ff34e0e487f661754f1815dd600
-AUX yasr-0.6.9-gcc43.patch 987 BLAKE2B 61f7cf34ff88ecb6d461886910489565c87d7bc972e9b0e6c19a3a6fc34f80fdf01f08f7ba24b610f92fee064da61d0cfb88d56475c87134d03d5f64aa17431c SHA512 9511d50b550939fb36bb3311fe0cafeb9a62a1ad55748c46ee9af5fb6ef9e510252588fd25bac600ac88badfd38518b43f0f8cc532759bd5e0bfff20ac8f9990
-AUX yasr-0.6.9-gettext018.patch 283 BLAKE2B cce70cf972341b9552fe9d00795e76382bb100a828a59feea06017d9bc2eb3db2f0ab89b3de0c45ab6d3dd241578dd9372658ad502f200da0499a15a018fb0ad SHA512 214b709bd69127dbb3559d97e09ff40c55d65374ebda22a4e2b7791c0589df39f9bf0413b4690ac3350bf46a2440e5954fdedb99d6e071701e26fee97f5b0778
-AUX yasr-0.6.9-remove-m4.patch 728 BLAKE2B 4ac6e03d2584798ec9f2c64ad21d9d965886e3c7cdf108146987534317b179bce1d7accdb9ed36d7ecf8a9436b4add311644bc1c8f209de7d831958ec9ff0676 SHA512 f2ee9f752cd177cf9ce919044b8128e6293ac87a955f2f974f76a828b32b4531fdd3ea0cad0d4513c74c9d44ee0589ca0663d15d8b67bad7fe874f19c1ef4c0d
+AUX yasr-0.6.9-automake113.patch 350 BLAKE2B e0b5dfea954b7454b53c2895782394402ff5d7b57fe7dae8a8b14e74884c89a26d971169910235d0c689bc639a2d9a6f50b62eb112d391ddfbd53a58981b2061 SHA512 4af1f1cd14f78f7ead05398b981d5028f3d2c8164dcc43102b6d42fbf86e0f829df70c2316f14a62db01527c2bf0f5abc88ebff88d4fcfabbd3aa99f720a3738
+AUX yasr-0.6.9-gcc43.patch 830 BLAKE2B 12f6cfb9cd4761eddbe7b1fa5063fa122916858a68de1df553fa213cd5df9c6c6332df716eb361d9a0df61bafcc6761bd36945eef575e57b8e1afa5292516530 SHA512 bc41914287b834dfc2469658a0462c1a32e83fb176005e0b093d1f0eedafad1ff1495e257a8b24ad0bde7d6b59076332e484a99f1b2e44d5c4402a58c5c659ff
+AUX yasr-0.6.9-gettext019.patch 210 BLAKE2B 055cf2d8a4e8321be0303a5dfb7cb1004d6e1e6f78bb46530806317c598ea2d5661daa93c7dd104cd1e94272ed0bed6e2011cc212158f6aca8c9311d248424cf SHA512 8183f356c48b9a71c74bbca6aaf01845fd6575f7ebdf266e4fbd3a023c1dd3e3f87821598a24dc15c9e11244ca7b969480d33283ad9920e8ab97cfc5ba1a9572
+AUX yasr-0.6.9-remove-m4.patch 412 BLAKE2B 41487fd7799a02b4abd0a30db012ff3d7c30a78e450be3f0b6daaa2612b75ac20ca6810a55a47a9a31e2a6e6abd82a0947d116bb8ea30b38f1dbd6f7c9fa07f6 SHA512 960559acb69be73f5f93162a0d2cded594c332ee4dc50fea92eaae58cfa64c9d473d86289643e1fac50663c0b90145d3fdd9c67a423ee93cd0fd67bd40689409
 DIST yasr-0.6.9.tar.gz 235768 BLAKE2B fbc9e9933b608644465e10e6418c6471fdd85497b98d19e7c66402a5d9075aaea78384c009e01d691899ae41268cfcd81a1f907d9cf6ee88863cf524335504f0 SHA512 107af558fce20bd79b81d68915032e511aa44df33a37b82ee2e82fb0d60ee14759d9b4dfe8634fdf1926c8b5c57e89aad1966e2dba243b725e72f783fe123df4
-EBUILD yasr-0.6.9-r1.ebuild 1270 BLAKE2B f1cb59cb6ccc67c6727ede1b8f024aedfa27efbabef46b02bbce7ef62a255e603e4f10dbe4e95c480d66207cb5f17de12210958e1c59490810df8489bb21a8fe SHA512 9ba6ebf087640d40eb4268b625e0cd626fd954f208dfa306a92c59023786fafc868b9982c8440460a901b94181d65f139e41ecbdac7505a4d52e3a2f08cddb13
+EBUILD yasr-0.6.9-r1.ebuild 1217 BLAKE2B 50751a4ef1135a66c6588aad351591621d0e1c9f7ff9d615f5fda424e6b5a5d1ee30da70a7b53a75a4cd18052e46a5bf85adc552b83230749c5f86c12e208ea2 SHA512 65e5108414d119aebc5933cd75982f6ef3b338ab3350d4961466879e11cfcd1b765a6634daba00f4c21230e8492ea049bf2603c63fa81519c8117540f61691a9
 MISC metadata.xml 343 BLAKE2B 996f4f22178b37cf20289679145ed57ce54dd1c4cfe90eb0bb77ed527b8e605241bdc7183418157b6795fcea0a4a340e2683dcfc44bc72a7fbafc047af16c490 SHA512 ec1a6eb820455bbb6d1dca0aba4e60e1e47e91725ea2091480f96a52cc98b1779b0c6bd2927142bc9bed45a45d51de22c84626531ee287303fce14ff9bd1a8f0
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch b/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch
index 2fbc32c2e986..0697a17fdc3f 100644
--- a/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch
+++ b/app-accessibility/yasr/files/yasr-0.6.9-automake113.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.in b/configure.in
-index d78e8b2..15e8666 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -2,11 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
index ee2b1a6ef7bd..ccff0009e9eb 100644
--- a/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
+++ b/app-accessibility/yasr/files/yasr-0.6.9-gcc43.patch
@@ -1,6 +1,5 @@
-diff -NrU5 yasr-0.6.9.orig/yasr/yasr.h yasr-0.6.9/yasr/yasr.h
---- yasr-0.6.9.orig/yasr/yasr.h	2008-06-29 01:23:44.000000000 +0200
-+++ yasr-0.6.9/yasr/yasr.h	2008-06-29 01:37:00.000000000 +0200
+--- a/yasr/yasr.h
++++ b/yasr/yasr.h
 @@ -306,22 +306,10 @@
  extern void opt_say(int num, int flag);
  extern void opt_set(int num, void *val);
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-gettext018.patch b/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch
index 26337dbc6735..89b2adfcd45f 100644
--- a/app-accessibility/yasr/files/yasr-0.6.9-gettext018.patch
+++ b/app-accessibility/yasr/files/yasr-0.6.9-gettext019.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.in b/configure.in
-index c26f577..d78e8b2 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -57,7 +57,7 @@ fi
@@ -7,7 +5,7 @@ index c26f577..d78e8b2 100644
  
  AM_GNU_GETTEXT(external)
 -AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18.1])
++AM_GNU_GETTEXT_VERSION([0.19])
  
  AC_OUTPUT([ m4/Makefile 
  Makefile
diff --git a/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch b/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch
index fa05f0791fc2..4c2a345df58b 100644
--- a/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch
+++ b/app-accessibility/yasr/files/yasr-0.6.9-remove-m4.patch
@@ -1,6 +1,5 @@
-diff -Naur yasr-0.6.9.orig/Makefile.am yasr-0.6.9/Makefile.am
---- yasr-0.6.9.orig/Makefile.am	2008-02-02 06:44:05.000000000 -0600
-+++ yasr-0.6.9/Makefile.am	2009-02-06 08:37:07.000000000 -0600
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -7,7 +7,6 @@
  
  SUBDIRS = \
@@ -14,9 +13,8 @@ diff -Naur yasr-0.6.9.orig/Makefile.am yasr-0.6.9/Makefile.am
  	README-ru
  
 -ACLOCAL_AMFLAGS = -I m4
-diff -Naur yasr-0.6.9.orig/configure.in yasr-0.6.9/configure.in
---- yasr-0.6.9.orig/configure.in	2008-02-02 07:09:04.000000000 -0600
-+++ yasr-0.6.9/configure.in	2009-02-06 08:36:43.000000000 -0600
+--- a/configure.in
++++ b/configure.in
 @@ -59,8 +59,7 @@
  AM_GNU_GETTEXT(external)
  AM_GNU_GETTEXT_VERSION([0.17])
diff --git a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
index 2bf8a4603be6..b9e8c1573d6e 100644
--- a/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
+++ b/app-accessibility/yasr/yasr-0.6.9-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
 
-DESCRIPTION="general-purpose console screen reader"
+inherit autotools
+
+DESCRIPTION="General-purpose console screen reader"
 HOMEPAGE="http://yasr.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -16,36 +17,36 @@ IUSE="nls"
 RDEPEND=""
 DEPEND="nls? ( sys-devel/gettext )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.9-automake113.patch
+	"${FILESDIR}"/${PN}-0.6.9-gettext019.patch
+	"${FILESDIR}"/${PN}-0.6.9-gcc43.patch
+	"${FILESDIR}"/${PN}-0.6.9-remove-m4.patch
+)
+
 src_prepare() {
+	default
 	local x=/usr/share/gettext/po/Makefile.in.in
-	[[ -e $x ]] && cp -f $x po/ #330879
+	[[ -e $x ]] && cp -f $x po/ || die #330879
+
+	rm -r "${S}"/m4 || die
 
-	epatch "${FILESDIR}"/${P}-automake113.patch \
-		"${FILESDIR}"/${P}-gettext018.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-remove-m4.patch
+	sed -i \
+	's:^\(synthesizer=emacspeak server\):#\1:
+	s:^\(synthesizer port=|/usr/local/bin/eflite\):#\1:
+	s:^#\(synthesizer=speech dispatcher\):\1:
+	s:^#\(synthesizer port=127.0.0.1.6560\):\1:' yasr.conf || die
 
-	rm -r "${S}"/m4
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--datadir=/etc \
-		--disable-dependency-tracking \
+		--datadir="${EPREFIX}"/etc \
 		$(use_enable nls)
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README ChangeLog AUTHORS BUGS CREDITS
-	dosed \
-	's:^\(synthesizer=emacspeak server\):#\1:
-	s:^\(synthesizer port=|/usr/local/bin/eflite\):#\1:
-	s:^#\(synthesizer=speech dispatcher\):\1:
-	s:^#\(synthesizer port=127.0.0.1.6560\):\1:' /etc/yasr/yasr.conf
-}
-
 pkg_postinst() {
 	elog
 	elog "Speech-dispatcher is configured as the default synthesizer for yasr."