diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libgd/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libgd/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/libgd/libgd-1.8.4-r1.ebuild | 36 |
3 files changed, 28 insertions, 20 deletions
diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog index a9823e8817ea..561a41340df7 100644 --- a/media-libs/libgd/ChangeLog +++ b/media-libs/libgd/ChangeLog @@ -1,6 +1,6 @@ # 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.28 2003/06/26 18:20:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.29 2003/06/26 19:01:10 vapier Exp $ *libgd-2.0.15-r1 (26 Jun 2003) @@ -48,6 +48,11 @@ *libgd-1.8.4-r1 (26 Jun 2003) 26 Jun 2003; Mike Frysinger <vapier@gentoo.org> : + Added local USE flag 'ttf' to determine whether user wants + to use freetype-2.x (truetype) or freetype-1.x (ttf). Since + ttf is a local USE flag, we defer choice to ttf. + + 26 Jun 2003; Mike Frysinger <vapier@gentoo.org> : mmm SLOT goodiness. *libgd-1.8.4 (18 Feb 2003) diff --git a/media-libs/libgd/Manifest b/media-libs/libgd/Manifest index 33474e4cbcce..5727436710dd 100644 --- a/media-libs/libgd/Manifest +++ b/media-libs/libgd/Manifest @@ -1,11 +1,10 @@ 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.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 e6fa6ad37763cdc88c1d2d7bfde54d19 libgd-1.8.4-r1.ebuild 2122 -MD5 014543fa80a5c99045e816359642f659 ChangeLog 4162 +MD5 f6c86a3750990e49292e0cc30587e99e libgd-1.8.4-r1.ebuild 2172 +MD5 e97b18a7ece1471722784e573ebf790f ChangeLog 4390 MD5 7698c9ea205d0313ebdc5d6313824063 libgd-1.8.4.ebuild 1851 MD5 c4079ca902e27788439f18e727c11f82 libgd-2.0.15-r1.ebuild 1289 diff --git a/media-libs/libgd/libgd-1.8.4-r1.ebuild b/media-libs/libgd/libgd-1.8.4-r1.ebuild index caffc79532ea..295900ab5b6e 100644 --- a/media-libs/libgd/libgd-1.8.4-r1.ebuild +++ b/media-libs/libgd/libgd-1.8.4-r1.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/media-libs/libgd/libgd-1.8.4-r1.ebuild,v 1.1 2003/06/26 18:20:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r1.ebuild,v 1.2 2003/06/26 19:01:11 vapier Exp $ MY_P=${P/lib/} S=${WORKDIR}/${MY_P} @@ -11,12 +11,15 @@ HOMEPAGE="http://www.boutell.com/gd/" SLOT="0" LICENSE="as-is | BSD" KEYWORDS="~x86 ~ppc ~sparc ~hppa" -IUSE="X jpeg truetype" +IUSE="X jpeg truetype ttf" DEPEND="media-libs/libpng X? ( virtual/x11 ) jpeg? ( media-libs/jpeg ) - truetype? ( =media-libs/freetype-1.3* )" + || ( + ttf? ( =media-libs/freetype-1* ) + truetype? ( =media-libs/freetype-2* ) + )" src_unpack() { unpack ${A} @@ -24,6 +27,7 @@ src_unpack() { local compopts local libsopts + local incopts use alpha \ && [ "${CC}" == "ccc" ] \ @@ -37,25 +41,25 @@ src_unpack() { && compopts="${compopts} -DHAVE_LIBJPEG" \ && libsopts="${libsopts} -ljpeg" - compopts="${compopts} -DHAVE_LIBPNG" \ + compopts="${compopts} -DHAVE_LIBPNG" libsopts="${libsopts} -lpng" - use truetype \ - && compopts="${compopts} -DHAVE_LIBTTF" \ - && libsopts="${libsopts} -lttf" - + if [ `use ttf` ] ; 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 - 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 :" \ - Makefile.old > Makefile || die - else - sed -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \ + 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 - fi } src_compile() { |