diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2010-06-19 18:03:47 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2010-06-19 18:03:47 +0000 |
| commit | c6d0c883f93222dce3a321c599797f80337b9dc8 (patch) | |
| tree | a0bc67b0ebcbf188908d9f185a4228934c6856bc /dev-dotnet | |
| parent | Add dependency on dev-python/pyasn1 (bug #316347). (diff) | |
| download | gentoo-2-c6d0c883f93222dce3a321c599797f80337b9dc8.tar.gz gentoo-2-c6d0c883f93222dce3a321c599797f80337b9dc8.tar.bz2 gentoo-2-c6d0c883f93222dce3a321c599797f80337b9dc8.zip | |
Use fedora patch to clean e-d-s version checking
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-dotnet')
3 files changed, 23 insertions, 15 deletions
diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog index f801872ff540..852c900b0a45 100644 --- a/dev-dotnet/evolution-sharp/ChangeLog +++ b/dev-dotnet/evolution-sharp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-dotnet/evolution-sharp # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.49 2010/02/25 18:43:05 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.50 2010/06/19 18:03:47 pacho Exp $ + + 19 Jun 2010; Pacho Ramos <pacho@gentoo.org> evolution-sharp-0.21.1.ebuild, + +files/evolution-sharp-0.21.1-version-check.patch: + Use fedora patch to clean e-d-s version checking and allow this to work + with Gnome 2.30 25 Feb 2010; Mark Loeser <halcy0n@gentoo.org> -evolution-sharp-0.18.1.ebuild: diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild index 4917d18369e6..08de172cdd1b 100644 --- a/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild +++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild,v 1.5 2009/10/24 13:13:08 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1.ebuild,v 1.6 2010/06/19 18:03:47 pacho Exp $ EAPI=2 @@ -16,14 +16,7 @@ IUSE="" # Does not build with <eds-2.24.0 # http://bugzilla.gnome.org/show_bug.cgi?id=563301 -RDEPEND=" - || ( - =gnome-extra/evolution-data-server-2.28* - =gnome-extra/evolution-data-server-2.27* - =gnome-extra/evolution-data-server-2.26* - =gnome-extra/evolution-data-server-2.25* - =gnome-extra/evolution-data-server-2.24* - ) +RDEPEND=">=gnome-extra/evolution-data-server-2.24 >=dev-dotnet/glib-sharp-2.12 >=dev-lang/mono-2" DEPEND="${RDEPEND} @@ -32,10 +25,7 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { - #Workaround for upstream Nazi version requirements. - sed -i \ - -e 's:2.27.4:2.29.0:' \ - configure.in || die "Sed failed" + epatch "${FILESDIR}/${PN}-0.21.1-version-check.patch" epatch "${FILESDIR}/${PN}-0.21.1-gtk-sharp-dropped.patch" eautoreconf } diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-version-check.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-version-check.patch new file mode 100644 index 000000000000..9a2ebe95e24e --- /dev/null +++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-version-check.patch @@ -0,0 +1,13 @@ +diff -up evolution-sharp-0.21.1/configure.in.fix-retarded-version-check evolution-sharp-0.21.1/configure.in +--- evolution-sharp-0.21.1/configure.in.fix-retarded-version-check 2009-08-20 21:46:34.000000000 -0400 ++++ evolution-sharp-0.21.1/configure.in 2009-08-20 21:47:16.000000000 -0400 +@@ -16,8 +16,7 @@ fi + PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no])) + PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no])) + PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no])) +-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27.4, edsver="2.24", AC_MSG_RESULT([no])) +-PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27.4, edsver="unsupported", AC_MSG_RESULT([no])) ++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92, edsver="2.24", AC_MSG_RESULT([no])) + + if test "x$edsver" = "x1.8"; then + EDS_VERSION=-1.2 |