Use virtual/jpeg (#347956)

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

3 files changed, 82 insertions, 5 deletions

diff --git a/dev-perl/GD/ChangeLog b/dev-perl/GD/ChangeLog
index 78a0b2242e53..5879bade007c 100644
--- a/dev-perl/GD/ChangeLog
+++ b/dev-perl/GD/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/GD
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.95 2010/07/19 21:47:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.96 2010/12/07 08:31:02 tove Exp $
+
+*GD-2.45-r1 (07 Dec 2010)
+
+  07 Dec 2010; Torsten Veller <tove@gentoo.org> +GD-2.45-r1.ebuild:
+  Use virtual/jpeg (#347956)
 
   19 Jul 2010; Markus Meier <maekke@gentoo.org> GD-2.45.ebuild:
   add ~arm, bug #301084
diff --git a/dev-perl/GD/GD-2.45-r1.ebuild b/dev-perl/GD/GD-2.45-r1.ebuild
new file mode 100644
index 000000000000..6581a3fa2e43
--- /dev/null
+++ b/dev-perl/GD/GD-2.45-r1.ebuild
@@ -0,0 +1,71 @@
+# 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.45-r1.ebuild,v 1.1 2010/12/07 08:31:02 tove Exp $
+
+EAPI=3
+
+MODULE_AUTHOR=LDS
+inherit perl-module
+
+DESCRIPTION="interface to Thomas Boutell's gd library"
+
+LICENSE="|| ( Artistic-2 GPL-1 GPL-2 GPL-3 )" # Artistic-2 or GPL1+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+IUSE="animgif gif jpeg png truetype xpm"
+
+DEPEND=">=media-libs/gd-2.0.33
+	png? (
+		media-libs/gd[png]
+		media-libs/libpng
+		sys-libs/zlib
+	)
+	jpeg? (
+		media-libs/gd[jpeg]
+		virtual/jpeg
+	)
+	truetype? (
+		media-libs/gd[truetype]
+		media-libs/freetype:2
+	)
+	xpm? (
+		media-libs/gd[xpm]
+		x11-libs/libXpm
+	)
+	gif? ( media-libs/giflib )"
+
+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"
+	use jpeg && myconf="${myconf},JPEG"
+	use truetype && myconf="${myconf},FREETYPE"
+	use png && myconf="${myconf},PNG"
+	use xpm && myconf="${myconf},XPM"
+	use gif && myconf="${myconf},GIF"
+	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" || \
+			has_version "media-libs/libjpeg-turbo" ; then
+			# https://rt.cpan.org/Public/Bug/Display.html?id=49053
+			ewarn "Tests fail with >=media-libs/jpeg-7 or media-libs/libjpeg-turbo. Skipping tests..."
+			return
+		fi
+		perl-module_src_test
+	else
+		ewarn "The test fails if neither of png, jpeg, gif is in USE!"
+		ewarn "Skipping tests..."
+	fi
+}
+mydoc="GD.html"
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 8a2c7765354d..b84571df44b9 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 DIST GD-2.44.tar.gz 258396 RMD160 d0cdf26bd8b14ab58458c2a7fe7d5a6f6164df90 SHA1 8520cdd1ebd3639cdf0478b71af71d7bb095fed6 SHA256 f736b9df57db0c428e6e9a0e8119d4289f3c1d572b985a7279ebea2f470efc08
 DIST GD-2.45.tar.gz 266918 RMD160 13e85ae27c8f661d8c470ec7dd388ffb71771100 SHA1 27c71bded682ccabb0c1429bb28e6c2bbae78e8d SHA256 1d9d20b1f335d701390c7e34eb4f48ed3b24e902d1e2058350d847b20a2a04dd
 EBUILD GD-2.44.ebuild 1654 RMD160 905966822d14c7232673259fc56df1e94aa54342 SHA1 2fce8e503249ae740e5f2f5b0921caee0a250c17 SHA256 50e392e8368c514464a9cd430cdad1c50c31e6eb1fee49a61965c39228c5b7ab
+EBUILD GD-2.45-r1.ebuild 1775 RMD160 258124c1b169ec16aa65edd7a7f65205f1749bb0 SHA1 febf57dd66ba849916d55e9838748f3fb0943465 SHA256 5a58b1c856ff66b01fc4a1e21d4197905f454bbd2efd269a05cb4855960329e3
 EBUILD GD-2.45.ebuild 1668 RMD160 1d133018b96a9ad910fe74294d71b4dfe1464d23 SHA1 cb655293a7f3a55a4ec24f866321b851821a70b0 SHA256 dba1310bb3a2199036dc4e0e7d0f5c2f480d642322d9c78eb28bb4ac0632eaed
-MISC ChangeLog 10581 RMD160 59b20099555aba2cc7f134669810e9263f378ebb SHA1 549e302b0d80de8b5f078cd161a8def3e1daebc8 SHA256 c127efea5e325a8b28a6ef06f5fa6f8ebcfbcd4d474e79cbfd404d61b7c4958c
+MISC ChangeLog 10704 RMD160 8927fd14ebaa434925a5122934599700fb31461e SHA1 8136a2ccbda27fe055985cd8da8e0e2885f7739c SHA256 bd370ca7b67f5051f0dd83f7ea2e631ad9ae34beed4aea715b3e8d4f264d4ba7
 MISC metadata.xml 305 RMD160 7a915960f9e286fb4387130524c062a40516a7aa SHA1 15db35ace77a6f80c433153b77a1feb52481bbad SHA256 d9faf0f73de9a10abe842a5df2f9a8db8ce1b4f83552756610ac0556e945841d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyPf0sACgkQV3J2n04EauyQRgCgy++dN80XAtiTe73+Fii7LpIC
-BjsAnRPc1CJD0lcbKNcJ5WYQknaUW+8V
-=AvWG
+iEYEARECAAYFAkz98MwACgkQV3J2n04Eauxl8gCffrp56BX2i3Or8ikugrowsIDn
+nSgAoLVqT8IZ7G8qixmEhcRDFpfUTwdL
+=sval
 -----END PGP SIGNATURE-----