touchups

3 files changed, 3 insertions, 91 deletions

diff --git a/media-libs/libgd/files/digest-libgd-1.8.3-r5 b/media-libs/libgd/files/digest-libgd-1.8.3-r5
deleted file mode 100644
index 1ebc96c7257d..000000000000
--- a/media-libs/libgd/files/digest-libgd-1.8.3-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad0e7dd1dda2812dbaeaa9706c4be536 gd-1.8.3.tar.gz 274318
diff --git a/media-libs/libgd/libgd-1.8.3-r5.ebuild b/media-libs/libgd/libgd-1.8.3-r5.ebuild
deleted file mode 100644
index 385ac1e8dff2..000000000000
--- a/media-libs/libgd/libgd-1.8.3-r5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-1.8.3-r5.ebuild,v 1.11 2003/04/23 00:13:19 lostlogic Exp $
-
-IUSE="X"
-
-MY_P=${P/lib/}
-S=${WORKDIR}/${MY_P}
-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/"
-
-SLOT="0"
-LICENSE="as-is | BSD"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="=sys-apps/sed-4*
-	media-libs/libpng
-	X? ( virtual/x11 )
-	jpeg? ( media-libs/jpeg )
-	truetype? ( =media-libs/freetype-1.3* )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	local compopts
-	local libsopts
-
-	use X \
-		&& compopts="${compopts} -DHAVE_XPM" \
-		&& libsopts="${libsopts} -lXpm -lX11"
-	
-	use jpeg \
-		&& compopts="${compopts} -DHAVE_JPEG" \
-		&& libsopts="${libsopts} -ljpeg"
-
-	
-	compopts="${compopts} -DHAVE_PNG" \
-	libsopts="${libsopts} -lpng"
-	
-	use truetype \
-		&& compopts="${compopts} -DHAVE_LIBTTF" \
-		&& libsopts="${libsopts} -lttf"
-	
-	if use truetype
-	then
-		sed -i -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
-			-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
-			-e "s:^\(INCLUDEDIRS\)=:\1=-I/usr/include/freetype :" \
-		Makefile
-	else
-		sed -i -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
-		-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
-		Makefile
-	fi
-
-}
-
-src_compile() {
-
-	emake || die
-
-}
-
-src_install() {
-	
-	dodir /usr/{bin,lib,include}
-	
-	make \
-		INSTALL_LIB=${D}/usr/lib \
-		INSTALL_BIN=${D}/usr/bin \
-		INSTALL_INCLUDE=${D}/usr/include \
-		install || die
-	
-	preplib /usr
-
-	dodoc readme.txt
-	dohtml -r ./
-}
diff --git a/media-libs/libgd/libgd-1.8.3-r6.ebuild b/media-libs/libgd/libgd-1.8.3-r6.ebuild
index 2bfba0e484f8..145dde6322ad 100644
--- a/media-libs/libgd/libgd-1.8.3-r6.ebuild
+++ b/media-libs/libgd/libgd-1.8.3-r6.ebuild
@@ -1,8 +1,6 @@
 # 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-1.8.3-r6.ebuild,v 1.6 2003/03/20 01:18:08 gmsoft Exp $
-
-IUSE="X"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.3-r6.ebuild,v 1.7 2003/04/27 20:19:22 vapier Exp $
 
 MY_P=${P/lib/}
 S=${WORKDIR}/${MY_P}
@@ -12,7 +10,8 @@ HOMEPAGE="http://www.boutell.com/gd/"
 
 SLOT="0"
 LICENSE="as-is | BSD"
-KEYWORDS="x86 ~ppc sparc hppa"
+KEYWORDS="x86 ppc sparc hppa"
+IUSE="X"
 
 DEPEND="media-libs/libpng
 	X? ( virtual/x11 )
@@ -20,7 +19,6 @@ DEPEND="media-libs/libpng
 	truetype? ( =media-libs/freetype-1.3* )"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -55,17 +53,13 @@ src_unpack() {
 		-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
 		Makefile.old > Makefile || die
 	fi
-
 }
 
 src_compile() {
-
 	emake || die
-
 }
 
 src_install() {
-	
 	dodir /usr/{bin,lib,include}
 	
 	make \