Gentoo Archives: gentoo-commits

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