Update to eapi4, punt static libs and libtool archive.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

7 files changed, 57 insertions, 201 deletions

diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 55cac73e062f..112d938c0d4c 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/t1lib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.80 2010/01/31 16:07:27 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.81 2011/10/23 11:54:50 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> -t1lib-5.0.2-r1.ebuild,
+  -files/t1lib-5.0.2-SA26241_buffer_overflow.patch,
+  -files/t1lib-5.0.2-asneeded.patch, -files/t1lib-5.0.2-gentoo.diff,
+  t1lib-5.1.2.ebuild:
+  Update to eapi4, punt static libs and libtool archive.
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org> t1lib-5.1.2.ebuild:
   ia64/s390/sh/sparc stable wrt #297690
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 80afb370af23..8140b3945764 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -1,11 +1,26 @@
-AUX t1lib-5.0.2-SA26241_buffer_overflow.patch 725 RMD160 daaae2cc279c9380121fffbede4314142c87e7ef SHA1 d95db25a0c3924d9fa0cd0bb5f46358adfc8b2d7 SHA256 9cd3ab4d7ede0cf32a233a669b49c7189fa90551b60f2d6677aa699430e677ba
-AUX t1lib-5.0.2-asneeded.patch 446 RMD160 04dbf0f2e515ab0dd0da4d49e096679344b72cf9 SHA1 7310f93cc45908d67dd5c2184e6e359ad9785a06 SHA256 fcb13e53bc92b93f67717a473061d7b9e50a214135559a932a18719b2e3bb43b
-AUX t1lib-5.0.2-gentoo.diff 2619 RMD160 15c0f89f625c0433ee05af1e5c08ce06904b1235 SHA1 7f9d364b967818f86208d00f8287e3ea9fea6a38 SHA256 a336bc4b305b1635d665a746f47e77cbc8e79a836dbf784ec58d1c339df38c5b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX t1lib-5.1.1-parallel.patch 472 RMD160 719d9e024af72588d3b6adac1a97bd8026985dd5 SHA1 f32a051f0ed4c0fd2294cfecf993316e37ee4e26 SHA256 ce21f6c0a24e7d59de2d41a517a0c5410b35e42d9677c494fc70701a3c3e8a24
 AUX t1lib-do-not-install-t1lib_doc.patch 514 RMD160 626e1f83cefe7c17730fdb1062f91a848d0809b8 SHA1 9c6600f13a395c2b498e5e7373c6ba37f7a91a46 SHA256 44c6ce37932e259370ac7c8ddf44b9e6932f69ec94f6fb8c3cfcb31e896119b8
-DIST t1lib-5.0.2.tar.gz 1697086 RMD160 d6ff7fa3baca4a4ce78960a145bfa69b4cd771fa SHA1 71a6ec6c84a2e28a21f261be865e0dabe52daeb5 SHA256 34ff6a85d1dae64d06b5aca04fb17822dd26a734f40cd966e3dd980afa4a037a
 DIST t1lib-5.1.2.tar.gz 1872534 RMD160 ab22aea390356750d743c0f4b08762aa76ca2a82 SHA1 4b4fc22c8688eefaaa8cfc990f0039f95f4287de SHA256 821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59
