Fix so that beagle-0.2.4 and evo-2.6 can compile

(Portage version: 2.1_pre7-r5)

5 files changed, 82 insertions, 14 deletions

diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 4ccd24510e56..fcca6fd3c79f 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.6 2006/04/08 11:44:39 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.7 2006/04/09 15:24:49 cretin Exp $
+
+*evolution-sharp-0.10.2-r2 (09 Apr 2006)
+
+  09 Apr 2006; Stefan Jones <cretin@gentoo.org>
+  +files/evolution-sharp-0.10.2-check-evo-2.6.patch,
+  +evolution-sharp-0.10.2-r2.ebuild:
+  Fix so that beagle-0.2.4 and evo-2.6 can compile
 
   08 Apr 2006; Herbie Hopkins <herbs@gentoo.org>
   evolution-sharp-0.10.2-r1.ebuild:
diff --git a/dev-dotnet/evolution-sharp/Manifest b/dev-dotnet/evolution-sharp/Manifest
index e9d2aba795ce..771a9786cc8f 100644
--- a/dev-dotnet/evolution-sharp/Manifest
+++ b/dev-dotnet/evolution-sharp/Manifest
@@ -1,25 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ed129db8c7702f16fdde2f62bea65486 ChangeLog 1162
-RMD160 65a69d80634009be7e2998b0c7d91c04bf33f892 ChangeLog 1162
-SHA256 033054b0a5089a33f9f3e0f8cd9d18091b6f33ae72a5223d8f454cf3ef74888d ChangeLog 1162
+MD5 998ebf3d4b2ef8ea8a40166c1eafee8d ChangeLog 1394
+RMD160 662865dcc1fa8876d0b7e8bf5c96dce652df55dd ChangeLog 1394
+SHA256 96c76770e568a30e0b8c706816d86d43a04096c5b0910b7a8f4691e7026a0a36 ChangeLog 1394
 MD5 20da8270a5b3998b5ad7f4389ceaa2cc evolution-sharp-0.10.2-r1.ebuild 980
 RMD160 995d6f02837b4e2459fa2e2049b0259453e6ba20 evolution-sharp-0.10.2-r1.ebuild 980
 SHA256 af5ff7b04994db1e64763098d7200aa1d6b21fe4a18fab5f4e201e4f655cddb0 evolution-sharp-0.10.2-r1.ebuild 980
+MD5 44dc049a27369de28b4851097cf54676 evolution-sharp-0.10.2-r2.ebuild 1047
+RMD160 171603b774aa2ac854a5fa1b39fa8d8ea8bc6728 evolution-sharp-0.10.2-r2.ebuild 1047
+SHA256 e7c49c05fd37929515af1a2f495435837535e399030ace72a6d4b544acce9a13 evolution-sharp-0.10.2-r2.ebuild 1047
 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 c290aaec6de69da9bef4ef8b73d6da64 files/digest-evolution-sharp-0.10.2-r2 271
+RMD160 d3cc15e676309f077c603dc11a9003e3b0d8c1c6 files/digest-evolution-sharp-0.10.2-r2 271
+SHA256 ed2200da9c1998588564d78d0e95b090b0b02deb3de83358b7a62277db0f3c66 files/digest-evolution-sharp-0.10.2-r2 271
+MD5 bf7306781fe9ae7c2a562f6c0773cba7 files/evolution-sharp-0.10.2-check-evo-2.6.patch 826
+RMD160 28581a46c76d3c709bb0377573700cf4ff450bb2 files/evolution-sharp-0.10.2-check-evo-2.6.patch 826
+SHA256 e52cc451df46870cef7f22120ed718835dada863ab1a84feda462794eb896faa files/evolution-sharp-0.10.2-check-evo-2.6.patch 826
 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
 RMD160 6070e5bc9d8a4e0983004f0e24da1de81f52d2c4 metadata.xml 308
 SHA256 d4e9c60cc0ce735082c4f3cb0837a68a34a51d6bfc38dc2b2bd2ce044e7c7259 metadata.xml 308
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEN6I22G5bA0cA/ScRAg1PAKCfwCUjMcazVBT597X/V4N1IRjTawCgioUP
-OzKdoGFcYBwcOGDBuz9RwQo=
-=MW5r
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2-r2.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2-r2.ebuild
new file mode 100644
index 000000000000..870b31008c9f
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.10.2-r2.ebuild
@@ -0,0 +1,40 @@
+# 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-r2.ebuild,v 1.1 2006/04/09 15:24:49 cretin Exp $
+
+inherit mono versionator eutils autotools
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+DEPEND=">=gnome-extra/evolution-data-server-1.2
+	>=dev-lang/mono-1.0
+	>=dev-dotnet/gtk-sharp-2.3.90
+	>=mail-client/evolution-2.2.0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Use correct libdir in pkgconfig files
+	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+		${S}/*.pc.in || die
+
+	# Bug 124581, fixed upstream
+	epatch ${FILESDIR}/${P}-use-glibsharpglue-2.patch
+
+	epatch ${FILESDIR}/${P}-check-evo-2.6.patch
+	eautoconf
+}
+
+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-r2 b/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2-r2
new file mode 100644
index 000000000000..2d87550fd260
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/digest-evolution-sharp-0.10.2-r2
@@ -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-check-evo-2.6.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.10.2-check-evo-2.6.patch
new file mode 100644
index 000000000000..ba009ba1067b
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.10.2-check-evo-2.6.patch
@@ -0,0 +1,19 @@
+--- evolution-sharp-0.10.2/configure.in.jj	2005-09-12 13:55:58.000000000 -0700
++++ evolution-sharp-0.10.2/configure.in	2006-04-09 07:40:57.000000000 -0700
+@@ -107,7 +107,7 @@
+ AC_MSG_RESULT($IDL_INCLUDES)
+ AC_SUBST(IDL_INCLUDES)
+ 
+-PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.4",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.2")])
++PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.6",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.4",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.2")])])
+ AC_SUBST(EVO_SHELL_CFLAGS)
+ AC_SUBST(EVO_SHELL_LIBS)
+ 
+--- evolution-sharp-0.10.2/evolution-sharp.pc.in.jj	2006-04-09 07:52:03.000000000 -0700
++++ evolution-sharp-0.10.2/evolution-sharp.pc.in	2006-04-09 07:53:24.000000000 -0700
+@@ -1,4 +1,4 @@
+-prefix=@prefix@
++exec_prefix=@prefix@
+ libdir=@libdir@
+ 
+ Name: Evolution#