Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/autopano-sift: ChangeLog autopano-sift-2.4-r1.ebuild
Date: Sun, 23 Nov 2008 13:32:45
Message-Id: E1L4F4s-0006Ck-Vh@stork.gentoo.org
1 loki_val 08/11/23 13:32:42
2
3 Modified: ChangeLog autopano-sift-2.4-r1.ebuild
4 Log:
5 Preparation for gtk-sharp-2.12.6.
6 (Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64)
7
8 Revision Changes Path
9 1.22 media-gfx/autopano-sift/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/autopano-sift/ChangeLog?rev=1.22&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/autopano-sift/ChangeLog?rev=1.22&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/autopano-sift/ChangeLog?r1=1.21&r2=1.22
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v
18 retrieving revision 1.21
19 retrieving revision 1.22
20 diff -u -r1.21 -r1.22
21 --- ChangeLog 16 Aug 2008 11:27:43 -0000 1.21
22 +++ ChangeLog 23 Nov 2008 13:32:42 -0000 1.22
23 @@ -1,6 +1,10 @@
24 # ChangeLog for media-gfx/autopano-sift
25 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v 1.21 2008/08/16 11:27:43 maekke Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v 1.22 2008/11/23 13:32:42 loki_val Exp $
28 +
29 + 23 Nov 2008; Peter Alfredsen <loki_val@g.o>
30 + autopano-sift-2.4-r1.ebuild:
31 + Preparation for gtk-sharp-2.12.6.
32
33 16 Aug 2008; Markus Meier <maekke@g.o> autopano-sift-2.4-r1.ebuild:
34 block media-gfx/autopano-sift-C
35
36
37
38 1.8 media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild?rev=1.8&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild?rev=1.8&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild?r1=1.7&r2=1.8
43
44 Index: autopano-sift-2.4-r1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild,v
47 retrieving revision 1.7
48 retrieving revision 1.8
49 diff -u -r1.7 -r1.8
50 --- autopano-sift-2.4-r1.ebuild 16 Aug 2008 11:27:43 -0000 1.7
51 +++ autopano-sift-2.4-r1.ebuild 23 Nov 2008 13:32:42 -0000 1.8
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2008 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild,v 1.7 2008/08/16 11:27:43 maekke Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild,v 1.8 2008/11/23 13:32:42 loki_val Exp $
57
58 inherit mono eutils
59
60 @@ -15,12 +15,22 @@
61
62 RDEPEND="!media-gfx/autopano-sift-C
63 dev-lang/mono
64 - dev-dotnet/glade-sharp
65 + || ( >=dev-dotnet/gtk-sharp-2.12.6 dev-dotnet/glade-sharp )
66 dev-dotnet/gtk-sharp
67 >=dev-dotnet/libgdiplus-1.1.11"
68 DEPEND="${RDEPEND}
69 dev-util/pkgconfig"
70
71 +pkg_setup() {
72 + if has_version '>=dev-dotnet/gtk-sharp-2.12.6'
73 + then
74 + if ! built_with_use --missing false 'dev-dotnet/gtk-sharp' 'glade'
75 + then
76 + eerror "Please rebuild >=dev-dotnet/gtk-sharp-2.12.6 with USE='glade'"
77 + fi
78 + fi
79 +}
80 +
81 src_unpack() {
82 unpack ${A}
83
84 @@ -31,7 +41,7 @@
85 sed -i 's%pkg:gtk-sharp%pkg:gtk-sharp-2.0%g' Makefile util/Makefile \
86 util/autopanog/Makefile || die "sed failed"
87 fi
88 - if has_version '>=dev-dotnet/glade-sharp-2' ; then
89 + if has_version '>=dev-dotnet/glade-sharp-2' || has_version '>=dev-dotnet/gtk-sharp-2.12.6' ; then
90 sed -i 's%pkg:glade-sharp%pkg:glade-sharp-2.0%g' util/Makefile \
91 util/autopanog/Makefile || die "sed failed"
92 fi