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

Package-Manager: portage-2.1.3.13

7 files changed, 26 insertions, 113 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/Manifest b/gnome-base/gnome-keyring/Manifest
index f4cde31d675b..9ce4dc30bcf0 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -2,18 +2,10 @@ AUX gnome-keyring-0.6.0-fbsd.patch 1268 RMD160 55a9f7eef3f95e59ee5235587b9c32b46
 MD5 87200f5a1af8eb556a5271a1113e8b7f files/gnome-keyring-0.6.0-fbsd.patch 1268
 RMD160 55a9f7eef3f95e59ee5235587b9c32b4681e85c6 files/gnome-keyring-0.6.0-fbsd.patch 1268
 SHA256 b20766b51197376bb22eae4a03aea84226e4b4147ea9297ab6cd3e2a3ab19acd files/gnome-keyring-0.6.0-fbsd.patch 1268
-AUX gnome-keyring-2.20.0-fix_gtk_doc.patch 466 RMD160 b7a3006471e0f2ecd72466a6121b258fe63e34cd SHA1 099cbb7ae929c77d1dd3470181b4803133251ac7 SHA256 f036447151b992d5a6c9c7177281fa33bca4a45ae9b3f4101172ffdaa81f73cb
-MD5 dde1b60e3333715aff5c02c198084d36 files/gnome-keyring-2.20.0-fix_gtk_doc.patch 466
-RMD160 b7a3006471e0f2ecd72466a6121b258fe63e34cd files/gnome-keyring-2.20.0-fix_gtk_doc.patch 466
-SHA256 f036447151b992d5a6c9c7177281fa33bca4a45ae9b3f4101172ffdaa81f73cb files/gnome-keyring-2.20.0-fix_gtk_doc.patch 466
-AUX gnome-keyring-2.20.0-fix_pam.patch 2063 RMD160 8189f060ec7f30aa8e7586e50139f2e96e412d0c SHA1 dcd28eedf2d064ba60439c377814ff2518385471 SHA256 b31d88fd137c944c3e1442060bd9880a8d2f06ee2cfe4adcdcb2e7f841101127
-MD5 155e27db2645c1c2bc6219922972cb6f files/gnome-keyring-2.20.0-fix_pam.patch 2063
-RMD160 8189f060ec7f30aa8e7586e50139f2e96e412d0c files/gnome-keyring-2.20.0-fix_pam.patch 2063
-SHA256 b31d88fd137c944c3e1442060bd9880a8d2f06ee2cfe4adcdcb2e7f841101127 files/gnome-keyring-2.20.0-fix_pam.patch 2063
 DIST gnome-keyring-0.4.9.tar.bz2 396162 RMD160 9deca60a67cba29b978974007c59e6963fec900e SHA1 56a9f2b634fd0f1b9bd73bab3824d02a77ad34c3 SHA256 6e287d88c3a4ce8c64bb6b0de151c210ecb20e487d5e1c757ef0ad941a37d393
 DIST gnome-keyring-0.6.0.tar.bz2 476280 RMD160 9114a0457871b7a4f9cfe6b3e979ab11881c9145 SHA1 53c5df57c068f3904a296e37ca743666eb42c7bb SHA256 649f2a0d5298b896781d0ac563b8ea1be7f3fe07fd17ea43b0ec0562be47769f
 DIST gnome-keyring-0.8.1.tar.bz2 448558 RMD160 7f9b100aa59b26fee7b761d2705ad9725b87a031 SHA1 6473106b3621c5e6b7cbc16f5955ec704a1a39c2 SHA256 ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
-DIST gnome-keyring-2.20.0.tar.bz2 572938 RMD160 e6af5c03eef1a972f5b6d42da8360f2faade253f SHA1 2d0089848d21d78303c19dd32fb5a1505275c5a5 SHA256 6fadcd85a16672381857de0e1cf2b6fe16ec3393931f92427deb13153eeabe1c
+DIST gnome-keyring-2.20.1.tar.bz2 546007 RMD160 770a9633d67b205b61148e5acc6d55d0b3f3d285 SHA1 7026d22cd457c99bb0c973a79b7bc0d08430e739 SHA256 69208630af42bc3eb7561161067e24eb6bfb8afc2eb73e526efd0bbe337868f8
 EBUILD gnome-keyring-0.4.9.ebuild 580 RMD160 c4ecfafbd51801ee1ca177df3b507cb91f710750 SHA1 221aa480306c5b138810b8616681b17029845447 SHA256 f1ae9ca78d0979f9b580220ddaf0b1fbc7c3467d76133cb55f5afb7781200cf3
 MD5 25774ec7cb25c4b9d2f26f298f789739 gnome-keyring-0.4.9.ebuild 580
 RMD160 c4ecfafbd51801ee1ca177df3b507cb91f710750 gnome-keyring-0.4.9.ebuild 580
