Fix bug 250069, g-k-s would pick up dev-scheme/chickens csc executable instead of gmcs. Also fix bug 254122, add doc use flag for monodoc dependency. Transition to gmcs done. Multilib-safe.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 117 insertions, 45 deletions

diff --git a/dev-dotnet/gnome-keyring-sharp/ChangeLog b/dev-dotnet/gnome-keyring-sharp/ChangeLog
index 862656bce680..b74ca4545b66 100644
--- a/dev-dotnet/gnome-keyring-sharp/ChangeLog
+++ b/dev-dotnet/gnome-keyring-sharp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-dotnet/gnome-keyring-sharp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/ChangeLog,v 1.3 2008/12/14 15:25:12 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/ChangeLog,v 1.4 2009/01/24 01:20:16 loki_val Exp $
+
+*gnome-keyring-sharp-1.0.0-r1 (24 Jan 2009)
+
+  24 Jan 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gnome-keyring-sharp-1.0.0-monodoc.patch,
+  -gnome-keyring-sharp-1.0.0.ebuild, +gnome-keyring-sharp-1.0.0-r1.ebuild:
+  Fix bug 250069, g-k-s would pick up dev-scheme/chickens csc executable
+  instead of gmcs. Also fix bug 254122, add doc use flag for monodoc
+  dependency. Transition to gmcs done. Multilib-safe.
 
   14 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
   gnome-keyring-sharp-1.0.0.ebuild:
diff --git a/dev-dotnet/gnome-keyring-sharp/Manifest b/dev-dotnet/gnome-keyring-sharp/Manifest
index 349649b90bbb..d100ef07d9f8 100644
--- a/dev-dotnet/gnome-keyring-sharp/Manifest
+++ b/dev-dotnet/gnome-keyring-sharp/Manifest
@@ -1,4 +1,5 @@
+AUX gnome-keyring-sharp-1.0.0-monodoc.patch 1665 RMD160 cd0c40d534947a7e9781125600683ba557e217cd SHA1 a0942cca2f55a9c7f09206b5219af5c7bdb0a4f3 SHA256 80642e51dfb7cdd9ef0b7468406321640bfb7db65986bfb75dbbbc1e824529ed
 DIST gnome-keyring-sharp-1.0.0.tar.bz2 84785 RMD160 9f9f691228c3493b32736089e2d5cb88dcea027f SHA1 9900da7b4245710832291bb55139d33a45e15225 SHA256 e419e2ea6378846a353e680d3ab0d1d60e9478ae85ee6672c39e16af2c217c75
