Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-admin/analog/ChangeLog5
-rw-r--r--app-admin/analog/analog-5.32.ebuild20
-rw-r--r--media-libs/libgd/ChangeLog7
-rw-r--r--media-libs/libgd/Manifest16
-rw-r--r--media-libs/libgd/files/digest-libgd-1.8.4-r21
-rw-r--r--media-libs/libgd/libgd-1.8.4-r2.ebuild86
6 files changed, 118 insertions, 17 deletions
diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index a8f4caa82778..414858cf2f47 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/analog
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.16 2003/06/17 19:43:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.17 2003/06/30 13:59:09 aliz Exp $
+
+ 30 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> analog-5.32.ebuild :
+ Updated dependencies to a libgd version that forces jpeg support in it.
*analog-5.32 (06 Apr 2003)
diff --git a/app-admin/analog/analog-5.32.ebuild b/app-admin/analog/analog-5.32.ebuild
index 6f669ef2bc9b..017ef2ca948f 100644
--- a/app-admin/analog/analog-5.32.ebuild
+++ b/app-admin/analog/analog-5.32.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.32.ebuild,v 1.3 2003/06/29 15:24:07 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-5.32.ebuild,v 1.4 2003/06/30 13:59:09 aliz Exp $
inherit eutils
@@ -13,21 +13,25 @@ LICENSE="as-is"
KEYWORDS="x86 ~ppc ~sparc"
DEPEND=">=dev-libs/libpcre-3.4
- >=media-libs/libgd-1.8.3
+ >=media-libs/libgd-1.8.4-r2
sys-libs/zlib
- media-libs/jpeg"
+ media-libs/jpeg
+ media-libs/libpng
+ >=sys-apps/sed-4"
src_unpack() {
unpack ${A} ; cd ${S}
- mv src/Makefile src/Makefile.orig
- sed -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
- -e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB:' \
- -e 's:^LIBS.*:LIBS = -lgd -lpng -ljpeg -lz -lpcre -lm:' \
- src/Makefile.orig > src/Makefile
epatch ${FILESDIR}/${PN}-5.1-gentoo.diff
}
src_compile() {
+ ebegin "Configuring"
+ sed -i -e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
+ -e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB:' \
+ -e "s:^LIBS.*:LIBS = -lgd -lz -lpcre -lm -lpng -ljpeg:" \
+ src/Makefile
+ eend $?
+
make -C src || die
}
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
+}