version bump

8 files changed, 66 insertions, 50 deletions

diff --git a/dev-perl/GD/ChangeLog b/dev-perl/GD/ChangeLog
index 7000d94acc67..7c0faa131f01 100644
--- a/dev-perl/GD/ChangeLog
+++ b/dev-perl/GD/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-perl/GD
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.15 2003/03/25 22:09:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/ChangeLog,v 1.16 2003/06/26 15:17:22 vapier Exp $
+
+*GD-2.07 (26 Jun 2003)
+
+  26 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
 
 *GD-2.06 (23 Feb 2003)
 
diff --git a/dev-perl/GD/GD-2.06.ebuild b/dev-perl/GD/GD-2.07.ebuild
index 9930ad40b0a0..8ba4498700b0 100644
--- a/dev-perl/GD/GD-2.06.ebuild
+++ b/dev-perl/GD/GD-2.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.06.ebuild,v 1.5 2003/06/21 21:36:36 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/GD/GD-2.07.ebuild,v 1.1 2003/06/26 15:16:33 vapier Exp $
 
 inherit eutils perl-module
 CATEGORY="dev-perl"
@@ -15,7 +15,8 @@ SLOT="0"
 LICENSE="Artistic | GPL-2"
 KEYWORDS="x86 amd64 ppc sparc alpha"
 
-newdepend ">=media-libs/libgd-2.0.5
+DEPEND="${DEPEND}
+	>=media-libs/libgd-2.0.5
 	jpeg? ( media-libs/jpeg )
 	truetype? ( =media-libs/freetype-2* )
 	X? ( virtual/x11 )
