Remove excessive preserve_old_lib on detailed library version that is not present in DT_NEEDED records

(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)

3 files changed, 7 insertions, 62 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 428ebe375ad3..01161ca8c810 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-desktop
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.254 2009/07/11 08:57:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.255 2009/10/02 03:33:31 leio Exp $
+
+  02 Oct 2009; Mart Raudsepp <leio@gentoo.org> -gnome-desktop-2.26.2.ebuild,
+  gnome-desktop-2.26.3.ebuild:
+  Remove excessive preserve_old_lib on detailed library version that is not
+  present in DT_NEEDED records
 
 *gnome-desktop-2.26.3 (11 Jul 2009)
 
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.26.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.2.ebuild
deleted file mode 100644
index e69d3b7a0161..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.26.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.26.2.ebuild,v 1.2 2009/06/03 23:03:05 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.14.0
-	>=dev-libs/glib-2.19.1
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.5"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
-PDEPEND=">=dev-python/pygtk-2.8
-	>=dev-python/pygobject-2.14
-	>=dev-python/libgnome-python-2.22"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gnome-distributor=Gentoo
-		--disable-scrollkeeper
-		--disable-static"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.7
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.7.2.6
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.7
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.7.2.6
-	ewarn
-	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.25, please"
-	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild
index 96de13aa77b6..2cd81a7b6dc8 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild,v 1.1 2009/07/11 08:57:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.26.3.ebuild,v 1.2 2009/10/02 03:33:31 leio Exp $
 
 inherit eutils gnome2
 
@@ -45,13 +45,11 @@ pkg_setup() {
 pkg_preinst() {
 	gnome2_pkg_preinst
 	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.7
-	preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-2.so.7.2.6
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
 	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.7
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-2.so.7.2.6
 	ewarn
 	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.25, please"
 	ewarn "make sure you run revdep-rebuild at the end of the upgrade."