Cleanup ebuild and link the compat module against gdbm #165263 by Gergan Penkov.

Package-Manager: portage-2.1.2-r6

5 files changed, 57 insertions, 26 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 14afbf292694..25d6329c47d6 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/gdbm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.39 2006/10/17 08:29:30 uberlord Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.40 2007/02/04 23:10:12 vapier Exp $
+
+*gdbm-1.8.3-r3 (04 Feb 2007)
+
+  04 Feb 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/gdbm-1.8.3-compat-linking.patch, -gdbm-1.8.3-r2.ebuild,
+  +gdbm-1.8.3-r3.ebuild:
+  Cleanup ebuild and link the compat module against gdbm #165263 by Gergan
+  Penkov.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> gdbm-1.8.3-r2.ebuild:
   Added ~sparc-fbsd keyword.
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 18a4fd7cd6d1..3201c0ed0b00 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,20 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gdbm-1.8.3-compat-linking.patch 409 RMD160 f80695aa404dbee8da4ef2dbac6e38e63883b5e9 SHA1 8d1b2929215c04faf96e082a2622ff016eb934c5 SHA256 49e10c9edd6be4371431b633605de0be6e0a8bb8bf21386f6c749b20a0d5f217
+MD5 d656d161130b93a1361ee861858056bc files/gdbm-1.8.3-compat-linking.patch 409
+RMD160 f80695aa404dbee8da4ef2dbac6e38e63883b5e9 files/gdbm-1.8.3-compat-linking.patch 409
+SHA256 49e10c9edd6be4371431b633605de0be6e0a8bb8bf21386f6c749b20a0d5f217 files/gdbm-1.8.3-compat-linking.patch 409
 AUX gdbm-1.8.3-fix-install-ownership.patch 1567 RMD160 e058ffe36f57dd421ac70bdbb4ed64cd1e641aa6 SHA1 efdbd776a434ccfd885e2f505e8cb2f8e54f5887 SHA256 e08df8b252176475c47615fbe87e554fc7391b29192131aba03e91f687a8076c
 MD5 9ed34cb95efec19c95fbf28a2e7e0986 files/gdbm-1.8.3-fix-install-ownership.patch 1567
 RMD160 e058ffe36f57dd421ac70bdbb4ed64cd1e641aa6 files/gdbm-1.8.3-fix-install-ownership.patch 1567
 SHA256 e08df8b252176475c47615fbe87e554fc7391b29192131aba03e91f687a8076c files/gdbm-1.8.3-fix-install-ownership.patch 1567
 DIST gdbm-1.8.3.tar.gz 228695 RMD160 0f5741ab32f95db721c5d9f4548447301171e938 SHA1 a0296b1986a99cb9ec0dc3b17ea99aec76e9b760 SHA256 cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
