cleanup ebuild and add m68k love

Package-Manager: portage-2.1.1_rc1-r3

4 files changed, 33 insertions, 23 deletions

diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 731cd3c4b41f..fd8f112eb694 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libpaper-1.1.14.8-malloc.patch 320 RMD160 a3876e374b7a7aca5008fb6c1217dfd16a254f91 SHA1 2547350f31d8e1641ffed6084e19f0bef3f10734 SHA256 11aa5cf9e3b8994eeff811869770c5c28fc6ae02957786ca0984834819bb72d1
 MD5 8b02cb3414866560e6688345a0a6d0af files/libpaper-1.1.14.8-malloc.patch 320
 RMD160 a3876e374b7a7aca5008fb6c1217dfd16a254f91 files/libpaper-1.1.14.8-malloc.patch 320
@@ -5,18 +8,18 @@ SHA256 11aa5cf9e3b8994eeff811869770c5c28fc6ae02957786ca0984834819bb72d1 files/li
 DIST libpaper_1.1.14ubuntu8.tar.gz 299116 RMD160 44d0aa0cfa602ac2e176b565db094aa570f71b96 SHA1 3917ead970ec5db3afceb55a6f39d0c50d476845 SHA256 44c3eb9177dbda1de8953311ad8d0ae67e1b01075a9ddd8cae97a84e899cac3c
 DIST libpaper_1.1.19.tar.gz 328462 RMD160 b286d8a49f226e6b3e06ee6a3cab6ff5a54c0c90 SHA1 7b80261dd73fe1580d5b754293d1ba7198d11d36 SHA256 12c7db432bceaff1c592b33e9277d19cfed1e35d571631a3e53ac649c2ca2407
 DIST libpaper_1.1.20.tar.gz 329001 RMD160 72def1bc31cf74cc679070caaf62cad1fa8b8ec6 SHA1 b140bd92bf890db77f780add857dda922b5b054c SHA256 7ff5f355bb254a3d4ed4541377e6304432ee8678e7c9ec29e7d43488903004c9
-EBUILD libpaper-1.1.14.8.ebuild 1083 RMD160 a26e84e4d050424011d808bc925e8c97f88c0c26 SHA1 d6f71af3c57bcecdd1106faffdce2a1f84ec6eaa SHA256 0e85977ca9e28ebd27768b83503f8628e325e8163e8217f738998b4d5f4076d2
-MD5 ac8b30ee9a445d754c972bd9d30baded libpaper-1.1.14.8.ebuild 1083
-RMD160 a26e84e4d050424011d808bc925e8c97f88c0c26 libpaper-1.1.14.8.ebuild 1083
-SHA256 0e85977ca9e28ebd27768b83503f8628e325e8163e8217f738998b4d5f4076d2 libpaper-1.1.14.8.ebuild 1083
-EBUILD libpaper-1.1.19.ebuild 999 RMD160 19ef4acebf33200a6b9089f70b32427720480d78 SHA1 6e08488f2550ddcced080686e1fbd1e309d010f4 SHA256 a533c75c027831bcc2f06ca8f9b153175100a42cafb4cd0bed3be9fa7d72eebe
-MD5 472de1cb968644a501b5cd11da77bcf9 libpaper-1.1.19.ebuild 999
-RMD160 19ef4acebf33200a6b9089f70b32427720480d78 libpaper-1.1.19.ebuild 999
-SHA256 a533c75c027831bcc2f06ca8f9b153175100a42cafb4cd0bed3be9fa7d72eebe libpaper-1.1.19.ebuild 999
-EBUILD libpaper-1.1.20.ebuild 1000 RMD160 21b298cf5f672c6251663fce3d1b346840106aa4 SHA1 c0abc9682a3f154dbd25084069c11d7a1d6edf9b SHA256 e67ffdfe0a0234ed320f14c49ecbe849593f746977ab1557ee6b264791187180
-MD5 18bb8a8d14cb39c9472bd3697e6ca37b libpaper-1.1.20.ebuild 1000
-RMD160 21b298cf5f672c6251663fce3d1b346840106aa4 libpaper-1.1.20.ebuild 1000
-SHA256 e67ffdfe0a0234ed320f14c49ecbe849593f746977ab1557ee6b264791187180 libpaper-1.1.20.ebuild 1000
+EBUILD libpaper-1.1.14.8.ebuild 1089 RMD160 22a8b25b940fdac4e4dc78ddaa33e966e28a3ddb SHA1 40d63e12efe61e0e885a83cc8e7feabc89d9a8ad SHA256 de554c6ac33a5da4da5c9bf713c79b24ade88b8dce43eee3494d070b6b15700d
+MD5 bce7220cad5dadda1be41264b10e77ba libpaper-1.1.14.8.ebuild 1089
+RMD160 22a8b25b940fdac4e4dc78ddaa33e966e28a3ddb libpaper-1.1.14.8.ebuild 1089
+SHA256 de554c6ac33a5da4da5c9bf713c79b24ade88b8dce43eee3494d070b6b15700d libpaper-1.1.14.8.ebuild 1089
+EBUILD libpaper-1.1.19.ebuild 1004 RMD160 c00d80c3f761c77e35a0b51ad6ae6dc8706f16f0 SHA1 2f77ae8bacd77c2dd2d922d83a33e950b3a7df24 SHA256 45c1f4aab9b4a5de7d6540608bed3f4d1f3847ff4e16d9f3a648038a3ed84931
+MD5 174dc8f7c699e4666c8d9e66f74c52a7 libpaper-1.1.19.ebuild 1004
+RMD160 c00d80c3f761c77e35a0b51ad6ae6dc8706f16f0 libpaper-1.1.19.ebuild 1004
+SHA256 45c1f4aab9b4a5de7d6540608bed3f4d1f3847ff4e16d9f3a648038a3ed84931 libpaper-1.1.19.ebuild 1004
+EBUILD libpaper-1.1.20.ebuild 998 RMD160 4d563adbf1d1e9dd167d7939df13d136806907f7 SHA1 a2f90b75cd94286a672664981c0ad04b9093d785 SHA256 2f532934ea6b091fdd233d0642e189a08704598f1a8956c277b9d1876187e96c
+MD5 559fc2c9bd00216c3e94040bb847ca7a libpaper-1.1.20.ebuild 998
+RMD160 4d563adbf1d1e9dd167d7939df13d136806907f7 libpaper-1.1.20.ebuild 998
+SHA256 2f532934ea6b091fdd233d0642e189a08704598f1a8956c277b9d1876187e96c libpaper-1.1.20.ebuild 998
 MISC ChangeLog 1440 RMD160 8fee3caa8ca704b18b96b808505fcf16ccb743e0 SHA1 8287412494a6608981c8496c5f883c38ae95a15b SHA256 1635253e2ed65ebeb1dd5a2228627f5153c75843c1e038b4d94b7c754278dfb8
 MD5 1a44708c4a2616dee6c3319f7e0e3351 ChangeLog 1440
 RMD160 8fee3caa8ca704b18b96b808505fcf16ccb743e0 ChangeLog 1440
