Convert USE=compat to USE=berkdb since that is what the compat library actually is for, and drop berkdb linkage since gdbm does not seem to use it anywhere.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

5 files changed, 23 insertions, 88 deletions

diff --git a/sys-libs/gdbm/ChangeLog b/sys-libs/gdbm/ChangeLog
index 09496a2cac08..0a4054f00158 100644
--- a/sys-libs/gdbm/ChangeLog
+++ b/sys-libs/gdbm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/gdbm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.56 2011/09/20 04:28:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/ChangeLog,v 1.57 2011/09/20 05:07:23 vapier Exp $
+
+*gdbm-1.9.1-r2 (20 Sep 2011)
+
+  20 Sep 2011; Mike Frysinger <vapier@gentoo.org> -gdbm-1.9.1.ebuild,
+  -gdbm-1.9.1-r1.ebuild, +gdbm-1.9.1-r2.ebuild, metadata.xml:
+  Convert USE=compat to USE=berkdb since that is what the compat library
+  actually is for, and drop berkdb linkage since gdbm does not seem to use it
+  anywhere.
 
   20 Sep 2011; Mike Frysinger <vapier@gentoo.org> gdbm-1.9.1-r1.ebuild:
   Enable compat by default since perl/python need it #383745 by Alexandre
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 03ee21ad12b5..3f06722d8b35 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -9,14 +9,13 @@ DIST gdbm-1.8.3.tar.gz 228695 RMD160 0f5741ab32f95db721c5d9f4548447301171e938 SH
 DIST gdbm-1.9.1.tar.gz 554843 RMD160 512ad1b5c3a3fb7b17094d627b9d6da8215532f2 SHA1 0742a9ed8fc93fb5d5d3984d2acf99821134e2e9 SHA256 6025852637772b0699f2294b5f14fd4a084bca3c8161d29d64d1f30d6d1a9aed
 EBUILD gdbm-1.8.3-r3.ebuild 1171 RMD160 79d544a5fa2691b944cebdad4d65bcc9f471bddf SHA1 d41239ddc97d54a7161813b212c60be33faa2687 SHA256 c9c4fb7821237ae2f6d9a45ebae1b07dd1864cbe8d8077f7690e9c5a5bb19ab0
 EBUILD gdbm-1.8.3-r4.ebuild 1969 RMD160 7a239e0117be74edf3424be094228185f0e62246 SHA1 a41baf9b5c632f8cecea54b07f9a4bbea5b3aff2 SHA256 6a6b0dd702118bd9eb23074aa605f3e5a618a422570bde2d40bf1b6c37c66986
