Fixes analog compiling

4 files changed, 102 insertions, 8 deletions

diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog
index 561a41340df7..bb6b87f5928d 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.29 2003/06/26 19:01:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.30 2003/06/30 13:59:09 aliz Exp $
+
+*libgd-1.8.4-r2 (30 Jun 2003)
+
+  30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> libgd-1.8.4-r2.ebuild :
+  Force jpeg support or else analog fails to build if libgd is built without jpeg support.
 
 *libgd-2.0.15-r1 (26 Jun 2003)
 
diff --git a/media-libs/libgd/Manifest b/media-libs/libgd/Manifest
index 3bd8b146c2df..215a09bd3d5b 100644
--- a/media-libs/libgd/Manifest
+++ b/media-libs/libgd/Manifest
@@ -1,10 +1,12 @@
-MD5 672aacb21c85d776c6ae750e98457ca9 files/digest-libgd-2.0.15 133
-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.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 67634abfdeb8afc01e326473b193b846 ChangeLog 4585
 MD5 2c48a501e780b719e0f635a8c92248f6 libgd-1.8.4-r1.ebuild 2217
-MD5 e97b18a7ece1471722784e573ebf790f ChangeLog 4390
+MD5 84c16ffcb2299e36888d0f0ea59eb6e1 libgd-2.0.15.ebuild 1026
 MD5 3e68d190c116bfd5a9e5456d19e43b73 libgd-1.8.4.ebuild 1850
 MD5 c4079ca902e27788439f18e727c11f82 libgd-2.0.15-r1.ebuild 1289
+MD5 c86fa003af78fe2d698b0852091c580c libgd-1.8.4-r2.ebuild 2129
+MD5 672aacb21c85d776c6ae750e98457ca9 files/digest-libgd-2.0.15 133
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4-r1 60
+MD5 672aacb21c85d776c6ae750e98457ca9 files/digest-libgd-2.0.15-r1 133
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4 60
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4-r2 60
+MD5 c700ef06f9532087e4f27487633179a9 files/gd-1.8.4-dec-alpha-compiler.diff 725
diff --git a/media-libs/libgd/files/digest-libgd-1.8.4-r2 b/media-libs/libgd/files/digest-libgd-1.8.4-r2
new file mode 100644
index 000000000000..e41c6df5c626
--- /dev/null
+++ b/media-libs/libgd/files/digest-libgd-1.8.4-r2
@@ -0,0 +1 @@
+MD5 2aef76e79f206f9798233f025f5dd28d gd-1.8.4.tar.gz 257631
diff --git a/media-libs/libgd/libgd-1.8.4-r2.ebuild b/media-libs/libgd/libgd-1.8.4-r2.ebuild
new file mode 100644
index 000000000000..19a319afce7d
--- /dev/null
+++ b/media-libs/libgd/libgd-1.8.4-r2.ebuild
@@ -0,0 +1,86 @@
+# 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-r2.ebuild,v 1.1 2003/06/30 13:59:09 aliz Exp $
+
+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 ~hppa"
+IUSE="X truetype freetype-version-1"
+
+DEPEND="media-libs/libpng
+	media-libs/jpeg
+	X? ( virtual/x11 )
+	freetype-version-1? ( =media-libs/freetype-1* ) :
+		( truetype? ( =media-libs/freetype-2* ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	local compopts
+	local libsopts
+	local incopts
+
+	use alpha \
+		&& [ "${CC}" == "ccc" ] \
+		&& epatch ${FILESDIR}/gd-${PV}-dec-alpha-compiler.diff
+
+	use X \
+		&& compopts="${compopts} -DHAVE_XPM" \
+		&& libsopts="${libsopts} -lXpm -lX11"
+
+	compopts="${compopts} -DHAVE_LIBPNG -DHAVE_LIBJPEG"
+	libsopts="${libsopts} -lpng -jpeg"
+
+	if [ `use freetype-version-1` ] ; then
+		compopts="${compopts} -DHAVE_LIBTTF"
+		libsopts="${libsopts} -lttf"
+		incopts="-I/usr/include/freetype"
+	elif [ `use truetype` ] ; then
+		compopts="${compopts} -DHAVE_LIBFREETYPE"
+		libsopts="${libsopts} -lfreetype"
+		incopts="-I/usr/include/freetype2"
+	fi
+
+	mv Makefile Makefile.old || die
+	sed -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
+		-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
+		-e "s:^\(INCLUDEDIRS\)=:\1=${incopts} :" \
+		-e "s:\(COMPILER=\)gcc:\1${CC:-gcc}:" \
+		Makefile.old > Makefile || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dodir /usr/{bin,lib,include/gd-1}
+	make \
+		INSTALL_LIB=${D}/usr/lib \
+		INSTALL_BIN=${D}/usr/bin \
+		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
+}