gentoo auto-resync : 21:11:2022 - 01:03:25

4 files changed, 34 insertions, 36 deletions

diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index aa19d972b17f..e224c7da0e13 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,4 +1,4 @@
-AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
+AUX crf++-0.58-autotools.patch 470 BLAKE2B e5d749ffdc84b45afaa5f1acb2fe2a71ca3ac4be0a93fa8ed16ac45267c77d15324e52a001b6a6bc14bde4bece6354e15a91dbb41b8d8c09f03ad4ea9afa3425 SHA512 188a95ba63a7c979a3fbd1a3f800764857f9b16c0ce2651ece7f575029992a9eb1a94bc14827bb7f766b7e61d5b0703edf4d204cb215ac1f002b977154e81da0
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.58.ebuild 1097 BLAKE2B afc590d65d22590d2bc02bb523953097f681875f8034adccbdb1ac5e79b12f7cea8865eccbf6340b7b1e9fe799d64e7ec8aee47b1106542bef574c782c6122f6 SHA512 a5f6db965938aee9d8ddf2079e1d996dbea715f87beeaff24fee2be0a47fad105eb8766958c84d8608d21b9eb6b1fc517a6a9400f5af9e57b2af983dcb0ef36f
+EBUILD crf++-0.58-r1.ebuild 828 BLAKE2B e12e631d0968f5ab1c9c1ff3a19c444c467bd7e6167372307802d4de8a210082a2814ef8652f0df17f23d224cfa2128c047f71ea82b36acaf92568bfacf08f80 SHA512 5bcd8b24b5b481baf04e269344a6fff23a9ce6b8ef8ce2ebd32bf6566c749a5b65b44f91a5cbea72c6490f2f66e427ebb287ba15cc82e4dfe80cfdf4c8319205
 MISC metadata.xml 670 BLAKE2B c37096e57c935e0d90c1434e509857577275165424fecbc8fe3a836c1330ff4fa4dffa174dd8004e3c923fd890dbbd370f8269b2ebe0b1538fec41ca25edeeed SHA512 e42bf715ac69cc4d61ee289a8ab14bc3e15bad7d4002b826fc9d5ca8bbf79998e4f79d76d0b698c30602d6dbd4dd64553085bbb354a30c466a3b1ab6ce62ca9c
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58-r1.ebuild
index f14ffbc4defd..c10b4b472085 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58-r1.ebuild
@@ -1,59 +1,44 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools
 
-MY_P="${P^^[crf]}"
-
 DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
 HOMEPAGE="https://taku910.github.io/crfpp/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://gentoo/${P^^}.tar.gz"
+S="${WORKDIR}/${P^^}"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="examples static-libs"
+IUSE="examples"
 
-PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 HTML_DOCS=( doc/. )
 
 src_prepare() {
-	sed -i \
-		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in
-
 	default
-	mv configure.{in,ac} || die
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_test() {
 	local d
 	for d in example/*; do
-		cd "${d}"
+		pushd "${d}" >/dev/null || die
 		./exec.sh || die "failed test in ${d}"
-		cd - >/dev/null
+		popd >/dev/null || die
 	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
+	default
 
 	if use examples; then
 		dodoc -r example
 		docompress -x /usr/share/doc/${PF}/example
 	fi
 
-	if ! use static-libs; then
-		find "${ED}" -name "*.la" -type f -delete || die
-	fi
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/crf++/files/crf++-0.58-autotools.patch b/app-text/crf++/files/crf++-0.58-autotools.patch
new file mode 100644
index 000000000000..df3584432bbe
--- /dev/null
+++ b/app-text/crf++/files/crf++-0.58-autotools.patch
@@ -0,0 +1,23 @@
+--- a/configure.in
++++ b/configure.in
+@@ -49,10 +49,8 @@
+ dnl
+ dnl check gcc
+ dnl
+-if test -n "$GCC"; then
+-   CFLAGS="-O3 -Wall";
+-   CXXFLAGS="-O3 -Wall";
+-fi
++CFLAGS="${CFLAGS} -Wall"
++CXXFLAGS="${CXXFLAGS} -Wall"
+ 
+ AC_DEFUN(ADD_CC_FLAG, [
+   AC_MSG_CHECKING(whether ${CC-cc} accepts $1)
+@@ -285,6 +283,6 @@
+ AC_MSG_RESULT([yes])
+ 
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+ 
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
deleted file mode 100644
index afff7edc0707..000000000000
--- a/app-text/crf++/files/crf++-automake-1.13.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -240,6 +240,6 @@
- AC_MSG_RESULT([yes])
- 
- AC_SUBST(datarootdir)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
-