-EBUILD t1lib-5.0.2-r1.ebuild 1551 RMD160 e81e12437a8e36ee66f93b0b55f45d4618269f0c SHA1 2d27d7aba76fcef474a6006f9c6467095cdd7b7e SHA256 88e790b37f4ea5600dada3cbeb7ba5b87eb0ac6075dffe6acd586534c6dc4ca3
-EBUILD t1lib-5.1.2.ebuild 1587 RMD160 eae4e9fdd1600b7432bb25ff4d63d59d1bc35ed9 SHA1 8bb4f2b59d8b4c00a0178e07f0162b221fb29d2a SHA256 2bea1187f65b4d7ba8c405397b57c30b4985ea9764085ad62a1d99e7b78a95b9
-MISC ChangeLog 10765 RMD160 d170f2a3547e9eedb286ecc25ba13bab7c252901 SHA1 2ce34b1a28586bb659b279fe804fd0852935c4b7 SHA256 ae5ac861028fb63a45c8ec8c968782d776d159a32be45795aeca6a2d27ce6edf
+EBUILD t1lib-5.1.2.ebuild 1647 RMD160 edd74e9a13e9d457d9d76bfc0a43ed7dc31eb5f1 SHA1 193457ac1cc35a2f8d144a4cd5e5b7bdb07d84d0 SHA256 274b3dd9bb3eba51d2799890a426d26c65da822dec3cb68c63298ed618bb7f0a
+MISC ChangeLog 11047 RMD160 190ebd016442c4457f3913cc88e9f4ccbedb6d3f SHA1 faf4fc528aaad17c0c972f28f7f72d83f83f6665 SHA256 8813e891e5b9777cc11a7ab5c14f37dd8efb0e8662b8c7bb865c6edfb476b60d
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOpAA7AAoJEOSiRoyO7jvofmsP/RH5McmZ/sCpKPhqoPp2M2Ew
+7MM/jQPVSSpbvdyZMw1ovE+nfM6q7teF0ImVWzd6I3ePSuPoiUQWe6CO7ov+06ty
+HdUT0KWTJMt9Bj1rSJbQZk+aTH29XQO+UZi2G30xJEPy0CxKZYe9iG54YQwMZ2fI
+VSwyWVqf9YhKw/SropmA7QLm9BLzOejJu3onQ5uQtBJmcvQwRSKnZAd8gu0qhr3i
+RPmiSkxccfW8a8t7kUQLjOBSWsHWMEdWOUd8DJFk/yon+Ghfwgw5zFvu+bOCz73Y
+gTSbsHL+URxxJw8x+oe742kjg6Xcjgsu+diFOSnNds5xkp5mov7+CEL2D3vWqsOf
+JAG4Et1MdoxAYJSBjc5JS1/UDFXROQEmhricfpzE97iH/uW+e3x6QH2HBKMzwEzZ
++krNBBMDonfpZm2ZWqSO5LfeZCy7y9cIF2uzHlTTwWXYvFrbmHHqSqV9PMSmbAqa
+711QDd0RfB926Mv9X1rsq563fSdM5It+iDzZ9zTUbfXB9lZs8oXhVW3dHfYpoXnq
+2RYP1kOS2gI3x6XjO28xc4FWC+d2aKct+CkebHF3+8HOzbWHscLHBuaM51a5h5Sr
+JFH8MDQyooQ5admKMX2Yaexf9wz2ZwxxnuUvj30mMhIpNHsq1TALIepLa6yRG2oH
+NH8EB6A2wWUervP3CRL0
+=vxLD
+-----END PGP SIGNATURE-----
diff --git a/media-libs/t1lib/files/t1lib-5.0.2-SA26241_buffer_overflow.patch b/media-libs/t1lib/files/t1lib-5.0.2-SA26241_buffer_overflow.patch
deleted file mode 100644
index 766f74cbe624..000000000000
--- a/media-libs/t1lib/files/t1lib-5.0.2-SA26241_buffer_overflow.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://secunia.com/advisories/26241/
-http://www.bugtraq.ir/adv/t1lib.txt
-https://bugs.gentoo.org/193437
-
-diff -Naur t1lib-5.0.2-orig/lib/t1lib/t1env.c t1lib-5.0.2/lib/t1lib/t1env.c
---- t1lib-5.0.2-orig/lib/t1lib/t1env.c	2002-11-27 19:53:11.000000000 -0600
-+++ t1lib-5.0.2/lib/t1lib/t1env.c	2007-09-22 12:57:01.000000000 -0600
-@@ -568,6 +568,12 @@
- #endif 
-     strcat( pathbuf, DIRECTORY_SEP);
-     /* And finally the filename: */
-+	/* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf
-+	 * let's try next pathbuf */
-+	if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
-+		i++;
-+		continue;
-+	}
-     strcat( pathbuf, StrippedName);
-     
-     /* Check for existence of the path: */
diff --git a/media-libs/t1lib/files/t1lib-5.0.2-asneeded.patch b/media-libs/t1lib/files/t1lib-5.0.2-asneeded.patch
deleted file mode 100644
index 3e005775660b..000000000000
--- a/media-libs/t1lib/files/t1lib-5.0.2-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- t1lib-5.0.2/lib/Makefile.in.orig	2006-04-18 15:32:53.676252250 +0200
-+++ t1lib-5.0.2/lib/Makefile.in	2006-04-18 15:33:12.989459250 +0200
-@@ -128,7 +128,7 @@
- 
- libt1.la: $(TYPE1_OBJS) $(T1LIB_OBJS)
- 	$(LIBTOOL) --mode=link \
--		$(CC) -o $@ $(TYPE1_OBJS) $(T1LIB_OBJS) \
-+		$(CC) -o $@ $(TYPE1_OBJS) $(T1LIB_OBJS) -lm \
- 	         -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
- 		 -rpath $(libdir)
- 	cp t1lib/t1lib.h .
diff --git a/media-libs/t1lib/files/t1lib-5.0.2-gentoo.diff b/media-libs/t1lib/files/t1lib-5.0.2-gentoo.diff
deleted file mode 100644
index 4799d21a903e..000000000000
--- a/media-libs/t1lib/files/t1lib-5.0.2-gentoo.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN t1lib-5.0.2.orig/doc/Makefile.in t1lib-5.0.2/doc/Makefile.in
---- t1lib-5.0.2.orig/doc/Makefile.in	Sat Oct 16 14:28:56 2004
-+++ t1lib-5.0.2/doc/Makefile.in	Sat Oct 16 14:55:59 2004
-@@ -89,16 +89,6 @@
- 
- 
- install: dummy
--	if (test -f t1lib_doc.ps) \
--	then \
--	  $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \
--	  $(INSTALL_DATA) t1lib_doc.ps @T1LIB_DATA_DIR@/doc; \
--	fi;
--	if (test -f t1lib_doc.pdf) \
--	then \
--	  $(MKINSTALLDIRS) @T1LIB_DATA_DIR@/doc; \
--	  $(INSTALL_DATA) t1lib_doc.pdf @T1LIB_DATA_DIR@/doc; \
--	fi;
- 
- 
- uninstall: dummy
-diff -urN t1lib-5.0.2.orig/lib/Makefile.in t1lib-5.0.2/lib/Makefile.in
---- t1lib-5.0.2.orig/lib/Makefile.in	Tue Jun 25 11:15:30 2002
-+++ t1lib-5.0.2/lib/Makefile.in	Sat Oct 16 14:37:28 2004
-@@ -160,18 +160,18 @@
- 
- 
- install: dummy
--	$(MKINSTALLDIRS) $(libdir)
--	$(MKINSTALLDIRS) $(includedir)
--	$(MKINSTALLDIRS) @T1LIB_DATA_DIR@
-+	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)
-+	$(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@
- 	$(LIBTOOL) --mode=install \
--		$(INSTALL_DATA) $(MAIN_TARGET) $(libdir)
-+		$(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir)
- 	$(LIBTOOL) --mode=install \
--		$(INSTALL_DATA) $(MAIN_HEADER) $(includedir)
--	if (test -f @T1LIB_DATA_DIR@/t1lib.config) \
-+		$(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir)
-+	if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \
- 	then \
- 	  echo "Alert: Global configuration file exists, installation skipped!"; \
- 	else \
--	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config @T1LIB_DATA_DIR@; \
-+	  $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \
- 	fi;
- 
- 
-diff -urN t1lib-5.0.2.orig/type1afm/Makefile.in t1lib-5.0.2/type1afm/Makefile.in
---- t1lib-5.0.2.orig/type1afm/Makefile.in	Tue Jan 16 07:08:23 2001
-+++ t1lib-5.0.2/type1afm/Makefile.in	Sat Oct 16 14:38:01 2004
-@@ -87,9 +87,9 @@
- 	-rmdir .libs
- 
- install: dummy
--	$(MKINSTALLDIRS) $(bindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- 	$(LIBTOOL) --mode=install \
--		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
-+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
- 
- 
- uninstall: dummy
-diff -urN t1lib-5.0.2.orig/xglyph/Makefile.in t1lib-5.0.2/xglyph/Makefile.in
---- t1lib-5.0.2.orig/xglyph/Makefile.in	Tue Jan 16 07:06:53 2001
-+++ t1lib-5.0.2/xglyph/Makefile.in	Sat Oct 16 14:38:16 2004
-@@ -94,8 +94,8 @@
- 
- 
- install: dummy
--	$(MKINSTALLDIRS) $(bindir)
--	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xglyph $(bindir)/xglyph
-+	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xglyph $(DESTDIR)$(bindir)/xglyph
- 
- 
- uninstall: dummy
diff --git a/media-libs/t1lib/t1lib-5.0.2-r1.ebuild b/media-libs/t1lib/t1lib-5.0.2-r1.ebuild
deleted file mode 100644
index a645c478768c..000000000000
--- a/media-libs/t1lib/t1lib-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2-r1.ebuild,v 1.12 2009/09/30 09:48:49 ssuominen Exp $
-
-inherit eutils flag-o-matic libtool toolchain-funcs
-
-DESCRIPTION="A Type 1 Font Rasterizer Library for UNIX/X11"
-HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics/"
-SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="5"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X doc"
-
-RDEPEND="X? ( x11-libs/libXaw
-			x11-libs/libX11
-			x11-libs/libXt )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )
-	X? ( x11-libs/libXfont
-		x11-proto/xproto
-		x11-proto/fontsproto )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gentoo.diff
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-SA26241_buffer_overflow.patch
-
-	sed -i -e "s:dvips:#dvips:" "${S}"/doc/Makefile.in
-	sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" "${S}"/xglyph/xglyph.c
-}
-
-src_compile() {
-	local myopt=""
-	tc-export CC
-
-	use alpha && append-flags -mieee
-
-	if ! use doc; then
-		myopt="without_doc"
-	else
-		addwrite /var/cache/fonts
-	fi
-
-	econf \
-		--datadir=/etc \
-		$(use_with X x) \
-		 || die "econf failed."
-
-	emake ${myopt} || die "emake failed."
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
-	dodoc Changes README*
-	if use doc ; then
-		cd doc
-		insinto /usr/share/doc/${PF}
-		doins *.pdf *.dvi
-	fi
-}
diff --git a/media-libs/t1lib/t1lib-5.1.2.ebuild b/media-libs/t1lib/t1lib-5.1.2.ebuild
index 2edaf7bbc80f..74f133396406 100644
--- a/media-libs/t1lib/t1lib-5.1.2.ebuild
+++ b/media-libs/t1lib/t1lib-5.1.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.2.ebuild,v 1.11 2010/01/31 16:07:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.1.2.ebuild,v 1.12 2011/10/23 11:54:50 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils flag-o-matic libtool toolchain-funcs
 
