touchup syntax, quoting, etc...

Package-Manager: portage-2.0.51.22-r2

7 files changed, 42 insertions, 48 deletions

diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 81e978a4f293..f8056a5abfa5 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0ca767bc41c911b212b9b47afaeb6f7d automake-1.6.3.ebuild 1457
-MD5 0c1f8d9c76e7bf1685363c0e5d673ac7 automake-1.4_p6.ebuild 1831
+MD5 c2b7648d70be8a4ab0080ed00cb796e3 automake-1.6.3.ebuild 1431
+MD5 60753f865fa023a3bcd0466250a743a7 automake-1.4_p6.ebuild 1809
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e0adbe48ce33e4527496dc8abc8259b7 automake-1.9.6.ebuild 1441
-MD5 6046836f4a1eb5385597ae400c2675ee automake-1.9.5.ebuild 1424
-MD5 f8941fa37804f154576df4982f9bf060 automake-1.8.5-r3.ebuild 1527
-MD5 c7b51b91a9a217fb8d6e5c00599be821 automake-1.5.ebuild 1654
+MD5 60402cbb0e854aea08a716500d6b48b9 automake-1.9.6.ebuild 1400
+MD5 e92da70fff503e5e1ab84cdb2b42b057 automake-1.9.5.ebuild 1400
+MD5 3ad0b6b355e91b67210e8e14e81de267 automake-1.8.5-r3.ebuild 1503
+MD5 88db2f78adf73dd93c0e21a58259d2eb automake-1.5.ebuild 1696
 MD5 2bcdc60669453e3bf4004bb894344dcf ChangeLog 12544
-MD5 cf475079291abe4fb62357998afa72d0 automake-1.7.9-r1.ebuild 1530
+MD5 f648af66d23f848644ae7f0e0a0fd8a9 automake-1.7.9-r1.ebuild 1506
 MD5 a1b9c06cc3ba7ac88f3b870f51d35758 files/digest-automake-1.9.6 67
 MD5 4c0ad89956f0b70972c19a60c65f9275 files/automake-1.9.3-infopage-namechange.patch 1109
 MD5 252f1212a83cc74c42cd557bc3f65e32 files/digest-automake-1.4_p6 67
@@ -28,9 +28,9 @@ MD5 9587f00ace066c11b5c22d72afe630a9 files/automake-1.8.2-infopage-namechange.pa
 MD5 0fe9854b3a6384ef4c7b0bd2bad72c59 files/digest-automake-1.8.5-r3 67
 MD5 5c2fe79f8f664efdb7e2736e88c10f09 files/automake-1.5-test-fixes.patch 2303
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC0fplgIKl8Uu19MoRAl7xAJwKZpxKH6WzoVDJWRz3Pf7wamjkDwCffrEe
-0KIYVvjgBm+gx5pvMamvX9I=
-=M4AP
+iD8DBQFDC7h2gIKl8Uu19MoRAkSAAJ0Z3oKtrRSSx4MLTtQqzGGn0V9IMQCfY2S7
+dDww4LrRfkn3qjm24dUZdvI=
+=AmkT
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.4_p6.ebuild b/sys-devel/automake/automake-1.4_p6.ebuild
index 17138e801102..03aae43478e5 100644
--- a/sys-devel/automake/automake-1.4_p6.ebuild
+++ b/sys-devel/automake/automake-1.4_p6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.18 2005/03/13 04:40:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6.ebuild,v 1.19 2005/08/23 23:58:59 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 MY_P="${P/_/-}"
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
@@ -19,21 +19,20 @@ DEPEND="dev-lang/perl
 	>=sys-devel/autoconf-2.59-r6
 	sys-devel/gnuconfig"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/automake-1.4-libtoolize.patch
