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