properly fix #106970

(Portage version: 2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/ )

3 files changed, 4 insertions, 59 deletions

diff --git a/sys-libs/gdbm/files/digest-gdbm-1.8.3-r1 b/sys-libs/gdbm/files/digest-gdbm-1.8.3-r1
deleted file mode 100644
index 1e924487734e..000000000000
--- a/sys-libs/gdbm/files/digest-gdbm-1.8.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d1b1d5c0245b1c00aff92da751e9aa1 gdbm-1.8.3.tar.gz 228695
diff --git a/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild b/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild
deleted file mode 100644
index dd390e52800e..000000000000
--- a/sys-libs/gdbm/gdbm-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.16 2005/09/21 23:15:19 vapier Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="Standard GNU database libraries included for compatibility with Perl"
-HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ppc-macos"
-IUSE="berkdb"
-
-DEPEND="berkdb? ( sys-libs/db )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-fix-install-ownership.patch #24178
-	elibtoolize
-}
-
-src_compile() {
-	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-	econf --includedir=/usr/include/gdbm || die
-	emake || die
-}
-
-src_install() {
-	make INSTALL_ROOT="${D}" install install-compat || die
-	dodoc ChangeLog NEWS README
-}
-
-pkg_preinst() {
-	# temp backwards support #32510
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
-		touch "${D}"/usr/$(get_libdir)/libgdbm.so.2
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e ${ROOT}/usr/$(get_libdir)/libgdbm.so.2 ]] ; then
-		ewarn "Please run revdep-rebuild --soname 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
-}
diff --git a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild b/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild
index b4c3b70331d9..813279cad314 100644
--- a/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1 2005/09/24 11:01:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.8.3-r2.ebuild,v 1.2 2005/09/24 23:24:37 vapier Exp $
 
 inherit eutils libtool
 
@@ -24,18 +24,13 @@ src_unpack() {
 
 src_compile() {
 	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-	econf || die
+	econf --includedir=/usr/include/gdbm || die
 	emake || die
 }
 
 src_install() {
-	make INSTALL_ROOT="${D}" install || die
-
-	make \
-	includedir=/usr/include/gdbm \
-	INSTALL_ROOT="${D}" \
-	install-compat || die
-
+	make INSTALL_ROOT="${D}" install install-compat || die
+	mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die
 	dodoc ChangeLog NEWS README
 }