-	epatch ${FILESDIR}/automake-1.4-subdirs-89656.patch
-	epatch ${FILESDIR}/automake-1.4-ansi2knr-stdlib.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/automake-1.4-libtoolize.patch
+	epatch "${FILESDIR}"/automake-1.4-subdirs-89656.patch
+	epatch "${FILESDIR}"/automake-1.4-ansi2knr-stdlib.patch
 	sed -i 's:error\.test::' tests/Makefile.in #79529
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
-	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.5.ebuild b/sys-devel/automake/automake-1.5.ebuild
index aba09d153397..ab5b67acdb4a 100644
--- a/sys-devel/automake/automake-1.5.ebuild
+++ b/sys-devel/automake/automake-1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.23 2005/03/13 04:40:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5.ebuild,v 1.24 2005/08/23 23:58:59 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -20,26 +20,25 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-target_hook.patch
-	epatch ${FILESDIR}/${P}-slot.patch
-	epatch ${FILESDIR}/${P}-test-fixes.patch #79505
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-target_hook.patch
+	epatch "${FILESDIR}"/${P}-slot.patch
+	epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
-	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	make install DESTDIR="${D}" || die "make install failed"
 
 	local x=
 	for x in aclocal automake ; do
-		mv "${D}"/usr/bin/${x}{,-${SLOT}}
-		mv "${D}"/usr/share/${x}{,-${SLOT}}
+		mv "${D}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
+		mv "${D}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
 	done
 
 	dodoc NEWS README THANKS TODO AUTHORS ChangeLog
diff --git a/sys-devel/automake/automake-1.6.3.ebuild b/sys-devel/automake/automake-1.6.3.ebuild
index 0d111cfa3a6d..0c721995f204 100644
--- a/sys-devel/automake/automake-1.6.3.ebuild
+++ b/sys-devel/automake/automake-1.6.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.33 2005/03/13 04:40:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3.ebuild,v 1.34 2005/08/23 23:58:59 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -20,13 +20,12 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed failed"
-	gnuconfig_update
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.7.9-r1.ebuild b/sys-devel/automake/automake-1.7.9-r1.ebuild
index 83de6bd18b32..a125bc821e3a 100644
--- a/sys-devel/automake/automake-1.7.9-r1.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.10 2005/03/13 04:40:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r1.ebuild,v 1.11 2005/08/23 23:58:59 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -20,14 +20,13 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		automake.texi || die "sed texi failed"
-	epatch ${FILESDIR}/${P}-infopage-namechange.patch
-	gnuconfig_update
+	epatch "${FILESDIR}"/${P}-infopage-namechange.patch
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.8.5-r3.ebuild b/sys-devel/automake/automake-1.8.5-r3.ebuild
index f76b825f36b5..7ea50974340e 100644
--- a/sys-devel/automake/automake-1.8.5-r3.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.10 2005/03/13 04:40:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r3.ebuild,v 1.11 2005/08/23 23:58:59 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -20,14 +20,13 @@ DEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
-	epatch ${FILESDIR}/${PN}-1.8.2-infopage-namechange.patch
-	gnuconfig_update
+	epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
 	export WANT_AUTOCONF=2.5
 }
 
diff --git a/sys-devel/automake/automake-1.9.5.ebuild b/sys-devel/automake/automake-1.9.5.ebuild
index 0821e45c6169..4d0494190f9b 100644
--- a/sys-devel/automake/automake-1.9.5.ebuild
+++ b/sys-devel/automake/automake-1.9.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.5.ebuild,v 1.3 2005/05/05 22:54:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.5.ebuild,v 1.4 2005/08/23 23:58:59 vapier Exp $
 
-inherit eutils gnuconfig
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://sources.redhat.com/automake/"
@@ -21,14 +21,13 @@ RDEPEND="dev-lang/perl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "/^@setfilename/s|automake|automake${SLOT}|" \
 		-e "s|automake: (automake)|automake v${SLOT}: (automake${SLOT})|" \
 		-e "s|aclocal: (automake)|aclocal v${SLOT}: (automake${SLOT})|" \
 		doc/automake.texi || die "sed failed"
-	epatch ${FILESDIR}/${PN}-1.9.3-infopage-namechange.patch
-	gnuconfig_update
+	epatch "${FILESDIR}"/${PN}-1.9.3-infopage-namechange.patch
 	export WANT_AUTOCONF=2.5
 }