Version bump including the patches we were applying and solving glue path (bug #345119 by Wojciech Dzierżanowski). Remove old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

3 files changed, 17 insertions, 53 deletions

diff --git a/dev-dotnet/gnome-keyring-sharp/ChangeLog b/dev-dotnet/gnome-keyring-sharp/ChangeLog
index c6eb7b47bb9d..dedd1f5d1deb 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/ChangeLog,v 1.6 2010/10/07 19:32:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/ChangeLog,v 1.7 2010/11/25 22:50:36 pacho Exp $
+
+*gnome-keyring-sharp-1.0.2 (25 Nov 2010)
+
+  25 Nov 2010; Pacho Ramos <pacho@gentoo.org>
+  -gnome-keyring-sharp-1.0.0-r2.ebuild,
+  -files/gnome-keyring-sharp-1.0.0-monodoc-r1.patch,
+  +gnome-keyring-sharp-1.0.2.ebuild:
+  Version bump including the patches we were applying and solving glue path
+  (bug #345119 by Wojciech Dzierżanowski). Remove old.
 
   07 Oct 2010; Pacho Ramos <pacho@gentoo.org>
   -gnome-keyring-sharp-1.0.0-r1.ebuild,
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
deleted file mode 100644
index 8c11e2b8c1b2..000000000000
--- a/dev-dotnet/gnome-keyring-sharp/files/gnome-keyring-sharp-1.0.0-monodoc-r1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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.2.ebuild
index 8a54fe6b14d0..8af5b36e74e6 100644
--- 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.2.ebuild
@@ -1,15 +1,14 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild,v 1.1 2010/11/25 22:50:36 pacho Exp $
 
-EAPI=2
+EAPI="2"
 
-inherit mono eutils autotools
+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
-	mirror://gentoo/${P}-gnome230.patch.bz2"
+HOMEPAGE="http://www.mono-project.com/ https://github.com/mono/gnome-keyring-sharp"
+SRC_URI="http://www.go-mono.com/archive/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -17,21 +16,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/mono-2.0
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
+	>=gnome-base/libgnome-keyring-2.30.0
 	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"
 }
@@ -48,7 +39,7 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
+	dodoc AUTHORS ChangeLog README || die
 	mono_multilib_comply
 	find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }