Revision bump applying debian patch to support Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 114 insertions, 3 deletions

diff --git a/dev-dotnet/gnome-keyring-sharp/ChangeLog b/dev-dotnet/gnome-keyring-sharp/ChangeLog
index b74ca4545b66..59cc0bfcd967 100644
--- a/dev-dotnet/gnome-keyring-sharp/ChangeLog
+++ b/dev-dotnet/gnome-keyring-sharp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/gnome-keyring-sharp
-# 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 $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/ChangeLog,v 1.5 2010/07/03 18:11:35 pacho Exp $
+
+*gnome-keyring-sharp-1.0.0-r2 (03 Jul 2010)
+
+  03 Jul 2010; Pacho Ramos <pacho@gentoo.org>
+  +gnome-keyring-sharp-1.0.0-r2.ebuild,
+  +files/gnome-keyring-sharp-1.0.0-monodoc-r1.patch:
+  Revision bump applying debian patch to support Gnome 2.30, also adapt
+  monodoc patch to this new situation.
 
 *gnome-keyring-sharp-1.0.0-r1 (24 Jan 2009)
 
diff --git a/dev-dotnet/gnome-keyring-sharp/Manifest b/dev-dotnet/gnome-keyring-sharp/Manifest
index d100ef07d9f8..e2be52a3d75c 100644
--- a/dev-dotnet/gnome-keyring-sharp/Manifest
+++ b/dev-dotnet/gnome-keyring-sharp/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-keyring-sharp-1.0.0-monodoc-r1.patch 1210 RMD160 a71683b5c4a352c189d658ceefb175f0fb90fcb6 SHA1 3b65eeb8ed52d489883bdedf33deffdc84c5acc8 SHA256 7e42ed0c1fc126cf35313ae1b103c286b67b0d3a34244d7af82576a4a6757e5e
 AUX gnome-keyring-sharp-1.0.0-monodoc.patch 1665 RMD160 cd0c40d534947a7e9781125600683ba557e217cd SHA1 a0942cca2f55a9c7f09206b5219af5c7bdb0a4f3 SHA256 80642e51dfb7cdd9ef0b7468406321640bfb7db65986bfb75dbbbc1e824529ed
+DIST gnome-keyring-sharp-1.0.0-gnome230.patch.bz2 9190 RMD160 26d63261f200a5aa93c9e404a9aa6f95868f8d87 SHA1 a0b2c50d41124aac489ca22d74b663ded99b1f14 SHA256 47ec8b600ed18f38968449514d963328c22ec19e9db3e0b455c0e5f244ea1451
 DIST gnome-keyring-sharp-1.0.0.tar.bz2 84785 RMD160 9f9f691228c3493b32736089e2d5cb88dcea027f SHA1 9900da7b4245710832291bb55139d33a45e15225 SHA256 e419e2ea6378846a353e680d3ab0d1d60e9478ae85ee6672c39e16af2c217c75
 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
+EBUILD gnome-keyring-sharp-1.0.0-r2.ebuild 1525 RMD160 24a7cc064e54f68fcab385316710126dbb69d49e SHA1 fabdbc0273fe7ef1dc1ce5eaa11b9e8c85a88441 SHA256 0d00321522282ecee0204a0d300f22bb91660b51994e4192c1104bbe4228ec1f
+MISC ChangeLog 1450 RMD160 318bb36820a98d07507a101878aabee22408f4fb SHA1 2c4304f807460ae00c9a2e9d89d1dffd00c3df13 SHA256 be875365828a879319a0d3816221147c1a854adabcd006c35b7ba22614ba4a3c
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwvfV8ACgkQCaWpQKGI+9TKIQCfUOnLSa14rNIyTegpht7BRY+A
+Zq0AnA6KepSy8tzeKYdq9yJj1nG+Exsn
+=va6T
+-----END PGP SIGNATURE-----
diff --git a/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc-r1.patch b/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc-r1.patch
new file mode 100644
index 000000000000..8c11e2b8c1b2
--- /dev/null
+++ b/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc-r1.patch
@@ -0,0 +1,36 @@
+--- configure.ac.orig	2010-07-03 19:43:46.000000000 +0200
++++ configure.ac	2010-07-03 19:45:59.000000000 +0200
+@@ -58,14 +58,25 @@
+ AC_SUBST(GNOME_KEYRING_CFLAGS)
+ AC_SUBST(GNOME_KEYRING_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")
diff --git a/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r2.ebuild b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..8a54fe6b14d0
--- /dev/null
+++ b/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/07/03 18:11:35 pacho 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
+	mirror://gentoo/${P}-gnome230.patch.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/mono-2.0
+	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
+	dev-dotnet/glib-sharp
+	doc? ( virtual/monodoc )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# https://bugzilla.novell.com/show_bug.cgi?id=589166
+	epatch "${WORKDIR}/${P}-gnome230.patch"
+
+	# https://bugzilla.novell.com/show_bug.cgi?id=469141
+	epatch "${FILESDIR}/${P}-monodoc-r1.patch"
+
+	eautoreconf
+
+	# Disable building samples.
+	sed -i -e 's:sample::' "${S}"/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf $(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"
+}