version bump + new gif patch

6 files changed, 46 insertions, 49 deletions

diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog
index 12cae17e86a8..d6b12e9385e8 100644
--- a/media-libs/libgd/ChangeLog
+++ b/media-libs/libgd/ChangeLog
@@ -1,15 +1,11 @@
 # ChangeLog for media-libs/libgd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.26 2003/05/24 19:14:02 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.27 2003/06/17 19:20:24 vapier Exp $
 
-  24 May 2003; Tavis Ormandy <taviso@gentoo.org> libgd-1.8.3-r6.ebuild,
-  libgd-1.8.4.ebuild, files/gd-1.8.3-dec-alpha-compiler.diff,
-  files/gd-1.8.4-dec-alpha-compiler.diff:
-  makring alpha, also ccc fixes.
+*libgd-2.0.15 (17 Jun 2003)
 
-  18 May 2003; Martin Holzer <mholzer@gentoo.org> libgd-1.8.3-r6.ebuild,
-  libgd-1.8.4.ebuild:
-  Added USE flags. Closes #21059.
+  17 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumped + grab gif patch from orig site.
 
 *libgd-2.0.12 (14 Apr 2003)
 
@@ -36,7 +32,24 @@
   23 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bumpage.
 
-*libgd-1.8.3-r6 (18 Feb 2003)
+*libgd-2.0.1 (09 Sep 2002)
+
+  14 Sep 2002; <mcummings@gentoo.org> :
+  bzip'd patch and moved to mirror
+
+  09 Sep 2002; <mcummings@gentoo.org> :
+  Fixes bugs with perl versions using gd; corrects a few compile options
+  
+*libgd-1.8.4 (18 Feb 2003)
+
+  24 May 2003; Tavis Ormandy <taviso@gentoo.org> libgd-1.8.3-r6.ebuild,
+  libgd-1.8.4.ebuild, files/gd-1.8.3-dec-alpha-compiler.diff,
+  files/gd-1.8.4-dec-alpha-compiler.diff:
+  makring alpha, also ccc fixes.
+
+  18 May 2003; Martin Holzer <mholzer@gentoo.org> libgd-1.8.3-r6.ebuild,
+  libgd-1.8.4.ebuild:
+  Added USE flags. Closes #21059.
 
   20 Mar 2003; Guy Martin <gmsoft@gentoo.org> libgd-1.8.3-r6.ebuild :
   Added hppa to KEYWORDS.
@@ -52,30 +65,20 @@
   Fix to work with userpriv properly.
 
   04 Feb 2003; Seemant Kulleen <seemant@gentoo.org> libgd-1.8.3-r6.ebuild :
-
   Removed dependency on sed-4 because it is buggy on ppc.  Switched to
   normal gnu-sed syntax. Closes bug #15022 by Rajiv Manglani
   <rajiv@gentoo.org>
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
   15 Jan 2003; Brandon Low <lostlogic@gentoo.org> libgd-1.8.3-r6.ebuild:
   Drop dependency on supersed, switch to >=sed-4.0.  This is unstable on the
   ppc pending the stability of sed-4 on the ppc.
 
-*libgd-2.0.1 (9 Sep 2002)
-  14 Sep 2002; <mcummings@gentoo.org> : bzip'd patch and moved to mirror
-
-  9 Sep 2002; <mcummings@gentoo.org> :
-  Fixes bugs with perl versions using gd; corrects a few compile options
-  
 *libgd-1.8.3-r5 (12 Apr 2002)
 
   22 Apr 2003; Brandon Low <lostlogic@gentoo.org> libgd-1.8.3-r5.ebuild:
   Change supersed dependencies
 
   22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> libgd-1.8.3-r5.ebuid :
-
   jpeg, X, and truetype turned into USE dependent support.
 
   07 Aug 2002; Mark Guertin <gerk@gentoo.org> :
@@ -84,22 +87,19 @@
   12 Apr 2002; Spider <spider@gentoo.org> libgd-1.8.3-r5.ebuild :
   Updating revision with new libpng
 
-*libgd-1.8.3-r4 (3 Apr 2002)
-
-  3 Apr 2002; Bruce A. Locke <blocke@shivan.org> libgd-1.8.3-r4.ebuild :
+*libgd-1.8.3-r4 (03 Apr 2002)
 
+  03 Apr 2002; Bruce A. Locke <blocke@shivan.org> libgd-1.8.3-r4.ebuild :
   Quick fix for glibc circular dependencies.
 
 *libgd-1.8.3-r3 (27 Mar 2002)
 
   27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> libgd-1.8.3-r3.ebuild :
-
   Updated ebuild to modern syntax, and ungzipped HTML docs.
 
