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 | ade4c9ccebd20dbb232c596052273ee4581648d0 (patch) | |
| tree | aad15aa77700e6b28cf0a264915ec41d4152ce8e /sys-process/parallel | |
| parent | arm stable, bug #342927 (diff) | |
| download | historical-ade4c9ccebd20dbb232c596052273ee4581648d0.tar.gz historical-ade4c9ccebd20dbb232c596052273ee4581648d0.tar.bz2 historical-ade4c9ccebd20dbb232c596052273ee4581648d0.zip | |
Block sys-apps/moreutils due to file collisions, see bug 349225 by Helmut Jarausch <jarausch AT igpm DOT rwth-aachen DOT de>
Package-Manager: portage-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/Manifest | 10 | ||||
| -rw-r--r-- | sys-process/parallel/parallel-20101202.ebuild | 6 |
3 files changed, 15 insertions, 8 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/Manifest b/sys-process/parallel/Manifest index 2ff8b9eeb491..341ba194df1d 100644 --- a/sys-process/parallel/Manifest +++ b/sys-process/parallel/Manifest @@ -2,13 +2,13 @@ Hash: SHA1 DIST parallel-20101202.tar.bz2 148142 RMD160 fe3ff92956b67047301f4eeb59a3c55ba374816c SHA1 718e3855e84198725bc4564816a0fd852b9446b8 SHA256 d110e9b0b861a1662abab3d9f2576ed25e78b7d0d61d20f289abc2969cb6d294 -EBUILD parallel-20101202.ebuild 635 RMD160 f4a2bb8dd74dad08654095e2a95efe36a6ed0f5f SHA1 82ba0648c35e6043634af58561224b98c7cf6d93 SHA256 b67992ecfdf7739cdfaaf57cbe3afeb147794cacfbd268ce4e51f0c752189e4f -MISC ChangeLog 472 RMD160 6f34118910ccd5683411ec92073a761207e13dae SHA1 8b808845e3f5dfd3b5808b642891985e314b2661 SHA256 1d278f9fd73e62fb4e155659e584a316d6d1982d4b410e062dbee8dc3ddefefe +EBUILD parallel-20101202.ebuild 703 RMD160 6b65820795db863e1fcd94fbcda30dbbf2ed9c1d SHA1 53ab8d1888adf995e4cceb4487ccff7542f4e54e SHA256 1205b424264a12fb8145a73640117bb3dfbd6305c45a9ca0aadc933ca7b73d26 +MISC ChangeLog 685 RMD160 b369ad3291d98bec6ca729088be7c669dfa833e4 SHA1 94f0e4493641c935239b20c65c3c7aa87e577ca5 SHA256 5a5831dbdb7bcd840e3723a7ede04fc7ca83c7b5a7360cc48ac1c4a31caf0ba7 MISC metadata.xml 1112 RMD160 10814ca695996d1226bd344ec2e01c561338bed6 SHA1 d630cf2a12c471bdb1a2b9725e357e0622903c33 SHA256 553523eefd96c48fa7f568b720719c508de2631ccb78e5a9d2aa1dc362c7d0cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAk0PjIsACgkQNQqtfCuFneNC5ACeM9GMMrJg0jKqOxxxEWbgjp7D -NtsAnRpXK+50Gt0VJsW+y1mKt7KqoJQy -=oI02 +iEYEARECAAYFAk0Qi78ACgkQNQqtfCuFnePYpACfZkNbtY7xF/0gGdR3Q1kRLnYk +IO8Anj+smL+OG1t4YelYo8AGnJ6dW0jq +=yiI2 -----END PGP SIGNATURE----- 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 \ |