@@ -11,21 +13,22 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X doc"
+IUSE="X doc static-libs"
 
-RDEPEND="X? ( x11-libs/libXaw
-			x11-libs/libX11
-			x11-libs/libXt )"
+RDEPEND="X? (
+		x11-libs/libXaw
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base )
-	X? ( x11-libs/libXfont
+	X? (
+		x11-libs/libXfont
 		x11-proto/xproto
-		x11-proto/fontsproto )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+		x11-proto/fontsproto
+	)"
 
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.1.1-parallel.patch
 	epatch "${FILESDIR}"/${PN}-do-not-install-t1lib_doc.patch
 
@@ -35,6 +38,15 @@ src_unpack() {
 	elibtoolize
 }
 
+src_configure() {
+	econf \
+		--datadir="${EPREFIX}/etc" \
+		$(use_enable static-libs static) \
+		$(use_with X x)
+}
+
+
+
 src_compile() {
 	local myopt=""
 	tc-export CC
@@ -47,16 +59,13 @@ src_compile() {
 		VARTEXFONTS=${T}/fonts
 	fi
 
-	econf \
-		--datadir=/etc \
-		$(use_with X x) \
-		|| die "econf failed."
-
 	emake ${myopt} || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
+	default
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
 	dodoc Changes README*
 	if use doc; then
 		cd doc