summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-09-20 05:07:23 +0000
committerMike Frysinger <vapier@gentoo.org>2011-09-20 05:07:23 +0000
commit7b818169eb8410fe7f84ef391a178c5ac06337a8 (patch)
treeb4be7f7e606044c7393bbe32c3e33524b17d4ba4 /sys-libs/gdbm
parentVersion bump, bug #376919 wrt andreyc. (diff)
downloadgentoo-2-7b818169eb8410fe7f84ef391a178c5ac06337a8.tar.gz
gentoo-2-7b818169eb8410fe7f84ef391a178c5ac06337a8.tar.bz2
gentoo-2-7b818169eb8410fe7f84ef391a178c5ac06337a8.zip
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.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/gdbm')
-rw-r--r--sys-libs/gdbm/ChangeLog10
-rw-r--r--sys-libs/gdbm/gdbm-1.9.1-r1.ebuild71
-rw-r--r--sys-libs/gdbm/gdbm-1.9.1-r2.ebuild (renamed from sys-libs/gdbm/gdbm-1.9.1.ebuild)15
-rw-r--r--sys-libs/gdbm/metadata.xml2
4 files changed, 17 insertions, 81 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/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>