gnuconfig_update in src_unpack; use emake; tidy; clean older ebuilds

9 files changed, 20 insertions, 355 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 8733f9c72b13..3138eeac8f8a 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.41 2004/06/27 17:05:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.42 2004/07/17 01:08:18 mr_bones_ Exp $
+
+  16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> -gawk-3.1.1-r2.ebuild,
+  -gawk-3.1.2-r3.ebuild, gawk-3.1.3-r1.ebuild, -gawk-3.1.3.ebuild:
+  gnuconfig_update in src_unpack; use emake; tidy; clean older ebuilds
 
   27 Jun 2004; Aron Griffis <agriffis@gentoo.org> gawk-3.1.1-r2.ebuild,
   gawk-3.1.2-r3.ebuild, gawk-3.1.3.ebuild:
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 37e1ad759244..82faef060076 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,15 +1,9 @@
-MD5 96e2ba6d32d7eeff97dc41295c93f206 gawk-3.1.2-r3.ebuild 2900
-MD5 332e2f7dee1353b949b18a6b4d8a559e gawk-3.1.3-r1.ebuild 3262
-MD5 aac45cec6e6998aa3ceaadffe9f6df94 ChangeLog 6830
-MD5 1a7531ea27e6c20b108152ba125844d5 gawk-3.1.1-r2.ebuild 2386
+MD5 c0da35ab434ab9b356411e11bb68fc4e ChangeLog 7048
+MD5 ec9370080192e9f99dd858bb23923012 gawk-3.1.3-r1.ebuild 3266
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 2309651ca9f3b5ce21275db90c5d0b53 gawk-3.1.3.ebuild 2533
+MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
 MD5 9f439b073b0d1903a54a04dca5aa44af files/gawk-3.1.2-input-filesize.patch 13485
-MD5 9ee5f35f388bc0943f9f1df199bdd64d files/digest-gawk-3.1.1-r2 63
-MD5 0a6cc5ae974c8876f6c3e975d7fb95e3 files/digest-gawk-3.1.2-r3 63
 MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3-r1 63
-MD5 1a6ff83a6dd7c5f300803cae1cabd4ae files/gawk-3.1.2-dec-alpha-compiler.diff 461
-MD5 a3d79dbed6a930b14071084a6c2dbcc7 files/digest-gawk-3.1.3 63
 MD5 c40ec6dfabda5864b7f62fa57d2329bd files/64bitnumfile.patch 340
 MD5 36b5ebb691c9060f293762de7adc9d50 files/filefuncs/Makefile 943
