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.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

5 files changed, 75 insertions, 40 deletions

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ò <flameeyes@gentoo.org> -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/Manifest b/app-i18n/zinnia/Manifest
index 5e3c248b484b..88cc07fe8db0 100644
--- a/app-i18n/zinnia/Manifest
+++ b/app-i18n/zinnia/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX zinnia-0.06-perl.patch 482 RMD160 500d1cd53790a69f8e6eac80d82191a834e95df1 SHA1 153d87b04c7e293a2db6224e002b67f9a069e056 SHA256 f5647adde6591faf8d1319cdcaeaa188253be711833c69d76e3f0b53b47fb054
+AUX zinnia-0.06-ricedown.patch 520 RMD160 c3760ff005c105321d77b3efba0f3a5ce2a34c6d SHA1 1d2982f33642a395ebcc84b31769660fcf9a6f7c SHA256 484335ef662208b3f08ee5e25e65783c15c5bdaf9665c473e33df889bc9c0cff
 DIST zinnia-0.05.tar.gz 455113 RMD160 4fe4e244e12de49e9dc2370573daab20e85620fb SHA1 85005660f71ff311477efb138a60572a7b500c41 SHA256 36b861d0989c0e2d7596bd596235c2a15223d152acd0322b6284091a4122b9a3
 DIST zinnia-0.06.tar.gz 457415 RMD160 7ade98fa37144f2750b027278c1b55d810612974 SHA1 bc67d65857186bb49710a712a2fc8f8cb81211c0 SHA256 ece3af93f937282971634fd81d3e997f848e8cfa958220e26a4564ca064ac20b
 EBUILD zinnia-0.05.ebuild 568 RMD160 2ebdb4f30b1ef0ad0b6bf5f207376796bc805423 SHA1 94d9bab938d3b3fa41036269992cdc730030ffd0 SHA256 49f88cc12678334252264bdb7db874b4499622611b9a0582229476ecb2aee391
-EBUILD zinnia-0.06.ebuild 1163 RMD160 72c36c2b8ade0ceab4077037a56a9343fd63d0af SHA1 3b3202468a3801e622ef44ecc30efcb01a5e66ef SHA256 c73fe5b0baa5312e839f6c17e0146f2bed95b47a477b6a86b9305f84da73d7a6
-MISC ChangeLog 488 RMD160 d9787fe153d63de93428a1c9125d7ab017ac19af SHA1 3ac109330d5d8923decac0c09fd9268ccc80be10 SHA256 e0829d83a58bce830923435dca32ad66dbc8b6db3e0b2dad679e768d9e88c67e
+EBUILD zinnia-0.06-r1.ebuild 1496 RMD160 aff16806be356d45131174c36d64b9642e373fee SHA1 c830341fe9020241cf7bf1df97d0cfe47a805466 SHA256 099c800fd3c284b2224a96c3728d3f602b7219cea1816f92b877158f1858598c
+MISC ChangeLog 895 RMD160 b56d6e0e06f95b9936c309daa2310c4482951900 SHA1 8d4d596849c4fe9c34e91a5bdb5a94617d22fb69 SHA256 2a4881710106fc52bb50225eefe180fcd4aafcbe65eae706c47f8967b7ab5814
 MISC metadata.xml 157 RMD160 97adcce791d5b0e94b3844a1e27e00be60378454 SHA1 e11f0d9b1f8c57c4f50e453a89d2e61cf737329a SHA256 92a8379a3f1d8c9e52e17dbaf224721ad5bd6ba9fba4302e909aa2b099b33f89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM0reSAAoJECaGw+YFKA1p988P/191Mimu9JouuDqDAPbyPC2M
-0tQ1B6bdzhHvXTp5lSNo78MBZ9ktFjbfwOMdIozvweSz2kmUF8VO6A40wbHhmome
-I3bipPMpYIWyGKtnpxyvi2NfkeaU79ppYQy/+upYL+BNN84Jwvzh3DiG25qQQB+Y
-vnEDnv52AFekW5xMBFLFbWfozwq9MMI92JrSGwPu95sGuxtgqqQqcOjLC9r2biTP
-w/EmBJvZECE0VKFIqDq3k0S5qvCHFCxDziur8AFKGB5C9I+7YNTCexnPeUewWyMS
-Bz9joRuv4iSxy5stmR4sNk+n+q4Zg4L7FIwQ4eXe67eza1QL74tzxXkI9X/N8x58
-4J/TWRlDkPkegm7GmXGARQLOQ/HXyn2oxGWNuOYkJW0kG6Fa56eKCZ4DUL68RrQT
-ttFzM8i2dlqHtjL5eUa6zZGs/6Zhkiew4gzNUdBFfIZwBnA0dwjeCdDydZE96tmC
-nsLTmK/+9l4gVSb2ZCI3QMWDtgw7BSTyuv1X+2pM5w4Rk+5bIgv6/51wOX2cxvN4
-ppDDTn9VhDA+OY5GJi+TgW84GfXcYZuA7WkEUiiCT+vA2/ESPonyI0fOKeqR4byW
-bnnnDvsuD7jJxYjrE1ryMQh+/8vB0A7DkDs5EYp3RQFOkX2MEf1rbzLeZ9zkOt1W
-4xXa96vWBWGdwHdaQmjF
-=83Na
+iEYEARECAAYFAk2eQnQACgkQAiZjviIA2XglrgCg6LvwfQGpP3CdZWXzrkxuZxzR
+RSIAn2pfAuOjuefJx282RfErZlIJGV+Q
+=xLqK
 -----END PGP SIGNATURE-----
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.ebuild b/app-i18n/zinnia/zinnia-0.06-r1.ebuild
index f42ce5386f01..d4907bee2a18 100644
--- a/app-i18n/zinnia/zinnia-0.06.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.1 2010/11/04 13:38:00 matsuu Exp $
+# $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
+inherit perl-module flag-o-matic toolchain-funcs autotools
 
 DESCRIPTION="Online hand recognition system with machine learning"
 HOMEPAGE="http://zinnia.sourceforge.net/"
@@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="perl"
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}/${P}-ricedown.patch"
+	epatch "${FILESDIR}/${P}-perl.patch"
+	eautoreconf
 
 	if use perl ; then
 		(
@@ -28,14 +30,7 @@ src_prepare() {
 }
 
 src_configure() {
-	base_src_configure
-
-	if use perl ; then
-		(
-			cd "${S}/perl"
-			perl-module_src_configure
-		)
-	fi
+	econf
 }
 
 src_compile() {
@@ -44,22 +39,28 @@ src_compile() {
 	if use perl ; then
 		(
 			cd "${S}/perl"
-			perl-module_src_compile
-		)
-	fi
-}
 
-src_test() {
-	base_src_test
+			# 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
 
-	if use perl ; then
-		(
-			cd "${S}/perl"
-			perl-module_src_test
+			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