* [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/
@ 2017-09-11 18:39 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2017-09-11 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 828da35a1d13377a7160a22a880bf257df73c6a3
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 11 17:38:12 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:39:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828da35a
app-i18n/zinnia: Port to EAPI="6". Minor cleanup.
app-i18n/zinnia/zinnia-0.06-r3.ebuild | 67 ++++++++++++++++++++++-------------
1 file changed, 42 insertions(+), 25 deletions(-)
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index a012fde380d..ce1ffaefc08 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,41 +1,50 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PERL_EXPORT_PHASE_FUNCTIONS=no
-inherit perl-module eutils flag-o-matic toolchain-funcs autotools-utils
+EAPI="6"
-DESCRIPTION="Online hand recognition system with machine learning"
-HOMEPAGE="http://zinnia.sourceforge.net/"
+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"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
-# Package warrants IUSE doc
IUSE="perl static-libs"
-DOCS=( AUTHORS ChangeLog NEWS README )
+
PATCHES=(
"${FILESDIR}/${P}-flags.patch"
"${FILESDIR}/${P}-perl_build.patch"
"${FILESDIR}/${P}-c++-2011.patch"
)
-AUTOTOOLS_AUTORECONF=yes
+
+DOCS=(AUTHORS)
src_prepare() {
- autotools-utils_src_prepare
- if use perl ; then
- pushd "${S}/perl" >/dev/null
+ default
+ mv configure.in configure.ac || die
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+
+ if use perl; then
+ pushd perl > /dev/null
PATCHES=()
perl-module_src_prepare
- popd >/dev/null
+ popd > /dev/null
fi
}
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
src_compile() {
- autotools-utils_src_compile
- if use perl ; then
- pushd "${S}"/perl >/dev/null
+ default
+
+ if use perl; then
+ pushd perl > /dev/null
# We need to run this here as otherwise it won't pick up the
# just-built -lzinnia and cause the extension to have
@@ -46,23 +55,31 @@ src_compile() {
append-ldflags "-L${S}/.libs"
emake \
+ CC="$(tc-getCXX)" \
+ LD="$(tc-getCXX)" \
+ OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \
LDDLFLAGS="-shared" \
- OTHERLDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCXX)" LD="$(tc-getCXX)" \
- OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}"
- popd >/dev/null
+ OTHERLDFLAGS="${LDFLAGS}"
+ popd > /dev/null
fi
}
+src_test() {
+ default
+}
+
src_install() {
- autotools-utils_src_install
+ default
+ find "${D}" -name "*.la" -delete || die
- if use perl ; then
- pushd "${S}/perl" >/dev/null
+ if use perl; then
+ pushd perl > /dev/null
perl-module_src_install
- popd >/dev/null
+ popd > /dev/null
fi
- # Curiously ChangeLog & NEWS are left uncompressed
- dohtml doc/*.html doc/*.css
+ (
+ docinto html
+ dodoc doc/*.css doc/*.html
+ )
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/
@ 2017-09-11 18:39 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2017-09-11 18:39 UTC (permalink / raw
To: gentoo-commits
commit: a8f2eabdfa00009df80ac2d8fad6199f291b8b02
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 11 17:40:15 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 18:39:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f2eabd
app-i18n/zinnia: Update metadata.xml.
app-i18n/zinnia/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-i18n/zinnia/metadata.xml b/app-i18n/zinnia/metadata.xml
index 662ae4df550..0601843f122 100644
--- a/app-i18n/zinnia/metadata.xml
+++ b/app-i18n/zinnia/metadata.xml
@@ -6,6 +6,7 @@
<name>Cjk</name>
</maintainer>
<upstream>
+ <remote-id type="github">taku910/zinnia</remote-id>
<remote-id type="sourceforge">zinnia</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/
@ 2018-03-15 19:23 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-03-15 19:23 UTC (permalink / raw
To: gentoo-commits
commit: d7ee4d60b633716cd3e45ed40f1fa36f75631b1c
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 15 19:23:20 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar 15 19:23:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ee4d60
app-i18n/zinnia: keyworded 0.06-r3 for ppc64, bug #642714
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"
app-i18n/zinnia/zinnia-0.06-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index ce1ffaefc08..7133d88b29b 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE="perl static-libs"
PATCHES=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/
@ 2020-07-04 13:53 Mike Gilbert
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2020-07-04 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 83feb34ef8a6c106d3717532ea093e4c76e52a2d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jul 2 14:14:36 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 13:52:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83feb34e
app-i18n/zinnia: ~ARM64 keywording (bug #730282).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/zinnia/zinnia-0.06-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index 7133d88b29b..70d37abf609 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="perl static-libs"
PATCHES=(
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/
@ 2021-11-03 12:47 Akinori Hattori
0 siblings, 0 replies; 5+ messages in thread
From: Akinori Hattori @ 2021-11-03 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 6111feda915c61a22bd00564f7370c2d3923dbbf
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 3 12:47:18 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Nov 3 12:47:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6111feda
app-i18n/zinnia: update to EAPI 8
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-i18n/zinnia/zinnia-0.06-r3.ebuild | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index 3dd317b48c5..383852add5d 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 2010-2021 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
@@ -20,20 +20,14 @@ PATCHES=(
"${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
- )
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-03 12:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-15 19:23 [gentoo-commits] repo/gentoo:master commit in: app-i18n/zinnia/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2021-11-03 12:47 Akinori Hattori
2020-07-04 13:53 Mike Gilbert
2017-09-11 18:39 Mike Gilbert
2017-09-11 18:39 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox