fix truetype USE flag and add in gif again

4 files changed, 15 insertions, 8 deletions

diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog
index c39cc53a5e99..c5aac2b245e4 100644
--- a/media-libs/libgd/ChangeLog
+++ b/media-libs/libgd/ChangeLog
@@ -1,6 +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.35 2003/12/27 06:16:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.36 2003/12/31 14:31:25 vapier Exp $
+
+*libgd-2.0.17-r1 (31 Dec 2003)
+
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Port the gif patch so as to not break some php installs.
 
 *libgd-2.0.17 (27 Dec 2003)
 
diff --git a/media-libs/libgd/files/digest-libgd-2.0.17 b/media-libs/libgd/files/digest-libgd-2.0.17
deleted file mode 100644
index 4f41a8dc63e3..000000000000
--- a/media-libs/libgd/files/digest-libgd-2.0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1c0b12e69df63c22c7f90a4e8618c83 gd-2.0.17.tar.gz 541198
diff --git a/media-libs/libgd/files/digest-libgd-2.0.17-r1 b/media-libs/libgd/files/digest-libgd-2.0.17-r1
new file mode 100644
index 000000000000..e6f4332bf64b
--- /dev/null
+++ b/media-libs/libgd/files/digest-libgd-2.0.17-r1
@@ -0,0 +1,2 @@
+MD5 a1c0b12e69df63c22c7f90a4e8618c83 gd-2.0.17.tar.gz 541198
+MD5 5690c8e054d6cefcf585cb63a6822c4d libgd-2.0.17-gif.patch.bz2 19755
diff --git a/media-libs/libgd/libgd-2.0.17.ebuild b/media-libs/libgd/libgd-2.0.17-r1.ebuild
index f51802067a88..db711b5e59a9 100644
--- a/media-libs/libgd/libgd-2.0.17.ebuild
+++ b/media-libs/libgd/libgd-2.0.17-r1.ebuild
@@ -1,22 +1,23 @@
 # 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.17.ebuild,v 1.1 2003/12/27 06:16:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-2.0.17-r1.ebuild,v 1.1 2003/12/31 14:31:25 vapier Exp $
 
 MY_P=${P/lib/}
 #GIF_PATCH=patch_gd2.0.15_gif_030801
 DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://www.boutell.com/gd/ http://www.rime.com.au/gd/"
-SRC_URI="http://www.boutell.com/gd/http/${MY_P}.tar.gz"
+SRC_URI="http://www.boutell.com/gd/http/${MY_P}.tar.gz
+	gif? ( mirror://gentoo/${P}-gif.patch.bz2 )"
 #	gif? ( http://downloads.rhyme.com.au/gd/${GIF_PATCH}.gz )"
 
 LICENSE="as-is | BSD"
 SLOT="2"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~hppa ~arm ~alpha"
-IUSE="jpeg png X freetype" # gif"
+IUSE="jpeg png X truetype gif"
 
 DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	png? ( >=media-libs/libpng-1.2.5 sys-libs/zlib )
-	freetype? ( >=media-libs/freetype-2.1.2 )
+	truetype? ( >=media-libs/freetype-2.1.2 )
 	X? ( virtual/x11 )"
 
 S=${WORKDIR}/${MY_P}
@@ -24,14 +25,14 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-#	[ -n "`use gif`" ] && epatch ${WORKDIR}/${GIF_PATCH}
+	use gif && epatch ${WORKDIR}/${P}-gif.patch
 	use png || echo 'void main(){}' > circletexttest.c
 	use jpeg || echo 'void main(){}' > circletexttest.c
 }
 
 src_compile() {
 	local myconf=""
-	use freetype \
+	use truetype \
 		&& myconf="${myconf} --with-freetype=yes" \
 		|| myconf="${myconf} --with-freetype=no"
 	use png \