gentoo resync : 18.12.2017

6 files changed, 43 insertions, 98 deletions

diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index 6a2c84a3f50b..8b3150097504 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,6 +1,4 @@
-AUX crf++-0.54-gcc46.patch 297 BLAKE2B a284ca06af5d752adc6017344abfede30b6e6939b316197f904081baa426e8558be862956d400a0b9434891c853f7d7b4464c1a66309f5906da41fa5d6c2e193 SHA512 3390be3aee788af08969a02ebcc4a645537d635e47091da528a6fa1a3d43a20e677287d47070bdc97b3b0c4f8aeabd5a5c107d598919a5e9882ef180f704c390
-DIST CRF++-0.54.tar.gz 809008 BLAKE2B ed23b998ee5a37afc3f429ac04a8e6f57febb93dec469c68c7db1fbb3dfb1d1df7a2ddeb48ab758a6548f60bc920b8c7a3d6f418776a2a110812457245a3f6e9 SHA512 4198ad9423776a44d02db51a655a35f36db767ec623f55de426b3415179ac7187b91d23c6ef9a2cf3d1c38e14507fc7681006ff2ba50dcfc771a7d5e9d1c5760
+AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.54.ebuild 1118 BLAKE2B c7e9750fe440add09c74750ede0b930cea6d978658d68225b0e4adc0084d178b637ebd122b756ac7695d5ece1f52919333dd9fe58c76c3de3a4b3dd310a22ee6 SHA512 7ae040f57b491421e2c6689f0b54ba3d963aadd1e67721177ed44aeb6539e3d40f229f652a695fe863fe752634b8d3600f00e6e78e8ec4ae807fe36971c414e5
-EBUILD crf++-0.58.ebuild 1097 BLAKE2B 53f3ec7866c58afb271e3b13b0d30354393716850ada6dfc4d645308e12a4d45a7fe8a11b74b7bd293006dd76de245cb8798c67e2036b937e8c256ccc700b97b SHA512 2b452d9e7be197a3100061040d606fac3df07bc61deb3a3fad69ff65fde3ab7b5e3fdcb2a57b45b29f7a23f8459d987a00be51be6a02874d6b15a27415bde91c
-MISC metadata.xml 666 BLAKE2B 01126fb5d24a9c8dfa3d8aca0516a132245bef92219100fd9970415153abbd80414cddcb1948a82617164f7515687fe01a950b326b200bdb71901a5bb9fb7312 SHA512 922c14845da38ed461a50f654bd858f1d1de04642bdd40ba353f87000fb1d0150dfe9fa2e52ed5b4d8dd2e8f64b636c94577cf74a9c138f0aebd1a0d9da462d8
+EBUILD crf++-0.58.ebuild 1142 BLAKE2B f3b9572d8fcedf2245d7e1ad51e5c43d9b13559c1894b47d9ca784fbdd447507e808f9df5c2f708f29dec06758740e0180770319ead3ddc56e77516c9330e707 SHA512 ecf7045059470e8a318fc8c46ae38af0eac567382755d29f5594d6f87f30baf35fb9c86a0a79d87f2b300c3675684924791a0656463a4191d94327c099bbbc30
+MISC metadata.xml 669 BLAKE2B 12280d15998c56ac4c2e3bd3e80fd2a22eb150b979836d8600df3d5a36008807f0cc7fd91b84cd3717c379c9ca603ce110a88c3f86b48e29be983f99faa1b6a0 SHA512 d479bf4332884e2dfdd57b6c496b585f7e55adad2200dd22684a9fe6f1cc1c69049fec20d3ee0683543119c4f4935c83cda7d6a501b44e51e612249283fda7f3
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
deleted file mode 100644
index 204eda151148..000000000000
--- a/app-text/crf++/crf++-0.54.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit autotools eutils
-
-MY_P="${P/crf/CRF}"
-DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="http://crfpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crfpp/${MY_P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
-
-	# bug #365921
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) || die
-}
-
-src_test() {
-	for task in example/* ; do
-		(
-			cd "${task}"
-			./exec.sh || die "failed test in ${task}"
-		)
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -type f -delete || die
-	fi
-
-	dodoc AUTHORS README || die
-	dohtml -r doc/* || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example || die
-	fi
-}
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 7518e894e2e9..c358043e7e8e 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,55 +1,61 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-inherit autotools eutils
+EAPI="6"
+
+inherit autotools
+
+MY_P="${P^^[crf]}"
 
-MY_P="${P/crf/CRF}"
 DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
-HOMEPAGE="https://crfpp.googlecode.com/svn/trunk/doc/index.html"
-SRC_URI="https://crfpp.googlecode.com/files/${MY_P}.tar.gz"
+HOMEPAGE="https://taku910.github.io/crfpp/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
+HTML_DOCS=( doc/. )
+
 src_prepare() {
 	sed -i \
 		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
-		configure.in || die
+		configure.in
 
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static) || die
+	econf $(use_enable static-libs static)
 }
 
 src_test() {
-	for task in example/* ; do
-		(
-			cd "${task}"
-			./exec.sh || die "failed test in ${task}"
-		)
+	local d
+	for d in example/*; do
+		cd "${d}"
+		./exec.sh || die "failed test in ${d}"
+		cd - >/dev/null
 	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
+	einstalldocs
 
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -type f -delete || die
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/example
+		insinto /usr/share/doc/${PF}
+		doins -r example
 	fi
 
-	dodoc AUTHORS README || die
-	dohtml -r doc/* || die
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r example || die
+	if ! use static-libs; then
+		find "${ED}" -name "*.la" -type f -delete || die
 	fi
 }
diff --git a/app-text/crf++/files/crf++-0.54-gcc46.patch b/app-text/crf++/files/crf++-0.54-gcc46.patch
deleted file mode 100644
index 93cb54020cfc..000000000000
--- a/app-text/crf++/files/crf++-0.54-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur CRF++-0.54.orig/path.h CRF++-0.54/path.h
---- CRF++-0.54.orig/path.h	2009-04-05 20:42:35.000000000 +0900
-+++ CRF++-0.54/path.h	2011-05-31 01:31:43.845198215 +0900
-@@ -8,6 +8,7 @@
- #ifndef CRFPP_PATH_H_
- #define CRFPP_PATH_H_
- 
-+#include <cstddef>
- #include <vector>
- #include "node.h"
- 
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
new file mode 100644
index 000000000000..afff7edc0707
--- /dev/null
+++ b/app-text/crf++/files/crf++-automake-1.13.patch
@@ -0,0 +1,10 @@
+--- 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])
+ 
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index 4fea4cf917d6..edc6c2bf83c2 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -13,6 +13,6 @@
 		Information Extraction and Text Chunking.
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">crfpp</remote-id>
+		<remote-id type="github">taku910/crfpp</remote-id>
 	</upstream>
 </pkgmetadata>