Various epatch, sed, changelog and cosmetic changes

12 files changed, 36 insertions, 30 deletions

diff --git a/dev-ada/adabindx/ChangeLog b/dev-ada/adabindx/ChangeLog
index b3e3aab69931..a4ccf66b31af 100644
--- a/dev-ada/adabindx/ChangeLog
+++ b/dev-ada/adabindx/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ada/adabindx
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/adabindx/ChangeLog,v 1.6 2003/12/01 08:03:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/adabindx/ChangeLog,v 1.7 2004/01/04 18:48:52 aliz Exp $
 
   01 Dec 2003; David Holm <dholm@gentoo.org> adabindx-0.7.2.ebuild,
   files/adabindx-0.7.2.diff, files/adabindx-0.7.2.diff.bz2:
@@ -18,7 +18,7 @@
   17 Aug 2003; David Holm <dholm@gentoo.org> metadata.xml:
   Added a <longdescription>-tag to metadata.xml.
 
-*adabindx-0.7.2.ebuild (13 Jul 2003)
+*adabindx-0.7.2 (13 Jul 2003)
 
   13 Jul 2003; George Shapovalov <george@gentoo.org> adabindx-0.7.2.ebuild, files/{adabindx-0.7.2.diff,digest-adabindx-0.7.2} :
   initial release (# 23028)
diff --git a/dev-ada/adabindx/Manifest b/dev-ada/adabindx/Manifest
index 1484ca7ce46d..8998f874ab4a 100644
--- a/dev-ada/adabindx/Manifest
+++ b/dev-ada/adabindx/Manifest
@@ -1,5 +1,5 @@
-MD5 a9e2ffad305c5fd5956b97df6ace0a01 ChangeLog 1146
 MD5 47df606e70f697516055cb9509595490 adabindx-0.7.2.ebuild 1780
+MD5 9070a8ca88124a36814b87dfe51f4a5f ChangeLog 1138
 MD5 04fabdb277cc755e6cfb58b42eee6675 metadata.xml 384
 MD5 8c577abf12ed815ffdc1400d2aee29c8 files/digest-adabindx-0.7.2 67
 MD5 5850752cc78726ab7e19b4574c6b6b3c files/adabindx-0.7.2.diff.bz2 20067
diff --git a/dev-ada/asis/Manifest b/dev-ada/asis/Manifest
index 715440a32429..fb119366ce03 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,5 +1,5 @@
+MD5 d16be45e9fbde08f4d9ce5cf23f198fb asis-3.15p.ebuild 2982
 MD5 1cba7bd0c817155d756a131a2562f52b ChangeLog 1081
-MD5 659c9b4bcddae88b5e6e95df27360aeb asis-3.15p.ebuild 3001
 MD5 fd7e5cf25ef3dec8ef610126f059f680 metadata.xml 598
-MD5 69d5c644b8ab42132401a32d66174a32 files/asis-3.15p.diff 1558
 MD5 0d239a4e8d4fd1134f91a1f28f0bdd47 files/digest-asis-3.15p 64
+MD5 69d5c644b8ab42132401a32d66174a32 files/asis-3.15p.diff 1558
diff --git a/dev-ada/asis/asis-3.15p.ebuild b/dev-ada/asis/asis-3.15p.ebuild
index 24cd40282cb7..56f288a9e780 100644
--- a/dev-ada/asis/asis-3.15p.ebuild
+++ b/dev-ada/asis/asis-3.15p.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.15p.ebuild,v 1.8 2003/10/28 20:01:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis/asis-3.15p.ebuild,v 1.9 2004/01/04 18:48:52 aliz Exp $
 
 inherit gnat
 
@@ -17,9 +17,8 @@ KEYWORDS="x86 ~ppc"
 IUSE=""
 
 src_unpack() {
-	unpack "${P}-src.tgz"
-	cd "${S}"
-	patch -p1 < "${FILESDIR}/${P}.diff"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}.diff
 }
 
 src_compile() {
diff --git a/dev-ada/cbind/ChangeLog b/dev-ada/cbind/ChangeLog
index 3869300d59e7..f5e9f690514d 100644
--- a/dev-ada/cbind/ChangeLog
+++ b/dev-ada/cbind/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ada/cbind
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/cbind/ChangeLog,v 1.3 2003/10/06 00:11:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/cbind/ChangeLog,v 1.4 2004/01/04 18:48:52 aliz Exp $
 
   06 Oct 2003; David Holm <dholm@gentoo.org> cbind-6.ebuild:
   Moved to stable on x86.
@@ -8,7 +8,7 @@
   17 Aug 2003; David Holm <dholm@gentoo.org> metadata.xml:
   Added <longdescription> to metadata.xml.
 
-*cbind-6.ebuild (13 Jul 2003)
+*cbind-6 (13 Jul 2003)
 
   13 Jul 2003; George Shapovalov <george@gentoo.org> cbind-6.ebuild, files/{cbind6.diff,digest-cbind-6} :
   initial release (#23025)
diff --git a/dev-ada/cbind/Manifest b/dev-ada/cbind/Manifest
index b209dd5ec0e1..450db96b16a3 100644
--- a/dev-ada/cbind/Manifest
+++ b/dev-ada/cbind/Manifest
@@ -1,5 +1,5 @@
-MD5 46cb4b10ca8db4618e062a13f2b73738 ChangeLog 674
-MD5 a960d67c718a86bfed284fe9938c187a cbind-6.ebuild 740
+MD5 068648e487cf19cc67f6c50c30d0dddc cbind-6.ebuild 719
+MD5 8705531c0a60ef80545d63fb2c60bf4a ChangeLog 666
 MD5 b1a57b79797c5cfb1af44255bee44d06 metadata.xml 451
-MD5 aa4cf2876e3e245ad93133ff4deb78c5 files/cbind6.diff 5268
 MD5 54d17954817798fdfed5399cee7f0373 files/digest-cbind-6 55
+MD5 aa4cf2876e3e245ad93133ff4deb78c5 files/cbind6.diff 5268
diff --git a/dev-ada/cbind/cbind-6.ebuild b/dev-ada/cbind/cbind-6.ebuild
index 0d2ee25da293..2ac0ba24e9a0 100644
--- a/dev-ada/cbind/cbind-6.ebuild
+++ b/dev-ada/cbind/cbind-6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/cbind/cbind-6.ebuild,v 1.3 2003/10/06 00:11:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/cbind/cbind-6.ebuild,v 1.4 2004/01/04 18:48:52 aliz Exp $
 
 S="${WORKDIR}/${PN}${PV}"
 DESCRIPTION="This tool is designed to aid in the creation of Ada bindings to C."
@@ -15,9 +15,8 @@ KEYWORDS="x86"
 IUSE=""
 
 src_unpack() {
-	unpack "${PN}${PV}.zip"
-	cd "${S}"
-	patch -p1 < "${FILESDIR}/${PN}${PV}.diff"
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${PN}${PV}.diff
 }
 
 src_compile() {
diff --git a/dev-ada/gps-bin/ChangeLog b/dev-ada/gps-bin/ChangeLog
index c13968b7998d..9111c3e5b5af 100644
--- a/dev-ada/gps-bin/ChangeLog
+++ b/dev-ada/gps-bin/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-ada/gps-bin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gps-bin/ChangeLog,v 1.4 2003/12/12 05:08:44 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gps-bin/ChangeLog,v 1.5 2004/01/04 18:48:52 aliz Exp $
 
   11 Dec 2003; George Shapovalov <george@gentoo.org> gps-bin-1.2.2.ebuild:
   fixed symlink to create the correct point version (#35596)
@@ -11,7 +11,7 @@
   17 Aug 2003; David Holm <dholm@gentoo.org> metadata.xml:
   Added metadata.xml.
 
-*gps-bin-1.2.2.ebuild (09 Aug 2003)
+*gps-bin-1.2.2 (09 Aug 2003)
 
   09 Aug 2003; George Shapovalov <george@gentoo.org> gps-bin-1.2.2.ebuild, Manifest, files/{10gps-bin,digest-gps-bin-1.2.2} :
   initial release (#24630)
diff --git a/dev-ada/gps-bin/Manifest b/dev-ada/gps-bin/Manifest
index d97d90cc44da..8b2a9fee0e24 100644
--- a/dev-ada/gps-bin/Manifest
+++ b/dev-ada/gps-bin/Manifest
@@ -1,5 +1,5 @@
 MD5 1c0aa42237a69130e7707ffe8b749eeb gps-bin-1.2.2.ebuild 1470
-MD5 bca5493c12bb6524b8ee9aff5ebdb06a ChangeLog 761
+MD5 2a1cc19da45a6e9768e85c29cfcf931d ChangeLog 752
 MD5 61a97d12115c75f54376aa875a836afb metadata.xml 998
 MD5 ce39349e495c585ee2ec7836881eef61 files/digest-gps-bin-1.2.2 78
 MD5 a31042ea1266ba5db83c74551c516082 files/10gps-bin 22
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 2e07d9def448..2ba28302fca8 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,9 +1,9 @@
+MD5 4f05875f894080edfb7a30b8189750c3 gtkada-2.2.0-r1.ebuild 2448
+MD5 7eb9516c33bb93d187fe5c5786cbf7b4 gtkada-2.2.1_pre20031005.ebuild 2312
+MD5 3e6ae73a64fd26c776fd76ecb1b2362f gtkada-2.2.1.ebuild 2452
 MD5 47e1800592062e0ce98615ec9f0f6832 ChangeLog 1545
-MD5 d2ec7ee30281bbf995da4c21f80ef2da gtkada-2.2.0-r1.ebuild 2413
-MD5 b15f342509d25544b5dcb705d1559a1d gtkada-2.2.1.ebuild 2410
 MD5 406df42dba8304e0bfa98dd1a79452b7 metadata.xml 556
-MD5 7eb9516c33bb93d187fe5c5786cbf7b4 gtkada-2.2.1_pre20031005.ebuild 2312
-MD5 f6dd28048026dfc33cdadfa70e75217e files/digest-gtkada-2.2.1_pre20031005 78
-MD5 27c6dd96e1ff25f77f4f3a50b4961a24 files/digest-gtkada-2.2.0-r1 62
 MD5 3272d807414b7bee90c1c4dc64971103 files/gtkada-2.2.0-gentoo.patch 541
 MD5 67a1b0d6cd1202e37a89427fbdecb948 files/digest-gtkada-2.2.1 62
+MD5 27c6dd96e1ff25f77f4f3a50b4961a24 files/digest-gtkada-2.2.0-r1 62
+MD5 f6dd28048026dfc33cdadfa70e75217e files/digest-gtkada-2.2.1_pre20031005 78
diff --git a/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild b/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild
index dc9c0e9e1bf1..c00489383ae3 100644
--- a/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild,v 1.4 2003/10/28 14:48:26 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.0-r1.ebuild,v 1.5 2004/01/04 18:48:52 aliz Exp $
 
 inherit gnat
 
@@ -20,6 +20,11 @@ RDEPEND=""
 
 S="${WORKDIR}/${Name}-${PV}"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
 src_compile() {
 	local myconf
 	myconf=""
@@ -27,7 +32,6 @@ src_compile() {
 	use nls    || myconf="${myconf} --disable-nls"
 	use opengl && myconf="${myconf} --with-GL=auto"
 
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
 	sed -i -e "s|-I\$prefix/include|-I/usr/lib/ada/adainclude|" \
 		src/gtkada-config.in
 	sed -i -e "s|-L\$prefix/include|-L/usr/lib/ada/adalib|" \
diff --git a/dev-ada/gtkada/gtkada-2.2.1.ebuild b/dev-ada/gtkada/gtkada-2.2.1.ebuild
index a76e700f7403..61c8dde4a9dd 100644
--- a/dev-ada/gtkada/gtkada-2.2.1.ebuild
+++ b/dev-ada/gtkada/gtkada-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.1.ebuild,v 1.1 2003/11/21 20:12:49 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/gtkada/gtkada-2.2.1.ebuild,v 1.2 2004/01/04 18:48:52 aliz Exp $
 
 inherit gnat
 
@@ -20,6 +20,11 @@ RDEPEND=""
 
 S="${WORKDIR}/${Name}-${PV}"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${PN}-2.2.0-gentoo.patch
+}
+
 src_compile() {
 	local myconf
 	myconf=""
@@ -27,7 +32,6 @@ src_compile() {
 	use nls    || myconf="${myconf} --disable-nls"
 	use opengl && myconf="${myconf} --with-GL=auto"
 
-	patch -p1 < ${FILESDIR}/${P}-gentoo.patch
 	sed -i -e "s|-I\$prefix/include|-I/usr/lib/ada/adainclude|" \
 		src/gtkada-config.in
 	sed -i -e "s|-L\$prefix/include|-L/usr/lib/ada/adalib|" \