Simplified ebuilds with epatch.

5 files changed, 108 insertions, 78 deletions

diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 25013998babd..a87036ab352b 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/t1lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.30 2004/10/07 03:03:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.31 2004/10/16 06:22:49 usata Exp $
+
+  16 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/t1lib-5.0.2-gentoo.diff, t1lib-5.0.0-r2.ebuild, t1lib-5.0.1.ebuild,
+  t1lib-5.0.2.ebuild:
+  Simplified ebuilds with epatch.
 
   06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> t1lib-1.3.1.ebuild,
   t1lib-5.0.2.ebuild:
diff --git a/media-libs/t1lib/files/t1lib-5.0.2-gentoo.diff b/media-libs/t1lib/files/t1lib-5.0.2-gentoo.diff
new file mode 100644
index 000000000000..4799d21a903e
--- /dev/null
+++ b/media-libs/t1lib/files/t1lib-5.0.2-gentoo.diff
@@ -0,0 +1,78 @@
+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.0-r2.ebuild b/media-libs/t1lib/t1lib-5.0.0-r2.ebuild
index 911f3df1fb4d..73d0f388437c 100644
--- a/media-libs/t1lib/t1lib-5.0.0-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r2.ebuild,v 1.13 2004/06/24 23:24:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r2.ebuild,v 1.14 2004/10/16 06:22:49 usata Exp $
 
-inherit gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="A Type 1 Font Rasterizer Library for UNIX/X11"
 HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics"
@@ -10,7 +10,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="x86 ~ppc sparc alpha hppa ~amd64 ia64"
+KEYWORDS="x86 ppc sparc alpha hppa ~amd64 ia64"
 IUSE="X doc"
 
 DEPEND="X? ( virtual/x11 )"
