SLOT goodiness

9 files changed, 102 insertions, 53 deletions

diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog
index d6b12e9385e8..a9823e8817ea 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.27 2003/06/17 19:20:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.28 2003/06/26 18:20:56 vapier Exp $
+
+*libgd-2.0.15-r1 (26 Jun 2003)
+
+  26 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  mmm SLOT goodiness.
 
 *libgd-2.0.15 (17 Jun 2003)
 
@@ -39,7 +44,12 @@
 
   09 Sep 2002; <mcummings@gentoo.org> :
   Fixes bugs with perl versions using gd; corrects a few compile options
-  
+
+*libgd-1.8.4-r1 (26 Jun 2003)
+
+  26 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  mmm SLOT goodiness.
+
 *libgd-1.8.4 (18 Feb 2003)
 
   24 May 2003; Tavis Ormandy <taviso@gentoo.org> libgd-1.8.3-r6.ebuild,
diff --git a/media-libs/libgd/Manifest b/media-libs/libgd/Manifest
index 0303510679a6..33474e4cbcce 100644
--- a/media-libs/libgd/Manifest
+++ b/media-libs/libgd/Manifest
@@ -1,9 +1,11 @@
 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 672aacb21c85d776c6ae750e98457ca9 files/digest-libgd-2.0.15-r1 133
 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 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4-r1 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
+MD5 e6fa6ad37763cdc88c1d2d7bfde54d19 libgd-1.8.4-r1.ebuild 2122
+MD5 014543fa80a5c99045e816359642f659 ChangeLog 4162
+MD5 7698c9ea205d0313ebdc5d6313824063 libgd-1.8.4.ebuild 1851
+MD5 c4079ca902e27788439f18e727c11f82 libgd-2.0.15-r1.ebuild 1289
diff --git a/media-libs/libgd/files/digest-libgd-1.8.3-r6 b/media-libs/libgd/files/digest-libgd-1.8.3-r6
deleted file mode 100644
index 1ebc96c7257d..000000000000
--- a/media-libs/libgd/files/digest-libgd-1.8.3-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad0e7dd1dda2812dbaeaa9706c4be536 gd-1.8.3.tar.gz 274318
diff --git a/media-libs/libgd/files/digest-libgd-1.8.4-r1 b/media-libs/libgd/files/digest-libgd-1.8.4-r1
new file mode 100644
index 000000000000..e41c6df5c626
--- /dev/null
+++ b/media-libs/libgd/files/digest-libgd-1.8.4-r1
@@ -0,0 +1 @@
+MD5 2aef76e79f206f9798233f025f5dd28d gd-1.8.4.tar.gz 257631
diff --git a/media-libs/libgd/files/digest-libgd-2.0.15-r1 b/media-libs/libgd/files/digest-libgd-2.0.15-r1
new file mode 100644
index 000000000000..208bfcc945fa
--- /dev/null
+++ b/media-libs/libgd/files/digest-libgd-2.0.15-r1
@@ -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-1.8.3-dec-alpha-compiler.diff b/media-libs/libgd/files/gd-1.8.3-dec-alpha-compiler.diff
deleted file mode 100644
index b63aeb62f709..000000000000
--- a/media-libs/libgd/files/gd-1.8.3-dec-alpha-compiler.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru gd-1.8.3.orig/gd.c gd-1.8.3/gd.c
---- gd-1.8.3.orig/gd.c	2000-06-03 20:26:12.000000000 +0100
-+++ gd-1.8.3/gd.c	2003-05-24 20:04:41.000000000 +0100
-@@ -1,6 +1,3 @@
--#ifndef _OSD_POSIX	/* _OSD_POSIX defines *alloc() in stdlib.h */
--#include <malloc.h>
--#endif /*_OSD_POSIX*/
- #include <stdio.h>
- #include <math.h>
- #include <string.h>
-diff -ru gd-1.8.3.orig/gdcache.h gd-1.8.3/gdcache.h
---- gd-1.8.3.orig/gdcache.h	2000-06-03 20:26:12.000000000 +0100
-+++ gd-1.8.3/gdcache.h	2003-05-24 20:04:55.000000000 +0100
-@@ -40,7 +40,6 @@
- /* header                                                */
- /*********************************************************/
- 
--#include <malloc.h>
- #ifndef NULL
- #define NULL (void *)0
- #endif
diff --git a/media-libs/libgd/libgd-1.8.3-r6.ebuild b/media-libs/libgd/libgd-1.8.4-r1.ebuild
index a9d41bed89fb..caffc79532ea 100644
--- a/media-libs/libgd/libgd-1.8.3-r6.ebuild
+++ b/media-libs/libgd/libgd-1.8.4-r1.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.9 2003/05/24 19:14:02 taviso Exp $
-
-IUSE="X jpeg truetype"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r1.ebuild,v 1.1 2003/06/26 18:20:57 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 alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa"
+IUSE="X jpeg truetype"
 
 DEPEND="media-libs/libpng
 	X? ( virtual/x11 )
