[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-keyring: ChangeLog gnome-keyring-2.22.3-r1.ebuild gnome-keyring-2.24.1.ebuild gnome-keyring-2.22.2.ebuild gnome-keyring-2.22.3.ebuild

[Gilles Dartiguelongue (eva)]

eva         09/04/27 22:00:09

  Modified:             ChangeLog gnome-keyring-2.22.3-r1.ebuild
                        gnome-keyring-2.24.1.ebuild
  Removed:              gnome-keyring-2.22.2.ebuild
                        gnome-keyring-2.22.3.ebuild
  Log:
  Fix configure with recent libtasn1, bug #266554. Clean up old revisions.
  (Portage version: 2.2_rc31/cvs/Linux x86_64)

Revision  Changes    Path
1.144                gnome-base/gnome-keyring/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?r1=1.143&r2=1.144

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog	27 Apr 2009 09:56:42 -0000	1.143
+++ ChangeLog	27 Apr 2009 22:00:09 -0000	1.144
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.143 2009/04/27 09:56:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.144 2009/04/27 22:00:09 eva Exp $
+
+  27 Apr 2009; Gilles Dartiguelongue <eva@g.o>
+  +files/gnome-keyring-2.22.3-pkg-libtasn1.patch,
+  -gnome-keyring-2.22.2.ebuild, -gnome-keyring-2.22.3.ebuild,
+  gnome-keyring-2.22.3-r1, gnome-keyring-2.24.1:
+  Fix configure with recent libtasn1, bug #266554.
+  Clean up old revisions.
 
   27 Apr 2009; Raúl Porcel <armin76@g.o>
   gnome-keyring-2.22.3-r1.ebuild:



1.11                 gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild?r1=1.10&r2=1.11

Index: gnome-keyring-2.22.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnome-keyring-2.22.3-r1.ebuild	27 Apr 2009 09:56:42 -0000	1.10
+++ gnome-keyring-2.22.3-r1.ebuild	27 Apr 2009 22:00:09 -0000	1.11
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 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.22.3-r1.ebuild,v 1.10 2009/04/27 09:56:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r1.ebuild,v 1.11 2009/04/27 22:00:09 eva Exp $
 
-inherit gnome2 eutils pam
+inherit gnome2 eutils pam autotools
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -24,6 +24,7 @@
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
+	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -43,4 +44,10 @@
 
 	# Backport from trunk for fixing upstream bug #511285, bug #238098
 	epatch "${FILESDIR}/${P}-warnings.patch"
+
+	# Fix configure with recent libtasn1, bug #266554
+	epatch "${FILESDIR}/${P}-pkg-libtasn1.patch"
+
+	intltoolize --force --copy --automake || die "inltoolize failed"
+	eautoreconf
 }



1.2                  gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild?r1=1.1&r2=1.2

Index: gnome-keyring-2.24.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-keyring-2.24.1.ebuild	17 Mar 2009 08:42:54 -0000	1.1
+++ gnome-keyring-2.24.1.ebuild	27 Apr 2009 22:00:09 -0000	1.2
@@ -1,8 +1,10 @@
 # Copyright 1999-2009 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.24.1.ebuild,v 1.1 2009/03/17 08:42:54 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild,v 1.2 2009/04/27 22:00:09 eva Exp $
 
-inherit gnome2 pam
+EAPI="2"
+
+inherit gnome2 pam eutils autotools
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -24,6 +26,7 @@
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
+	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -42,3 +45,13 @@
 		--enable-acl-prompts
 		--enable-ssh-agent"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix configure with recent libtasn1, bug #266554
+	epatch "${FILESDIR}/${PN}-2.22.3-pkg-libtasn1.patch"
+
+	intltoolize --force --copy --automake || die "inltoolize failed"
+	eautoreconf
+}