gentoo resync : 15.01.2020

3 files changed, 20 insertions, 25 deletions

diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index 4b39ee039540..ddcec0b23f3a 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -1,5 +1,5 @@
 AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a4f39d15c6bd315921674e8653c0c87bf07b85e9d72c6ef3cae6463852a78b5f084b4a193ec1412369a818b04737f57f2e SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5
-AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 BLAKE2B af02bd996b41651305b7f958adf87a0901be40b39312951ddfec4b0c973fa95626de115ed33d0ac609a3ef8b1f97e8673fad3c5d6ef09ac5f2744ef415c8609b SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e
+AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1204 BLAKE2B 8014d5cf159b64c3898f3356ea8dd5393d4288c352c660b75d847a8323eb4425b02ab3f466864424405011e6587334a1e5f006588b563a1666b53b0e5f256359 SHA512 a4379869ea0035640905fd592085a48a6d23e3ae958044f606129e589348d5244cd3b6b161a22b8b5867588aeb60cc3f90ea93ed38ea1c90039928e4126fd29b
 DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
-EBUILD unac-1.8.0.ebuild 1171 BLAKE2B 8b5a9c2fcdcb36897b2c872f868779d61594ce3e436d381588a072698ee1b508aae1936e42126e68253d6a3d988f0f696b026d76223deb2c118017f3b21c17e5 SHA512 78bde946af0b15b836075093f2d0d93b031c4fa1071fcae697c5e6940b80caae970d5418c4c62f3e5e404da93b757f39ace4154edd1344284e266ee80ed35c60
+EBUILD unac-1.8.0.ebuild 864 BLAKE2B e6341adb6cab9229b6e298abf5ba3162768d8f53d85b3579db43fb118255d101fed4edc4a27ceb8bb152ef0ba1119732020d8a623ae8c7636649a23f2a6ced5e SHA512 fbbbf170f80624d5952a4a7982d343f3d22f3fe8b6495bad7d57197ffeb49c5ceb265640dd55e11f9ee024819e1317fef2a4b5ef912523ffa64263c9f6cba5c5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
index ca1d50274da6..a006c4fbd787 100644
--- a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
+++ b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
@@ -1,8 +1,7 @@
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556379
 
-diff -r fd7eb0d70970 unac-1.8.0/unac.c
---- a/unac-1.8.0/unac.c	Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unac.c	Fri Sep 17 10:36:07 2010 +0200
+--- a/unac.c
++++ b/unac.c
 @@ -13873,9 +13873,9 @@
      *out_lengthp = 0;
    } else {
@@ -15,9 +14,8 @@ diff -r fd7eb0d70970 unac-1.8.0/unac.c
    
      if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
        return -1;
-diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
---- a/unac-1.8.0/unaccent.c	Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unaccent.c	Fri Sep 17 10:40:34 2010 +0200
+--- a/unaccent.c
++++ b/unaccent.c
 @@ -90,7 +90,7 @@
      const char* charset = argv[optind++];
  
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index 72fcf4f08e3f..fed5a147afe5 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Library and command-line tool for removing accents from characters"
 HOMEPAGE="http://www.nongnu.org/unac/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/libiconv"
@@ -21,29 +21,26 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}.orig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-debian-gcc-4.4-bug-556379.patch
+	"${FILESDIR}"/${P}-automake-1.13.1.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-debian-gcc-4.4-bug-556379.patch"
-	epatch "${FILESDIR}/${P}-automake-1.13.1.patch"
+	default
+	rm README.Debian || die
 	# otherwise automake will fail
 	touch config.rpath
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
 	default
-	prune_libtool_files
-}
 
-pkg_postinst() {
-	einfo "Examples of using unaccent from the command line:"
-	einfo "unaccent utf8 été"
-	einfo "echo -e '\\\\0303\\\\0251t\\\\0303\\\\0251' | unaccent utf8"
-	einfo "unaccent ISO-8859-1 < myfile > myfile.unaccent"
-	einfo
-	einfo "See man unaccent and man unac for more information."
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }