Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/db/
Date: Mon, 15 Apr 2019 12:44:43
Message-Id: 1555332270.8337f9f8e97557e455fbccf34695efc2abc34472.polynomial-c@gentoo
1 commit: 8337f9f8e97557e455fbccf34695efc2abc34472
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 15 12:44:30 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 15 12:44:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8337f9f8
7
8 sys-libs/db: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-libs/db/Manifest | 1 -
14 sys-libs/db/db-6.1.29-r1.ebuild | 238 ----------------------------------------
15 2 files changed, 239 deletions(-)
16
17 diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
18 index 5ad9aa060e6..cf552adc74f 100644
19 --- a/sys-libs/db/Manifest
20 +++ b/sys-libs/db/Manifest
21 @@ -13,7 +13,6 @@ DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a8
22 DIST db-5.1.29.tar.gz 32188074 BLAKE2B 6af9e6afc0ebd06a43c0e96fd0b2b3c8e17476507996605aea0c1519b9120140ff410829118a59ea8eff1ab220762131cfab8cf574ffddfa6348128a57721b37 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0
23 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
24 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
25 -DIST db-6.1.29.tar.gz 37521943 BLAKE2B 3f036647337a36cb5f8cf5cc8774bd49d4cdff2d57750f21488183de67e426ab0863ee97d972751adc10b294f6c23e1e5e3f2c7b3fc02616463f971b10f3b15e SHA512 ced40e357acd1214f8b5800ddcf084c65c0ab77ca045a4504ac1a4c864035bd50aa8993cd1232174ff81071a36806314807330aa53dcb18de548c886c2a99e73
26 DIST db-6.1.36.tar.gz 37526795 BLAKE2B 9334dc66501465acf99f2675dc838a979c03a29b526b1d22fc9f811c6e76c5ecab4fafad4aa7efbc658c0bc64218f22ac4189c34bce866b0a4ffa052525607a6 SHA512 5f63eaaf75cad12c2a9b9f960bf39cb4ba6f8636609472f5909e38dccb65322a20104f0a8641b968c195c1b9a3ac5456c8bdaf3253995c9a4ace222a2e0d6811
27 DIST db-6.1.38.tar.gz 37644337 BLAKE2B 32b3f65bef04bb18e45c3c0c9110d5d0bf58f4761bee5bf07949e192f4b9f5fa28117b1696c17863da0affe408bd6c81eeee32c472c46d31c17693519959ff03 SHA512 5760d1e441bea11c371825ac47203b1eb9f188f9cb2ea0e3d547b3d3b15620d27cb0b3333d617eb7b89c53407fb7ed79cad27477d714b5b797869f8bf4b1808b
28 DIST db-6.2.32.tar.gz 45342417 BLAKE2B d3254fba1300d6c7dda5d872c5fa349e8704d71be9c4d37ccf3357782adeb879ce30e066cf083bd97554405c2e94071a96cee16090ad9f797a4fa657ff7e8c46 SHA512 83bdbf18a7b9782409cf4563f8d5f11322d5e564a39946c890604a60440a6ea6361e0236bbc30bd4e8e1de1fa9196b8e815fd126baa035f55c5826c2c6aa3401
29
30 diff --git a/sys-libs/db/db-6.1.29-r1.ebuild b/sys-libs/db/db-6.1.29-r1.ebuild
31 deleted file mode 100644
32 index 4f3570a788d..00000000000
33 --- a/sys-libs/db/db-6.1.29-r1.ebuild
34 +++ /dev/null
35 @@ -1,238 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=5
40 -inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
41 -
42 -#Number of official patches
43 -#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
44 -PATCHNO=${PV/*.*.*_p}
45 -if [[ ${PATCHNO} == "${PV}" ]] ; then
46 - MY_PV=${PV}
47 - MY_P=${P}
48 - PATCHNO=0
49 -else
50 - MY_PV=${PV/_p${PATCHNO}}
51 - MY_P=${PN}-${MY_PV}
52 -fi
53 -
54 -S_BASE="${WORKDIR}/${MY_P}"
55 -S="${S_BASE}/build_unix"
56 -DESCRIPTION="Oracle Berkeley DB"
57 -HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
58 -SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
59 -for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
60 - export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
61 -done
62 -
63 -LICENSE="AGPL-3"
64 -SLOT="$(get_version_component_range 1-2)"
65 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
66 -IUSE="doc java cxx tcl test"
67 -
68 -REQUIRED_USE="test? ( tcl )"
69 -
70 -# the entire testsuite needs the TCL functionality
71 -DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
72 - test? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
73 - java? ( >=virtual/jdk-1.5 )
74 - >=sys-devel/binutils-2.16.1"
75 -RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
76 - java? ( >=virtual/jre-1.5 )"
77 -
78 -MULTILIB_WRAPPED_HEADERS=(
79 - /usr/include/db$(get_version_component_range 1-2)/db.h
80 -)
81 -
82 -src_prepare() {
83 - cd "${WORKDIR}"/"${MY_P}"
84 - for (( i=1 ; i<=${PATCHNO} ; i++ ))
85 - do
86 - epatch "${DISTDIR}"/patch."${MY_PV}"."${i}"
87 - done
88 -
89 - # bug #510506
90 - epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
91 -
92 - # use the includes from the prefix
93 - epatch "${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
94 - epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
95 -
96 - # sqlite configure call has an extra leading ..
97 - # upstreamed:5.2.36, missing in 5.3.x/6.x
98 - # still needs to be patched in 6.0.20
99 - epatch "${FILESDIR}"/${PN}-6.1.19-sqlite-configure-path.patch
100 -
101 - # The upstream testsuite copies .lib and the binaries for each parallel test
102 - # core, ~300MB each. This patch uses links instead, saves a lot of space.
103 - epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch
104 -
105 - # Upstream release script grabs the dates when the script was run, so lets
106 - # end-run them to keep the date the same.
107 - export REAL_DB_RELEASE_DATE="$(awk \
108 - '/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \
109 - "${S_BASE}"/dist/configure)"
110 - sed -r -i \
111 - -e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \
112 - "${S_BASE}"/dist/RELEASE || die
113 -
114 - # Include the SLOT for Java JAR files
115 - # This supersedes the unused jarlocation patches.
116 - sed -r -i \
117 - -e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
118 - "${S_BASE}"/dist/Makefile.in || die
119 -
120 - cd "${S_BASE}"/dist || die
121 - rm -f aclocal/libtool.m4
122 - sed -i \
123 - -e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \
124 - configure.ac || die
125 - sed -i \
126 - -e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \
127 - aclocal/programs.m4 || die
128 - AT_M4DIR="aclocal aclocal_java" eautoreconf
129 - # Upstream sucks - they do autoconf and THEN replace the version variables.
130 - . ./RELEASE
131 - for v in \
132 - DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \
133 - DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \
134 - DB_VERSION \
135 - DB_RELEASE_DATE ; do
136 - local ev="__EDIT_${v}__"
137 - sed -i -e "s/${ev}/${!v}/g" configure || die
138 - done
139 -
140 - # This is a false positive skip in the tests as the test-reviewer code
141 - # looks for 'Skipping\s'
142 - sed -i \
143 - -e '/db_repsite/s,Skipping:,Skipping,g' \
144 - "${S_BASE}"/test/tcl/reputils.tcl || die
145 -}
146 -
147 -multilib_src_configure() {
148 - local myconf=()
149 -
150 - tc-ld-disable-gold #470634
151 -
152 - # compilation with -O0 fails on amd64, see bug #171231
153 - if [[ ${ABI} == amd64 ]]; then
154 - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
155 - replace-flags -O0 -O2
156 - is-flagq -O[s123] || append-flags -O2
157 - fi
158 -
159 - # Add linker versions to the symbols. Easier to do, and safer than header file
160 - # mumbo jumbo.
161 - if use userland_GNU ; then
162 - append-ldflags -Wl,--default-symver
163 - fi
164 -
165 - # use `set` here since the java opts will contain whitespace
166 - if multilib_is_native_abi && use java ; then
167 - myconf+=(
168 - --with-java-prefix="${JAVA_HOME}"
169 - --with-javac-flags="$(java-pkg_javac-args)"
170 - )
171 - fi
172 -
173 - # Bug #270851: test needs TCL support
174 - if use tcl || use test ; then
175 - myconf+=(
176 - --enable-tcl
177 - --with-tcl="${EPREFIX}/usr/$(get_libdir)"
178 - )
179 - else
180 - myconf+=(--disable-tcl )
181 - fi
182 -
183 - # sql_compat will cause a collision with sqlite3
184 - # --enable-sql_compat
185 - # Don't --enable-sql* because we don't want to use bundled sqlite.
186 - # See Gentoo bug #605688
187 - ECONF_SOURCE="${S_BASE}"/dist \
188 - STRIP="true" \
189 - econf \
190 - --enable-compat185 \
191 - --enable-dbm \
192 - --enable-o_direct \
193 - --without-uniquename \
194 - --disable-sql \
195 - --disable-sql_codegen \
196 - --disable-sql_compat \
197 - $([[ ${ABI} == arm ]] && echo --with-mutex=ARM/gcc-assembly) \
198 - $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \
199 - $(use_enable cxx) \
200 - $(use_enable cxx stl) \
201 - $(multilib_native_use_enable java) \
202 - "${myconf[@]}" \
203 - $(use_enable test)
204 -}
205 -
206 -multilib_src_install() {
207 - emake install DESTDIR="${D}"
208 -
209 - db_src_install_headerslot
210 -
211 - db_src_install_usrlibcleanup
212 -
213 - if multilib_is_native_abi && use java; then
214 - java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
215 - java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
216 - rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
217 - fi
218 -}
219 -
220 -multilib_src_install_all() {
221 - db_src_install_usrbinslot
222 -
223 - db_src_install_doc
224 -
225 - dodir /usr/sbin
226 - # This file is not always built, and no longer exists as of db-4.8
227 - if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
228 - mv "${ED}"/usr/bin/berkeley_db_svc \
229 - "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
230 - fi
231 -}
232 -
233 -pkg_postinst() {
234 - multilib_foreach_abi db_fix_so
235 -}
236 -
237 -pkg_postrm() {
238 - multilib_foreach_abi db_fix_so
239 -}
240 -
241 -src_test() {
242 - # db_repsite is impossible to build, as upstream strips those sources.
243 - # db_repsite is used directly in the setup_site_prog,
244 - # setup_site_prog is called from open_site_prog
245 - # which is called only from tests in the multi_repmgr group.
246 - #sed -ri \
247 - # -e '/set subs/s,multi_repmgr,,g' \
248 - # "${S_BASE}/test/testparams.tcl"
249 - sed -ri \
250 - -e '/multi_repmgr/d' \
251 - "${S_BASE}/test/tcl/test.tcl" || die
252 -
253 - # This is the only failure in 5.2.28 so far, and looks like a false positive.
254 - # Repmgr018 (btree): Test of repmgr stats.
255 - # Repmgr018.a: Start a master.
256 - # Repmgr018.b: Start a client.
257 - # Repmgr018.c: Run some transactions at master.
258 - # Rep_test: btree 20 key/data pairs starting at 0
259 - # Rep_test.a: put/get loop
260 - # FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1
261 - sed -ri \
262 - -e '/set parms.*repmgr018/d' \
263 - -e 's/repmgr018//g' \
264 - "${S_BASE}/test/tcl/test.tcl" || die
265 -
266 - multilib-minimal_src_test
267 -}
268 -
269 -multilib_src_test() {
270 - multilib_is_native_abi || return
271 -
272 - S=${BUILD_DIR} db_src_test
273 -}