-EBUILD gdbm-1.8.3-r2.ebuild 1469 RMD160 7d18e8d5955d83cbdf2a53e15a0941846f196d11 SHA1 41355bea0701fa47f40997c2aa34974004df5c83 SHA256 8079eae381b1ee2478581622490d6567ae7f02a725c1f8e2c59f4a1d806a2f50
-MD5 84ae113f99ac4e2243303e6fcfbb097f gdbm-1.8.3-r2.ebuild 1469
-RMD160 7d18e8d5955d83cbdf2a53e15a0941846f196d11 gdbm-1.8.3-r2.ebuild 1469
-SHA256 8079eae381b1ee2478581622490d6567ae7f02a725c1f8e2c59f4a1d806a2f50 gdbm-1.8.3-r2.ebuild 1469
-MISC ChangeLog 5221 RMD160 45e83e0318329d4878e027760e902b4ed8650206 SHA1 7c9e587b5c3d7149f358200e7a04007cd17eca22 SHA256 c39a729f084d5bb84267c6964fe19f9d6ec7e20d34c149d4b09b520b14485c5a
-MD5 367579b03d6c7bea5a69e98166840775 ChangeLog 5221
-RMD160 45e83e0318329d4878e027760e902b4ed8650206 ChangeLog 5221
-SHA256 c39a729f084d5bb84267c6964fe19f9d6ec7e20d34c149d4b09b520b14485c5a ChangeLog 5221
+EBUILD gdbm-1.8.3-r3.ebuild 1178 RMD160 5913d56e722dd7f7e16796e1cc0b827beae09e26 SHA1 1618affbcf6db02ad06b4f998c0c7468f93e5b5b SHA256 26bdccd31a3313cd5e3a6a4409981d1d70744b258590802f891721c06997d13b
+MD5 8044f5d80124e92c180411b3c9bf3bda gdbm-1.8.3-r3.ebuild 1178
+RMD160 5913d56e722dd7f7e16796e1cc0b827beae09e26 gdbm-1.8.3-r3.ebuild 1178
+SHA256 26bdccd31a3313cd5e3a6a4409981d1d70744b258590802f891721c06997d13b gdbm-1.8.3-r3.ebuild 1178
+MISC ChangeLog 5475 RMD160 751b993a5ae34a7506ede415718afdf47bbda3ed SHA1 2247d4fdea5f1e84e16c641e195ef763d276ac43 SHA256 f9205ad27361723c0312a873631731a2962dd400c78c1f112e4c074fb1b1ae7d
+MD5 17d749502aedc7aaaf31cfaf5308c973 ChangeLog 5475
+RMD160 751b993a5ae34a7506ede415718afdf47bbda3ed ChangeLog 5475
+SHA256 f9205ad27361723c0312a873631731a2962dd400c78c1f112e4c074fb1b1ae7d ChangeLog 5475
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 b4485374fb9e69fedc303f71700964ef files/digest-gdbm-1.8.3-r2 232
-RMD160 829ce25824ba2a152c421f9f79d1b39db6f51034 files/digest-gdbm-1.8.3-r2 232
-SHA256 ed3955b7dd86a349fb2e9d9a0f7c88ff1983f693a675d853f4c5591ee43e78f1 files/digest-gdbm-1.8.3-r2 232
+MD5 b4485374fb9e69fedc303f71700964ef files/digest-gdbm-1.8.3-r3 232
+RMD160 829ce25824ba2a152c421f9f79d1b39db6f51034 files/digest-gdbm-1.8.3-r3 232
+SHA256 ed3955b7dd86a349fb2e9d9a0f7c88ff1983f693a675d853f4c5591ee43e78f1 files/digest-gdbm-1.8.3-r3 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFxmft8bi6rjpTunYRAsHeAKDF72gp5/LS7FxAYSW7zpGm9neNPwCfXsu2
+8cCZ24Y22wK5N1pkIEEwTVw=
+=EaKw
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.3-r2 b/sys-libs/gdbm/files/digest-gdbm-1.8.3-r3
index 440f9dd971ae..440f9dd971ae 100644
--- a/sys-libs/gdbm/files/digest-gdbm-1.8.3-r2
+++ b/sys-libs/gdbm/files/digest-gdbm-1.8.3-r3
diff --git a/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch b/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch
new file mode 100644
index 000000000000..6a77e3f64fbd
--- /dev/null
+++ b/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch
@@ -0,0 +1,15 @@
+Taken from Debian
+
+http://bugs.gentoo.org/165263
+
+--- gdbm-1.8.3/Makefile.in
++++ gdbm-1.8.3/Makefile.in
+@@ -161,7 +161,7 @@
+ libgdbm_compat.la: $(C_LOBJS) gdbm.h
+ 	rm -f libgdbm_compat.la
+ 	$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
+-		-version-info $(SHLIB_VER) $(C_LOBJS)
++		-version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm
+ 
+ gdbm.h:	gdbm.proto gdbmerrno.h gdbm.proto2
+ 	rm -f gdbm.h
diff --git a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild b/sys-libs/gdbm/gdbm-1.8.3-r3.ebuild
index f923326cf80d..a41cbe763f1f 100644
--- a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.3-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild,v 1.6 2006/10/17 08:29:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r3.ebuild,v 1.1 2007/02/04 23:10:12 vapier Exp $
 
 inherit eutils libtool multilib
 
-DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
+DESCRIPTION="Standard GNU database libraries"
 HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
 SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
 
@@ -19,6 +19,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-fix-install-ownership.patch #24178
+	epatch "${FILESDIR}"/${P}-compat-linking.patch #165263
 	elibtoolize
 }
 
@@ -29,22 +30,15 @@ src_compile() {
 }
 
 src_install() {
-	make INSTALL_ROOT="${D}" install install-compat || die
+	emake INSTALL_ROOT="${D}" install install-compat || die
 	mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die
 	dodoc ChangeLog NEWS README
 }
 
 pkg_preinst() {
-	# temp backwards support #32510
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
-		touch "${ROOT}"/usr/$(get_libdir)/libgdbm.so.2
-	fi
+	preserve_old_lib libgdbm.so.2 #32510
 }
 
 pkg_postinst() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
-		ewarn "Please run revdep-rebuild --library libgdbm.so.2"
-		ewarn "After that completes, it will be safe to remove the old"
-		ewarn "library (${ROOT}usr/$(get_libdir)/libgdbm.so.2)."
-	fi
+	preserve_old_lib_notify libgdbm.so.2 #32510
 }