prepare for the world #32510

3 files changed, 33 insertions, 17 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 743de18a1922..5b579c5d0941 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/gdbm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.19 2004/07/02 08:45:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.20 2004/07/24 06:57:17 vapier Exp $
+
+  24 Jul 2004; Mike Frysinger <vapier@gentoo.org> gdbm-1.8.3.ebuild:
+  Clean up the ebuild a bit and add temp backwards compat #32510.
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gdbm-1.8.0-r5.ebuild,
   gdbm-1.8.3.ebuild:
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 1775b2d84bdf..3fe5b3f692a0 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,7 +1,17 @@
-MD5 1039d04f9693323dd0f014c4ebd1480b ChangeLog 2780
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1a99b4b7943d3b6a2a28c770ed4c5c08 ChangeLog 2912
 MD5 d372d002aa15a2bf938b0921cd0c328f gdbm-1.8.0-r5.ebuild 1179
-MD5 72ea1b5b0a84df2aa4f6c7cf153a7d4b gdbm-1.8.3.ebuild 1256
+MD5 b6d9ffaa0babfa8f63ee5326b87eeec4 gdbm-1.8.3.ebuild 1268
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 017b1a2d0ae227d89ee16480e3129a3b files/digest-gdbm-1.8.0-r5 62
 MD5 c7bef9bbd37f161be399c58c61edef94 files/digest-gdbm-1.8.3 62
 MD5 8640084b5d1f0e27de1d1c7da372f00a files/gdbm-1.8.0-r5-gentoo.diff 6093
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFBAghXHTu7gpaalycRAkb2AKCO4/qk/KM/RK/aT/pOA+ZTmVpWnACggJmW
+Ipkv8e4enziNOk4Myo+XqqI=
+=UIOX
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/gdbm-1.8.3.ebuild b/sys-libs/gdbm/gdbm-1.8.3.ebuild
index 90aeec8baff9..c650208088b4 100644
--- a/sys-libs/gdbm/gdbm-1.8.3.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.ebuild,v 1.10 2004/07/02 08:45:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3.ebuild,v 1.11 2004/07/24 06:57:17 vapier Exp $
 
-inherit gnuconfig eutils flag-o-matic
+inherit gnuconfig flag-o-matic
 
 DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
 HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
@@ -17,16 +17,17 @@ DEPEND="virtual/libc
 	berkdb? ( =sys-libs/db-1* )"
 RDEPEND="virtual/libc"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	gnuconfig_update
+}
 
-	! is-flag "-fomit-frame-pointer" && append-flags "-fomit-frame-pointer"
-
-	local myconf
-	use static && myconf="${myconf} --enable-static"
-
-	econf ${myconf} || die
-	emake CFLAGS="${CFLAGS}" || die
+src_compile() {
+	append-flags -fomit-frame-pointer
+	econf || die
+	use berkdb || sed -i '/HAVE_LIBNDBM/s:.*::' autoconf.h
+	emake || die
 }
 
 src_install() {
@@ -37,13 +38,15 @@ src_install() {
 		INSTALL_ROOT=${D} \
 		install-compat || die
 
-	dosed "s:/usr/local/lib':/usr/lib':g" /usr/lib/libgdbm.la
-
 	dodoc ChangeLog NEWS README
+
+	# temp backwards support #32510
+	if [ -e ${ROOT}/usr/lib/libgdbm.so.2 ] ; then
+		cp -a ${ROOT}/usr/lib/libgdbm.so.2 ${D}/usr/lib/
+	fi
 }
 
 pkg_postinst() {
 	ewarn "Please run revdep-rebuild --soname libgdbm.so"
-	ewarn "Because things compiled against the previous version will not"
-	ewarn "work"
+	ewarn "Packages compiled against the previous version will not work"
 }