Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/gdbm/, sys-libs/gdbm/files/
Date: Fri, 31 Dec 2021 23:02:30
Message-Id: 1640991723.91122008001945cd9853c1d2e36e2e66426d86c0.soap@gentoo
1 commit: 91122008001945cd9853c1d2e36e2e66426d86c0
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 31 23:02:03 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 31 23:02:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91122008
7
8 sys-libs/gdbm: drop 1.20, 1.21
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sys-libs/gdbm/Manifest | 3 --
13 sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch | 12 ------
14 sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch | 17 --------
15 sys-libs/gdbm/gdbm-1.20.ebuild | 53 ------------------------
16 sys-libs/gdbm/gdbm-1.21.ebuild | 49 ----------------------
17 5 files changed, 134 deletions(-)
18
19 diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
20 index d966b222643a..32567a6b6fb8 100644
21 --- a/sys-libs/gdbm/Manifest
22 +++ b/sys-libs/gdbm/Manifest
23 @@ -1,4 +1 @@
24 -DIST gdbm-1.20.tar.gz 987628 BLAKE2B b0e01e63714b0485f9ac28f4a2260bf9309d2b3a87f6ccf6c9901619d383b6527d068b8614220eb6a6dec909fbf3fab5162a6c67bb928cfedaef36f1df26d0df SHA512 5f2fbd4318259e5b879ea2bff09e22defbb4e566ebbe11c44ac5b5369fd00745d7ed9f72ec1206153027eba245c4ee4a515a8ec6d67f84ec477483e72753590b
25 -DIST gdbm-1.21-gettext-ac.patch.gz 7142 BLAKE2B 1cb4eed1dbea047e115b13831ab2c6af9b639c48324c83b60ee926e7731a4b59fb779aaea8508d12fd5e5d64328464768a153135a555c1783086e4d1e981d86f SHA512 714dc008b5d5a5882f13c8bfc889e04a0b2c142a06ffe479f3ba3b21e8d6f08f579d1b111237ad9e1987d9aae27f67b4689aa3cd664c2adadb1bb856497ed3f8
26 -DIST gdbm-1.21.tar.gz 1005982 BLAKE2B 1f9b04507601b9660a9a81edc29e9b7c0d9adececf21e372670bcf1acf3d0551d858af3e7cf9202b460691cc851ca6dfcc5014ae28161b06f31c9442d3a9fe96 SHA512 b2a31802d1af9f97b24d3dd01cb048bab4a8e748297f1b70851c0342400dde4281242b7f80bd92a36035e22398d240d131b550ab444ee838a077522a6921fa43
27 DIST gdbm-1.22.tar.gz 1090100 BLAKE2B f27c65e8cc7c71fc4f4a119b92e1d1b2068c1ec87456d5a555879dc23654ad4e7cf8172049aa9f4f9c432cc7140ff61fc36ddf6d5e45c321add67a105754a59c SHA512 67461fc4f41e825d0134175ff99c913ccb4aa7ea3d0f64f32bdedbc7677b3ecabd2c525ac6b2ee47a9561e002e4224e492b72088d57bb4862a1f8c089521ec51
28
29 diff --git a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch b/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
30 deleted file mode 100644
31 index 2f0c0c450733..000000000000
32 --- a/sys-libs/gdbm/files/gdbm-1.18.1-gettext.patch
33 +++ /dev/null
34 @@ -1,12 +0,0 @@
35 -diff -ruN gdbm-1.18.1.orig/configure.ac gdbm-1.18.1/configure.ac
36 ---- gdbm-1.18.1.orig/configure.ac 2018-10-27 08:46:09.000000000 +0300
37 -+++ gdbm-1.18.1/configure.ac 2020-12-17 14:12:14.249678303 +0200
38 -@@ -94,7 +94,7 @@
39 -
40 - dnl Internationalization macros.
41 - AM_GNU_GETTEXT([external], [need-ngettext])
42 --AM_GNU_GETTEXT_VERSION(0.18)
43 -+AM_GNU_GETTEXT_REQUIRE_VERSION(0.18)
44 -
45 - AC_CHECK_HEADERS([sys/file.h sys/termios.h string.h locale.h getopt.h])
46 -
47
48 diff --git a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch b/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch
49 deleted file mode 100644
50 index 448ce9fbbddc..000000000000
51 --- a/sys-libs/gdbm/files/gdbm-1.20-uclibc-types.patch
52 +++ /dev/null
53 @@ -1,17 +0,0 @@
54 -https://bugs.gentoo.org/808480
55 -
56 -From: Sergey Poznyakoff <gray@×××.org>
57 -Date: Wed, 7 Jul 2021 09:36:22 +0300
58 -Subject: Fix https://puszcza.gnu.org.ua/bugs/?515
59 -
60 -* src/gdbm.h.in: Include sys/types.h
61 ---- a/src/gdbm.h.in
62 -+++ b/src/gdbm.h.in
63 -@@ -30,6 +30,7 @@
64 - # define _GDBM_H_
65 -
66 - # include <stdio.h>
67 -+# include <sys/types.h>
68 -
69 - /* GDBM C++ support */
70 - # if defined(__cplusplus) || defined(c_plusplus)
71
72 diff --git a/sys-libs/gdbm/gdbm-1.20.ebuild b/sys-libs/gdbm/gdbm-1.20.ebuild
73 deleted file mode 100644
74 index 1658e3a497be..000000000000
75 --- a/sys-libs/gdbm/gdbm-1.20.ebuild
76 +++ /dev/null
77 @@ -1,53 +0,0 @@
78 -# Copyright 1999-2021 Gentoo Authors
79 -# Distributed under the terms of the GNU General Public License v2
80 -
81 -EAPI=7
82 -
83 -inherit autotools multilib-minimal
84 -
85 -DESCRIPTION="Standard GNU database libraries"
86 -HOMEPAGE="https://www.gnu.org/software/gdbm/"
87 -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz"
88 -
89 -LICENSE="GPL-3"
90 -SLOT="0/6" # libgdbm.so version
91 -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"
92 -IUSE="+berkdb nls +readline static-libs"
93 -
94 -DEPEND="
95 - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
96 -"
97 -RDEPEND="${DEPEND}"
98 -
99 -PATCHES=(
100 - "${FILESDIR}"/${PN}-1.18.1-gettext.patch # bug #696838
101 - "${FILESDIR}"/${PN}-1.20-uclibc-types.patch # bug #808480
102 -)
103 -
104 -src_prepare() {
105 - default
106 - eautoreconf
107 -}
108 -
109 -multilib_src_configure() {
110 - # gdbm doesn't appear to use either of these libraries
111 - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
112 -
113 - local myeconfargs=(
114 - --includedir="${EPREFIX}"/usr/include/gdbm
115 - $(use_enable berkdb libgdbm-compat)
116 - $(use_enable nls)
117 - $(use_enable static-libs static)
118 - $(use_with readline)
119 - )
120 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
121 -}
122 -
123 -multilib_src_install_all() {
124 - einstalldocs
125 -
126 - if ! use static-libs ; then
127 - find "${ED}" -name '*.la' -delete || die
128 - fi
129 - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
130 -}
131
132 diff --git a/sys-libs/gdbm/gdbm-1.21.ebuild b/sys-libs/gdbm/gdbm-1.21.ebuild
133 deleted file mode 100644
134 index 6f0257fa15b7..000000000000
135 --- a/sys-libs/gdbm/gdbm-1.21.ebuild
136 +++ /dev/null
137 @@ -1,49 +0,0 @@
138 -# Copyright 1999-2021 Gentoo Authors
139 -# Distributed under the terms of the GNU General Public License v2
140 -
141 -EAPI=7
142 -
143 -inherit multilib-minimal
144 -
145 -DESCRIPTION="Standard GNU database libraries"
146 -HOMEPAGE="https://www.gnu.org/software/gdbm/"
147 -SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
148 - https://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.21-gettext-ac.patch.gz
149 -"
150 -
151 -LICENSE="GPL-3"
152 -SLOT="0/6" # libgdbm.so version
153 -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"
154 -IUSE="+berkdb nls +readline static-libs"
155 -
156 -DEPEND="
157 - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
158 -"
159 -RDEPEND="${DEPEND}"
160 -
161 -PATCHES=(
162 - "${WORKDIR}"/${PN}-1.21-gettext-ac.patch #696838 #811303
163 -)
164 -
165 -multilib_src_configure() {
166 - # gdbm doesn't appear to use either of these libraries
167 - export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
168 -
169 - local myeconfargs=(
170 - --includedir="${EPREFIX}"/usr/include/gdbm
171 - $(use_enable berkdb libgdbm-compat)
172 - $(use_enable nls)
173 - $(use_enable static-libs static)
174 - $(use_with readline)
175 - )
176 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
177 -}
178 -
179 -multilib_src_install_all() {
180 - einstalldocs
181 -
182 - if ! use static-libs ; then
183 - find "${ED}" -name '*.la' -delete || die
184 - fi
185 - mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
186 -}