Update to eapi4, punt static libs and libtool archive.

(Portage version: 2.2.0_alpha70/cvs/Linux x86_64)

6 files changed, 35 insertions, 194 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/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