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 + ) }
