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

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

6 files changed, 79 insertions, 92 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/Manifest b/sys-apps/moreutils/Manifest
index 752fcd0f16fb..dc913d6ed4ec 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -4,23 +4,21 @@ Hash: SHA1
 AUX moreutils-0.30-dtd-path.patch 2894 RMD160 e2ebb2d3ad8f72230fa0ea4f6c9e8bfffd712d96 SHA1 d3420b1fbf6dce6dffa06766e50533c27abdab13 SHA256 253208d704080b26e7e1b5c8ee6006acf9d2a441a37039c573c5e0ae57c1af70
 AUX moreutils-0.42-dtd-path.patch 3368 RMD160 71ff93fa1149040e8820044aa3c3de77403a0718 SHA1 d0a245ab92e9b77c9f3972eff6f09e62b1bdc0e2 SHA256 05e066eb79d242ccfd86b49ab09e6e0915465ba5bbe6dc5e6dc88cb4df407862
 DIST moreutils_0.39.tar.gz 40591 RMD160 5b7be7b4b07497c04f5792021bf1dc54ec5d07a8 SHA1 ebf83f430a8c30b4f787e0b469ef2a37b6e2ae42 SHA256 6c982ed4c863f385da1ec9f90665cb9000c84f59b56340ca0832fea2d4b8bb98
-DIST moreutils_0.40.tar.gz 41625 RMD160 48a44657a35114198b984188dd54357db75596ab SHA1 614731f3534684a5e69747aee4ab59fd5886d0df SHA256 0ab604692b4c7a3b1398018af44e1d64a2180d618a2c6f89cc482efeb83ffd9e
-DIST moreutils_0.42.tar.gz 43296 RMD160 a7aa45bd8c5aaad6a3b67961ecb843fff5f1e09c SHA1 8644f01fe27a042295c92c92ae64a837e88d9986 SHA256 71cf9b37dd5093d51c4c7bbebca786bee54806b13b9c6be683f486fc0d5b614f
 DIST moreutils_0.43.tar.gz 44233 RMD160 66d8096eaa0274b6abc6127fce8693cfd99974e8 SHA1 75cee1c077ccee4e8a38d77d846edc7fe2be12f5 SHA256 09e31e4f308bb1e8f9ab4f7d57f9e3c8246e3e3824015534af59763114a85c7d
+DIST moreutils_0.44.tar.gz 44685 RMD160 2a23a175a7e9d3704dbadd4020b9d01d42a94eeb SHA1 73b7cb3b06f74d61a613f236f00bd5c81ebbfbce SHA256 53ec2a967b4ab39cd29e5f9116b6f7b75eefdb97e768fe7b1b04fb688d236604
 EBUILD moreutils-0.39.ebuild 947 RMD160 a4e98c7dd721d5be4788b4eb1f8633f5114117b3 SHA1 1f74e5992347749fa28e438e25a02f2b38888353 SHA256 ada4e9037c11b287ad2752c8e0c78415e92dd971d6ccf233190bc7117d521875
-EBUILD moreutils-0.40.ebuild 956 RMD160 ded15e6f9a34d710dcd2fd8e91d21da890737c9a SHA1 ef8b7d52932ae1055a6b4e47641310df355915b7 SHA256 e3b613edd8e19c335394efe8dba9474e1de95a6363d615aba63c54a02d220540
-EBUILD moreutils-0.42.ebuild 950 RMD160 06ec415407fb50f158356e6ce428315a088afcca SHA1 f7b0f2bdb9be20a2b4244c826b39f6eb0221d02c SHA256 9d6d3383d32ad64ee3bf38087699aa09b9ca7c756bcebeffe788d1c1220ea009
-EBUILD moreutils-0.43.ebuild 1207 RMD160 13b155a0d7a2cd12af478f99f9f4951a5e0da824 SHA1 16db010f4ff4b7c81bac0e51a529ff26fb37ebce SHA256 6dc780d019032b9388847d67926286c84573b133facb7e76bc56b35a8608f963
-MISC ChangeLog 3253 RMD160 9ec768d85ffceddfc5cf9a16936127fd7d03e418 SHA1 4d442bdd968fd217b6043b5b995c871b81eb42cb SHA256 c42823718bc42cbe58cc404d6aeea978f8646cae30dbbb853e15b365c2d8d79a
+EBUILD moreutils-0.43.ebuild 1220 RMD160 d778730c6d738366c9ff629e4131863d42d4f1ff SHA1 f0f2b3e82d0c9f125330c1023ab09fc7d523384b SHA256 05f801f8b0ad8c34d3532872a8b2440b3fabb3d5799768c4366fe8e832ee6731
+EBUILD moreutils-0.44.ebuild 1220 RMD160 2da336260c13ce782d6aae3fcde79808b794eb0c SHA1 5ea8c6233b0c2cf91145dcea97c097c33eb47c4f SHA256 f0f19f85a329229954e85e85ab0ca7c82cebd3d2e972fe6ae3b752219d387ace
+MISC ChangeLog 3565 RMD160 95e207dddd05a395e0e55c59ba986049cff5a3ef SHA1 535a9be8121c3b8f528acc081ab6523f86979464 SHA256 67f651d22c62230201e3ad0c0e6fcdf9a2fd8681c136b671424e0c2f71de4641
 MISC metadata.xml 414 RMD160 4c861a25d694c22ac898923ad9d0042afd5a9b6c SHA1 ff6b197f5cae171764c7dd73a8d7e850e9165dc2 SHA256 25b18aad2743d0d2a5f3c076e9b38cb52e847977b651bb924393f1978afa3aea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNeGv0AAoJEEqz6FtPBkyjMd0IAJYd9QxamMgv9LEFKvBgkLEF
-xXVovobyCfeqluU+M9XaRizod0c51Bdbzu/GpZnaH15exv/y1LmAaQMuvZ/Nf8lf
-3csppdhadPP2UmmPpCfy/XpYB4iEj+eo7+qVEZdtclaRAFUppXIWI+ed5A2GWCb3
-FE6Ade73K60EDl8Yq9/2AY4hdofimD3oNjoyEg+7IIBAChZ3HKws18CJ/lbnEh4g
-ZvAoN/Rnkx0Ll26speWFP5Ktu0CwMvPMQHZwKPISIOWvvFaFxt/N7GmNOt97Oems
-BfbfeYXUOFilbiGQeoc5qkrv7SA7yiKD4bBRyFqr1w8DxV2giQSvH2fQfxDnz7Q=
-=cVYX
+iQEcBAEBAgAGBQJNkjWvAAoJEEqz6FtPBkyjYIoH/iOp9QREs1lGFW42F0C0khjE
+hljzs8aOMAkf2vvp/bL3qFhFeeNcxWK1zcdhcrvTvbIHARbxZy1vCyAwFlWuZ2iM
+sxb9UmcK59fYu0+q8pxVEuT0eGBP4wd6wjP4wvX+vmQ97n6BYrGcHgx0S6pJt/AL
+rug/9bG2RP9WfGhy6NrWFSAEcg/kqBv89aBAvtIBOWgEtf3iBPhE8Y4/BcbcUT6T
+oiXAF41mZIL4wdLP+JcwC9cMjtYq1Dpv+YdTZc58KroZsDD2V6fYTEzt8CGkkEpN
+CAV/+3F6U6CU77SqXcavNNMTA4k8BncaIAeC7NcZqgkrCUfzOBxgM9I6tEwrXQY=
+=t66D
 -----END PGP SIGNATURE-----
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
+}