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

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64

4 files changed, 9 insertions, 76 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/Manifest b/gnome-base/gnome-desktop/Manifest
index eeb0e1ff93e5..15fefa0687ad 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-desktop-2.24.2-background.patch 886 RMD160 032349d5797ce2333a961a214bf078138ab16010 SHA1 6e271f942e130cf1f5020d1d7ab9f64f81903fc0 SHA256 cbe72e1e9f8b4891cbbe321ab7f6e16ca98fbdf05a5c833dbf5dfb8135173457
 DIST gnome-desktop-2.24.3.tar.bz2 1509505 RMD160 b6489965a0baa6056b5c7826418401459ffbf0b9 SHA1 2ebbf2475bb741131b523819fb46e71d4489fa79 SHA256 03b1e08ee1318820f538864e8db492a245848bd727da1412a62de51d4cb76e89
-DIST gnome-desktop-2.26.2.tar.bz2 3084469 RMD160 56df9c9df3ad5744e191c8b456bd474dba1787c8 SHA1 e3b1adc3b0d4c48225e5f633df75ee4ddc6fb21a SHA256 4d50afffce98c5af17d08c3ad20e201e216e8b6753bef97878967df6f2c2f02a
 DIST gnome-desktop-2.26.3.tar.bz2 3107987 RMD160 04e0de4e9e31e2994e1a3220f2183f25ac780399 SHA1 5b1090354ee775392d8faf4ee667a84c9c7a9e79 SHA256 37b7278d3132bb97f70ba2d5c5c06f5a219433d886e3f85e9a16c1f05c3726b7
 EBUILD gnome-desktop-2.24.3-r1.ebuild 1931 RMD160 62ce2601950b45cd88e5c44c7530147b7fa81e14 SHA1 a0930d5fa2a45caad03a96163eef92087ba33d31 SHA256 cda0460212dec55d56ba180f17a8dda7e33ef346668538c47a4a958b23f4c8e7
-EBUILD gnome-desktop-2.26.2.ebuild 1822 RMD160 dccc5160d165b75ee80d1f207b4e2f04e9f71747 SHA1 f250a53952854bd18b72793a386c38f6e12de44c SHA256 511f02ff51332ed1a39d7ac4b1c33a98daefea505a5e5ef252cb661bbc23357f
-EBUILD gnome-desktop-2.26.3.ebuild 1822 RMD160 fb53d9417d7c197a7aca18e12b4103c8e796ebc2 SHA1 ce8758226688d99043d405a5ef5b2fdb92a87c84 SHA256 c33fd5326dd2af0ebf40fbb8c5d00ff78c745dabcadab903fcd9fbbfb591dcb2
-MISC ChangeLog 32651 RMD160 dc0722e2ebe0afc4dabe7c60d09769f48d2ad8ae SHA1 6877366b3f428ba4d448d0678aae412b84b9b924 SHA256 d03572ff6af10ab425de9a30f5c772dc2ac527a06fe45c70e2449b1ad631a9e2
+EBUILD gnome-desktop-2.26.3.ebuild 1686 RMD160 5a7e8002b62a06accfb8f5c006553b218cc64344 SHA1 5252ab0932ca1d064d00c974191bdcb38c84344a SHA256 96796a15fed631c05e2a95046652ed6235cca6583cd3aeded63a7d5ea2c855ad
+MISC ChangeLog 32868 RMD160 12e5be01cb78e4efddec936b244d9949278348c8 SHA1 1674ced5c0d3b9911c7b9af3ec8c1c362dd79dd9 SHA256 e580c9c9d4730b682eaa939b6b5ba13c21d673053abc01e74fa97e121f0e1af3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpYVDQACgkQ1fmVwcYIWAba1wCfYtbxVzp79eWLMhaQO+gbd1aW
-GoEAn2Vp5tb33lZltdcQwTrdy/mwkuCV
-=Cw5y
------END PGP SIGNATURE-----
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."