From 6a40365b146a2d2250a3f00e5150de9aaa2f8e8c Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 24 Jul 2004 06:57:17 +0000
Subject: prepare for the world #32510

---
 sys-libs/gdbm/ChangeLog         |  5 ++++-
 sys-libs/gdbm/gdbm-1.8.3.ebuild | 31 +++++++++++++++++--------------
 2 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'sys-libs/gdbm')

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/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"
 }
-- 
cgit v1.2.3-65-gdbad