| 1 |
maekke 09/09/29 09:19:21 |
| 2 |
|
| 3 |
Modified: ChangeLog cocom-0.996.ebuild cocom-0.996-r1.ebuild |
| 4 |
Log: |
| 5 |
block media-gfx/hugin due to a file collision wrt bug #280241 |
| 6 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.10 dev-util/cocom/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/ChangeLog?rev=1.10&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/ChangeLog?rev=1.10&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/ChangeLog?r1=1.9&r2=1.10 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cocom/ChangeLog,v |
| 18 |
retrieving revision 1.9 |
| 19 |
retrieving revision 1.10 |
| 20 |
diff -u -r1.9 -r1.10 |
| 21 |
--- ChangeLog 1 Sep 2009 18:34:50 -0000 1.9 |
| 22 |
+++ ChangeLog 29 Sep 2009 09:19:20 -0000 1.10 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-util/cocom |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/ChangeLog,v 1.9 2009/09/01 18:34:50 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/ChangeLog,v 1.10 2009/09/29 09:19:20 maekke Exp $ |
| 28 |
+ |
| 29 |
+ 29 Sep 2009; Markus Meier <maekke@g.o> cocom-0.996.ebuild, |
| 30 |
+ cocom-0.996-r1.ebuild: |
| 31 |
+ block media-gfx/hugin due to a file collision wrt bug #280241 |
| 32 |
|
| 33 |
01 Sep 2009; Jeroen Roovers <jer@g.o> -cocom-0.995.ebuild, |
| 34 |
-files/cocom-0.995-gcc4.patch, cocom-0.996.ebuild, cocom-0.996-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-util/cocom/cocom-0.996.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: cocom-0.996.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- cocom-0.996.ebuild 1 Sep 2009 18:34:50 -0000 1.2 |
| 51 |
+++ cocom-0.996.ebuild 29 Sep 2009 09:19:20 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild,v 1.2 2009/09/01 18:34:50 jer Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996.ebuild,v 1.3 2009/09/29 09:19:20 maekke Exp $ |
| 57 |
|
| 58 |
inherit autotools |
| 59 |
|
| 60 |
@@ -12,6 +12,8 @@ |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 63 |
IUSE="" |
| 64 |
+RDEPEND="!media-gfx/hugin" |
| 65 |
+DEPEND="${RDEPEND}" |
| 66 |
|
| 67 |
src_unpack() { |
| 68 |
unpack ${A} |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.3 dev-util/cocom/cocom-0.996-r1.ebuild |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild?rev=1.3&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild?rev=1.3&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild?r1=1.2&r2=1.3 |
| 77 |
|
| 78 |
Index: cocom-0.996-r1.ebuild |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild,v |
| 81 |
retrieving revision 1.2 |
| 82 |
retrieving revision 1.3 |
| 83 |
diff -u -r1.2 -r1.3 |
| 84 |
--- cocom-0.996-r1.ebuild 1 Sep 2009 18:34:50 -0000 1.2 |
| 85 |
+++ cocom-0.996-r1.ebuild 29 Sep 2009 09:19:20 -0000 1.3 |
| 86 |
@@ -1,6 +1,6 @@ |
| 87 |
# Copyright 1999-2009 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild,v 1.2 2009/09/01 18:34:50 jer Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cocom/cocom-0.996-r1.ebuild,v 1.3 2009/09/29 09:19:20 maekke Exp $ |
| 91 |
|
| 92 |
EAPI="2" |
| 93 |
|
| 94 |
@@ -14,6 +14,8 @@ |
| 95 |
SLOT="0" |
| 96 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 97 |
IUSE="" |
| 98 |
+RDEPEND="!!media-gfx/hugin" |
| 99 |
+DEPEND="${RDEPEND}" |
| 100 |
|
| 101 |
src_prepare() { |
| 102 |
epatch "${FILESDIR}/${P}-configure.patch" |
Archives