diff options
Diffstat (limited to 'app-i18n/zinnia')
-rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-c++11.patch (renamed from app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch) | 4 | ||||
-rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-flags.patch | 4 | ||||
-rw-r--r-- | app-i18n/zinnia/files/zinnia-0.06-perl.patch (renamed from app-i18n/zinnia/files/zinnia-0.06-perl_build.patch) | 4 | ||||
-rw-r--r-- | app-i18n/zinnia/metadata.xml | 2 | ||||
-rw-r--r-- | app-i18n/zinnia/zinnia-0.06-r3.ebuild | 41 |
5 files changed, 22 insertions, 33 deletions
diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch index 0ef6ae40e434..66a78a5a6997 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch @@ -1,5 +1,5 @@ ---- /trainer.cpp -+++ /trainer.cpp +--- a/trainer.cpp ++++ b/trainer.cpp @@ -103,7 +103,7 @@ if (!fn) { return false; diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch index 80442ee4880f..5c26415f6018 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch @@ -1,5 +1,5 @@ ---- /configure.in -+++ /configure.in +--- a/configure.in ++++ b/configure.in @@ -59,15 +59,6 @@ AC_SUBST([pkgconfigdir]) AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}]) diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch index 4da9e1eeb900..02d52faf93a7 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch @@ -1,5 +1,5 @@ ---- /perl/Makefile.PL -+++ /perl/Makefile.PL +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL @@ -4,7 +4,7 @@ 'CC' => 'c++', 'LD' => 'c++', diff --git a/app-i18n/zinnia/metadata.xml b/app-i18n/zinnia/metadata.xml index 0601843f122a..65232f902279 100644 --- a/app-i18n/zinnia/metadata.xml +++ b/app-i18n/zinnia/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild index 70d37abf609e..8a6dbee115a7 100644 --- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild +++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 2010-2020 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools flag-o-matic perl-module toolchain-funcs DESCRIPTION="Zinnia - Online hand recognition system with machine learning" HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/" -SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/zinnia/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -15,25 +15,19 @@ KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="perl static-libs" PATCHES=( - "${FILESDIR}/${P}-flags.patch" - "${FILESDIR}/${P}-perl_build.patch" - "${FILESDIR}/${P}-c++-2011.patch" + "${FILESDIR}"/${P}-c++11.patch + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-perl.patch ) -DOCS=(AUTHORS) +HTML_DOCS=( doc/{index{,-ja}.html,${PN}.css} ) src_prepare() { default - mv configure.in configure.ac || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - eautoreconf + sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die - if use perl; then - pushd perl > /dev/null - PATCHES=() - perl-module_src_prepare - popd > /dev/null - fi + mv configure.{in,ac} || die + eautoreconf } src_configure() { @@ -44,8 +38,7 @@ src_compile() { default if use perl; then - pushd perl > /dev/null - + cd perl >/dev/null || die # We need to run this here as otherwise it won't pick up the # just-built -lzinnia and cause the extension to have # undefined symbols. @@ -60,7 +53,7 @@ src_compile() { OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \ LDDLFLAGS="-shared" \ OTHERLDFLAGS="${LDFLAGS}" - popd > /dev/null + cd - >/dev/null || die fi } @@ -70,16 +63,12 @@ src_test() { src_install() { default + einstalldocs find "${D}" -name "*.la" -delete || die if use perl; then - pushd perl > /dev/null + cd perl >/dev/null || die perl-module_src_install - popd > /dev/null + cd - >/dev/null || die fi - - ( - docinto html - dodoc doc/*.css doc/*.html - ) } |