Version bump and remove old. Add dependency on dev-perl/IPC-Run (bug #358751 by Siim Ainsaar) and temporarily drop ~hppa keyword.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

5 files changed, 68 insertions, 79 deletions

diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index 533d9568a4f6..cd8a4a4602fa 100644
--- a/sys-apps/moreutils/ChangeLog
+++ b/sys-apps/moreutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/moreutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.21 2011/03/10 06:12:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.22 2011/03/29 19:40:22 radhermit Exp $
+
+*moreutils-0.44 (29 Mar 2011)
+
+  29 Mar 2011; Tim Harder <radhermit@gentoo.org> -moreutils-0.40.ebuild,
+  -moreutils-0.42.ebuild, moreutils-0.43.ebuild, +moreutils-0.44.ebuild:
+  Version bump and remove old. Add dependency on dev-perl/IPC-Run (bug #358751
+  by Siim Ainsaar) and temporarily drop ~hppa keyword.
 
 *moreutils-0.43 (10 Mar 2011)
 
diff --git a/sys-apps/moreutils/moreutils-0.40.ebuild b/sys-apps/moreutils/moreutils-0.40.ebuild
deleted file mode 100644
index ae29d263b31b..000000000000
--- a/sys-apps/moreutils/moreutils-0.40.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.40.ebuild,v 1.1 2010/07/18 16:50:23 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a growing collection of the unix tools that nobody thought to write
-thirty years ago"
-HOMEPAGE="http://kitenet.net/~joey/code/moreutils/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/Time-Duration
-	dev-perl/TimeDate"
-DEPEND="${RDEPEND}
-	>=app-text/docbook2X-0.8.8-r2
-	app-text/docbook-xml-dtd:4.4"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.30-dtd-path.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_BIN=install install || die
-}
diff --git a/sys-apps/moreutils/moreutils-0.42.ebuild b/sys-apps/moreutils/moreutils-0.42.ebuild
deleted file mode 100644
index 395875f206b8..000000000000
--- a/sys-apps/moreutils/moreutils-0.42.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.42.ebuild,v 1.1 2010/10/22 07:12:59 radhermit Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a growing collection of the unix tools that nobody thought to write
-thirty years ago"
-HOMEPAGE="http://kitenet.net/~joey/code/moreutils/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/Time-Duration
-	dev-perl/TimeDate"
-DEPEND="${RDEPEND}
-	>=app-text/docbook2X-0.8.8-r2
-	app-text/docbook-xml-dtd:4.4"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dtd-path.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_BIN=install install || die
-}
diff --git a/sys-apps/moreutils/moreutils-0.43.ebuild b/sys-apps/moreutils/moreutils-0.43.ebuild
index ff61aa347e6a..4841c88def00 100644
--- a/sys-apps/moreutils/moreutils-0.43.ebuild
+++ b/sys-apps/moreutils/moreutils-0.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.43.ebuild,v 1.1 2011/03/10 06:12:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.43.ebuild,v 1.2 2011/03/29 19:40:22 radhermit Exp $
 
 EAPI=4
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+doc +perl"
 
 RDEPEND="perl? (
 		dev-lang/perl
+		dev-perl/IPC-Run
 		dev-perl/Time-Duration
 		dev-perl/TimeDate
 	)"
diff --git a/sys-apps/moreutils/moreutils-0.44.ebuild b/sys-apps/moreutils/moreutils-0.44.ebuild
new file mode 100644
index 000000000000..fa3fe53f70f3
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.44.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.44.ebuild,v 1.1 2011/03/29 19:40:22 radhermit Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a growing collection of the unix tools that nobody thought to write
+thirty years ago"
+HOMEPAGE="http://kitenet.net/~joey/code/moreutils/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+doc +perl"
+
+RDEPEND="perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.42-dtd-path.patch
+
+	# Don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' \
+			-e '/man1/d' \
+			Makefile
+	fi
+
+	# Don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_BIN=install install
+}