Bug 7136 - corrected checks for jpeg support

diff --git a/dev-perl/GD/ChangeLog b/dev-perl/GD/ChangeLog
index 486935f1cb13d72be3a7e323669071b4216fbd1e..0ca9f1a12ca8473c93a829f1d9e8e3e0a1194f31 100644 (file)
--- a/dev-perl/GD/ChangeLog
+++ b/dev-perl/GD/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-perl/GD
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.6 2002/09/21 19:11:31 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.7 2002/10/24 15:35:47 mcummings Exp $
 
 *GD-1.32-r2 (18 Sep 2002) <mcummings@gentoo.org> 
 
+  24 Oct 2002; <mcummings@gentoo.org> : Fixed JPEG dep check - there
+  was no correction clause for jpeg if use jpeg was no. Thanks to
+  Lasse Mikkelsen who pointed this out months ago in bug 7136
+
   21 Sep 2002; <mcummings@gentoo.org> : Fixed X dep check - there
   was no correction clause for xpm if use X was no. Thanks ska-fan!
 

diff --git a/dev-perl/GD/GD-1.32-r2.ebuild b/dev-perl/GD/GD-1.32-r2.ebuild
index 6e70d73e07ffae53860188112e1ff582c278af84..ca1f960a9beec86f9752c3321b1b8f7105bd0dfe 100644 (file)
--- a/dev-perl/GD/GD-1.32-r2.ebuild
+++ b/dev-perl/GD/GD-1.32-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-1.32-r2.ebuild,v 1.5 2002/10/17 16:43:13 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-1.32-r2.ebuild,v 1.6 2002/10/24 15:35:47 mcummings Exp $
 
 IUSE="X"
 
@@ -37,6 +37,17 @@ src_unpack() {
                sed -e "s:my \$XPM.*:my \$XPM='n';:" \
                        Makefile.PL.orig > Makefile.PL
        )
+       use jpeg && ( \
+               cp Makefile.PL Makefile.PL.orig
+               sed -e "s:my \$JPEG.*:my \$JPEG='y';:" \
+                       Makefile.PL.orig > Makefile.PL
+       ) || ( \
+               cp Makefile.PL Makefile.PL.orig
+               sed -e "s:my \$JPEG.*:my \$JPEG='n';:" \
+                       Makefile.PL.orig > Makefile.PL
+       )
+       
+       myconf="${myconf} --with-jpeg-dir=/usr"
 
        perl-module_src_prep
 }