diff options
Diffstat (limited to 'sys-libs/gdbm')
| -rw-r--r-- | sys-libs/gdbm/Manifest | 6 | ||||
| -rw-r--r-- | sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch | 12 | ||||
| -rw-r--r-- | sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch | 17 | ||||
| -rw-r--r-- | sys-libs/gdbm/gdbm-1.21.ebuild | 49 | ||||
| -rw-r--r-- | sys-libs/gdbm/gdbm-1.22.ebuild | 43 | ||||
| -rw-r--r-- | sys-libs/gdbm/gdbm-1.23.ebuild (renamed from sys-libs/gdbm/gdbm-1.20.ebuild) | 31 | ||||
| -rw-r--r-- | sys-libs/gdbm/metadata.xml | 17 |
7 files changed, 30 insertions, 145 deletions
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest index d966b222643a..63bb68e78015 100644 --- a/sys-libs/gdbm/Manifest +++ b/sys-libs/gdbm/Manifest @@ -1,4 +1,2 @@ -DIST gdbm-1.20.tar.gz 987628 BLAKE2B b0e01e63714b0485f9ac28f4a2260bf9309d2b3a87f6ccf6c9901619d383b6527d068b8614220eb6a6dec909fbf3fab5162a6c67bb928cfedaef36f1df26d0df SHA512 5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b -DIST gdbm-1.21-gettext-ac.patch.gz 7142 BLAKE2B 1cb4eed1dbea047e115b13831ab2c6af9b639c48324c83b60ee926e7731a4b59fb779aaea8508d12fd5e5d64328464768a153135a555c1783086e4d1e981d86f SHA512 714dc008b5d5a5882f13c8bfc889e04a0b2c142a06ffe479f3ba3b21e8d6f08f579d1b111237ad9e1987d9aae27f67b4689aa3cd664c2adadb1bb856497ed3f8 -DIST gdbm-1.21.tar.gz 1005982 BLAKE2B 1f9b04507601b9660a9a81edc29e9b7c0d9adececf21e372670bcf1acf3d0551d858af3e7cf9202b460691cc851ca6dfcc5014ae28161b06f31c9442d3a9fe96 SHA512 b2a31802d1af9f97b24d3dd01cb048bab4a8e748297f1b70851c0342400dde4281242b7f80bd92a36035e22398d240d131b550ab444ee838a077522a6921fa43 -DIST gdbm-1.22.tar.gz 1090100 BLAKE2B f27c65e8cc7c71fc4f4a119b92e1d1b2068c1ec87456d5a555879dc23654ad4e7cf8172049aa9f4f9c432cc7140ff61fc36ddf6d5e45c321add67a105754a59c SHA512 67461fc4f41e825d0134175ff99c913ccb4aa7ea3d0f64f32bdedbc7677b3ecabd2c525ac6b2ee47a9561e002e4224e492b72088d57bb4862a1f8c089521ec51 +DIST gdbm-1.23.tar.gz 1115854 BLAKE2B a47746577cf2f3c9b62faea496c4d6a50a8f1b0a5af448cb2215e90057c99b5b630ba3f5357c85dfb7fd98ba4e90969e30a779120c29106ed1e8736721f9bec1 SHA512 918080cb0225b221c11eb7339634a95e00c526072395f7a3d46ccf42ef020dea7c4c5bec34aff2c4f16033e1fff6583252b7e978f68b8d7f8736b0e025838e10 +DIST gdbm-1.23.tar.gz.sig 181 BLAKE2B 34785e6fe8e02100084d61e989749ee388794b8af82fc59a417140807bf169c45c15935f8cf91d0ba116dfdee295e05b2b014f1539f1f128a57acfe59010d34d SHA512 6653751c04584f10aa3325bd1cb5b9f7970a786dd2a99602ea620c11a86a9ba5c342aa52627bd06c03da822e9e1600dc034d9a8f42856a287fd67f6b9f161c71 diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch deleted file mode 100644 index 2f0c0c450733..000000000000 --- a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN gdbm-1.18.1.orig/configure.ac gdbm-1.18.1/configure.ac ---- gdbm-1.18.1.orig/configure.ac 2018-10-27 08:46:09.000000000 +0300 -+++ gdbm-1.18.1/configure.ac 2020-12-17 14:12:14.249678303 +0200 -@@ -94,7 +94,7 @@ - - dnl Internationalization macros. - AM_GNU_GETTEXT([external], [need-ngettext]) --AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_REQUIRE_VERSION(0.18) - - AC_CHECK_HEADERS([sys/file.h sys/termios.h string.h locale.h getopt.h]) - diff --git a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch deleted file mode 100644 index 448ce9fbbddc..000000000000 --- a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/808480 - -From: Sergey Poznyakoff <gray@gnu.org> -Date: Wed, 7 Jul 2021 09:36:22 +0300 -Subject: Fix https://puszcza.gnu.org.ua/bugs/?515 - -* src/gdbm.h.in: Include sys/types.h ---- a/src/gdbm.h.in -+++ b/src/gdbm.h.in -@@ -30,6 +30,7 @@ - # define _GDBM_H_ - - # include <stdio.h> -+# include <sys/types.h> - - /* GDBM C++ support */ - # if defined(__cplusplus) || defined(c_plusplus) diff --git a/sys-libs/gdbm/gdbm-1.21.ebuild b/sys-libs/gdbm/gdbm-1.21.ebuild deleted file mode 100644 index 6f0257fa15b7..000000000000 --- a/sys-libs/gdbm/gdbm-1.21.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Standard GNU database libraries" -HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz - https://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.21-gettext-ac.patch.gz -" - -LICENSE="GPL-3" -SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+berkdb nls +readline static-libs" - -DEPEND=" - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${WORKDIR}"/${PN}-1.21-gettext-ac.patch #696838 #811303 -) - -multilib_src_configure() { - # gdbm doesn't appear to use either of these libraries - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no - - local myeconfargs=( - --includedir="${EPREFIX}"/usr/include/gdbm - $(use_enable berkdb libgdbm-compat) - $(use_enable nls) - $(use_enable static-libs static) - $(use_with readline) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die -} diff --git a/sys-libs/gdbm/gdbm-1.22.ebuild b/sys-libs/gdbm/gdbm-1.22.ebuild deleted file mode 100644 index ea2981b0de29..000000000000 --- a/sys-libs/gdbm/gdbm-1.22.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Standard GNU database libraries" -HOMEPAGE="https://www.gnu.org/software/gdbm/" -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+berkdb nls +readline static-libs" - -DEPEND=" - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -multilib_src_configure() { - # gdbm doesn't appear to use either of these libraries - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no - - local myeconfargs=( - --includedir="${EPREFIX}"/usr/include/gdbm - $(use_enable berkdb libgdbm-compat) - $(use_enable nls) - $(use_enable static-libs static) - $(use_with readline) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -name '*.la' -delete || die - fi - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die -} diff --git a/sys-libs/gdbm/gdbm-1.20.ebuild b/sys-libs/gdbm/gdbm-1.23.ebuild index 1658e3a497be..178a5707800d 100644 --- a/sys-libs/gdbm/gdbm-1.20.ebuild +++ b/sys-libs/gdbm/gdbm-1.23.ebuild @@ -1,32 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools multilib-minimal +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gdbm.asc +inherit libtool multilib-minimal verify-sig DESCRIPTION="Standard GNU database libraries" HOMEPAGE="https://www.gnu.org/software/gdbm/" SRC_URI="mirror://gnu/gdbm/${P}.tar.gz" +SRC_URI+=" verify-sig? ( mirror://gnu/gdbm/${P}.tar.gz.sig )" LICENSE="GPL-3" SLOT="0/6" # libgdbm.so version -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+berkdb nls +readline static-libs" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+berkdb nls +readline static-libs test" +RESTRICT="!test? ( test )" -DEPEND=" - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) -" +DEPEND="readline? ( sys-libs/readline:=[${MULTILIB_USEDEP}] )" RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.18.1-gettext.patch # bug #696838 - "${FILESDIR}"/${PN}-1.20-uclibc-types.patch # bug #808480 -) +BDEPEND=" + test? ( dev-util/dejagnu ) + verify-sig? ( sec-keys/openpgp-keys-gdbm ) +" src_prepare() { default - eautoreconf + + # gdbm ships with very old libtool files, regen to avoid + # errors when cross-compiling. + elibtoolize } multilib_src_configure() { @@ -40,6 +43,7 @@ multilib_src_configure() { $(use_enable static-libs static) $(use_with readline) ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } @@ -49,5 +53,6 @@ multilib_src_install_all() { if ! use static-libs ; then find "${ED}" -name '*.la' -delete || die fi + mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die } diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml index 12136288f7bd..931542e3ee05 100644 --- a/sys-libs/gdbm/metadata.xml +++ b/sys-libs/gdbm/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag> -</use> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <use> + <flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag> + </use> + <upstream> + <remote-id type="savannah">gdbm</remote-id> + </upstream> </pkgmetadata> |