@@ -27,26 +26,26 @@ src_unpack() {
 	local libsopts
 
 	use alpha \
-		&& [ "${CC}" == "ccc" ] && epatch ${FILESDIR}/gd-${PV}-dec-alpha-compiler.diff
+		&& [ "${CC}" == "ccc" ] \
+		&& epatch ${FILESDIR}/gd-${PV}-dec-alpha-compiler.diff
+
 	use X \
 		&& compopts="${compopts} -DHAVE_XPM" \
 		&& libsopts="${libsopts} -lXpm -lX11"
-	
+
 	use jpeg \
-		&& compopts="${compopts} -DHAVE_JPEG" \
+		&& compopts="${compopts} -DHAVE_LIBJPEG" \
 		&& libsopts="${libsopts} -ljpeg"
 
-	
-	compopts="${compopts} -DHAVE_PNG" \
+	compopts="${compopts} -DHAVE_LIBPNG" \
 	libsopts="${libsopts} -lpng"
-	
+
 	use truetype \
 		&& compopts="${compopts} -DHAVE_LIBTTF" \
 		&& libsopts="${libsopts} -lttf"
 	
 	mv Makefile Makefile.old || die
-	if [ `use truetype` ]
-	then
+	if [ `use truetype` ] ; then
 		sed -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
 			-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
 			-e "s:^\(INCLUDEDIRS\)=:\1=-I/usr/include/freetype :" \
@@ -64,16 +63,26 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/{bin,lib,include}
-	
+	dodir /usr/{bin,lib,include/gd-1}
 	make \
 		INSTALL_LIB=${D}/usr/lib \
 		INSTALL_BIN=${D}/usr/bin \
-		INSTALL_INCLUDE=${D}/usr/include \
+		INSTALL_INCLUDE=${D}/usr/include/gd-1 \
 		install || die
-	
 	preplib /usr
 
 	dodoc readme.txt
 	dohtml -r ./
+
+	# now make it slotable
+	mv ${D}/usr/lib/libgd{,1}.a
+	if `has_version =media-libs/libgd-2*` ; then
+		rm -rf ${D}/usr/bin
+	else
+		dosym libgd1.a /usr/lib/libgd.a
+		cd ${D}/usr/include/gd-1/
+		for f in * ; do
+			dosym gd-1/${f} /usr/include/${f}
+		done
+	fi
 }
diff --git a/media-libs/libgd/libgd-1.8.4.ebuild b/media-libs/libgd/libgd-1.8.4.ebuild
index d0a4ace56524..e08051ea667e 100644
--- a/media-libs/libgd/libgd-1.8.4.ebuild
+++ b/media-libs/libgd/libgd-1.8.4.ebuild
@@ -1,8 +1,7 @@
 # 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.4.ebuild,v 1.4 2003/05/24 19:14:02 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4.ebuild,v 1.5 2003/06/26 18:20:57 vapier Exp $
 
-IUSE="X jpeg truetype"
 
 MY_P=${P/lib/}
 S=${WORKDIR}/${MY_P}
@@ -12,7 +11,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 jpeg truetype"
 
 DEPEND="media-libs/libpng
 	X? ( virtual/x11 )
@@ -20,7 +20,6 @@ DEPEND="media-libs/libpng
 	truetype? ( =media-libs/freetype-1.3* )"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 
@@ -38,7 +37,6 @@ src_unpack() {
 		&& compopts="${compopts} -DHAVE_LIBJPEG" \
 		&& libsopts="${libsopts} -ljpeg"
 
-	
 	compopts="${compopts} -DHAVE_LIBPNG" \
 	libsopts="${libsopts} -lpng"
 	
@@ -59,17 +57,13 @@ src_unpack() {
 		-e "s:\(COMPILER=\)gcc:\1${CC:-gcc}:" \
 		Makefile.old > Makefile || die
 	fi
-
 }
 
 src_compile() {
-
 	emake || die
-
 }
 
 src_install() {
-	
 	dodir /usr/{bin,lib,include}
 	
 	make \
diff --git a/media-libs/libgd/libgd-2.0.15-r1.ebuild b/media-libs/libgd/libgd-2.0.15-r1.ebuild
new file mode 100644
index 000000000000..bf6c794c6269
--- /dev/null
+++ b/media-libs/libgd/libgd-2.0.15-r1.ebuild
@@ -0,0 +1,53 @@
+# 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.15-r1.ebuild,v 1.1 2003/06/26 18:20:57 vapier Exp $
+
+inherit eutils libtool
+
+MY_P=${P/lib/}
+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
+	gif? ( http://downloads.rhyme.com.au/gd/${GIF_PATCH}.gz )"
+HOMEPAGE="http://www.boutell.com/gd/ http://www.rime.com.au/gd/"
+
+SLOT="2"
+LICENSE="as-is | BSD"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~hppa ~arm ~alpha"
+IUSE="X gif"
+
+DEPEND=">=media-libs/jpeg-6b
+	>=media-libs/libpng-1.2.5
+	>=media-libs/freetype-2.1.2
+	X? ( virtual/x11 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	elibtoolize
+	[ -n "`use gif`" ] && epatch ${WORKDIR}/${GIF_PATCH}
+}
+
+src_compile() {
+	econf \
+		`use_with X x` \
+		--includedir=/usr/include/gd-2 \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+	dodoc INSTALL README*
+	dohtml -r ./
+
+	# make it slotable
+	mv ${D}/usr/lib/libgd{,2}.a
+	dosed 's:libgd\.a:libgd2.a:' /usr/lib/libgd.la
+	dosym libgd2.a /usr/lib/libgd.a
+	cd ${D}/usr/include/gd-2/
+	for f in * ; do
+		dosym gd-2/${f} /usr/include/${f}
+	done
+}