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