Simplified ebuilds with epatch.

diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 25013998babd30edb5bf77321605207746fcbd56..a87036ab352b59b3a1dd9c769e6693633cdf5b03 100644 (file)
--- 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/Manifest b/media-libs/t1lib/Manifest
index faf89e713592401c0c2c93eff5decb004262475f..74960480f2101ae0dc9c35ef7c0376588a9b820c 100644 (file)
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 59e1eb0110d3e2ed47e80154ccb41302 ChangeLog 4749
 MD5 2171eacf456f4ccb6472881fc6e28aeb t1lib-1.3.1.ebuild 1496
-MD5 9f2b6ccb9b8955386421833a38931270 t1lib-5.0.0-r2.ebuild 1846
-MD5 69880cbccc902be48c082e87c63e0078 t1lib-5.0.1.ebuild 1936
-MD5 77a4c1483d6993a7dd7bc8155905baec t1lib-5.0.2.ebuild 2008
-MD5 4b8ab003940e25c2fac30ceb8a10830f ChangeLog 4571
+MD5 ac3c730a67f609073409f7e624eb7dab t1lib-5.0.0-r2.ebuild 1469
+MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+MD5 9f26b2c890b80c7966921887c151d8ba t1lib-5.0.1.ebuild 1531
+MD5 731e03e18bba8887d0fab5b6467ab120 t1lib-5.0.2.ebuild 1557
 MD5 817757abf473e739c3314daca2aecea2 files/digest-t1lib-1.3.1 64
-MD5 fd18dc7d703e77e595bc054f2f4c0f20 files/digest-t1lib-5.0.0-r2 64
 MD5 60bcc4bc9f1f21b6f445e2dc1f462171 files/digest-t1lib-5.0.1 64
+MD5 fd18dc7d703e77e595bc054f2f4c0f20 files/digest-t1lib-5.0.0-r2 64
 MD5 31349cc7c0045a650519549f365906a9 files/digest-t1lib-5.0.2 64
+MD5 564c11663ec99286c576cedef39a854e files/t1lib-5.0.2-gentoo.diff 2619
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZLIjArHZZzCEUG0RAoR4AJ9qW+0NkZgE2MHO5kgD2N+EKKnZqwCeL9MI
-X7cLFGWhmG1T/SQujPftrgY=
-=8Vee
+iD8DBQFBcLziVWNWqTUmv+0RAsDJAJ94OH8myabU8BmL/lsG92qSeJYztgCeI4jZ
+Zw8YbHRcoUUm8IFIAinnsh8=
+=NPpZ
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..4799d21
--- /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 911f3df1fb4d9a1e1b45e30317d2381267ec9a8a..73d0f388437c52cfaaf07d8612dd2ce48a07aa9e 100644 (file)
--- 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 c996e631accdac39bfc5e7cf21fc9e1c845d70ce..6b4484d73d40372a802ac569833ece7fd0475a11 100644 (file)
--- 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 962b3afa8c1d33752b84970bf22753230fed6f79..999ad30073f17acd461f5824136079494987f02f 100644 (file)
--- 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