-EBUILD gdbm-1.9.1-r1.ebuild 1790 RMD160 7f20c589d7a6a472044d91fc05f8e9e2f94723a7 SHA1 6c8c81bb33f469aea22374b09fb90ed36e1abd1d SHA256 5e7a00d258acd2221c8ddec26c6577a3982bdc3a5bab1d0110e888c1d18f201f
-EBUILD gdbm-1.9.1.ebuild 1670 RMD160 9329e556449f56b0a28577bf9d58d816c5cb0298 SHA1 3b9f24450261558ada6f8adff9d055d0d3774ea4 SHA256 3cf0223ce4f97366fd7f8a76b13aba97ec60cd2581f35487173f059f8abbfdb6
-MISC ChangeLog 7486 RMD160 a80998c3f1066a620fbacbc883809a47e229fe8a SHA1 2d554a4b48815b52076cbf11e9e4812436bfdaff SHA256 938c97c6785893cb5b77689200dc272ec7d7c222d909a4723372dd04f103a692
-MISC metadata.xml 344 RMD160 8e398bea8e7123574e065df595904a4f68bc4beb SHA1 c90c3c7b781f3601dfb78430fdce5aa254475d87 SHA256 f8af8e7dd65943e64ef56c78c2afdc16ec7086590e859156aef6af473a94e7de
+EBUILD gdbm-1.9.1-r2.ebuild 1699 RMD160 a621b72ce54a54fe45224c2521d3c92414b416f3 SHA1 815c6931b61c9e2792a13039339f95a46520e201 SHA256 c35f7f2fc183daf931ce82150674c7e57fc16ddae13f85d823c0d45ff9632b9f
+MISC ChangeLog 7812 RMD160 be9d80cb50238dc17ac7ac1e8465d72a15de2202 SHA1 435e077e3dc9f81d1815e0c639c53aab467fc7ee SHA256 335f76243a55ba3bab6539b27fed8cb654befc64635fb7e5771028eff461e4a2
+MISC metadata.xml 382 RMD160 b2567918dbec61d6fe5c0a2d4809245a87eb7e21 SHA1 48f56078d6fc63d0089148486d689b3cf624367a SHA256 08df40c74ce04dcb73a182dbb283233242bd568c16b00b20c7eaa97da80c75e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk54FpMACgkQaC/OocHi7JZbPwD+KA8lgO8Ic0Vs+Fcp4LWM81IA
-cSNy9Wx7DKpf3TER0SYA/RB/Tan9H3CPtRUiApDgfyjlOE42WPw3LcycEt5T1KCk
-=AKj3
+iF4EAREIAAYFAk54H5MACgkQaC/OocHi7JYnBQD/W5JEhYXYCNcEVGq7sDvk19K8
+z6SJJAOqImkWr6PwPBMA/RyQ2ouhqT+LHrU4XlyX9BSP7U8339DExXKbPUZ3A3vK
+=+PXr
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild b/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild
deleted file mode 100644
index 737bf6d59415..000000000000
--- a/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.9.1-r1.ebuild,v 1.2 2011/09/20 04:28:59 vapier Exp $
-
-EAPI="2"
-
-inherit eutils libtool flag-o-matic
-
-EX_P="${PN}-1.8.3"
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
-	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-# enable compat by default only so long as perl/python need it
-IUSE="berkdb +compat exporter static-libs"
-
-DEPEND="berkdb? ( sys-libs/db )"
-RDEPEND="${DEPEND}"
-
-EX_S="${WORKDIR}"/${EX_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-compat-link.patch #383743
-	elibtoolize
-}
-
-src_configure() {
-	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
-	if use exporter ; then
-		pushd "${EX_S}" >/dev/null
-		append-lfs-flags
-		econf --disable-shared
-		popd >/dev/null
-	fi
-
-	econf \
-		--includedir=/usr/include/gdbm \
-		--with-gdbm183-libdir="${EX_S}/.libs" \
-		--with-gdbm183-includedir="${EX_S}" \
-		$(use_enable compat libgdbm-compat) \
-		$(use_enable exporter gdbm-export) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	if use exporter ; then
-		emake -C "${WORKDIR}"/${EX_P} libgdbm.la || die
-	fi
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use static-libs || find "${D}" -name '*.la' -delete
-	mv "${D}"/usr/include/gdbm/gdbm.h "${D}"/usr/include/ || die
-	dodoc ChangeLog NEWS README
-}
-
-pkg_preinst() {
-	preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/gdbm/gdbm-1.9.1.ebuild b/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
index 9d2ab463c4ee..c9069b133a34 100644
--- a/sys-libs/gdbm/gdbm-1.9.1.ebuild
+++ b/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.9.1.ebuild,v 1.1 2011/09/19 04:28:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.9.1-r2.ebuild,v 1.1 2011/09/20 05:07:23 vapier Exp $
 
 EAPI="2"
 
@@ -8,26 +8,25 @@ inherit eutils libtool flag-o-matic
 
 EX_P="${PN}-1.8.3"
 DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="http://www.gnu.org/software/gdbm/gdbm.html"
+HOMEPAGE="http://www.gnu.org/software/gdbm/"
 SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 	exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="berkdb compat exporter static-libs"
-
-DEPEND="berkdb? ( sys-libs/db )"
-RDEPEND="${DEPEND}"
+IUSE="+berkdb exporter static-libs"
 
 EX_S="${WORKDIR}"/${EX_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-compat-link.patch #383743
 	elibtoolize
 }
 
 src_configure() {
-	use berkdb || export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
+	# gdbm doesn't appear to use either of these libraries
+	export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
 
 	if use exporter ; then
 		pushd "${EX_S}" >/dev/null
@@ -40,7 +39,7 @@ src_configure() {
 		--includedir=/usr/include/gdbm \
 		--with-gdbm183-libdir="${EX_S}/.libs" \
 		--with-gdbm183-includedir="${EX_S}" \
-		$(use_enable compat libgdbm-compat) \
+		$(use_enable berkdb libgdbm-compat) \
 		$(use_enable exporter gdbm-export) \
 		$(use_enable static-libs static)
 }
diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index 350132dacc06..07b37856f07f 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
- <flag name='compat'>enable gdbm_compat library</flag>
+ <flag name='berkdb'>enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
  <flag name='exporter'>enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
 </use>
 </pkgmetadata>