Remove linkage to gtk-sharp-1.x, thanks to Fabio Bonfante for reporting the problem in bug #124581

(Portage version: 2.1_pre5-r3)

6 files changed, 56 insertions, 16 deletions

diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 46285b5eaef1..f55811ed86c4 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/evolution-sharp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.3 2006/01/04 01:23:06 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.4 2006/03/04 18:59:54 dsd Exp $
+
+*evolution-sharp-0.10.2-r1 (04 Mar 2006)
+
+  04 Mar 2006; Daniel Drake <dsd@gentoo.org>
+  +files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch,
+  -evolution-sharp-0.10.2.ebuild, +evolution-sharp-0.10.2-r1.ebuild:
+  Remove linkage to gtk-sharp-1.x, thanks to Fabio Bonfante for reporting the
+  problem in bug #124581
 
   04 Jan 2006; Luis Medinas <metalgod@gentoo.org>
   evolution-sharp-0.10.2.ebuild:
diff --git a/dev-dotnet/evolution-sharp/Manifest b/dev-dotnet/evolution-sharp/Manifest
index 9ad619b3a355..b2f754eaa1e9 100644
--- a/dev-dotnet/evolution-sharp/Manifest
+++ b/dev-dotnet/evolution-sharp/Manifest
@@ -1,14 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1ff99997a7ae6394006ef18bba5b9278 ChangeLog 604
-MD5 7a3a79c65223982e6f227f2dde499e0d evolution-sharp-0.10.2.ebuild 738
-MD5 57940e36815a8a991745927dc9c914dc files/digest-evolution-sharp-0.10.2 75
+RMD160 f595ea4e89f7bd7c668659757dc38a82e3cda448 ChangeLog 604
+SHA256 f6b89827b47fec6f32a314422eb9e6a273c1d174da4b30ecd5c3c69639f5698c ChangeLog 604
+MD5 1198e16012a18b3eae70ae5c4a722137 evolution-sharp-0.10.2-r1.ebuild 867
+RMD160 0b687ba5726aebd296777caf09eda2ae916d9bdf evolution-sharp-0.10.2-r1.ebuild 867
+SHA256 f9c8a176585475e45d41989dc14aa38ae1bd079a337a2e09402e10901b103192 evolution-sharp-0.10.2-r1.ebuild 867
+MD5 c290aaec6de69da9bef4ef8b73d6da64 files/digest-evolution-sharp-0.10.2-r1 271
+RMD160 d3cc15e676309f077c603dc11a9003e3b0d8c1c6 files/digest-evolution-sharp-0.10.2-r1 271
+SHA256 ed2200da9c1998588564d78d0e95b090b0b02deb3de83358b7a62277db0f3c66 files/digest-evolution-sharp-0.10.2-r1 271
+MD5 1f1221967325e4cc7dd03afa77696c46 files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch 893
+RMD160 6d7a03937368cc9c46ca7482061d96f272f87a8c files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch 893
+SHA256 b4fdb230525fa2633747f40262aad21f1a8c7de9afbf6a42c68b0fb4f493d933 files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch 893
 MD5 41c8c61dcf74c45eb359a4a41958abb3 metadata.xml 308
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuyNHwUpWvClEHQoRAunfAJsHMFzQw0DsikSEClYmvIL71/Z/mQCfZwnB
-qQjls4r5IAqRhjXbJ5OccC0=
-=TqE0
------END PGP SIGNATURE-----
+RMD160 6070e5bc9d8a4e0983004f0e24da1de81f52d2c4 metadata.xml 308
+SHA256 d4e9c60cc0ce735082c4f3cb0837a68a34a51d6bfc38dc2b2bd2ce044e7c7259 metadata.xml 308
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2-r1.ebuild
index a970573e0b32..f6f5caa7eb11 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.10.2.ebuild,v 1.3 2006/01/04 01:23:06 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2-r1.ebuild,v 1.1 2006/03/04 18:59:54 dsd Exp $
 
-inherit mono versionator
+inherit mono versionator eutils
 DESCRIPTION="Mono bindings for Evolution"
 HOMEPAGE="http://www.gnome.org/projects/beagle/"
 SRC_URI="mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
@@ -18,6 +18,14 @@ DEPEND=">=gnome-extra/evolution-data-server-1.2
 	>=dev-dotnet/gtk-sharp-2.3.90
 	>=mail-client/evolution-2.2.0"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Bug 124581, fixed upstream
+	epatch ${FILESDIR}/${P}-use-glibsharpglue-2.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
diff --git a/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2 b/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2
deleted file mode 100644
index 89ab1d997af6..000000000000
--- a/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66957006f02706490d244d4f01ec542d evolution-sharp-0.10.2.tar.bz2 297442
diff --git a/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2-r1 b/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2-r1
new file mode 100644
index 000000000000..2d87550fd260
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2-r1
@@ -0,0 +1,3 @@
+MD5 66957006f02706490d244d4f01ec542d evolution-sharp-0.10.2.tar.bz2 297442
+RMD160 88a8ac7e194bffc2dfb316406e8d84b42c33d437 evolution-sharp-0.10.2.tar.bz2 297442
+SHA256 a564577da703d2a2c478818af8b5295218c09dd2b2d2190d8071b3ec96e2cecf evolution-sharp-0.10.2.tar.bz2 297442
diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch
new file mode 100644
index 000000000000..3710b6626bfc
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.10.2-use-glibsharpglue-2.patch
@@ -0,0 +1,21 @@
+Index: evolution/src/GLibUtil.cs
+===================================================================
+RCS file: /cvs/gnome/evolution-sharp/evolution/src/GLibUtil.cs,v
+retrieving revision 1.2
+diff -u -B -p -r1.2 GLibUtil.cs
+--- evolution/src/GLibUtil.cs	12 Sep 2005 21:00:27 -0000	1.2
++++ evolution/src/GLibUtil.cs	4 Mar 2006 18:46:37 -0000
+@@ -13,10 +13,10 @@ namespace Evolution {
+ 		[DllImport("libglib-2.0.so.0")]
+ 		public static extern int g_slist_length (IntPtr slist);
+ 		
+-                [DllImport("glibsharpglue")]
+-                public static extern IntPtr gtksharp_slist_get_data (IntPtr slist);
++		[DllImport("glibsharpglue-2")]
++		public static extern IntPtr gtksharp_slist_get_data (IntPtr slist);
+ 
+-		[DllImport("glibsharpglue")]
++		[DllImport("glibsharpglue-2")]
+ 		public static extern  IntPtr gtksharp_slist_get_next (IntPtr slist);
+  
+ 		[DllImport("libglib-2.0.so.0")]