Remove file collision with sys-apps/moreutils by renaming binary and man page to gparallel, patch by maintainer Ryoichiro Suzuki

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 54 insertions, 27 deletions

diff --git a/sys-process/parallel/ChangeLog b/sys-process/parallel/ChangeLog
index e650e30fe9b5..9b231e493e14 100644
--- a/sys-process/parallel/ChangeLog
+++ b/sys-process/parallel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/parallel
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/ChangeLog,v 1.3 2010/12/24 06:25:48 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/ChangeLog,v 1.4 2011/01/03 15:49:58 fauli Exp $
+
+*parallel-20101222-r1 (03 Jan 2011)
+
+  03 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
+  -parallel-20101202.ebuild, +parallel-20101222-r1.ebuild:
+  Remove file collision with sys-apps/moreutils by renaming binary and man
+  page to gparallel, patch by maintainer Ryoichiro Suzuki
 
 *parallel-20101222 (24 Dec 2010)
 
diff --git a/sys-process/parallel/parallel-20101202.ebuild b/sys-process/parallel/parallel-20101202.ebuild
deleted file mode 100644
index 775cc105d5c9..000000000000
--- a/sys-process/parallel/parallel-20101202.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20101202.ebuild,v 1.2 2010/12/21 11:10:15 fauli Exp $
-
-EAPI=3
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="http://www.gnu.org/software/parallel/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-# Collision, reported upstream, see bug 349225
-DEPEND="${RDEPEND}
-	!sys-apps/moreutils"
-
-src_install() {
-	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html \
-		|| die
-	dodoc NEWS README || die
-}
diff --git a/sys-process/parallel/parallel-20101222-r1.ebuild b/sys-process/parallel/parallel-20101222-r1.ebuild
new file mode 100644
index 000000000000..95cd35d5490b
--- /dev/null
+++ b/sys-process/parallel/parallel-20101222-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20101222-r1.ebuild,v 1.1 2011/01/03 15:49:58 fauli Exp $
+
+EAPI=3
+
+DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
+HOMEPAGE="http://www.gnu.org/software/parallel/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e '/^[ \t]*$Global::progname[ \t]*=/ s/parallel/gparallel/' \
+		src/parallel || die
+}
+
+src_configure() {
+	econf --program-transform-name='s/parallel/gparallel/' || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html || die
+
+	# --program-transform-* care about only bin and man.
+	mv "${D}"/usr/share/doc/${PF}/html/{,g}parallel.html || die
+
+	rm -f "${D}"/usr/bin/sem || die
+	dosym gparallel /usr/bin/sem
+	dodoc NEWS README || die
+}
+
+pkg_postinst() {
+	ewarn "'parallel' command has been renamed to 'gparallel' to avoid"
+	ewarn "a naming collision with sys-apps/moreutils."
+	elog "To distribute jobs to remote machines you'll need these dependencies"
+	elog " net-misc/openssh"
+	elog " net-misc/rsync"
+}