Version bump.

5 files changed, 121 insertions, 7 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 218e4a1f35b0..eed42bf9d6f7 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2004/11/22 06:03:16 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.48 2005/01/12 18:27:53 vapier Exp $
+
+*gawk-3.1.4 (12 Jan 2005)
+
+  12 Jan 2005; Mike Frysinger <vapier@gentoo.org> gawk-3.1.3-r2.ebuild,
+  +gawk-3.1.4.ebuild:
+  Version bump.
 
 *gawk-3.1.3-r2 (22 Nov 2004)
 
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.4 b/sys-apps/gawk/files/digest-gawk-3.1.4
new file mode 100644
index 000000000000..a8f0b595ff36
--- /dev/null
+++ b/sys-apps/gawk/files/digest-gawk-3.1.4
@@ -0,0 +1 @@
+MD5 3c8935efb9fdc7202720894279ad04a7 gawk-3.1.4.tar.gz 2260582
diff --git a/sys-apps/gawk/gawk-3.1.3-r1.ebuild b/sys-apps/gawk/gawk-3.1.3-r1.ebuild
index 4262172844dc..aa181c7b2afe 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
+# Copyright 1999-2005 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.22 2004/11/14 21:08:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r1.ebuild,v 1.23 2005/01/12 18:27:53 vapier Exp $
 
 inherit eutils gnuconfig toolchain-funcs
 
diff --git a/sys-apps/gawk/gawk-3.1.3-r2.ebuild b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
index 5b1b4aeec50e..922c449965c0 100644
--- a/sys-apps/gawk/gawk-3.1.3-r2.ebuild
+++ b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2004/11/22 06:03:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.2 2005/01/12 18:27:53 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="nls build uclibc"
 
 RDEPEND="virtual/libc"
diff --git a/sys-apps/gawk/gawk-3.1.4.ebuild b/sys-apps/gawk/gawk-3.1.4.ebuild
new file mode 100644
index 000000000000..a99edfc59130
--- /dev/null
+++ b/sys-apps/gawk/gawk-3.1.4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4.ebuild,v 1.1 2005/01/12 18:27:53 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls build uclibc"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Copy filefuncs module's source over ...
+	cp -PR "${FILESDIR}"/filefuncs "${WORKDIR}"/ || die "cp failed"
+
+	cd ${S}
+	# support for dec compiler.
+	[[ $(tc-getCC) == "ccc" ]] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
+}
+
+src_compile() {
+	econf --bindir=/bin $(use_enable nls) || die
+	emake || die "emake failed"
+
+	cd ../filefuncs
+	emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "install failed"
+	cd ../filefuncs
+	make \
+		DESTDIR="${D}" \
+		AWKINCDIR="${S}" \
+		install \
+		|| die "filefuncs install failed"
+
+	dodir /usr/bin
+	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
+	# (p)gawk-${PV} ..  Also make sure that /bin/(p)gawk is a symlink
+	# to /bin/(p)gawk-${PV}.
+	local x=
+	for x in gawk pgawk igawk ; do
+		local binpath="/bin"
+
+		case ${x} in
+			igawk|pgawk)
+				binpath="/usr/bin"
+				;;
+		esac
+
+		if [ -f "${D}/bin/${x}" -a ! -f "${D}/bin/${x}-${PV}" ]
+		then
+			mv -f ${D}/bin/${x} ${D}/${binpath}/${x}-${PV}
+		elif [ -f "${D}/bin/${x}-" -a ! -f "${D}/bin/${x}-${PV}" ]
+		then
+			mv -f ${D}/bin/${x}- ${D}/${binpath}/${x}-${PV}
+		elif [ "${binpath}" = "/usr/bin" -a -f "${D}/bin/${x}-${PV}" ]
+		then
+			mv -f ${D}/bin/${x}-${PV} ${D}/${binpath}/${x}-${PV}
+		fi
+
+		rm -f ${D}/bin/${x}
+		dosym ${x}-${PV} ${binpath}/${x}
+		[[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x}
+	done
+
+	rm -f "${D}"/bin/awk
+	dosym gawk-${PV} /bin/awk
+	# Compat symlinks
+	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 ...
+		[[ -f ${x} && ${x/acconfig.h/} == ${x} ]] && doins ${x}
+	done
+
+	if ! use build ; then
+		cd ${S}
+		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
+		dodoc AUTHORS ChangeLog FUTURES 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 -r "${D}"/usr/share
+	fi
+}