Gentoo Archives: gentoo-commits

From: "Thomas Sachau (tommy)" <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/subversion: subversion-1.7.17.ebuild ChangeLog
Date: Sun, 01 Jun 2014 14:44:19
Message-Id: 20140601144416.232B82004E@flycatcher.gentoo.org
1 tommy 14/06/01 14:44:16
2
3 Modified: ChangeLog
4 Added: subversion-1.7.17.ebuild
5 Log:
6 Version bump to 1.7.17, fixes bug 506308
7
8 (Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)
9
10 Revision Changes Path
11 1.166 dev-vcs/subversion/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.166&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.166&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.165&r2=1.166
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v
20 retrieving revision 1.165
21 retrieving revision 1.166
22 diff -u -r1.165 -r1.166
23 --- ChangeLog 23 May 2014 12:19:19 -0000 1.165
24 +++ ChangeLog 1 Jun 2014 14:44:15 -0000 1.166
25 @@ -1,6 +1,12 @@
26 # ChangeLog for dev-vcs/subversion
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.165 2014/05/23 12:19:19 polynomial-c Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.166 2014/06/01 14:44:15 tommy Exp $
30 +
31 +*subversion-1.7.17 (01 Jun 2014)
32 +
33 + 01 Jun 2014; Thomas Sachau (Tommy[D]) <tommy@g.o>
34 + +subversion-1.7.17.ebuild:
35 + Version bump to 1.7.17, fixes bug 506308
36
37 *subversion-1.8.9 (23 May 2014)
38
39
40
41
42 1.1 dev-vcs/subversion/subversion-1.7.17.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.7.17.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.7.17.ebuild?rev=1.1&content-type=text/plain
46
47 Index: subversion-1.7.17.ebuild
48 ===================================================================
49 # Copyright 1999-2014 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.17.ebuild,v 1.1 2014/06/01 14:44:15 tommy Exp $
52
53 EAPI=5
54 PYTHON_COMPAT=( python{2_6,2_7} )
55 DISTUTILS_OPTIONAL=1
56 WANT_AUTOMAKE="none"
57 MY_P="${P/_/-}"
58 GENTOO_DEPEND_ON_PERL="no"
59
60 inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
61
62 DESCRIPTION="Advanced version control system"
63 HOMEPAGE="http://subversion.apache.org/"
64 SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
65 S="${WORKDIR}/${MY_P}"
66
67 LICENSE="Subversion GPL-2"
68 SLOT="0"
69 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
70 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
71
72 COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
73 >=dev-libs/apr-1.3:1
74 >=dev-libs/apr-util-1.3:1
75 dev-libs/expat
76 sys-libs/zlib
77 berkdb? ( >=sys-libs/db-4.0.14 )
78 ctypes-python? ( ${PYTHON_DEPS} )
79 gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
80 kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
81 perl? ( dev-lang/perl )
82 python? ( ${PYTHON_DEPS} )
83 ruby? ( >=dev-lang/ruby-1.8.2:1.8
84 dev-ruby/rubygems[ruby_targets_ruby18] )
85 sasl? ( dev-libs/cyrus-sasl )
86 webdav-neon? ( >=net-libs/neon-0.28 )
87 webdav-serf? ( >=net-libs/serf-0.3.0 )"
88 RDEPEND="${COMMON_DEPEND}
89 apache2? ( www-servers/apache[apache2_modules_dav] )
90 java? ( >=virtual/jre-1.5 )
91 kde? ( kde-base/kwalletd )
92 nls? ( virtual/libintl )
93 perl? ( dev-perl/URI )"
94 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
95 DEPEND="${COMMON_DEPEND}
96 test? ( ${PYTHON_DEPS} )
97 !!<sys-apps/sandbox-1.6
98 ctypes-python? ( dev-python/ctypesgen )
99 doc? ( app-doc/doxygen )
100 gnome-keyring? ( virtual/pkgconfig )
101 java? ( >=virtual/jdk-1.5 )
102 kde? ( virtual/pkgconfig )
103 nls? ( sys-devel/gettext )
104 webdav-neon? ( virtual/pkgconfig )"
105
106 REQUIRED_USE="
107 ctypes-python? ( ${PYTHON_REQUIRED_USE} )
108 python? ( ${PYTHON_REQUIRED_USE} )
109 test? ( ${PYTHON_REQUIRED_USE} )"
110
111 want_apache
112
113 pkg_setup() {
114 if use berkdb; then
115 local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
116 | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
117 | sed 's:.*b::')"
118 einfo
119 if [[ -z "${SVN_BDB_VERSION}" ]]; then
120 if [[ -n "${apu_bdb_version}" ]]; then
121 SVN_BDB_VERSION="${apu_bdb_version}"
122 einfo "Matching db version to apr-util"
123 else
124 SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
125 einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
126 fi
127 fi
128 einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
129 einfo
130
131 if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
132 eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
133 eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
134 eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
135 eerror "Aborting to avoid possible run-time crashes."
136 die "Berkeley DB version mismatch"
137 fi
138 fi
139
140 depend.apache_pkg_setup
141
142 java-pkg-opt-2_pkg_setup
143
144 if ! use webdav-neon && ! use webdav-serf; then
145 ewarn "WebDAV support is disabled. You need WebDAV to"
146 ewarn "access repositories through the HTTP protocol."
147 ewarn "Consider enabling one of the following USE-flags:"
148 ewarn " webdav-neon webdav-serf"
149 echo -ne "\a"
150 fi
151
152 if use debug; then
153 append-cppflags -DSVN_DEBUG -DAP_DEBUG
154 fi
155
156 # Allow for custom repository locations.
157 SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
158 }
159
160 src_prepare() {
161 epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
162 "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
163 "${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
164 "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
165 epatch_user
166
167 fperms +x build/transform_libtool_scripts.sh
168
169 sed -i \
170 -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
171 -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
172
173 # this bites us in particular on Solaris
174 sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
175 die "/bin/sh is not POSIX shell!"
176
177 eautoconf
178 elibtoolize
179
180 sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
181 -i build-outputs.mk || die "sed failed"
182
183 if use python; then
184 # XXX: make python_copy_sources accept path
185 S=${S}/subversion/bindings/swig/python python_copy_sources
186 rm -r "${S}"/subversion/bindings/swig/python || die
187 fi
188 }
189
190 src_configure() {
191 local myconf
192
193 if use python || use perl || use ruby; then
194 myconf+=" --with-swig"
195 else
196 myconf+=" --without-swig"
197 fi
198
199 if use java; then
200 myconf+=" --without-junit"
201 fi
202
203 if use kde || use nls; then
204 myconf+=" --enable-nls"
205 else
206 myconf+=" --disable-nls"
207 fi
208
209 case ${CHOST} in
210 *-aix*)
211 # avoid recording immediate path to sharedlibs into executables
212 append-ldflags -Wl,-bnoipath
213 ;;
214 *-interix*)
215 # loader crashes on the LD_PRELOADs...
216 myconf+=" --disable-local-library-preloading"
217 ;;
218 *-solaris*)
219 # need -lintl to link
220 use nls && append-libs intl
221 # this breaks installation, on x64 echo replacement is 32-bits
222 myconf+=" --disable-local-library-preloading"
223 ;;
224 *-mint*)
225 myconf+=" --enable-all-static --disable-local-library-preloading"
226 ;;
227 *)
228 # inject LD_PRELOAD entries for easy in-tree development
229 myconf+=" --enable-local-library-preloading"
230 ;;
231 esac
232
233 #workaround for bug 387057
234 has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
235
236 #version 1.7.7 again tries to link against the older installed version and fails, when trying to
237 #compile for x86 on amd64, so workaround this issue again
238 #check newer versions, if this is still/again needed
239 myconf+=" --disable-disallowing-of-undefined-references"
240
241 # for build-time scripts
242 if use ctypes-python || use python || use test; then
243 python_export_best
244 fi
245
246 #force ruby-1.8 for bug 399105
247 #allow overriding Python include directory
248 ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \
249 ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
250 econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
251 $(use_with apache2 apxs "${APXS}") \
252 $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
253 $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
254 $(use_enable dso runtime-module-search) \
255 $(use_with gnome-keyring) \
256 $(use_enable java javahl) \
257 $(use_with java jdk "${JAVA_HOME}") \
258 $(use_with kde kwallet) \
259 $(use_with sasl) \
260 $(use_with webdav-neon neon) \
261 $(use_with webdav-serf serf "${EPREFIX}/usr") \
262 ${myconf} \
263 --with-apr="${EPREFIX}/usr/bin/apr-1-config" \
264 --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
265 --disable-experimental-libtool \
266 --without-jikes \
267 --disable-mod-activation \
268 --disable-neon-version-check \
269 --disable-static
270 }
271
272 src_compile() {
273 emake local-all
274
275 if use ctypes-python; then
276 # pre-generate .py files
277 use ctypes-python && emake ctypes-python
278
279 pushd subversion/bindings/ctypes-python >/dev/null || die
280 distutils-r1_src_compile
281 popd >/dev/null || die
282 fi
283
284 if use python; then
285 swig_py_compile() {
286 local p=subversion/bindings/swig/python
287 rm -f ${p} || die
288 ln -s "${BUILD_DIR}" ${p} || die
289
290 python_export PYTHON_INCLUDEDIR
291 emake swig-py \
292 swig_pydir="$(python_get_sitedir)/libsvn" \
293 swig_pydir_extra="$(python_get_sitedir)/svn"
294 }
295
296 # this will give us proper BUILD_DIR for symlinking
297 BUILD_DIR=python \
298 python_foreach_impl swig_py_compile
299 fi
300
301 if use perl; then
302 emake swig-pl
303 fi
304
305 if use ruby; then
306 emake swig-rb
307 fi
308
309 if use java; then
310 emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
311 fi
312
313 if use extras; then
314 emake tools
315 fi
316
317 if use doc; then
318 doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
319
320 if use java; then
321 emake doc-javahl
322 fi
323 fi
324 }
325
326 src_test() {
327 default
328
329 if use ctypes-python; then
330 python_test() {
331 "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
332 || die "ctypes-python tests fail with ${EPYTHON}"
333 }
334
335 distutils-r1_src_test
336 fi
337
338 if use python; then
339 swig_py_test() {
340 pushd "${BUILD_DIR}" >/dev/null || die
341 "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
342 popd >/dev/null || die
343 }
344
345 BUILD_DIR=subversion/bindings/swig/python \
346 python_foreach_impl swig_py_test
347 fi
348 }
349
350 src_install() {
351 emake -j1 DESTDIR="${D}" local-install
352
353 if use ctypes-python; then
354 pushd subversion/bindings/ctypes-python >/dev/null || die
355 distutils-r1_src_install
356 popd >/dev/null || die
357 fi
358
359 if use python; then
360 swig_py_install() {
361 local p=subversion/bindings/swig/python
362 rm -f ${p} || die
363 ln -s "${BUILD_DIR}" ${p} || die
364
365 emake \
366 DESTDIR="${D}" \
367 swig_pydir="$(python_get_sitedir)/libsvn" \
368 swig_pydir_extra="$(python_get_sitedir)/svn" \
369 install-swig-py
370 }
371
372 BUILD_DIR=python \
373 python_foreach_impl swig_py_install
374 fi
375
376 if use perl; then
377 emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
378 fixlocalpod
379 find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
380 fi
381
382 if use ruby; then
383 emake DESTDIR="${D}" install-swig-rb
384 fi
385
386 if use java; then
387 emake DESTDIR="${D}" install-javahl
388 java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
389 java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
390 rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
391 fi
392
393 # Install Apache module configuration.
394 if use apache2; then
395 keepdir "${APACHE_MODULES_CONFDIR}"
396 insinto "${APACHE_MODULES_CONFDIR}"
397 doins "${FILESDIR}/47_mod_dav_svn.conf"
398 fi
399
400 # Install Bash Completion, bug 43179.
401 newbashcomp tools/client-side/bash_completion subversion
402 rm -f tools/client-side/bash_completion
403
404 # Install hot backup script, bug 54304.
405 newbin tools/backup/hot-backup.py svn-hot-backup
406 rm -fr tools/backup
407
408 # Install svnserve init-script and xinet.d snippet, bug 43245.
409 newinitd "${FILESDIR}"/svnserve.initd2 svnserve
410 newconfd "${FILESDIR}"/svnserve.confd svnserve
411 insinto /etc/xinetd.d
412 newins "${FILESDIR}"/svnserve.xinetd svnserve
413
414 #adjust default user and group with disabled apache2 USE flag, bug 381385
415 use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
416 -e "s\GROUP:-apache\GROUP:-svnusers\g" \
417 -i "${ED}"etc/init.d/svnserve || die
418 use apache2 || sed -e "0,/apache/s//svn/" \
419 -e "s:apache:svnusers:" \
420 -i "${ED}"etc/xinetd.d/svnserve || die
421
422 # Install documentation.
423 dodoc CHANGES COMMITTERS README
424 dodoc tools/xslt/svnindex.{css,xsl}
425 rm -fr tools/xslt
426
427 # Install extra files.
428 if use extras; then
429 cat << EOF > 80subversion-extras
430 PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
431 ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
432 EOF
433 doenvd 80subversion-extras
434
435 emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
436
437 find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
438 rm -fr tools/client-side/svnmucc
439 rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
440 rm -fr tools/{buildbot,dev,diff,po}
441
442 insinto /usr/share/${PN}
443 find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
444 doins -r tools
445 fi
446
447 if use doc; then
448 dohtml -r doc/doxygen/html/*
449
450 if use java; then
451 java-pkg_dojavadoc doc/javadoc
452 fi
453 fi
454
455 find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
456
457 cd "${ED}"usr/share/locale
458 for i in * ; do
459 [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; }
460 done
461 }
462
463 pkg_preinst() {
464 # Compare versions of Berkeley DB, bug 122877.
465 if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
466 OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
467 NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
468 if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
469 CHANGED_BDB_VERSION="1"
470 fi
471 fi
472 }
473
474 pkg_postinst() {
475 use perl && perl-module_pkg_postinst
476
477 if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
478 ewarn "You upgraded from an older version of Berkeley DB and may experience"
479 ewarn "problems with your repository. Run the following commands as root to fix it:"
480 ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
481 ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
482 fi
483
484 ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
485 }
486
487 pkg_postrm() {
488 use perl && perl-module_pkg_postrm
489 }
490
491 pkg_config() {
492 # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
493 # already has EPREFIX in it
494 einfo "Initializing the database in ${SVN_REPOS_LOC}..."
495 if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
496 echo "A Subversion repository already exists and I will not overwrite it."
497 echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
498 else
499 mkdir -p "${SVN_REPOS_LOC}/conf"
500
501 einfo "Populating repository directory..."
502 # Create initial repository.
503 "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
504
505 einfo "Setting repository permissions..."
506 SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
507 SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
508 if use apache2; then
509 [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
510 [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
511 else
512 [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
513 [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
514 fi
515 chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
516 chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
517 echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
518 echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
519 echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
520 echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
521 echo "to finish the configuration."
522 fi
523 }