summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-11-23 13:32:42 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-11-23 13:32:42 +0000
commit6794cf981ae14ea8095568a649029177fee23b57 (patch)
treee687ad7f60b7f3cd777517a82c72d3ecf1e3f8d9 /media-gfx/autopano-sift
parentbump (diff)
downloadgentoo-2-6794cf981ae14ea8095568a649029177fee23b57.tar.gz
gentoo-2-6794cf981ae14ea8095568a649029177fee23b57.tar.bz2
gentoo-2-6794cf981ae14ea8095568a649029177fee23b57.zip
Preparation for gtk-sharp-2.12.6.
(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64)
Diffstat (limited to 'media-gfx/autopano-sift')
-rw-r--r--media-gfx/autopano-sift/ChangeLog6
-rw-r--r--media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild16
2 files changed, 18 insertions, 4 deletions
diff --git a/media-gfx/autopano-sift/ChangeLog b/media-gfx/autopano-sift/ChangeLog
index 32c198ea018c..2dd513632562 100644
--- a/media-gfx/autopano-sift/ChangeLog
+++ b/media-gfx/autopano-sift/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/autopano-sift
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v 1.21 2008/08/16 11:27:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/autopano-sift/ChangeLog,v 1.22 2008/11/23 13:32:42 loki_val Exp $
+
+ 23 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+ autopano-sift-2.4-r1.ebuild:
+ Preparation for gtk-sharp-2.12.6.
16 Aug 2008; Markus Meier <maekke@gentoo.org> autopano-sift-2.4-r1.ebuild:
block media-gfx/autopano-sift-C
diff --git a/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild b/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild
index 3a3a5265eb7e..9ff639c193fd 100644
--- a/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild
+++ b/media-gfx/autopano-sift/autopano-sift-2.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
inherit mono eutils
@@ -15,12 +15,22 @@ IUSE=""
RDEPEND="!media-gfx/autopano-sift-C
dev-lang/mono
- dev-dotnet/glade-sharp
+ || ( >=dev-dotnet/gtk-sharp-2.12.6 dev-dotnet/glade-sharp )
dev-dotnet/gtk-sharp
>=dev-dotnet/libgdiplus-1.1.11"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+pkg_setup() {
+ if has_version '>=dev-dotnet/gtk-sharp-2.12.6'
+ then
+ if ! built_with_use --missing false 'dev-dotnet/gtk-sharp' 'glade'
+ then
+ eerror "Please rebuild >=dev-dotnet/gtk-sharp-2.12.6 with USE='glade'"
+ fi
+ fi
+}
+
src_unpack() {
unpack ${A}
@@ -31,7 +41,7 @@ src_unpack() {
sed -i 's%pkg:gtk-sharp%pkg:gtk-sharp-2.0%g' Makefile util/Makefile \
util/autopanog/Makefile || die "sed failed"
fi
- if has_version '>=dev-dotnet/glade-sharp-2' ; then
+ if has_version '>=dev-dotnet/glade-sharp-2' || has_version '>=dev-dotnet/gtk-sharp-2.12.6' ; then
sed -i 's%pkg:glade-sharp%pkg:glade-sharp-2.0%g' util/Makefile \
util/autopanog/Makefile || die "sed failed"
fi