Revision bump dropping soversion checks since it's a pain to maintain around e-d-s bumps and causes breakage on, for example, tasque when running on 2.30. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 31 insertions, 13 deletions

diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 852c900b0a45..782251abc49c 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,15 @@
 # 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.50 2010/06/19 18:03:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.51 2010/10/07 08:43:32 pacho Exp $
+
+*evolution-sharp-0.21.1-r1 (07 Oct 2010)
+
+  07 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+  -evolution-sharp-0.20.0.ebuild, +evolution-sharp-0.21.1-r1.ebuild,
+  +files/evolution-sharp-0.21.1-drop-soversion.patch:
+  Revision bump dropping soversion checks since it's a pain to maintain
+  around e-d-s bumps and causes breakage on, for example, tasque when
+  running on 2.30. Remove old.
 
   19 Jun 2010; Pacho Ramos <pacho@gentoo.org> evolution-sharp-0.21.1.ebuild,
   +files/evolution-sharp-0.21.1-version-check.patch:
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1-r1.ebuild
index 64931751e404..e8c15e9c5496 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.20.0.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1-r1.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.20.0.ebuild,v 1.3 2009/09/02 20:57:09 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.21.1-r1.ebuild,v 1.1 2010/10/07 08:43:32 pacho Exp $
 
 EAPI=2
 
@@ -16,12 +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.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}
@@ -30,11 +25,10 @@ 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"
+	# Drop .so versions since it's a headache to maintain otherwise
+	epatch "${FILESDIR}/${PN}-0.21.1-drop-soversion.patch"
 	eautoreconf
 }
 
diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-drop-soversion.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-drop-soversion.patch
new file mode 100644
index 000000000000..6a065e299989
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.21.1-drop-soversion.patch
@@ -0,0 +1,15 @@
+--- evolution/evolution-sharp.dll.config.in~	2009-05-26 09:25:06.000000000 +0200
++++ evolution/evolution-sharp.dll.config.in	2010-10-07 10:33:59.000000000 +0200
+@@ -1,7 +1,7 @@
+ <configuration>
+-  <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.@EBOOK_SOVERSION@@LIB_SUFFIX@"/>
+-  <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.@ECAL_SOVERSION@@LIB_SUFFIX@"/>
+-  <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.@EDS_SOVERSION@@LIB_SUFFIX@"/>
+-  <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.@EBACKEND_SOVERSION@@LIB_SUFFIX@"/>
+-  <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.@EDATACAL_SOVERSION@@LIB_SUFFIX@"/>
++  <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@"/>
++  <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@"/>
++  <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@"/>
++  <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@"/>
++  <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@"/>
+ </configuration>