From 06e63d38d7404e0eec8e39a7c85fa521169214d7 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Thu, 7 Apr 2011 23:02:08 +0000 Subject: Revision bump: there are not tests (close bug #348577); fix building with USE=perl if zinnia was not installed before (bug #356039); rice the build down to respect flags and not use -O3 instead. (Portage version: 2.2.0_alpha29/cvs/Linux x86_64) --- app-i18n/zinnia/ChangeLog | 13 +++- app-i18n/zinnia/files/zinnia-0.06-perl.patch | 13 ++++ app-i18n/zinnia/files/zinnia-0.06-ricedown.patch | 20 +++++++ app-i18n/zinnia/zinnia-0.06-r1.ebuild | 76 ++++++++++++++++++++++++ app-i18n/zinnia/zinnia-0.06.ebuild | 75 ----------------------- 5 files changed, 120 insertions(+), 77 deletions(-) create mode 100644 app-i18n/zinnia/files/zinnia-0.06-perl.patch create mode 100644 app-i18n/zinnia/files/zinnia-0.06-ricedown.patch create mode 100644 app-i18n/zinnia/zinnia-0.06-r1.ebuild delete mode 100644 app-i18n/zinnia/zinnia-0.06.ebuild (limited to 'app-i18n') diff --git a/app-i18n/zinnia/ChangeLog b/app-i18n/zinnia/ChangeLog index 984b98881ea9..f2a1ee732321 100644 --- a/app-i18n/zinnia/ChangeLog +++ b/app-i18n/zinnia/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-i18n/zinnia -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/zinnia/ChangeLog,v 1.2 2010/11/04 13:38:00 matsuu Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/zinnia/ChangeLog,v 1.3 2011/04/07 23:02:07 flameeyes Exp $ + +*zinnia-0.06-r1 (07 Apr 2011) + + 07 Apr 2011; Diego E. Pettenò -zinnia-0.06.ebuild, + +zinnia-0.06-r1.ebuild, +files/zinnia-0.06-perl.patch, + +files/zinnia-0.06-ricedown.patch: + Revision bump: there are not tests (close bug #348577); fix building with + USE=perl if zinnia was not installed before (bug #356039); rice the build + down to respect flags and not use -O3 instead. *zinnia-0.06 (04 Nov 2010) diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch new file mode 100644 index 000000000000..3688a91ad9ca --- /dev/null +++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch @@ -0,0 +1,13 @@ +Index: zinnia-0.06/perl/Makefile.PL +=================================================================== +--- zinnia-0.06.orig/perl/Makefile.PL ++++ zinnia-0.06/perl/Makefile.PL +@@ -4,7 +4,7 @@ WriteMakefile( + 'CC' => 'c++', + 'LD' => 'c++', + 'INC' => '', +- 'LIBS' => '-lzinnia', ++ 'LIBS' => '-L../.libs -lzinnia', + # 'VERSION' => '0.1', + 'OBJECT' => 'zinnia_wrap.o' + ); diff --git a/app-i18n/zinnia/files/zinnia-0.06-ricedown.patch b/app-i18n/zinnia/files/zinnia-0.06-ricedown.patch new file mode 100644 index 000000000000..397d0b0688ad --- /dev/null +++ b/app-i18n/zinnia/files/zinnia-0.06-ricedown.patch @@ -0,0 +1,20 @@ +Index: zinnia-0.06/configure.in +=================================================================== +--- zinnia-0.06.orig/configure.in ++++ zinnia-0.06/configure.in +@@ -59,15 +59,6 @@ AC_ARG_WITH(pkgconfigdir, + AC_SUBST([pkgconfigdir]) + AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}]) + +-dnl +-dnl check gcc +-dnl +-if test -n "$GCC"; then +- CFLAGS="-O3 -Wall" +- CXXFLAGS="-O3 -Wall" +- AC_MSG_RESULT($ac_cv_x86_sse) +-fi +- + AC_DEFUN(ADD_CC_FLAG, [ + AC_MSG_CHECKING(whether ${CC-cc} accepts $1) + AC_LANG_SAVE diff --git a/app-i18n/zinnia/zinnia-0.06-r1.ebuild b/app-i18n/zinnia/zinnia-0.06-r1.ebuild new file mode 100644 index 000000000000..d4907bee2a18 --- /dev/null +++ b/app-i18n/zinnia/zinnia-0.06-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/zinnia/zinnia-0.06-r1.ebuild,v 1.1 2011/04/07 23:02:07 flameeyes Exp $ + +EAPI="3" + +inherit perl-module flag-o-matic toolchain-funcs autotools + +DESCRIPTION="Online hand recognition system with machine learning" +HOMEPAGE="http://zinnia.sourceforge.net/" +SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +#IUSE="perl python ruby" +IUSE="perl" + +src_prepare() { + epatch "${FILESDIR}/${P}-ricedown.patch" + epatch "${FILESDIR}/${P}-perl.patch" + eautoreconf + + if use perl ; then + ( + cd "${S}/perl" + perl-module_src_prepare + ) + fi +} + +src_configure() { + econf +} + +src_compile() { + base_src_compile + + if use perl ; then + ( + cd "${S}/perl" + + # 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. + perl-module_src_configure + + append-cppflags "-I${S}" + append-ldflags "-L${S}/.libs" + + emake \ + LDDLFLAGS="-shared" \ + OTHERLDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCXX)" LD="$(tc-getCXX)" \ + OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \ + || die + ) + fi +} + +# no tests present +src_test() { :; } + +src_install() { + emake DESTDIR="${D}" install || die + + if use perl ; then + ( + cd "${S}/perl" + perl-module_src_install + ) + fi + + dodoc AUTHORS ChangeLog NEWS README || die + dohtml doc/*.html doc/*.css || die +} diff --git a/app-i18n/zinnia/zinnia-0.06.ebuild b/app-i18n/zinnia/zinnia-0.06.ebuild deleted file mode 100644 index f42ce5386f01..000000000000 --- a/app-i18n/zinnia/zinnia-0.06.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/zinnia/zinnia-0.06.ebuild,v 1.1 2010/11/04 13:38:00 matsuu Exp $ - -EAPI="3" - -inherit perl-module - -DESCRIPTION="Online hand recognition system with machine learning" -HOMEPAGE="http://zinnia.sourceforge.net/" -SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -#IUSE="perl python ruby" -IUSE="perl" - -src_prepare() { - base_src_prepare - - if use perl ; then - ( - cd "${S}/perl" - perl-module_src_prepare - ) - fi -} - -src_configure() { - base_src_configure - - if use perl ; then - ( - cd "${S}/perl" - perl-module_src_configure - ) - fi -} - -src_compile() { - base_src_compile - - if use perl ; then - ( - cd "${S}/perl" - perl-module_src_compile - ) - fi -} - -src_test() { - base_src_test - - if use perl ; then - ( - cd "${S}/perl" - perl-module_src_test - ) - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - - if use perl ; then - ( - cd "${S}/perl" - perl-module_src_install - ) - fi - - dodoc AUTHORS ChangeLog NEWS README || die - dohtml doc/*.html doc/*.css || die -} -- cgit v1.2.3-65-gdbad