diff options
| author |   Torsten Veller <tove@gentoo.org> | 2010-04-19 08:56:24 +0000 |
|---|---|---|
| committer | Torsten Veller <tove@gentoo.org> | 2010-04-19 08:56:24 +0000 |
| commit | 63b9097d039ce04f23c707d8ac6daedc2aa91251 (patch) | |
| tree | 5eb87d63fcd6f427c70156ea4eedefc06d76fba3 /dev-perl/GD | |
| parent | Force python2 version. Fix bug #312275 (diff) | |
| download | gentoo-2-63b9097d039ce04f23c707d8ac6daedc2aa91251.tar.gz gentoo-2-63b9097d039ce04f23c707d8ac6daedc2aa91251.tar.bz2 gentoo-2-63b9097d039ce04f23c707d8ac6daedc2aa91251.zip | |
Skip tests if >=media-libs/jpeg-7 is installed (#316049)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-perl/GD')
| -rw-r--r-- | dev-perl/GD/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-perl/GD/GD-2.44.ebuild | 13 |
2 files changed, 15 insertions, 5 deletions
diff --git a/dev-perl/GD/ChangeLog b/dev-perl/GD/ChangeLog index 3866959bc3b5..487eab27c296 100644 --- a/dev-perl/GD/ChangeLog +++ b/dev-perl/GD/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-perl/GD -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.92 2009/12/24 20:08:09 tove Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.93 2010/04/19 08:56:24 tove Exp $ + + 19 Apr 2010; Torsten Veller <tove@gentoo.org> GD-2.44.ebuild: + Skip tests if >=media-libs/jpeg-7 is installed (#316049) 24 Dec 2009; Torsten Veller <tove@gentoo.org> -GD-2.35-r1.ebuild: Cleanup diff --git a/dev-perl/GD/GD-2.44.ebuild b/dev-perl/GD/GD-2.44.ebuild index 629e351965fe..1b3652bb2189 100644 --- a/dev-perl/GD/GD-2.44.ebuild +++ b/dev-perl/GD/GD-2.44.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.44.ebuild,v 1.9 2009/12/23 18:17:03 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.44.ebuild,v 1.10 2010/04/19 08:56:24 tove Exp $ EAPI=2 @@ -34,13 +34,14 @@ DEPEND=">=media-libs/gd-2.0.33 ) gif? ( media-libs/giflib )" - SRC_TEST=do +SRC_TEST=do src_prepare(){ perl-module_src_prepare sed -i "s/use Getopt::Long;/use Getopt::Long qw(:config pass_through);/" \ "${S}"/Makefile.PL || die } + src_configure() { myconf="" use gif && use animgif && myconf="${myconf},ANIMGIF" @@ -52,8 +53,14 @@ src_configure() { myconf="-options \"${myconf:1}\"" perl-module_src_configure } + src_test() { if use png || use jpeg || use gif ; then + if has_version ">=media-libs/jpeg-7" ; then + # https://rt.cpan.org/Public/Bug/Display.html?id=49053 + ewarn "Tests fail with >=media-libs/jpeg-7. Skipping tests..." + return + fi perl-module_src_test else ewarn "The test fails if neither of png, jpeg, gif is in USE!" |