repoman'd

5 files changed, 56 insertions, 105 deletions

diff --git a/media-libs/freetype/files/digest-freetype-2.1.0 b/media-libs/freetype/files/digest-freetype-2.1.0
deleted file mode 100644
index e72c5e9303d5..000000000000
--- a/media-libs/freetype/files/digest-freetype-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 27741388b19784be65b963a98c961bc5 freetype-2.1.0.tar.bz2 649519
diff --git a/media-libs/freetype/freetype-1.3.1-r3.ebuild b/media-libs/freetype/freetype-1.3.1-r3.ebuild
index cfa81687d36b..5240aa4fe833 100644
--- a/media-libs/freetype/freetype-1.3.1-r3.ebuild
+++ b/media-libs/freetype/freetype-1.3.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.6 2002/07/22 14:37:06 seemant Exp $
 
 # r3 change by me (danarmak): there's a contrib dir inside the freetype1
 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner.
@@ -13,90 +13,82 @@
 # When we update to freetype-pre1.4 or any later version, we should use
 # the included contrib directory and not download any additional files.
 
-A1=${P}.tar.gz
-A2=freetype1-contrib.tar.gz
-A="${A1} ${A2}"
+P2=${PN}1-contrib
 S=${WORKDIR}/${P}
 DESCRIPTION="TTF-Library"
-SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${A1}
-	 ftp://ftp.freetype.org/pub/freetype1/${A2}"
+SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${P}.tar.gz
+	 ftp://ftp.freetype.org/pub/freetype1/${P2}.tar.gz"
 HOMEPAGE="http://www.freetype.org/"
 
 SLOT="1"
 LICENSE="FTL"
 KEYWORDS="x86 ppc"
 
-DEPEND="virtual/glibc
-        nls? ( sys-devel/gettext )"
-
-RDEPEND="virtual/glibc"
+DEPEND="virtual/glibc"
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
-    
-    cd ${WORKDIR}
-    unpack ${A1}
-    # freetype1-contrib goes under freetype-1.3.1
-    cd ${S}
-    unpack ${A2}
-    
+		
+	cd ${WORKDIR}
+	unpack ${P}.tar.gz
+	# freetype1-contrib goes under freetype-1.3.1
+	cd ${S}
+	unpack ${P2}.tar.gz
+		
 }
 
 src_compile() {
 
-  local myconf
+	local myconf
 
-  if [ -z "`use nls`" ]
-  then
-    myconf="${myconf} --disable-nls"
-  fi
+	use nls || myconf="${myconf} --disable-nls"
 
-  try ./configure --host=${CHOST} --prefix=/usr ${myconf}
+	econf ${myconf} || die
 
-  # Make a small fix to disable tests
-  # Now xfree is no longer required
-  cp Makefile Makefile.orig
-  sed -e "s:ttlib tttest ttpo:ttlib ttpo:" Makefile.orig > Makefile
+	# Make a small fix to disable tests
+	# Now xfree is no longer required
+	cp Makefile Makefile.orig
+	sed -e "s:ttlib tttest ttpo:ttlib ttpo:" Makefile.orig > Makefile
 
-  try make
-  
-  # make contrib utils
-  for x in ttf2bdf ttf2pfb ttf2pk ttfbanner
-  do
-    cd ${S}/freetype1-contrib/${x}
-    try ./configure --host=${CHOST} --prefix=/usr
-    try make
-  done
+	make || die
+	
+	# make contrib utils
+	for x in ttf2bdf ttf2pfb ttf2pk ttfbanner
+	do
+		cd ${S}/freetype1-contrib/${x}
+		econf || die
+		make || die
+	done
 
 }
 
 src_install() {
 
-  cd lib
-
-  # Seems to require a shared libintl (getetxt comes only with a static one
-  # But it seems to work without problems
-
-  try make -f arch/unix/Makefile prefix=${D}/usr install
-  cd ../po
-  try make prefix=${D}/usr install
-  cd ..
-  dodoc announce PATENTS README readme.1st
-  dodoc docs/*.txt docs/FAQ docs/TODO
-  docinto html
-  dodoc docs/*.htm
-  docinto html/image
-  dodoc docs/image/*.gif docs/image/*.png
-  
-  # install contrib utils
-  cd ${S}/freetype1-contrib
-  into /usr
-  dobin ttf2bdf/ttf2bdf \
+	cd lib
+
+	# Seems to require a shared libintl (getetxt comes only with a static one
+	# But it seems to work without problems
+
+	make -f arch/unix/Makefile prefix=${D}/usr install || die
+
+	cd ${S}/po
+	make prefix=${D}/usr install || die
+
+	cd ${S}
+	dodoc announce PATENTS README readme.1st
+	dodoc docs/*.txt docs/FAQ docs/TODO
+	dohtml -r docs
+	
+	# install contrib utils
+	cd ${S}/freetype1-contrib
+	into /usr
+	dobin ttf2bdf/ttf2bdf \
 	ttf2pfb/getafm ttf2pfb/t1asm ttf2pfb/.libs/ttf2pfb \
 	ttf2pk/.libs/ttf2pk ttf2pk/.libs/ttf2tfm \
 	ttfbanner/.libs/ttfbanner
-  cp ttf2bdf/ttf2bdf.man ttf2bdf/ttf2bdf.man.1
-  doman ttf2bdf/ttf2bdf.man.1
-  docinto contrib
-  dodoc ttf2pk/ttf2pk.doc
-  
+	newman ttf2bdf/ttf2bdf.man ttf2bdf/ttf2bdf.man.1
+	doman ttf2bdf/ttf2bdf.man.1
+	docinto contrib
+	dodoc ttf2pk/ttf2pk.doc
+	
 }
diff --git a/media-libs/freetype/freetype-2.0.9.ebuild b/media-libs/freetype/freetype-2.0.9.ebuild
index cc6816889313..d36e5ed8f98d 100644
--- a/media-libs/freetype/freetype-2.0.9.ebuild
+++ b/media-libs/freetype/freetype-2.0.9.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.9.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.9.ebuild,v 1.6 2002/07/22 14:37:06 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-quality and portable font engine"
diff --git a/media-libs/freetype/freetype-2.1.0.ebuild b/media-libs/freetype/freetype-2.1.0.ebuild
deleted file mode 100644
index 151bbe3b10ab..000000000000
--- a/media-libs/freetype/freetype-2.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.0.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A high-quality and portable font engine"
-SRC_URI="mirror://sourceforge/freetype/${P}.tar.bz2"
-HOMEPAGE="http://www.freetype.org/"
-
-SLOT="2"
-LICENSE="FTL | GPL-2"
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	# Enable hinting for truetype fonts
-	cd ${S}/include/freetype/config
-	cp ftoption.h ftoption.h.orig
-	sed -e 's:#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER:#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER:' \
-		ftoption.h.orig > ftoption.h
-	cd ${S}
-}
-
-src_compile() {
-	make CFG="--host=${CHOST} --prefix=/usr" || die
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr install || die
-
-	dodoc ChangeLog README 
-	dodoc docs/{BUGS,BUILD,CHANGES,*.txt,PATENTS,readme.vms,TODO}
-}
diff --git a/media-libs/freetype/freetype-2.1.2.ebuild b/media-libs/freetype/freetype-2.1.2.ebuild
index a8e2e193a9ee..904edc6a03b4 100644
--- a/media-libs/freetype/freetype-2.1.2.ebuild
+++ b/media-libs/freetype/freetype-2.1.2.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.2.ebuild,v 1.1 2002/07/17 03:28:03 raker Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.2.ebuild,v 1.2 2002/07/22 14:37:06 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-quality and portable font engine"