Non-maintainer-commit: Fix bug 248657. Import signing key from upstream, fix assemblyinfo.cs and Makefile.am to actually sign the assembly.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 42 insertions, 14 deletions

diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog
index 1326ad1c5391..04d60d978dfa 100644
--- a/dev-libs/gmime/ChangeLog
+++ b/dev-libs/gmime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gmime
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.84 2008/12/24 12:50:14 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.85 2009/01/26 00:13:01 loki_val Exp $
+
+  26 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gmime-2.2.23-sign-assembly.patch, +files/gmime-sharp.snk,
+  gmime-2.2.23.ebuild:
+  Non-maintainer-commit: Fix bug 248657. Import signing key from upstream,
+  fix assemblyinfo.cs and Makefile.am to actually sign the assembly.
 
   24 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> -gmime-2.2.3.ebuild,
   -gmime-2.2.11.ebuild, -gmime-2.2.17.ebuild, -gmime-2.2.22.ebuild,
diff --git a/dev-libs/gmime/files/gmime-2.2.23-sign-assembly.patch b/dev-libs/gmime/files/gmime-2.2.23-sign-assembly.patch
new file mode 100644
index 000000000000..d68b50b3ceb7
--- /dev/null
+++ b/dev-libs/gmime/files/gmime-2.2.23-sign-assembly.patch
@@ -0,0 +1,26 @@
+diff -NrU5 gmime-2.2.23.orig/mono/AssemblyInfo.cs.in gmime-2.2.23/mono/AssemblyInfo.cs.in
+--- gmime-2.2.23.orig/mono/AssemblyInfo.cs.in	2009-01-25 19:01:15.000000000 +0100
++++ gmime-2.2.23/mono/AssemblyInfo.cs.in	2009-01-25 19:02:08.000000000 +0100
+@@ -1,6 +1,4 @@
+ using System.Reflection;
+ using System.Runtime.CompilerServices;
+ 
+ [assembly:AssemblyVersion("@API_VERSION@")]
+-[assembly:AssemblyDelaySign(true)]
+-[assembly:AssemblyKeyFile("@srcdir@/gmime-sharp.pub")]
+diff -NrU5 gmime-2.2.23.orig/mono/Makefile.am gmime-2.2.23/mono/Makefile.am
+--- gmime-2.2.23.orig/mono/Makefile.am	2009-01-25 19:01:35.000000000 +0100
++++ gmime-2.2.23/mono/Makefile.am	2009-01-25 18:57:11.000000000 +0100
+@@ -72,11 +72,11 @@
+ 	rm -f generated/* &&	\
+ 	$(GAPI_CODEGEN) --generate $(API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) 	\
+ 	&& touch generated-stamp
+ 
+ $(ASSEMBLY): $(build_sources) generated-stamp $(ASSEMBLY_NAME).pub
+-	$(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs
++	$(CSC) --unsafe /out:$(ASSEMBLY) -keyfile:$(ASSEMBLY_NAME).snk /target:library $(references) $(build_sources) generated/*.cs
+ 
+ install-data-local:
+ 	@if test -n '$(TARGET)'; then									\
+ 	  if test -n '$(DESTDIR)'; then								\
+ 	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(prefix)/lib";		\
diff --git a/dev-libs/gmime/files/gmime-sharp.snk b/dev-libs/gmime/files/gmime-sharp.snk
new file mode 100644
index 000000000000..5c62e8ca3a33
--- /dev/null
+++ b/dev-libs/gmime/files/gmime-sharp.snk
diff --git a/dev-libs/gmime/gmime-2.2.23.ebuild b/dev-libs/gmime/gmime-2.2.23.ebuild
index 722cf41510a6..30992cbadbe4 100644
--- a/dev-libs/gmime/gmime-2.2.23.ebuild
+++ b/dev-libs/gmime/gmime-2.2.23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.23.ebuild,v 1.6 2008/12/01 06:58:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.2.23.ebuild,v 1.7 2009/01/26 00:13:01 loki_val Exp $
 
-inherit gnome2 eutils mono libtool
+inherit gnome2 eutils mono libtool autotools
 
 DESCRIPTION="Utilities for creating and parsing messages using MIME"
 SRC_URI="http://spruce.sourceforge.net/${PN}/sources/v${PV%.*}/${P}.tar.gz"
@@ -28,7 +28,8 @@ DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PORTING README TODO doc/html/"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+	epatch "${FILESDIR}/gmime-2.2.23-sign-assembly.patch"
+	cp "${FILESDIR}/gmime-sharp.snk" mono/
 	if use doc ; then
 		#db2html should be docbook2html
 		sed -i -e 's:db2html:docbook2html -o gmime-tut:g' \
@@ -39,12 +40,7 @@ src_unpack() {
 			gtk-doc.make docs/reference/Makefile.in || die "sed failed (3)"
 	fi
 
-	# Use correct libdir for mono assembly
-	sed -i -e 's:^libdir.*:libdir=@libdir@:' \
-		   -e 's:^prefix=:exec_prefix=:' \
-		   -e 's:prefix)/lib:libdir):' \
-		mono/gmime-sharp.pc.in mono/Makefile.{am,in} || die "sed failed (2)"
-
+	eautoreconf
 	elibtoolize
 }
 
@@ -54,8 +50,7 @@ src_compile() {
 }
 
 src_install() {
-	emake GACUTIL_FLAGS="/root '${D}/usr/$(get_libdir)' /gacdir /usr/$(get_libdir) /package ${PN}" \
-		DESTDIR="${D}" install || die "installation failed"
+	emake DESTDIR="${D}" install || die "installation failed"
 
 	if use doc ; then
 		# we don't use docinto/dodoc, because we don't want html doc gzipped
@@ -67,4 +62,5 @@ src_install() {
 	# (bug #70392)	Ticho, 2004-11-10
 	mv "${D}/usr/bin/uuencode" "${D}/usr/bin/gmime-uuencode"
 	mv "${D}/usr/bin/uudecode" "${D}/usr/bin/gmime-uudecode"
+	mono_multilib_comply
 }