-EBUILD gnome-keyring-sharp-1.0.0.ebuild 1008 RMD160 b1122615a75eb0c2ade210a544d8c540497277d9 SHA1 f0e37b5e127a03aeaf808df3ec3d764634cc3009 SHA256 608002c09a964e10afb0969d2f663f23d7d3d452b3da4219765e7d71ee0aecc6
-MISC ChangeLog 737 RMD160 43171d13741b530ce465b36aa3c817f4ab230ef8 SHA1 d316ef9da084d8a706af86018854d4d0583f93bb SHA256 dd9fa33f745999784411d77e4536748d8799df0c9d87c49577596f063f664a27
+EBUILD gnome-keyring-sharp-1.0.0-r1.ebuild 1388 RMD160 7d38fcb423d57fbabb6df3ad2497f362bdbb32b2 SHA1 21ccdc6d4497ed84000dddc911f36c813604542d SHA256 b77f8ceda9c35e9378a5004508283fd6aace1d631a7ebcdf481516cbfd72baf4
+MISC ChangeLog 1157 RMD160 517d7aeb2814c8dbc6bd2a610ff618b67d0feb8d SHA1 5dd5c0fb91ea82e8249155df3d493a42e1f678c2 SHA256 b2e361c0affb467f79ee06af09a7d102457a901b52e4321666d660518a7a6092
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc.patch b/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc.patch
new file mode 100644
index 000000000000..7a00b2706a00
--- /dev/null
+++ b/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc.patch
@@ -0,0 +1,54 @@
+--- configure.ac.orig	2009-01-24 01:02:06.000000000 +0100
++++ configure.ac	2009-01-24 01:37:22.000000000 +0100
+@@ -49,11 +49,11 @@
+ 
+ #
+ # Use D-Bus as a fallback to get the keyring socket address
+ #
+ AC_ARG_ENABLE(dbus, 
+-	      [  --enable-dbus[[=no/yes]]    compile with D-Bus support [[default: yes]]],
++	      [AC_HELP_STRING([--enable-dbus],[compile with D-Bus support default: yes])],
+ 	      ENABLE_DBUS="$enableval")
+ AM_CONDITIONAL(ENABLE_DBUS, test "x$ENABLE_DBUS" != "xno")
+ 
+ CSFLAGS=
+ DBUS_LIBS=
+@@ -67,19 +67,29 @@
+ 	CSFLAGS=" -d:WITH_DBUS "
+ fi
+ AC_SUBST(CSFLAGS)
+ AC_SUBST(DBUS_LIBS)
+ 
+-
+-AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
+-AC_PATH_PROG(MONODOCER, monodocer, no)
+-if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
+-  enable_monodoc=no
+-  doc_sources_dir=
+-else
+-  enable_monodoc=yes
+-  doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
++AC_ARG_ENABLE(monodoc, 
++	      [AC_HELP_STRING([--enable-monodoc],[install monodoc documents default: yes])],
++	      [ENABLE_MONODOC="$enableval"])
++
++if test "x$ENABLE_MONODOC" != "xno" ; then
++	AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
++	AC_PATH_PROG(MONODOCER, monodocer, no)
++
++	if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then
++		if test "x$ENABLE_MONODOC" = "xyes" ; then
++			AC_MSG_ERROR([monodoc can't be installed even though it was explicitly enabled. mdassembler or monodocer not found.])
++		else
++			enable_monodoc=no
++			doc_sources_dir=
++		fi
++	else
++		enable_monodoc=yes
++		doc_sources_dir="`pkg-config --variable=sourcesdir monodoc`"
++	fi
+ fi
+ 
+ AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
+ AC_SUBST(CSC)
+ AC_SUBST(RUNTIME)
diff --git a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r1.ebuild b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..aaa444b870c5
--- /dev/null
+++ b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r1.ebuild,v 1.1 2009/01/24 01:20:16 loki_val Exp $
+
+EAPI=2
+
+inherit mono eutils autotools
+
+DESCRIPTION="C# implementation of gnome-keyring"
+HOMEPAGE="http://www.mono-project.com/"
+SRC_URI="http://ftp.novell.com/pub/mono/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="dbus doc"
+
+RDEPEND=">=dev-lang/mono-2.0
+	>=gnome-base/gnome-keyring-2.22
+	dbus? ( dev-dotnet/dbus-sharp )
+	doc? ( virtual/monodoc )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# https://bugzilla.novell.com/show_bug.cgi?id=469141
+	epatch "${FILESDIR}/${P}-monodoc.patch"
+	eautoreconf
+	# Disable building samples.
+	sed -i -e 's:sample::' "${S}"/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf	$(use_enable dbus) \
+		$(use_enable doc monodoc) || die "econf failed"
+}
+
+src_compile() {
+	# This dies without telling in docs with anything not -j1
+	# CSC=gmcs needed for http://bugs.gentoo.org/show_bug.cgi?id=250069
+	emake -j1 CSC=gmcs || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README
+	mono_multilib_comply
+	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
diff --git a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0.ebuild b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0.ebuild
deleted file mode 100644
index baee81bc4152..000000000000
--- a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0.ebuild,v 1.3 2008/12/14 15:25:12 loki_val Exp $
-
-EAPI=2
-
-inherit mono
-
-DESCRIPTION="C# implementation of gnome-keyring"
-HOMEPAGE="http://www.mono-project.com/"
-SRC_URI="http://ftp.novell.com/pub/mono/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="dbus"
-
-RDEPEND="dev-lang/mono
-	dbus? ( dev-dotnet/dbus-sharp )"
-DEPEND="${RDEPEND}
-	virtual/monodoc
-	dev-util/pkgconfig"
-
-src_prepare() {
-	# Disable building samples.
-	sed -i -e 's:sample::' "${S}"/Makefile.in || die "sed failed"
-}
-
-src_configure() {
-	econf $(use_enable dbus) || die "econf failed"
-}
-
-src_compile() {
-	# This dies a horrible death with anything other than "-j1".
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-}