From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E974B158020 for ; Sun, 20 Nov 2022 23:56:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3187FE0976; Sun, 20 Nov 2022 23:56:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 188C4E0976 for ; Sun, 20 Nov 2022 23:56:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42E923406C0 for ; Sun, 20 Nov 2022 23:56:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 83A9A75E for ; Sun, 20 Nov 2022 23:56:04 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1668988554.9ac73bf83b7c5fbdeadab0ddb508b6c88a69461f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/crf++/, app-text/crf++/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/crf++/crf++-0.58-r1.ebuild app-text/crf++/crf++-0.58.ebuild app-text/crf++/files/crf++-0.58-autotools.patch app-text/crf++/files/crf++-automake-1.13.patch X-VCS-Directories: app-text/crf++/ app-text/crf++/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9ac73bf83b7c5fbdeadab0ddb508b6c88a69461f X-VCS-Branch: master Date: Sun, 20 Nov 2022 23:56:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0580a07e-aea4-43ce-8844-2db34c1d42e4 X-Archives-Hash: 65bd57be4b6c2ecdbb03a1f80117c282 commit: 9ac73bf83b7c5fbdeadab0ddb508b6c88a69461f Author: David Seifert gentoo org> AuthorDate: Sun Nov 20 23:55:54 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Nov 20 23:55:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac73bf8 app-text/crf++: update EAPI 6 -> 8 Signed-off-by: David Seifert gentoo.org> .../{crf++-0.58.ebuild => crf++-0.58-r1.ebuild} | 33 ++++++---------------- app-text/crf++/files/crf++-0.58-autotools.patch | 23 +++++++++++++++ app-text/crf++/files/crf++-automake-1.13.patch | 10 ------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58-r1.ebuild similarity index 52% rename from app-text/crf++/crf++-0.58.ebuild rename to 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]) -