From 4b99ad255e883f76b9e2663be48159bfd1e5e543 Mon Sep 17 00:00:00 2001
From: Torsten Veller <tove@gentoo.org>
Date: Mon, 19 Apr 2010 08:56:24 +0000
Subject: [PATCH] Skip tests if >=media-libs/jpeg-7 is installed (#316049)
 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

---
 dev-perl/GD/ChangeLog      |  7 +++++--
 dev-perl/GD/GD-2.44.ebuild | 13 ++++++++++---
 dev-perl/GD/Manifest       | 12 ++++++------
 3 files changed, 21 insertions(+), 11 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!"
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 5279d34372c9..6441ba5aa405 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST GD-2.44.tar.gz 258396 RMD160 d0cdf26bd8b14ab58458c2a7fe7d5a6f6164df90 SHA1 8520cdd1ebd3639cdf0478b71af71d7bb095fed6 SHA256 f736b9df57db0c428e6e9a0e8119d4289f3c1d572b985a7279ebea2f470efc08
-EBUILD GD-2.44.ebuild 1470 RMD160 9cbdb56334670808484cf120a7d7ded7920969b9 SHA1 dd49178ca6a0cf148b7ceb81cd61d05634f580ca SHA256 5043e599c4df0cbbe59dc40d15fb6bdbcdf61581ab073c6f05c586f72a5a219f
-MISC ChangeLog 10223 RMD160 faf28e568998dfcf034035fbe8b55fe15cd61acf SHA1 263467a625b5080c9e8137bd8182d30d74fec71b SHA256 59aa41f77578bd0a6558275eadb19acb83d535aefa720841d19ac90ff849abcc
+EBUILD GD-2.44.ebuild 1654 RMD160 905966822d14c7232673259fc56df1e94aa54342 SHA1 2fce8e503249ae740e5f2f5b0921caee0a250c17 SHA256 50e392e8368c514464a9cd430cdad1c50c31e6eb1fee49a61965c39228c5b7ab
+MISC ChangeLog 10347 RMD160 8558c6861c05d00c188f20acc9439be5b23e85e3 SHA1 708d5cced52086d40e4eba684229b2e57370c733 SHA256 4f11771e453d0bd45721ecc25fa5761be4029ea213cba8395fb388b9b7fe22a6
 MISC metadata.xml 227 RMD160 142ad350570fd92f60a51484fe2223a6e2f7651f SHA1 2517513446748aa62ad9e117c015767027c19909 SHA256 a010e8f66443138ef08d23a44d102f1694b34b2bb813d2c0f11e2c116892a1a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkszyi8ACgkQV3J2n04Eauy3AwCgzY7ZMc318qbgkp8xhVwTiYQk
-t6oAni5LlQJVHSFDumdva+eo8w9FQdgr
-=XPvc
+iEYEARECAAYFAkvMGr4ACgkQV3J2n04EauzXVQCgmrger9By9AJi26Hto6nmeszW
+bEsAniIjTS5IRxycGotOZ6d85RfLbs/Q
+=wjdj
 -----END PGP SIGNATURE-----
-- 
2.26.2