Rename parallel command to moreutils_parallel because the one from sys-process/parallel is more advanced wrt #349225 by Helmut Jarausch

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

3 files changed, 82 insertions, 9 deletions

diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index 9817eed53965..acae1670e996 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.33 2011/09/05 07:04:40 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.34 2012/01/23 11:23:54 ssuominen Exp $
+
+*moreutils-0.45-r1 (23 Jan 2012)
+
+  23 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +moreutils-0.45-r1.ebuild:
+  Rename parallel command to moreutils_parallel because the one from
+  sys-process/parallel is more advanced wrt #349225 by Helmut Jarausch
 
   05 Sep 2011; Tim Harder <radhermit@gentoo.org>
   -files/moreutils-0.30-dtd-path.patch, -moreutils-0.39.ebuild,
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 72bca0268892..8f52ca5a41d6 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX moreutils-0.45-dtd-path.patch 3560 RMD160 c00f640b71aaea9610628808ae2b75fdf80fb713 SHA1 c9687f1af5c43154129f6a476871a4db490635d9 SHA256 fd2b53e05aaf2b9bfdf0acf23200686e1f8cdffc732155040f6a2003c30396b0
 DIST moreutils_0.45.tar.gz 44777 RMD160 318e2c3aa67645559157b3b32f8fbb4add09ce87 SHA1 4275e4e27e1d37a374d8f97db3aeb36fecb6cabc SHA256 f5ea101649e3ff3e7a903950219b16cf56d7af65c4e0080372875f8c3db46edb
+EBUILD moreutils-0.45-r1.ebuild 1498 RMD160 58a83746aa3d18b8c4814c6754f0bfa9ba86ed8c SHA1 12f47e13d183dc638bd54290fec7ab3e31d7c965 SHA256 0869cf2fc8c3a8991c0ddf7f76403cb3b3d71049702345f53c1dfa22927ae65f
 EBUILD moreutils-0.45.ebuild 1309 RMD160 85376c6fea3d72299830e4f3e16a8ec0b6ca5fad SHA1 c6d6649c9e00604328f9a7bafb013b9ae4ab1b4f SHA256 fb5f1419c835ab73d6d276b66b23c47a8c5fc4d32eb822726089ee55d03c55c7
-MISC ChangeLog 5148 RMD160 1e8208e1d1a49fb66a17f9aa1de3ad3bf23c90ae SHA1 5ae9a5938fc9275f53d13d6b787c215d16110664 SHA256 fa5aae16b7aba88d812ea9e37c598141c87d7bd37dcc01c0cd252cc97043b390
+MISC ChangeLog 5406 RMD160 d6854db8367b6e4d129543179994ea7c1c39596f SHA1 d2ca11362f5b572c083bf1be17995a9c80485331 SHA256 32afbc3062f61827828da9b26c0e940f3904fdc046e3ea0913750b109081f88e
 MISC metadata.xml 393 RMD160 40b0d9099e2efad8269ac2270831d59a730a2e27 SHA1 86840ad9403c70e88569db85e828e21d1c1e63c7 SHA256 43a43aba45d87b31f2081aa91fef2931bdf986be3438a727ebc5f8421a219a00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sb0ACgkQfXuS5UK5QB1MjAP/aoeEad/W+ci6SKA4zqTjaxY3
-Z5N1bjE5KKCcipTCDjZmMGz7DwtNWA/ly2UzapythS86bq/ZcUanvLDEvvDY1BcM
-6OzB2y2bHDNy2Bz3wJ29mSD95WmOmtQsoz6OK6eY1QDkMTMH1LtengdPZkauRiz2
-RapH4h7g8nCa61qvxO8=
-=tfsq
+iQEcBAEBAgAGBQJPHULAAAoJEEdUh39IaPFNxmYH/Rvi7mxfB3DO6RXV5yY9F2/l
+ITb/aOFiEZTRWdqr18hE1ryy7P+okmrRIP4xksQgHXnVZNqoZzZM46sj51G9nIYc
+AGSisF2RbeS9ti7DYpEuI03/cTIaGxcoxcjxmVtwUS9EohSaxckk3m0xbTMz4N+2
+gOm+fZ3RQq7h35qhR7FBQbVwsNfzGfWZtMPxrQSX578ngeq+iZZPf4NtvxDDq4U2
+GF9m53+WXJMFA+gOipWIhI2gQZrIR6cp8vvgCpzADxH4lEoz2JolDlMItfOAravQ
+sJwv9ll4nO41zyHXsrBa3wsisQQTfqluk+1gTup3fiUM3kh2Do9cwy12a6gU/Lw=
+=VKCK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/moreutils/moreutils-0.45-r1.ebuild b/sys-apps/moreutils/moreutils-0.45-r1.ebuild
new file mode 100644
index 000000000000..b1f20ec39d3a
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.45-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.45-r1.ebuild,v 1.1 2012/01/23 11:23:54 ssuominen Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs prefix
+
+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 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	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.45-dtd-path.patch
+	eprefixify "${S}/"*.docbook
+
+	# 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 PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	mv -vf "${ED}"usr/share/man/man1/{,${PN}_}parallel.1 || die
+	mv -vf "${ED}"usr/bin/{,${PN}_}parallel || die
+}