summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2007-10-07 21:47:01 +0000
committerRémi Cardona <remi@gentoo.org>2007-10-07 21:47:01 +0000
commit410d3069ee349589e1de68dd8188355a7202ff73 (patch)
treefe1f3217c1e242682b70a0d95009d51e7d88ce3d /gnome-base/gnome-keyring
parentAdded warning for bug #191295 (diff)
downloadgentoo-2-410d3069ee349589e1de68dd8188355a7202ff73.tar.gz
gentoo-2-410d3069ee349589e1de68dd8188355a7202ff73.tar.bz2
gentoo-2-410d3069ee349589e1de68dd8188355a7202ff73.zip
fix gtk-doc patch (see bug #195026) and fix quotes
(Portage version: 2.1.3.12)
Diffstat (limited to 'gnome-base/gnome-keyring')
-rw-r--r--gnome-base/gnome-keyring/ChangeLog7
-rw-r--r--gnome-base/gnome-keyring/files/gnome-keyring-2.20.0-fix_gtk_doc.patch4
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild4
3 files changed, 11 insertions, 4 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/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"