[gentoo-commits] repo/gentoo:master commit in: app-text/unac/files/, app-text/unac/

[David Seifert]

commit:     cb0928bd2cce682e1eb3cd29b8b367d2b0873e94
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 17:06:38 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 17:06:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0928bd

app-text/unac: Port to EAPI 7

Closes: https://bugs.gentoo.org/704976
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../unac-1.8.0-debian-gcc-4.4-bug-556379.patch     | 10 +++----
 app-text/unac/unac-1.8.0.ebuild                    | 31 ++++++++++------------
 2 files changed, 18 insertions(+), 23 deletions(-)

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 ca1d50274da..a006c4fbd78 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 72fcf4f08e3..fed5a147afe 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
 }