Version bump to fix png building #69611

diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog
index 50de4d603a5b9e7939b9b60e143447378c3baae1..62752149c0b4ceda9cdecc232637bffc4af1daae 100644 (file)
--- a/media-libs/gd/ChangeLog
+++ b/media-libs/gd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/gd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.11 2004/10/31 16:13:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.12 2004/11/01 01:53:32 vapier Exp $
+
+*gd-2.0.31 (31 Oct 2004)
+
+  31 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/2.0.31-png-check.patch, -gd-2.0.30.ebuild, +gd-2.0.31.ebuild:
+  Version bump to fix png building #69611 by Tomasz Sterna.
 
   31 Oct 2004; Jason Wever <weeve@gentoo.org> gd-2.0.30.ebuild:
   Stable on sparc wrt securit bug #69070.

diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index d02ff10f10f35f1b15dc9f0dc93e7912b3e036a0..ec63dd57d7fb8a0fb3a69020c709ea15ac8f28af 100644 (file)
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,10 +1,21 @@
-MD5 19198e3574a224f3085d5bad3c794314 ChangeLog 7431
-MD5 fb45f43372ca8e8c5a8ee203d52cb1dc gd-1.8.4-r2.ebuild 2225
-MD5 fff60119b5e4f68b28394f8b647a4fee gd-2.0.30.ebuild 960
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2d98a5160432efac9e9e4257ff1ddd6c ChangeLog 7640
+MD5 91fb60093026cec390b6df0ddd4a1d59 gd-2.0.28.ebuild 957
 MD5 312563b7288a2111976b24b0865d9df8 metadata.xml 1227
-MD5 ecf98c50570a620b6e064d83abed4303 gd-2.0.28.ebuild 958
-MD5 c700ef06f9532087e4f27487633179a9 files/1.8.4-dec-alpha-compiler.diff 725
+MD5 a4afb55d39a96c93e9b99d8d2706c84c gd-2.0.31.ebuild 1013
+MD5 fb45f43372ca8e8c5a8ee203d52cb1dc gd-1.8.4-r2.ebuild 2225
 MD5 09cc9995071652c954638c7ed2590dee files/1.8.4-jpeg-inc.patch 419
-MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-gd-1.8.4-r2 60
-MD5 e9f2abd6a0ef05426a70dd19610678c9 files/digest-gd-2.0.30 61
 MD5 7f1d011b6f09a5125c3c5151abbb2f56 files/digest-gd-2.0.28 133
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-gd-1.8.4-r2 60
+MD5 c700ef06f9532087e4f27487633179a9 files/1.8.4-dec-alpha-compiler.diff 725
+MD5 7b4c1fddfe76029cf9683586b0ea732c files/digest-gd-2.0.31 61
+MD5 38fb558a8071c00ce93e35aede13aaf6 files/2.0.31-png-check.patch 369
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBhZc8HTu7gpaalycRAhzGAKC+eW4BgGMRTyT2ylTTpicYZ8dUrgCfVrP+
+7sqNafTzT7ba+fNSm7ZtmvI=
+=uWVV
+-----END PGP SIGNATURE-----

diff --git a/media-libs/gd/files/2.0.31-png-check.patch b/media-libs/gd/files/2.0.31-png-check.patch
new file mode 100644 (file)
index 0000000..8489312
--- /dev/null
+++ b/media-libs/gd/files/2.0.31-png-check.patch
@@ -0,0 +1,16 @@
+--- gd-2.0.30/testtr.c 2004-10-27 13:01:03.000000000 -0400
++++ gd-2.0.30.fixed/testtr.c   2004-10-31 20:33:49.621525120 -0500
+@@ -37,9 +37,13 @@
+ 
+       gdImageSaveAlpha (im, TRUE);
+ 
++#ifdef HAVE_LIBPNG
+       out = fopen ("testtr.png", "wb");
+       gdImagePng (im, out);
+       fclose (out);
++#else
++      fprintf(stderr, "Compiled without png support\n");
++#endif
+ 
+       gdImageDestroy (im);
+ 

diff --git a/media-libs/gd/files/digest-gd-2.0.30 b/media-libs/gd/files/digest-gd-2.0.30
deleted file mode 100644 (file)
index eda5e75..0000000
--- a/media-libs/gd/files/digest-gd-2.0.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ec99b54b1e985d27f2b871deae953e3 gd-2.0.30.tar.gz 582715

diff --git a/media-libs/gd/files/digest-gd-2.0.31 b/media-libs/gd/files/digest-gd-2.0.31
new file mode 100644 (file)
index 0000000..52dd37d
--- /dev/null
+++ b/media-libs/gd/files/digest-gd-2.0.31
@@ -0,0 +1 @@
+MD5 3a6e508f7911458151fe4a1475cbba51 gd-2.0.31.tar.gz 587984

diff --git a/media-libs/gd/gd-2.0.28.ebuild b/media-libs/gd/gd-2.0.28.ebuild
index 41a8851e75f510b7222d5f44b1b05557ca233537..51c95f190f7b3c7d2a5db3e80b3a8bdc0e05bc4a 100644 (file)
--- a/media-libs/gd/gd-2.0.28.ebuild
+++ b/media-libs/gd/gd-2.0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.28.ebuild,v 1.4 2004/10/31 11:07:35 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.28.ebuild,v 1.5 2004/11/01 01:53:32 vapier Exp $
 
 inherit gnuconfig
 
@@ -35,7 +35,7 @@ src_compile() {
 }
 
 src_install() {
-       emake DESTDIR=${D} install || die
+       make DESTDIR=${D} install || die
        dodoc INSTALL README*
        dohtml -r ./
 }

diff --git a/media-libs/gd/gd-2.0.30.ebuild b/media-libs/gd/gd-2.0.31.ebuild
similarity index 70%
rename from media-libs/gd/gd-2.0.30.ebuild
rename to media-libs/gd/gd-2.0.31.ebuild
index 2a7d671b575d7b14ced76bdea0ea5617f0a7ca61..524c1e55bcc9d896d51cb0c8a878f129466223af 100644 (file)
--- a/media-libs/gd/gd-2.0.30.ebuild
+++ b/media-libs/gd/gd-2.0.31.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.30.ebuild,v 1.4 2004/10/31 16:13:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.31.ebuild,v 1.1 2004/11/01 01:53:32 vapier Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://www.boutell.com/gd/"
@@ -21,21 +21,22 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 src_unpack() {
        unpack ${A}
        cd ${S}
+       epatch ${FILESDIR}/${PV}-png-check.patch
        gnuconfig_update
 }
 
 src_compile() {
        econf \
-               `use_with png` \
-               `use_with truetype freetype` \
-               `use_with jpeg` \
-               `use_with X xpm` \
+               $(use_with png) \
+               $(use_with truetype freetype) \
+               $(use_with jpeg) \
+               $(use_with X xpm) \
                || die
        emake || die
 }
 
 src_install() {
-       emake DESTDIR=${D} install || die
+       make DESTDIR=${D} install || die
        dodoc INSTALL README*
        dohtml -r ./
 }