fix gtk-doc patch (see bug #195026) and fix quotes

Package-Manager: portage-2.1.3.12

4 files changed, 23 insertions, 16 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 7286e3f8dae3..97e416d3a5db 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,11 @@
 # 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.100 2007/10/06 07:39:20 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.101 2007/10/07 21:47:01 remi Exp $
+
+  07 Oct 2007; Rémi Cardona <remi@gentoo.org>
+  files/gnome-keyring-2.20.0-fix_gtk_doc.patch,
+  gnome-keyring-2.20.0-r1.ebuild:
+  fix gtk-doc patch (see bug #195026) and fix quotes
 
   06 Oct 2007; Rémi Cardona <remi@gentoo.org>
   +files/gnome-keyring-2.20.0-fix_gtk_doc.patch,
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index c6dde1c41a88..12862d777fc2 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -2,10 +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 410 RMD160 6239f8d846e83f3a690cc5687125d274af020708 SHA1 55595ebd2fc89d971d3a5ad2bbd326be9acf5834 SHA256 7b8031ea81ab78fd7b15be2798aa84b413ce14467742946ef4e9036701ecfabb
-MD5 695dcc4b5fba0441f8024c2c22ab565e files/gnome-keyring-2.20.0-fix_gtk_doc.patch 410
-RMD160 6239f8d846e83f3a690cc5687125d274af020708 files/gnome-keyring-2.20.0-fix_gtk_doc.patch 410
-SHA256 7b8031ea81ab78fd7b15be2798aa84b413ce14467742946ef4e9036701ecfabb files/gnome-keyring-2.20.0-fix_gtk_doc.patch 410
+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
@@ -26,18 +26,18 @@ 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-r1.ebuild 1175 RMD160 927ee544dd362e22611dbbf6eaae2f66fbf16876 SHA1 c6d0435c54facacf48b2a908f3f814626491559a SHA256 8b873456a6429c11ff2b7c4bfe56400b4edf68edf0e32feec79d118bea5b8d8f
-MD5 6d650d79e16cd313909be1f4ff9c449b gnome-keyring-2.20.0-r1.ebuild 1175
-RMD160 927ee544dd362e22611dbbf6eaae2f66fbf16876 gnome-keyring-2.20.0-r1.ebuild 1175
-SHA256 8b873456a6429c11ff2b7c4bfe56400b4edf68edf0e32feec79d118bea5b8d8f gnome-keyring-2.20.0-r1.ebuild 1175
+EBUILD gnome-keyring-2.20.0-r1.ebuild 1177 RMD160 e720fe3422c0b8b661f4c2927fef466f9562fb49 SHA1 dcc906ea20b0fbdbe609760c5669284c056833e4 SHA256 491d3e42007a99a5c7773710b270d59dbf4f280d087e2c1dd95b199ce097f329
+MD5 1f123f700d50a5293ef022e38cca53b2 gnome-keyring-2.20.0-r1.ebuild 1177
+RMD160 e720fe3422c0b8b661f4c2927fef466f9562fb49 gnome-keyring-2.20.0-r1.ebuild 1177
+SHA256 491d3e42007a99a5c7773710b270d59dbf4f280d087e2c1dd95b199ce097f329 gnome-keyring-2.20.0-r1.ebuild 1177
 EBUILD gnome-keyring-2.20.0.ebuild 961 RMD160 1a94c40272f6caa55d0618f426cce9189d0e1b5d SHA1 e01a425e76e98a5546bb58cdcac10df87974b454 SHA256 0d2acf4850b90f278fd8ac3a80ccf027e3fdddd4f446f3ee59f93c50a0d24b00
 MD5 fb87758151d7a4cb17bfd6fb174341ea gnome-keyring-2.20.0.ebuild 961
 RMD160 1a94c40272f6caa55d0618f426cce9189d0e1b5d gnome-keyring-2.20.0.ebuild 961
 SHA256 0d2acf4850b90f278fd8ac3a80ccf027e3fdddd4f446f3ee59f93c50a0d24b00 gnome-keyring-2.20.0.ebuild 961
-MISC ChangeLog 11860 RMD160 fdad766950554db153188b3c35c1a4cb548ad80f SHA1 91b8d6fc98c12392eb600b8e9e4428153d0ebe95 SHA256 f346c1ecc2ec5bb8e14186b812d4f07c1cf2100397f0c7465ca024182f11a37f
-MD5 4c8898bce87860ed60eb7729e4bcffbe ChangeLog 11860
-RMD160 fdad766950554db153188b3c35c1a4cb548ad80f ChangeLog 11860
-SHA256 f346c1ecc2ec5bb8e14186b812d4f07c1cf2100397f0c7465ca024182f11a37f ChangeLog 11860
+MISC ChangeLog 12043 RMD160 44791bdaa146ffd1c2e9f5df2e2ba63a9f79f6d0 SHA1 863c238fbf2dc257a1b13441c602f6d8b4790000 SHA256 e5ea7b99c6959fb01d6944be121e8200d309e979102f78513d40c3045908a25e
+MD5 aa736c517b4d3016e1205c3e18930e81 ChangeLog 12043
+RMD160 44791bdaa146ffd1c2e9f5df2e2ba63a9f79f6d0 ChangeLog 12043
+SHA256 e5ea7b99c6959fb01d6944be121e8200d309e979102f78513d40c3045908a25e ChangeLog 12043
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
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
index ded93d740efd..9c73946a61ab 100644
--- 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
@@ -2,7 +2,7 @@ Index: configure.in
 ===================================================================
 --- configure.in	(revision 845)
 +++ configure.in	(working copy)
-@@ -26,7 +26,11 @@
+@@ -26,7 +26,13 @@
  AC_TYPE_SIZE_T
  AC_TYPE_UID_T
  
@@ -10,6 +10,8 @@ Index: configure.in
  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/gnome-keyring-2.20.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild
index 2004c095e37a..ba79ad9f019a 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2007/10/06 07:39:20 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild,v 1.3 2007/10/07 21:47:01 remi Exp $
 
 inherit gnome2 eutils autotools pam
 
@@ -30,7 +30,7 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Fix tests
-	echo "gkr-ask-tool.c" >> ${S}/po/POTFILES.in
+	echo "gkr-ask-tool.c" >> "${S}/po/POTFILES.in"
 
 	epatch "${FILESDIR}/${P}-fix_pam.patch"
 	use doc || epatch "${FILESDIR}/${P}-fix_gtk_doc.patch"