diff options
| author |   Christian Faulhammer <fauli@gentoo.org> | 2010-12-21 11:10:15 +0000 |
|---|---|---|
| committer | Christian Faulhammer <fauli@gentoo.org> | 2010-12-21 11:10:15 +0000 |
| commit | 10ddda9d04aa9d9c3a4eb6cc0239881ee0648b10 (patch) | |
| tree | bf0be9bacf5f38b60cddc78992332c549f8c59b7 /sys-process/parallel | |
| parent | arm stable, bug #342927 (diff) | |
| download | gentoo-2-10ddda9d04aa9d9c3a4eb6cc0239881ee0648b10.tar.gz gentoo-2-10ddda9d04aa9d9c3a4eb6cc0239881ee0648b10.tar.bz2 gentoo-2-10ddda9d04aa9d9c3a4eb6cc0239881ee0648b10.zip | |
Block sys-apps/moreutils due to file collisions, see bug 349225 by Helmut Jarausch <jarausch AT igpm DOT rwth-aachen DOT de>
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'sys-process/parallel')
| -rw-r--r-- | sys-process/parallel/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-process/parallel/parallel-20101202.ebuild | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-process/parallel/ChangeLog b/sys-process/parallel/ChangeLog index 04821cf70f5c..28cc68bfb004 100644 --- a/sys-process/parallel/ChangeLog +++ b/sys-process/parallel/ChangeLog @@ -1,6 +1,11 @@ # 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.1 2010/12/20 17:01:27 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/ChangeLog,v 1.2 2010/12/21 11:10:15 fauli Exp $ + + 21 Dec 2010; Christian Faulhammer <fauli@gentoo.org> + parallel-20101202.ebuild: + Block sys-apps/moreutils due to file collisions, see bug 349225 by Helmut + Jarausch <jarausch AT igpm DOT rwth-aachen DOT de> *parallel-20101202 (20 Dec 2010) diff --git a/sys-process/parallel/parallel-20101202.ebuild b/sys-process/parallel/parallel-20101202.ebuild index 8406318b2ddb..775cc105d5c9 100644 --- a/sys-process/parallel/parallel-20101202.ebuild +++ b/sys-process/parallel/parallel-20101202.ebuild @@ -1,6 +1,6 @@ # 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.1 2010/12/20 17:01:27 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20101202.ebuild,v 1.2 2010/12/21 11:10:15 fauli Exp $ EAPI=3 @@ -14,7 +14,9 @@ KEYWORDS="~x86 ~amd64" IUSE="" RDEPEND="dev-lang/perl" -DEPEND="${RDEPEND}" +# Collision, reported upstream, see bug 349225 +DEPEND="${RDEPEND} + !sys-apps/moreutils" src_install() { emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html \ |