-*libgd-1.8.3-r2 (1 Feb 2002)
+*libgd-1.8.3-r2 (01 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/media-libs/libgd/Manifest b/media-libs/libgd/Manifest
index eb23265fe1f8..0303510679a6 100644
--- a/media-libs/libgd/Manifest
+++ b/media-libs/libgd/Manifest
@@ -1,10 +1,9 @@
-MD5 295e84552ff48812564d42246e1e44d2 libgd-1.8.3-r6.ebuild 1855
-MD5 1172a98d01758a3401ae2adf82450bb5 libgd-2.0.12.ebuild 950
-MD5 abff7bb9ac9d9260c1b2cb57719b60d5 ChangeLog 3901
-MD5 1d0839b1a8455eff75d5591220bae0dc libgd-1.8.4.ebuild 1863
+MD5 672aacb21c85d776c6ae750e98457ca9 files/digest-libgd-2.0.15 133
+MD5 d511d179becfddc2f4b475a92a26fae4 files/digest-libgd-1.8.3-r6 60
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4 60
 MD5 c700ef06f9532087e4f27487633179a9 files/gd-1.8.3-dec-alpha-compiler.diff 725
 MD5 c700ef06f9532087e4f27487633179a9 files/gd-1.8.4-dec-alpha-compiler.diff 725
-MD5 fb76cd227ccbc8d9e53b3c235bd54d3e files/gd-2.0.11-gif-support.patch.bz2 25710
-MD5 6b3637a270c03c1ee62cf2c6ab2964a5 files/digest-libgd-2.0.12 61
-MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4 60
-MD5 d511d179becfddc2f4b475a92a26fae4 files/digest-libgd-1.8.3-r6 60
+MD5 84c16ffcb2299e36888d0f0ea59eb6e1 libgd-2.0.15.ebuild 1026
+MD5 295e84552ff48812564d42246e1e44d2 libgd-1.8.3-r6.ebuild 1855
+MD5 ce57e1cba89156c1766386c46256fbb2 ChangeLog 3951
+MD5 1d0839b1a8455eff75d5591220bae0dc libgd-1.8.4.ebuild 1863
diff --git a/media-libs/libgd/files/digest-libgd-2.0.12 b/media-libs/libgd/files/digest-libgd-2.0.12
deleted file mode 100644
index 3f4111719fbf..000000000000
--- a/media-libs/libgd/files/digest-libgd-2.0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 de82080fbac781cfcd512c3c299066d7 gd-2.0.12.tar.gz 525446
diff --git a/media-libs/libgd/files/digest-libgd-2.0.15 b/media-libs/libgd/files/digest-libgd-2.0.15
new file mode 100644
index 000000000000..208bfcc945fa
--- /dev/null
+++ b/media-libs/libgd/files/digest-libgd-2.0.15
@@ -0,0 +1,2 @@
+MD5 6ededf633b4fd054662ec123c7825fbb gd-2.0.15.tar.gz 526904
+MD5 7456398bc5bb9eb2c73fc49586b7d29c patch_gd2.0.15_gif_030616.gz 27312
diff --git a/media-libs/libgd/files/gd-2.0.11-gif-support.patch.bz2 b/media-libs/libgd/files/gd-2.0.11-gif-support.patch.bz2
deleted file mode 100644
index 0cf787555735..000000000000
--- a/media-libs/libgd/files/gd-2.0.11-gif-support.patch.bz2
+++ /dev/null
diff --git a/media-libs/libgd/libgd-2.0.12.ebuild b/media-libs/libgd/libgd-2.0.15.ebuild
index 957565940bad..9930b9f1f625 100644
--- a/media-libs/libgd/libgd-2.0.12.ebuild
+++ b/media-libs/libgd/libgd-2.0.15.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-2.0.12.ebuild,v 1.1 2003/04/14 01:17:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-2.0.15.ebuild,v 1.1 2003/06/17 19:20:25 vapier Exp $
 
 inherit eutils libtool
 
 MY_P=${P/lib/}
-S=${WORKDIR}/${MY_P}
+GIF_PATCH=patch_gd${PV}_gif_030616
 DESCRIPTION="A graphics library for fast image creation"
-SRC_URI="http://www.boutell.com/gd/http/${MY_P}.tar.gz"
-HOMEPAGE="http://www.boutell.com/gd/"
+SRC_URI="http://www.boutell.com/gd/http/${MY_P}.tar.gz
+	gif? ( http://downloads.rhyme.com.au/gd/${GIF_PATCH}.gz )"
+HOMEPAGE="http://www.boutell.com/gd/ http://www.rime.com.au/gd/"
 
-SLOT="0"
+SLOT="2"
 LICENSE="as-is | BSD"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~hppa ~arm ~alpha"
 IUSE="X gif"
@@ -20,20 +21,16 @@ DEPEND=">=media-libs/jpeg-6b
 	>=media-libs/freetype-2.1.2
 	X? ( virtual/x11 )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
+S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
 	elibtoolize
-
-	#[ -n "`use gif`" ] && epatch ${FILESDIR}/${MY_P}-gif-support.patch.bz2
+	[ -n "`use gif`" ] && epatch ${WORKDIR}/${GIF_PATCH}
 }
 
 src_compile() {
-	econf \
-		--with-gnu-ld \
-		`use_with X x` \
-		|| die
+	econf `use_with X x` || die
 	emake || die
 }