properly fix #106970

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index c3c891f06ee660fb3b53dded602541685b1bd026..fbc7768b3b25536471c1589b0972bf075c1445b9 100644 (file)
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 22314eff7a4f923601e6dba3863baf3d gdbm-1.8.0-r5.ebuild 1232
-MD5 e77dfc3f70817b0d79d6de1ef72a9262 gdbm-1.8.3-r1.ebuild 1371
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 6792927bc0b3a3ffec98cfc3dc6a8a38 gdbm-1.8.3-r2.ebuild 1412
+MD5 baeff0d16e9bba9efccc83cf537aff01 gdbm-1.8.3-r2.ebuild 1432
+MD5 22314eff7a4f923601e6dba3863baf3d gdbm-1.8.0-r5.ebuild 1232
 MD5 893b34bd914ab4b81e0df07da6818acf ChangeLog 4848
-MD5 017b1a2d0ae227d89ee16480e3129a3b files/digest-gdbm-1.8.0-r5 62
-MD5 c7bef9bbd37f161be399c58c61edef94 files/digest-gdbm-1.8.3-r1 62
-MD5 9ed34cb95efec19c95fbf28a2e7e0986 files/gdbm-1.8.3-fix-install-ownership.patch 1567
 MD5 c7bef9bbd37f161be399c58c61edef94 files/digest-gdbm-1.8.3-r2 62
+MD5 9ed34cb95efec19c95fbf28a2e7e0986 files/gdbm-1.8.3-fix-install-ownership.patch 1567
+MD5 017b1a2d0ae227d89ee16480e3129a3b files/digest-gdbm-1.8.0-r5 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDNTILKf2g/qXtneoRAsheAKCRsPRquytuW2RTgQA5np5FRHg1wwCfUq/k
-QLkZjH0PM4yCAjQcrxV9+Vw=
-=q5lE
+iD8DBQFDNeBigIKl8Uu19MoRApE+AJ0a4wRUcXmX1qqWS8z3uuJg90eiZgCfXnt4
+JcbqdgK4r47TssMXbVil16k=
+=DzV/
 -----END PGP SIGNATURE-----

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 (file)
index 1e92448..0000000
--- 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 (file)
index dd390e5..0000000
--- 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 b4c3b70331d9dd58ff21c14b964072432207f73e..813279cad314e70a90ebeca6c31638d354d5ae06 100644 (file)
--- 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
 }