Fix tests with gcc-4.4. Tests need all use-flags enabled to succeed. Use EAPI=2.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 64 insertions, 22 deletions

diff --git a/media-libs/vigra/ChangeLog b/media-libs/vigra/ChangeLog
index ba1152342aee..91dd0224123b 100644
--- a/media-libs/vigra/ChangeLog
+++ b/media-libs/vigra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/vigra
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.18 2008/09/28 20:10:05 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/ChangeLog,v 1.19 2009/05/17 13:26:46 loki_val Exp $
+
+  17 May 2009; Peter Alfredsen <loki_val@gentoo.org> vigra-1.6.0.ebuild,
+  +files/vigra-1.6.0-gcc44.patch:
+  Fix tests with gcc-4.4. Tests need all use-flags enabled to succeed. Use
+  EAPI=2.
 
   28 Sep 2008; Mike Frysinger <vapier@gentoo.org> vigra-1.6.0.ebuild:
   Add ~ppc64 love.
diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index d29010778f06..019b5ed38f9f 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX vigra-1.6.0-gcc44.patch 635 RMD160 2d787b30517e501f9eb97f9c83e5b8697f6598c2 SHA1 21600a4fae903e3b34e1c869f01b4de1c1c2bdd3 SHA256 800afef55c0e390f831207c98f047bccd80c3538ad998ff0dc8bc9269e98a277
 DIST vigra1.5.0.tar.gz 12854465 RMD160 8d8cadc7f20586ec3336d0f6581ddfafc93fff73 SHA1 26fca97f1b3b97d9f4d3b4e775c841894e492143 SHA256 2ac6416bc1da1be8e6c308985566be93d3e210582c2a83a8e2e55077c457d6b6
 DIST vigra1.6.0.tar.gz 16525605 RMD160 cc9f6626801182a0ee71ec9eb8fa34c38f8777a7 SHA1 9714a0c4efb77726a1140329e98e5db057f9a69f SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f
 EBUILD vigra-1.5.0-r1.ebuild 1220 RMD160 d7e63171cacb49c54c3b6da2e5700dfb4ff9597b SHA1 8b8d78d759005ab889dc989df17dc125436792d0 SHA256 36caf1b51a27c6eb6727969d89b6c39f063062f4aba04ac0a2c1683ea2fcaad2
-EBUILD vigra-1.6.0.ebuild 1225 RMD160 1d800f10ca55bcb9968b6abe81525a6895e944de SHA1 47b2a81aad3a49eafad6cb4070f5a53a8c4eec8b SHA256 678b0b5f17e729520d363c0e30edfb85305b3bfafaafcc05abb4b1640d71a313
-MISC ChangeLog 2351 RMD160 c6761ca3d769d61d5c661762a70867442890855e SHA1 f48131b1b373ac30f11ac268106ba25ff97994d0 SHA256 0de69fd6fa643eeeb3535ccf6d5eec1f23405d76c87e6735d27ef047c37c05c7
+EBUILD vigra-1.6.0.ebuild 1693 RMD160 2c6e48fe057d35df88465ee0f9400e3aed11337d SHA1 da42cd07b0a178d1ec7e6218b72ba6a2fffc7a26 SHA256 b63f7f01dc673ce4f649bb31fe7353bfc1aaa08258634940c4313aad4362bf1e
+MISC ChangeLog 2546 RMD160 703bcab7b25366f88feb09494f3a12cdac6ca65d SHA1 10d47091f7c9f5fab36cf96f54407c31eb44227e SHA256 7179d5680192dc566dcb51160e0774577c7105916ded032127bdf061f1523680
 MISC metadata.xml 227 RMD160 4551a81d2a3e6c24cd1b69ac01cdaa0e386928da SHA1 9f924e786861e44c3829474e923490a2edd632b6 SHA256 eaa9fad22834ebdd28bc584d0ccbca855170280655afdccb7c6174de49c95cec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjf5KQACgkQ67wieSYcaxdIcQCgqTHmfmFevvR8AG8OP/bova5Y
-z64An1T/05lpzzNFwT4KgxN0llgk2/ht
-=21Xg
------END PGP SIGNATURE-----
diff --git a/media-libs/vigra/files/vigra-1.6.0-gcc44.patch b/media-libs/vigra/files/vigra-1.6.0-gcc44.patch
new file mode 100644
index 000000000000..72c7fee3fd97
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.6.0-gcc44.patch
@@ -0,0 +1,15 @@
+diff -NrU5 vigra1.6.0.orig/test/convolution/test.cxx vigra1.6.0/test/convolution/test.cxx
+--- vigra1.6.0.orig/test/convolution/test.cxx	2009-05-17 14:30:10.674673754 +0200
++++ vigra1.6.0/test/convolution/test.cxx	2009-05-17 14:31:45.388542661 +0200
+@@ -35,10 +35,11 @@
+ /*                                                                      */
+ /************************************************************************/
+ 
+ #include <iostream>
+ #include <cmath>
++#include <cstdio>
+ #include "vigra/convolution.hxx"
+ #include "unittest.hxx"
+ #include "vigra/stdimage.hxx"
+ #include "vigra/impex.hxx"
+ #include "vigra/combineimages.hxx"
diff --git a/media-libs/vigra/vigra-1.6.0.ebuild b/media-libs/vigra/vigra-1.6.0.ebuild
index c0b124711961..dc29ebc849ce 100644
--- a/media-libs/vigra/vigra-1.6.0.ebuild
+++ b/media-libs/vigra/vigra-1.6.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.6.0.ebuild,v 1.2 2008/09/28 20:10:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vigra/vigra-1.6.0.ebuild,v 1.3 2009/05/17 13:26:46 loki_val Exp $
 
-inherit multilib
+EAPI=2
+
+inherit eutils multilib
 
 DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
 HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
@@ -11,7 +13,7 @@ SRC_URI="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${P/-}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc fftw jpeg png tiff zlib"
+IUSE="doc fftw jpeg png tiff zlib test"
 
 RDEPEND="png? ( media-libs/libpng )
 	tiff? ( media-libs/tiff )
@@ -24,17 +26,46 @@ S="${WORKDIR}/${P/-}"
 
 MY_DOCDIR="usr/share/doc/${PF}"
 
-src_compile() {
+pkg_setup() {
+	local flag
+	export usefail=""
+	if use test
+	then
+		for flag in png tiff jpeg fftw
+		do
+			use $flag || usefail="$usefail $flag"
+		done
+
+		if [[ -n "$usefail" ]]
+		then
+			elog "USE=test enabled but the following use-flags are disabled:"
+			elog "${usefail# }"
+			elog "Tests will be skipped, please enable the other use-flags."
+		fi
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+}
+
+src_configure() {
 	./configure \
-		--prefix="/usr/" \
 		--docdir="${D}/${MY_DOCDIR}" \
+		--prefix=/usr \
 		$(use_with png) \
 		$(use_with tiff) \
 		$(use_with jpeg) \
 		$(use_with zlib) \
 		$(use_with fftw) \
-	|| die "configure failed"
-	emake || die "emake failed"
+		|| die "configure failed"
+}
+
+src_test() {
+	if [[ -z "${usefail}" ]]
+	then
+		default
+	fi
 }
 
 src_install() {