@@ -20,6 +20,8 @@ src_unpack() {
 	if use amd64 || use alpha; then
 		gnuconfig_update || die "gnuconfig_update failed"
 	fi
+	cd ${S}
+	epatch ${FILESDIR}/t1lib-5.0.2-gentoo.diff
 
 	cd ${S}/doc
 	mv Makefile.in Makefile.in-orig
@@ -32,40 +34,19 @@ src_compile() {
 
 	use alpha && append-flags -mieee
 
-	use X \
-		&& myconf="--with-x" \
-		|| myconf="--without-x"
-
 	if [ ! -x /usr/bin/latex ] ; then
 		myopt="without_doc"
+	else
+		addwrite /var/cache/fonts
 	fi
 
-	echo `pwd`
-	econf ${myconf} || die
+	econf ${myconf} --datadir=/etc $(use_with X x) || die
 	make ${myopt} || die
 }
 
 src_install() {
-	cd lib
-	insinto /usr/include
-	doins t1lib.h
-
-	use X && ( \
-		doins t1libx.h
-		ln -s -f libt1x.lai .libs/libt1x.la
-		dolib .libs/libt1x.{la,a,so.${PV}}
-		dosym libt1x.so.${PV} /usr/lib/libt1x.so.${PV%%.*}
-		dosym libt1x.so.${PV} /usr/lib/libt1x.so
-	)
-
-	ln -s -f libt1.lai .libs/libt1.la
-	dolib .libs/libt1.{la,a,so.${PV}}
-	dosym libt1.so.${PV} /usr/lib/libt1.so.${PV%%.*}
-	dosym libt1.so.${PV} /usr/lib/libt1.so
-	insinto /etc/t1lib
-	doins t1lib.config
+	make DESTDIR=${D} install || die
 
-	cd ..
 	dodoc Changes LGPL LICENSE README*
 	if use doc ; then
 		cd doc
diff --git a/media-libs/t1lib/t1lib-5.0.1.ebuild b/media-libs/t1lib/t1lib-5.0.1.ebuild
index c996e631accd..6b4484d73d40 100644
--- a/media-libs/t1lib/t1lib-5.0.1.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.1.ebuild,v 1.3 2004/06/24 23:24:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.1.ebuild,v 1.4 2004/10/16 06:22:49 usata Exp $
 
-inherit gnuconfig flag-o-matic
+inherit gnuconfig flag-o-matic eutils
 
 DESCRIPTION="A Type 1 Font Rasterizer Library for UNIX/X11"
 HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics"
@@ -10,7 +10,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="5"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="x86 ppc ~sparc alpha hppa ~amd64 ~ia64"
 IUSE="X doc"
 
 DEPEND="X? ( virtual/x11 )"
@@ -20,6 +20,8 @@ src_unpack() {
 	if use amd64 || use alpha; then
 		gnuconfig_update || die "gnuconfig_update failed"
 	fi
+	cd ${S}
+	epatch ${FILESDIR}/t1lib-5.0.2-gentoo.diff
 
 	cd ${S}/doc
 	mv Makefile.in Makefile.in-orig
@@ -35,6 +37,8 @@ src_compile() {
 
 	if [ ! -x /usr/bin/latex ] ; then
 		myopt="without_doc"
+	else
+		addwrite /var/cache/fonts
 	fi
 
 	econf \
@@ -45,29 +49,8 @@ src_compile() {
 }
 
 src_install() {
-	cd lib
-	insinto /usr/include
-	doins t1lib.h
+	make DESTDIR=${D} install || die
 
-	use X && ( \
-		doins t1libx.h
-		ln -s -f libt1x.lai .libs/libt1x.la
-		dolib .libs/libt1x.{la,a,so.${PV}}
-		dosym libt1x.so.${PV} /usr/lib/libt1x.so.${PV%%.*}
-		dosym libt1x.so.${PV} /usr/lib/libt1x.so
-	)
-
-	ln -s -f libt1.lai .libs/libt1.la
-	dolib .libs/libt1.{la,a,so.${PV}}
-	dosym libt1.so.${PV} /usr/lib/libt1.so.${PV%%.*}
-	dosym libt1.so.${PV} /usr/lib/libt1.so
-	insinto /etc/t1lib
-	doins t1lib.config
-
-	use X && dobin xglyph/.libs/xglyph
-	dobin type1afm/.libs/type1afm
-
-	cd ..
 	dodoc Changes LGPL LICENSE README*
 	if use doc ; then
 		cd doc
diff --git a/media-libs/t1lib/t1lib-5.0.2.ebuild b/media-libs/t1lib/t1lib-5.0.2.ebuild
index 962b3afa8c1d..999ad30073f1 100644
--- a/media-libs/t1lib/t1lib-5.0.2.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.ebuild,v 1.7 2004/10/07 03:03:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.8 2004/10/16 06:22:49 usata Exp $
 
-inherit gnuconfig flag-o-matic
+inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="A Type 1 Font Rasterizer Library for UNIX/X11"
 HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics/"
@@ -20,6 +20,8 @@ src_unpack() {
 	if use amd64 || use alpha || use ppc64; then
 		gnuconfig_update || die "gnuconfig_update failed"
 	fi
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
 
 	cd ${S}/doc
 	mv Makefile.in Makefile.in-orig
@@ -35,6 +37,8 @@ src_compile() {
 
 	if [ ! -x /usr/bin/latex ] ; then
 		myopt="without_doc"
+	else
+		addwrite /var/cache/fonts
 	fi
 
 	econf \
@@ -45,29 +49,8 @@ src_compile() {
 }
 
 src_install() {
-	cd lib
-	insinto /usr/include
-	doins t1lib.h
+	make DESTDIR=${D} install || die
 
-	use X && ( \
-		doins t1libx.h
-		ln -s -f libt1x.lai .libs/libt1x.la
-		dolib .libs/libt1x.{la,a,so.${PV}}
-		dosym libt1x.so.${PV} /usr/$(get_libdir)/libt1x.so.${PV%%.*}
-		dosym libt1x.so.${PV} /usr/$(get_libdir)/libt1x.so
-	)
-
-	ln -s -f libt1.lai .libs/libt1.la
-	dolib .libs/libt1.{la,a,so.${PV}}
-	dosym libt1.so.${PV} /usr/$(get_libdir)/libt1.so.${PV%%.*}
-	dosym libt1.so.${PV} /usr/$(get_libdir)/libt1.so
-	insinto /etc/t1lib
-	doins t1lib.config
-
-	use X && dobin xglyph/.libs/xglyph
-	dobin type1afm/.libs/type1afm
-
-	cd ..
 	dodoc Changes LGPL LICENSE README*
 	if use doc ; then
 		cd doc