Gentoo Archives: gentoo-commits

From: "Markus Meier (maekke)" <maekke@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/hugin: hugin-2009.2.0_beta3.ebuild hugin-0.7.0.ebuild ChangeLog hugin-0.8.0.ebuild
Date: Tue, 29 Sep 2009 09:23:01
Message-Id: E1MsYv9-00074J-3Q@stork.gentoo.org
1 maekke 09/09/29 09:22:55
2
3 Modified: hugin-2009.2.0_beta3.ebuild hugin-0.7.0.ebuild
4 ChangeLog hugin-0.8.0.ebuild
5 Log:
6 block dev-util/cocom due to a file collision wrt bug #280241
7 (Portage version: 2.2_rc42/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-gfx/hugin/hugin-2009.2.0_beta3.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild?r1=1.1&r2=1.2
15
16 Index: hugin-2009.2.0_beta3.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- hugin-2009.2.0_beta3.ebuild 13 Sep 2009 14:11:54 -0000 1.1
23 +++ hugin-2009.2.0_beta3.ebuild 29 Sep 2009 09:22:54 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2009 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild,v 1.1 2009/09/13 14:11:54 maekke Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-2009.2.0_beta3.ebuild,v 1.2 2009/09/29 09:22:54 maekke Exp $
29
30 EAPI="2"
31 WX_GTK_VER="2.8"
32 @@ -17,7 +17,9 @@
33 LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
34 IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
35
36 -DEPEND="app-arch/zip
37 +DEPEND="
38 + !!dev-util/cocom
39 + app-arch/zip
40 >=dev-libs/boost-1.35.0-r5
41 >=media-gfx/enblend-3.0_p20080807
42 media-gfx/exiv2
43
44
45
46 1.10 media-gfx/hugin/hugin-0.7.0.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild?rev=1.10&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild?rev=1.10&content-type=text/plain
50 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild?r1=1.9&r2=1.10
51
52 Index: hugin-0.7.0.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v
55 retrieving revision 1.9
56 retrieving revision 1.10
57 diff -u -r1.9 -r1.10
58 --- hugin-0.7.0.ebuild 13 Sep 2009 14:11:54 -0000 1.9
59 +++ hugin-0.7.0.ebuild 29 Sep 2009 09:22:54 -0000 1.10
60 @@ -1,6 +1,6 @@
61 # Copyright 1999-2009 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.9 2009/09/13 14:11:54 maekke Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.7.0.ebuild,v 1.10 2009/09/29 09:22:54 maekke Exp $
65
66 EAPI="2"
67 WX_GTK_VER="2.8"
68 @@ -16,6 +16,7 @@
69 IUSE="+sift"
70
71 DEPEND="
72 + !!dev-util/cocom
73 app-arch/zip
74 || ( >=dev-libs/boost-1.34 =dev-libs/boost-1.33*[threads] )
75 >=media-gfx/enblend-3.0_p20080807
76
77
78
79 1.72 media-gfx/hugin/ChangeLog
80
81 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.72&view=markup
82 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/ChangeLog?rev=1.72&content-type=text/plain
83 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/ChangeLog?r1=1.71&r2=1.72
84
85 Index: ChangeLog
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v
88 retrieving revision 1.71
89 retrieving revision 1.72
90 diff -u -r1.71 -r1.72
91 --- ChangeLog 13 Sep 2009 14:11:54 -0000 1.71
92 +++ ChangeLog 29 Sep 2009 09:22:54 -0000 1.72
93 @@ -1,6 +1,10 @@
94 # ChangeLog for media-gfx/hugin
95 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
96 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.71 2009/09/13 14:11:54 maekke Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/ChangeLog,v 1.72 2009/09/29 09:22:54 maekke Exp $
98 +
99 + 29 Sep 2009; Markus Meier <maekke@g.o> hugin-0.7.0.ebuild,
100 + hugin-0.8.0.ebuild, hugin-2009.2.0_beta3.ebuild:
101 + block dev-util/cocom due to a file collision wrt bug #280241
102
103 *hugin-2009.2.0_beta3 (13 Sep 2009)
104
105
106
107
108 1.3 media-gfx/hugin/hugin-0.8.0.ebuild
109
110 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild?rev=1.3&view=markup
111 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild?rev=1.3&content-type=text/plain
112 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild?r1=1.2&r2=1.3
113
114 Index: hugin-0.8.0.ebuild
115 ===================================================================
116 RCS file: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild,v
117 retrieving revision 1.2
118 retrieving revision 1.3
119 diff -u -r1.2 -r1.3
120 --- hugin-0.8.0.ebuild 1 Aug 2009 09:49:21 -0000 1.2
121 +++ hugin-0.8.0.ebuild 29 Sep 2009 09:22:54 -0000 1.3
122 @@ -1,6 +1,6 @@
123 # Copyright 1999-2009 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild,v 1.2 2009/08/01 09:49:21 maekke Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/hugin/hugin-0.8.0.ebuild,v 1.3 2009/09/29 09:22:54 maekke Exp $
127
128 EAPI="2"
129 WX_GTK_VER="2.8"
130 @@ -17,7 +17,9 @@
131 LANGS=" bg ca cs de en_GB es fr hu it ja ko nl pl pt_BR ru sk sl sv uk zh_CN zh_TW"
132 IUSE="lapack +sift $(echo ${LANGS//\ /\ linguas_})"
133
134 -DEPEND="app-arch/zip
135 +DEPEND="
136 + !!dev-util/cocom
137 + app-arch/zip
138 >=dev-libs/boost-1.35.0-r5
139 >=media-gfx/enblend-3.0_p20080807
140 media-gfx/exiv2