@@ -34,3 +37,10 @@ SHA256 528b535a185b0b9ae1c1e687bb47fb8c9c58bf6051d9d9adce70cc808224f6e0 files/di
 MD5 c30781161ed732545811644c75f8c766 files/digest-libpaper-1.1.20 247
 RMD160 e6ace8f6426a71bb3460f2b1b617963562074bc9 files/digest-libpaper-1.1.20 247
 SHA256 29bf554eee5cf0caf97adb6f191c4a35a80e2d54d4f402a87db93efb8775d6ed files/digest-libpaper-1.1.20 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE+/+ramhnQswr0vIRAtSQAJ9nyvUrO1XIm2tq3mLxmjJ04oZTOACeMcdm
+JVrnuebsxEU/A7nGChDtlNA=
+=+7fp
+-----END PGP SIGNATURE-----
diff --git a/app-text/libpaper/libpaper-1.1.14.8.ebuild b/app-text/libpaper/libpaper-1.1.14.8.ebuild
index f47413e03a09..7dd03f19ed2b 100644
--- a/app-text/libpaper/libpaper-1.1.14.8.ebuild
+++ b/app-text/libpaper/libpaper-1.1.14.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.14.8.ebuild,v 1.8 2006/07/03 01:36:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.14.8.ebuild,v 1.9 2006/09/04 10:27:09 vapier Exp $
 
 inherit versionator libtool eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://archive.ubuntu.com/ubuntu/pool/main/libp/libpaper/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 S=${WORKDIR}/${MY_P/_/-}
diff --git a/app-text/libpaper/libpaper-1.1.19.ebuild b/app-text/libpaper/libpaper-1.1.19.ebuild
index fe32ec0d6c3e..aa55e89d9128 100644
--- a/app-text/libpaper/libpaper-1.1.19.ebuild
+++ b/app-text/libpaper/libpaper-1.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.19.ebuild,v 1.1 2006/08/18 00:46:35 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.19.ebuild,v 1.2 2006/09/04 10:27:09 vapier Exp $
 
 inherit eutils libtool
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 src_unpack() {
diff --git a/app-text/libpaper/libpaper-1.1.20.ebuild b/app-text/libpaper/libpaper-1.1.20.ebuild
index 14883f55ea5e..4c527ddbfb71 100644
--- a/app-text/libpaper/libpaper-1.1.20.ebuild
+++ b/app-text/libpaper/libpaper-1.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.20.ebuild,v 1.1 2006/09/01 14:19:10 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libpaper/libpaper-1.1.20.ebuild,v 1.2 2006/09/04 10:27:09 vapier Exp $
 
 inherit eutils libtool
 
@@ -11,22 +11,22 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	ln -s /usr/share/libtool/config.sub
-	ln -s /usr/share/libtool/config.guess
+	cd "${S}"
+	# let portage update these for us
+	touch config.sub config.guess
 
-	epatch "${FILESDIR}/libpaper-1.1.14.8-malloc.patch"
+	epatch "${FILESDIR}"/libpaper-1.1.14.8-malloc.patch
 
 	elibtoolize
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc README ChangeLog