@@ -26,14 +18,14 @@ EBUILD gnome-keyring-0.8.1.ebuild 669 RMD160 e3c6a29aaa43379e9bf957f2192273d15f0
 MD5 def1b954068ff19137b2b7a21a439e9a gnome-keyring-0.8.1.ebuild 669
 RMD160 e3c6a29aaa43379e9bf957f2192273d15f0ead56 gnome-keyring-0.8.1.ebuild 669
 SHA256 7b295a365439abbc0fd17ea54c8aa46f3440009e96e9b308ea17ab3ad984bdee gnome-keyring-0.8.1.ebuild 669
-EBUILD gnome-keyring-2.20.0-r2.ebuild 1177 RMD160 7a09e47f1ee29b0eb120c5838cd9af26e85fa3f9 SHA1 0b04d6cb7451892a1d87396ea96b5de406a6a8a2 SHA256 c0327f096b251b9c60e0a7103c71d2c9193ff93af6777cb2eddc760b505ae49f
-MD5 e02fd7748486cb1ec79458ee968ff0dc gnome-keyring-2.20.0-r2.ebuild 1177
-RMD160 7a09e47f1ee29b0eb120c5838cd9af26e85fa3f9 gnome-keyring-2.20.0-r2.ebuild 1177
-SHA256 c0327f096b251b9c60e0a7103c71d2c9193ff93af6777cb2eddc760b505ae49f gnome-keyring-2.20.0-r2.ebuild 1177
-MISC ChangeLog 12258 RMD160 bb6ff1599a62a16a8e1257564d05c33d5ead0748 SHA1 012598da82f632e4f63b9464c2bb27eeaccae028 SHA256 ec4b089af9d4511c69090d604dfeea3e4dc6f9535b0aa514cbd70dc26baef150
-MD5 78c84c40bb12f2866780e472a8d6dbc5 ChangeLog 12258
-RMD160 bb6ff1599a62a16a8e1257564d05c33d5ead0748 ChangeLog 12258
-SHA256 ec4b089af9d4511c69090d604dfeea3e4dc6f9535b0aa514cbd70dc26baef150 ChangeLog 12258
+EBUILD gnome-keyring-2.20.1.ebuild 954 RMD160 9ea7a0328b02830ee473736f987a3b067208189b SHA1 a53d2a259b1d201acb0e7cd1ec5f449c8e8440da SHA256 256ec2e315991d40dde31f818da42a828ac0933e59748dfb5d25d0f041cdb661
+MD5 bfc9ad2f59a41f2a752c0f7122fd4be9 gnome-keyring-2.20.1.ebuild 954
+RMD160 9ea7a0328b02830ee473736f987a3b067208189b gnome-keyring-2.20.1.ebuild 954
+SHA256 256ec2e315991d40dde31f818da42a828ac0933e59748dfb5d25d0f041cdb661 gnome-keyring-2.20.1.ebuild 954
+MISC ChangeLog 12552 RMD160 6b2480938e5698ea13a86e0e5396d528867e893c SHA1 787860f645349ae208df7b836bf0e85cf4279658 SHA256 ced83909896878f589c881873696d791f4bb7aad629e73e165c6606ea01b8810
+MD5 c7385839e82710e8ec3fec233c98b2a3 ChangeLog 12552
+RMD160 6b2480938e5698ea13a86e0e5396d528867e893c ChangeLog 12552
+SHA256 ced83909896878f589c881873696d791f4bb7aad629e73e165c6606ea01b8810 ChangeLog 12552
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -47,6 +39,6 @@ SHA256 c05189f869ad876daad2f33c9ed9126db57a822c79f897fba786b758e6889e75 files/di
 MD5 a47cec36a7d2da7f058b1536d8a16422 files/digest-gnome-keyring-0.8.1 262
 RMD160 b4fa93f9571ac051507f1d1283f5e063c8d8674e files/digest-gnome-keyring-0.8.1 262
 SHA256 76e112c978f80806f7b2c9766275a7751d9a0979fb482232a2e47de4186c55fe files/digest-gnome-keyring-0.8.1 262
-MD5 6c2b356738e60100666ea02b1ef7d705 files/digest-gnome-keyring-2.20.0-r2 265
-RMD160 4350876a0bd58b442f62c3e33fc2b370c4076362 files/digest-gnome-keyring-2.20.0-r2 265
-SHA256 a95192a627a301e482f5e027f7f366812a06ca00b941fff0bdaa5e34f6bed7c9 files/digest-gnome-keyring-2.20.0-r2 265
+MD5 8f677c7f1c3312cc729380ac1762dc91 files/digest-gnome-keyring-2.20.1 265
+RMD160 927e5204ef5385e2cd2db7e43aa6433de8f51a78 files/digest-gnome-keyring-2.20.1 265
+SHA256 7a839bac7145130607cb27b609cdbaff9c24cc94ba5d75669e004fb2e6973cc3 files/digest-gnome-keyring-2.20.1 265
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) \