-MD5 4cb59bd814987bd7f2e4d2f8deca16ae files/filefuncs/filefuncs.c 11027
+MD5 6329d35b6c81a6fd70ab4a902af8e0bd files/filefuncs/filefuncs.c 11028
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.1-r2 b/sys-apps/gawk/files/digest-gawk-3.1.1-r2
deleted file mode 100644
index d0f65dc6c181..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.1.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47e3754195bf32c8b78ad632bab903cd gawk-3.1.1.tar.gz 1875134
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.2-r3 b/sys-apps/gawk/files/digest-gawk-3.1.2-r3
deleted file mode 100644
index d002b5ee0638..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.1.2-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d14f3c95669ace8c6aee2a96ba4eed7 gawk-3.1.2.tar.gz 2003860
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.3 b/sys-apps/gawk/files/digest-gawk-3.1.3
deleted file mode 100644
index 0bb5d217017a..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b637b454005f9e72a9a8eecfacd07ca0 gawk-3.1.3.tar.gz 2078246
diff --git a/sys-apps/gawk/gawk-3.1.1-r2.ebuild b/sys-apps/gawk/gawk-3.1.1-r2.ebuild
deleted file mode 100644
index 7ee528a8ac18..000000000000
--- a/sys-apps/gawk/gawk-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.1-r2.ebuild,v 1.10 2004/06/30 02:30:26 vapier Exp $
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
-IUSE="nls build"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -dR ${FILESDIR}/filefuncs ${WORKDIR}/ || die
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	einfo "Building gawk ..."
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/awk \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} \
-		${myconf} || die
-
-	emake || die
-
-	einfo "Building filefuncs module ..."
-	cd ${WORKDIR}/filefuncs
-	make AWKINCDIR=${S} || die
-}
-
-src_install() {
-	einfo "Installing gawk ..."
-	make prefix=${D}/usr \
-		bindir=${D}/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		libexecdir=${D}/usr/lib/awk \
-		install || die
-
-	einfo "Installing filefuncs module ..."
-	cd ${WORKDIR}/filefuncs
-	make DESTDIR=${D} \
-		AWKINCDIR=${S} \
-		install || die
-
-	# In some rare cases, gawk gets installed as gawk- and not gawk-${PV} ..
-	if [ -f ${D}/bin/gawk -a ! -f ${D}/bin/gawk-${PV} ]
-	then
-		mv -f ${D}/bin/gawk ${D}/bin/gawk-${PV}
-	elif [ -f ${D}/bin/gawk- -a ! -f ${D}/bin/gawk-${PV} ]
-	then
-		mv -f ${D}/bin/gawk ${D}/bin/gawk-${PV}
-	fi
-
-	rm -f ${D}/bin/{awk,gawk}
-	dosym gawk-${PV} /bin/awk
-	dosym gawk-${PV} /bin/gawk
-	#compat symlink
-	dodir /usr/bin
-	dosym ../../bin/gawk-${PV} /usr/bin/awk
-	dosym ../../bin/gawk-${PV} /usr/bin/gawk
-
-	# Install headers
-	insinto /usr/include/awk
-	for x in ${S}/*.h
-	do
-		# We do not want 'acconfig.h' in there ...
-		if [ -f "${x}" -a "${x/acconfig\.h/}" = "${x}" ]
-		then
-			doins ${x}
-		fi
-	done
-
-	if ! use build
-	then
-		cd ${S}
-		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog COPYING FUTURES
-		dodoc LIMITATIONS NEWS PROBLEMS POSIX.STD README
-		docinto README_d
-		dodoc README_d/*
-		docinto awklib
-		dodoc awklib/ChangeLog
-		docinto pc
-		dodoc pc/ChangeLog
-		docinto posix
-		dodoc posix/ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/sys-apps/gawk/gawk-3.1.2-r3.ebuild b/sys-apps/gawk/gawk-3.1.2-r3.ebuild
deleted file mode 100644
index 2a7a8b3307c7..000000000000
--- a/sys-apps/gawk/gawk-3.1.2-r3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.2-r3.ebuild,v 1.19 2004/07/15 01:46:18 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64"
-IUSE="nls build"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -dR ${FILESDIR}/filefuncs ${WORKDIR}/ || die
-
-	cd ${S}
-	# Special files like those in /proc, report themselves as regular files
-	# of length 0, when in fact they have data in them if you try to read them.
-	# The new record-reading code wasn't quite smart enough to deal with such
-	# a bizarre case.  The following patch fixes the problem, thanks to
-	# Arnold D. Robbins (Maintainer of gawk).
-	epatch ${FILESDIR}/${P}-input-filesize.patch
-
-	# support for dec compiler.
-	[ "${CC}" == "ccc" ] && epatch ${FILESDIR}/${P}-dec-alpha-compiler.diff
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	einfo "Building gawk ..."
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/awk \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} \
-		${myconf} || die
-
-	emake || die
-
-	einfo "Building filefuncs module ..."
-	cd ${WORKDIR}/filefuncs
-	make AWKINCDIR=${S} || die
-}
-
-src_install() {
-	einfo "Installing gawk ..."
-	make prefix=${D}/usr \
-		bindir=${D}/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		libexecdir=${D}/usr/lib/awk \
-		install || die
-
-	einfo "Installing filefuncs module ..."
-	cd ${WORKDIR}/filefuncs
-	make DESTDIR=${D} \
-		AWKINCDIR=${S} \
-		install || die
-
-	# In some rare cases, gawk gets installed as gawk- and not gawk-${PV} ..
-	if [ -f ${D}/bin/gawk -a ! -f ${D}/bin/gawk-${PV} ]
-	then
-		mv -f ${D}/bin/gawk ${D}/bin/gawk-${PV}
-	elif [ -f ${D}/bin/gawk- -a ! -f ${D}/bin/gawk-${PV} ]
-	then
-		mv -f ${D}/bin/gawk ${D}/bin/gawk-${PV}
-	fi
-
-	rm -f ${D}/bin/{awk,gawk}
-	dosym gawk-${PV} /bin/awk
-	dosym gawk-${PV} /bin/gawk
-	#compat symlink
-	dodir /usr/bin
-	dosym ../../bin/gawk-${PV} /usr/bin/awk
-	dosym ../../bin/gawk-${PV} /usr/bin/gawk
-
-	# Install headers
-	insinto /usr/include/awk
-	for x in ${S}/*.h
-	do
-		# We do not want 'acconfig.h' in there ...
-		if [ -f "${x}" -a "${x/acconfig\.h/}" = "${x}" ]
-		then
-			doins ${x}
-		fi
-	done
-
-	if ! use build
-	then
-		cd ${S}
-		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog COPYING FUTURES
-		dodoc LIMITATIONS NEWS PROBLEMS POSIX.STD README
-		docinto README_d
-		dodoc README_d/*
-		docinto awklib
-		dodoc awklib/ChangeLog
-		docinto pc
-		dodoc pc/ChangeLog
-		docinto posix
-		dodoc posix/ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-}
diff --git a/sys-apps/gawk/gawk-3.1.3-r1.ebuild b/sys-apps/gawk/gawk-3.1.3-r1.ebuild
index ff13532b796e..e175025bf567 100644
--- a/sys-apps/gawk/gawk-3.1.3-r1.ebuild
+++ b/sys-apps/gawk/gawk-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.14 2004/07/15 01:46:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.15 2004/07/17 01:08:18 mr_bones_ Exp $
 
 inherit eutils gnuconfig
 
@@ -20,17 +20,16 @@ src_unpack() {
 	unpack ${A}
 
 	# Copy filefuncs module's source over ...
-	cp -dR ${FILESDIR}/filefuncs ${WORKDIR}/ || die
+	cp -dR "${FILESDIR}/filefuncs" "${WORKDIR}/" || die "cp failed"
 
 	cd ${S}
 	# support for dec compiler.
-	[ "${CC}" == "ccc" ] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
-	epatch ${FILESDIR}/64bitnumfile.patch
+	[ "${CC}" == "ccc" ] && epatch "${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff"
+	epatch "${FILESDIR}/64bitnumfile.patch"
+	gnuconfig_update
 }
 
 src_compile() {
-	gnuconfig_update
-
 	local myconf=
 	use nls || myconf="${myconf} --disable-nls"
 	[ -z "${CBUILD}" ] || myconf="${myconf} --build=${CBUILD}"
@@ -44,11 +43,11 @@ src_compile() {
 		${myconf} \
 		|| die
 
-	emake || die "make failed"
+	emake || die "emake failed"
 
 	einfo "Building filefuncs module ..."
 	cd ${WORKDIR}/filefuncs
-	make AWKINCDIR=${S} || die "filefuncs make failed"
+	emake AWKINCDIR=${S} || die "filefuncs emake failed"
 }
 
 src_install() {
@@ -77,9 +76,9 @@ src_install() {
 		local binpath="/bin"
 
 		case ${x} in
-			igawk|pgawk)
-					binpath="/usr/bin"
-					;;
+		igawk|pgawk)
+				binpath="/usr/bin"
+				;;
 		esac
 
 		if [ -f "${D}/bin/${x}" -a ! -f "${D}/bin/${x}-${PV}" ]
@@ -120,8 +119,7 @@ src_install() {
 	then
 		cd ${S}
 		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog COPYING FUTURES
-		dodoc LIMITATIONS NEWS PROBLEMS POSIX.STD README
+		dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README
 		docinto README_d
 		dodoc README_d/*
 		docinto awklib
diff --git a/sys-apps/gawk/gawk-3.1.3.ebuild b/sys-apps/gawk/gawk-3.1.3.ebuild
deleted file mode 100644
index fabd595691bd..000000000000
--- a/sys-apps/gawk/gawk-3.1.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3.ebuild,v 1.15 2004/07/15 01:46:18 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/gawk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc mips ~alpha hppa amd64 ia64 ppc64"
-IUSE="nls build"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -dR ${FILESDIR}/filefuncs ${WORKDIR}/ || die
-
-	cd ${S}
-	# support for dec compiler.
-	[ "${CC}" == "ccc" ] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
-}
-
-src_compile() {
-	local myconf=""
-	use nls || myconf="${myconf} --disable-nls"
-
-	einfo "Building gawk ..."
-	./configure --prefix=/usr \
-		--libexecdir=/usr/lib/awk \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--host=${CHOST} \
-		${myconf} || die
-
-	emake || die
-
-	einfo "Building filefuncs module ..."
-	cd ${WORKDIR}/filefuncs
-	make AWKINCDIR=${S} || die
-}
-
-src_install() {
-	einfo "Installing gawk ..."
-	make prefix=${D}/usr \
-		bindir=${D}/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		libexecdir=${D}/usr/lib/awk \
-		install || die
-
-	einfo "Installing filefuncs module ..."
-	cd ${WORKDIR}/filefuncs
-	make DESTDIR=${D} \
-		AWKINCDIR=${S} \
-		install || die
-
-	# In some rare cases, gawk gets installed as gawk- and not gawk-${PV} ..
-	if [ -f ${D}/bin/gawk -a ! -f ${D}/bin/gawk-${PV} ]
-	then
-		mv -f ${D}/bin/gawk ${D}/bin/gawk-${PV}
-	elif [ -f ${D}/bin/gawk- -a ! -f ${D}/bin/gawk-${PV} ]
-	then
-		mv -f ${D}/bin/gawk ${D}/bin/gawk-${PV}
-	fi
-
-	rm -f ${D}/bin/{awk,gawk}
-	dosym gawk-${PV} /bin/awk
-	dosym gawk-${PV} /bin/gawk
-	#compat symlink
-	dodir /usr/bin
-	dosym ../../bin/gawk-${PV} /usr/bin/awk
-	dosym ../../bin/gawk-${PV} /usr/bin/gawk
-
-	# Install headers
-	insinto /usr/include/awk
-	for x in ${S}/*.h
-	do
-		# We do not want 'acconfig.h' in there ...
-		if [ -f "${x}" -a "${x/acconfig\.h/}" = "${x}" ]
-		then
-			doins ${x}
-		fi
-	done
-
-	if ! use build
-	then
-		cd ${S}
-		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog COPYING FUTURES
-		dodoc LIMITATIONS NEWS PROBLEMS POSIX.STD README
-		docinto README_d
-		dodoc README_d/*
-		docinto awklib
-		dodoc awklib/ChangeLog
-		docinto pc
-		dodoc pc/ChangeLog
-		docinto posix
-		dodoc posix/ChangeLog
-	else
-		rm -rf ${D}/usr/share
-	fi
-}