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

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

[Gilles Dartiguelongue (eva)]

eva         10/08/27 18:30:15

  Modified:             gnome-keyring-2.30.3.ebuild ChangeLog
  Removed:              gnome-keyring-2.22.3-r1.ebuild
                        gnome-keyring-2.22.3-r2.ebuild
  Log:
  Clean up old revisions. Add missing preserve_old_lib.
  
  (Portage version: 2.2_rc68/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild?r1=1.7&r2=1.8

Index: gnome-keyring-2.30.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-keyring-2.30.3.ebuild	11 Aug 2010 16:27:01 -0000	1.7
+++ gnome-keyring-2.30.3.ebuild	27 Aug 2010 18:30:15 -0000	1.8
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.30.3.ebuild,v 1.7 2010/08/11 16:27:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.30.3.ebuild,v 1.8 2010/08/27 18:30:15 eva Exp $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx autotools
+inherit autotools eutils gnome2 pam virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -51,9 +51,7 @@
 	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
 		-i configure.in configure || die "sed failed"
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
 
@@ -61,3 +59,13 @@
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
 }
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgnome-keyring.so.0
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-keyring.so.0
+}



1.182                gnome-base/gnome-keyring/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-keyring/ChangeLog?r1=1.181&r2=1.182

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ChangeLog	18 Aug 2010 22:06:45 -0000	1.181
+++ ChangeLog	27 Aug 2010 18:30:15 -0000	1.182
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.181 2010/08/18 22:06:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.182 2010/08/27 18:30:15 eva Exp $
+
+  27 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-keyring-2.22.3-r1.ebuild, -gnome-keyring-2.22.3-r2.ebuild,
+  -files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch,
+  -files/gnome-keyring-2.22.3-pkg-libtasn1.patch,
+  -files/gnome-keyring-2.22.3-warnings.patch,
+  -files/gnome-keyring-2.26.1-dlopen.patch,
+  -files/gnome-keyring-2.27.92-as-needed.patch, gnome-keyring-2.30.3.ebuild:
+  Clean up old revisions. Add missing preserve_old_lib.
 
   18 Aug 2010; Markus Meier <maekke@gentoo.org> gnome-keyring-2.28.2.ebuild:
   arm stable, bug #314899