@@ -28,21 +29,22 @@ src_unpack() {
 	use gif && epatch ${FILESDIR}/${PV}-gif-support.patch
 
 	use jpeg \
-		&& jpeg="y" \
-		|| jpeg="n"
+		&& jpeg=1 \
+		|| jpeg=0
 
 	use truetype \
-		&& freetype="y" \
-		|| freetype="n"
+		&& freetype=1 \
+		|| freetype=0
 
 	use X \
-		&& x="y" \
-		|| x="n"
+		&& x=1 \
+		|| x=0
 
 	cp Makefile.PL{,.orig}
-	sed -e "s:GENTOO_JPEG:${jpeg}:" \
-	 -e "s:GENTOO_FREETYPE:${freetype}:" \
-	 -e "s:GENTOO_XPM:${x}:" \
+	sed \
+		-e "s:GENTOO_JPEG:${jpeg}:" \
+		-e "s:GENTOO_FREETYPE:${freetype}:" \
+		-e "s:GENTOO_XPM:${x}:" \
 		Makefile.PL.orig > Makefile.PL
 
 	perl-module_src_prep
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 45459b73af4b..b914e545c619 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,7 +1,7 @@
-MD5 29f0419f47226cfa1c5b7f04e08a1848 ChangeLog 2167
-MD5 4aa083163288674939a54e4b7b1b925d GD-1.32-r3.ebuild 1323
-MD5 11efe215f3f6902338a2219473332582 GD-2.06.ebuild 1178
-MD5 b51ab87c113e42bd5560824fc63bc2bc files/2.06-gif-support.patch 21921
-MD5 09b39b1c077d8e72751e35850cc4b77c files/2.06-makefile-opts.patch 1209
+MD5 b51ab87c113e42bd5560824fc63bc2bc files/2.07-gif-support.patch 21921
+MD5 e6903f48f6e8261afb3b2e964b400c0b files/2.07-makefile-opts.patch 1746
 MD5 0608e756c077adb2d2b1e9bba551d499 files/digest-GD-1.32-r3 59
-MD5 930907847b20135f193fdeefac7601dd files/digest-GD-2.06 59
+MD5 cf9127479253ccf83984029239c00ea1 files/digest-GD-2.07 59
+MD5 4b028b3b5f3b06ad946410a20f729353 GD-2.07.ebuild 1176
+MD5 4aa083163288674939a54e4b7b1b925d GD-1.32-r3.ebuild 1323
+MD5 f52e8253ae9729a706649ba6bf7892c5 ChangeLog 2259
diff --git a/dev-perl/GD/files/2.06-makefile-opts.patch b/dev-perl/GD/files/2.06-makefile-opts.patch
deleted file mode 100644
index fbbc705d7b28..000000000000
--- a/dev-perl/GD/files/2.06-makefile-opts.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.PL.orig	2003-02-23 21:10:37.000000000 -0500
-+++ Makefile.PL	2003-02-23 21:12:43.000000000 -0500
-@@ -33,19 +33,19 @@
- 
- # path to libgd
- warn "\n";
--my $PREFIX = lc prompt('Where is libgd installed?','/usr/lib');
--unless ($PREFIX eq '/usr/lib') {
--  $PREFIX =~ s!/lib$!!;
--  unshift @INC,"-I$PREFIX/include";
--  unshift @LIBPATH,"-L$PREFIX/lib";
--}
-+#my $PREFIX = lc prompt('Where is libgd installed?','/usr/lib');
-+#unless ($PREFIX eq '/usr/lib') {
-+#  $PREFIX =~ s!/lib$!!;
-+#  unshift @INC,"-I$PREFIX/include";
-+#  unshift @LIBPATH,"-L$PREFIX/lib";
-+#}
- 
- # FEATURE FLAGS
- warn "\nPlease choose the features that match how libgd was built:\n";
- 
--my $JPEG    = lc prompt('Build JPEG support?','y') eq 'y';
--my $FT      = lc prompt('Build FreeType support?','y') eq 'y';
--my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
-+my $JPEG    = 'GENTOO_JPEG'; #lc prompt('Build JPEG support?','y') eq 'y';
-+my $FT      = 'GENTOO_FREETYPE'; #lc prompt('Build FreeType support?','y') eq 'y';
-+my $XPM     = 'GENTOO_XPM'; #$^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
- 
- my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
- 
diff --git a/dev-perl/GD/files/2.06-gif-support.patch b/dev-perl/GD/files/2.07-gif-support.patch
index 279840357a6a..279840357a6a 100644
--- a/dev-perl/GD/files/2.06-gif-support.patch
+++ b/dev-perl/GD/files/2.07-gif-support.patch
diff --git a/dev-perl/GD/files/2.07-makefile-opts.patch b/dev-perl/GD/files/2.07-makefile-opts.patch
new file mode 100644
index 000000000000..de46f51e87f4
--- /dev/null
+++ b/dev-perl/GD/files/2.07-makefile-opts.patch
@@ -0,0 +1,40 @@
+--- Makefile.PL.orig	2003-06-26 11:09:51.000000000 -0400
++++ Makefile.PL	2003-06-26 11:12:50.000000000 -0400
+@@ -94,12 +94,7 @@
+ ###################################################################
+ # path to libgd, skip prompt if passed in from above
+ ###################################################################
+-my $PREFIX = $lib_gd_path;
+-if( ! defined($lib_gd_path) )
+-{
+-  warn "\n";
+-  $PREFIX = lc prompt('Where is libgd installed?','/usr/lib');
+-}
++my $PREFIX = '/usr/lib';
+ 
+ unless ($PREFIX eq '/usr/lib') {
+   $PREFIX =~ s!/lib$!!;
+@@ -112,20 +107,9 @@
+ ##################################################################################################################
+ # If build options have not been passed in then prompt for settings
+ ##################################################################################################################
+-my ($JPEG, $FT, $XPM) = (undef, undef, undef);
+-if( defined($options) )
+-{
+-    if( $options =~ m/JPEG/i )  {  $JPEG = 1;  }  else  {  $JPEG = 0;  }
+-    if( $options =~ m/FT/i )    {  $FT   = 1;  }  else  {  $FT   = 0;  }
+-    if( $options =~ m/XPM/i )   {  $XPM  = 1;  }  else  {  $XPM  = 0;  }
+-}
+-else
+-{
+-    warn "\nPlease choose the features that match how libgd was built:\n";
+-    $JPEG = lc prompt('Build JPEG support?','y') eq 'y';
+-    $FT   = lc prompt('Build FreeType support?','y') eq 'y';
+-    $XPM  = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
+-}
++my $JPEG    = 'GENTOO_JPEG';
++my $FT      = 'GENTOO_FREETYPE';
++my $XPM     = 'GENTOO_XPM';
+ ##################################################################################################################
+ 
+ my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
diff --git a/dev-perl/GD/files/digest-GD-2.06 b/dev-perl/GD/files/digest-GD-2.06
deleted file mode 100644
index bfbac41a01ba..000000000000
--- a/dev-perl/GD/files/digest-GD-2.06
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90025c06e22c91e22588cee1567d3c7c GD-2.06.tar.gz 143228
diff --git a/dev-perl/GD/files/digest-GD-2.07 b/dev-perl/GD/files/digest-GD-2.07
new file mode 100644
index 000000000000..2fc4d5b313a3
--- /dev/null
+++ b/dev-perl/GD/files/digest-GD-2.07
@@ -0,0 +1 @@
+MD5 7a44d308e082471e824fcbff044d8300 GD-2.07.tar.gz 153759