gnome-base/gnome-keyring: Bump to version 2.20.1 with a cleaned-up ebuild

(Portage version: 2.1.3.13)

6 files changed, 14 insertions, 93 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 10d65e3a4c1d..caaacca302a8 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.102 2007/10/08 08:53:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.103 2007/10/15 17:34:56 remi Exp $
+
+*gnome-keyring-2.20.1 (15 Oct 2007)
+
+  15 Oct 2007; Rémi Cardona <remi@gentoo.org>
+  -files/gnome-keyring-2.20.0-fix_gtk_doc.patch,
+  -files/gnome-keyring-2.20.0-fix_pam.patch,
+  -gnome-keyring-2.20.0-r2.ebuild, +gnome-keyring-2.20.1.ebuild:
+  Bump to version 2.20.1 with a cleaned-up ebuild
 
 *gnome-keyring-2.20.0-r2 (08 Oct 2007)
 
diff --git a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r2 b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r2
deleted file mode 100644
index 441b928e628d..000000000000
--- a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 effc946bf3fa05d70b1251801383efd2 gnome-keyring-2.20.0.tar.bz2 572938
-RMD160 e6af5c03eef1a972f5b6d42da8360f2faade253f gnome-keyring-2.20.0.tar.bz2 572938
-SHA256 6fadcd85a16672381857de0e1cf2b6fe16ec3393931f92427deb13153eeabe1c gnome-keyring-2.20.0.tar.bz2 572938
diff --git a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.1 b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.1
new file mode 100644
index 000000000000..f0c85b91b733
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.1
@@ -0,0 +1,3 @@
+MD5 16eb73c4a23db11ee8f20a731cf2a92b gnome-keyring-2.20.1.tar.bz2 546007
+RMD160 770a9633d67b205b61148e5acc6d55d0b3f3d285 gnome-keyring-2.20.1.tar.bz2 546007
+SHA256 69208630af42bc3eb7561161067e24eb6bfb8afc2eb73e526efd0bbe337868f8 gnome-keyring-2.20.1.tar.bz2 546007
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch
deleted file mode 100644
index 9c73946a61ab..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 845)
-+++ configure.in	(working copy)
-@@ -26,7 +26,13 @@
- AC_TYPE_SIZE_T
- AC_TYPE_UID_T
- 
-+AC_DEFUN(GTK_DOC_CHECK, [])
- GTK_DOC_CHECK
-+AM_CONDITIONAL(ENABLE_GTK_DOC, 0)
-+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0)
-+HTML_DIR="${datadir}/gtk-doc/html"
-+AC_SUBST(HTML_DIR)
-+
- DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
- AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
- 
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch
deleted file mode 100644
index 49a1e214a2c2..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_pam.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 844)
-+++ configure.in	(revision 845)
-@@ -249,7 +249,7 @@
- AC_ARG_WITH([pam-dir],
-             [AC_HELP_STRING([--with-pam-dir=DIR],
-                              [directory to install pam modules in])],
--             [], [with_pam_dir="/usr/lib"])
-+             [], [with_pam_dir="${prefix}/lib/security"])
- PAM_DEST_DIR="$with_pam_dir"
- AC_SUBST(PAM_DEST_DIR)
- 	
-Index: Makefile.am
-===================================================================
---- Makefile.am	(revision 844)
-+++ Makefile.am	(revision 845)
-@@ -50,8 +50,4 @@
- 	@echo "DONE AUTOMATIC UNIT TESTS ------------------------------"
- 
- install-pam:
--	$(MAKE) -C pam install-pam
--	
--uninstall-pam:
--	$(MAKE) -C pam uninstall-pam
--
-+	@echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead"
-Index: pam/Makefile.am
-===================================================================
---- pam/Makefile.am	(revision 844)
-+++ pam/Makefile.am	(revision 845)
-@@ -3,7 +3,8 @@
- 	-I$(top_srcdir) \
- 	-DGNOME_KEYRING_DAEMON=\""$(bindir)/gnome-keyring-daemon"\" 
- 
--lib_LTLIBRARIES = pam_gnome_keyring.la
-+pamlibdir = $(PAM_DEST_DIR)
-+pamlib_LTLIBRARIES = pam_gnome_keyring.la
- 
- pam_gnome_keyring_la_SOURCES = \
- 	gkr-pam.h \
-@@ -19,13 +20,5 @@
- 	-export-symbols-regex 'pam_sm_'
- 
- install-pam: install
--	$(mkinstalldirs) "$(DESTDIR)$(PAM_DEST_DIR)"
--	cp "$(DESTDIR)$(libdir)/pam_gnome_keyring.so" "$(DESTDIR)$(PAM_DEST_DIR)"
--	( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_auth.so )
--	( cd "$(DESTDIR)$(PAM_DEST_DIR)"; $(LN_S) -f pam_gnome_keyring.so pam_gnome_keyring_session.so )
--	
--uninstall-pam: 
--	rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring.so"
--	rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_auth.so"
--	rm -f "$(DESTDIR)$(PAM_DEST_DIR)/pam_gnome_keyring_session.so"
--	
-+	@echo "WARNING: install-pam is no longer used, use the --with-pam-dir configure option instead"
-+	
-\ No newline at end of file
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.20.1.ebuild
index 0e77fd05e674..36b3a0f55f22 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.20.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r2.ebuild,v 1.1 2007/10/08 08:53:11 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.20.1.ebuild,v 1.1 2007/10/15 17:34:56 remi Exp $
 
-inherit gnome2 eutils autotools pam
+inherit gnome2 eutils pam
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -26,17 +26,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix tests
-	echo "gkr-ask-tool.c" >> "${S}/po/POTFILES.in"
-
-	epatch "${FILESDIR}/${P}-fix_pam.patch"
-	use doc || epatch "${FILESDIR}/${P}-fix_gtk_doc.patch"
-	eautoreconf
-}
-
 pkg_setup() {
 	G2CONF="$(use_enable hal) \
 		$(use_enable test tests) \