Gentoo Archives: gentoo-commits

From: "Tony Vroon (chainsaw)" <chainsaw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/subversion: ChangeLog subversion-1.6.17-r5.ebuild subversion-1.6.17-r3.ebuild
Date: Tue, 30 Aug 2011 11:19:52
Message-Id: 20110830111941.F18CC2004C@flycatcher.gentoo.org
1 chainsaw 11/08/30 11:19:41
2
3 Modified: ChangeLog
4 Added: subversion-1.6.17-r5.ebuild
5 Removed: subversion-1.6.17-r3.ebuild
6 Log:
7 Stop static libraries from being built entirely, instead of deleting them after the fact as suggested by Rafał "galtgendo" Mużyło in bug #380891. Removed old ebuild.
8
9 (Portage version: 2.1.10.11/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.55 dev-vcs/subversion/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.55&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.55&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.54&r2=1.55
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v
21 retrieving revision 1.54
22 retrieving revision 1.55
23 diff -u -r1.54 -r1.55
24 --- ChangeLog 27 Aug 2011 11:19:28 -0000 1.54
25 +++ ChangeLog 30 Aug 2011 11:19:41 -0000 1.55
26 @@ -1,6 +1,14 @@
27 # ChangeLog for dev-vcs/subversion
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.54 2011/08/27 11:19:28 armin76 Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.55 2011/08/30 11:19:41 chainsaw Exp $
31 +
32 +*subversion-1.6.17-r5 (30 Aug 2011)
33 +
34 + 30 Aug 2011; Tony Vroon <chainsaw@g.o> -subversion-1.6.17-r3.ebuild,
35 + +subversion-1.6.17-r5.ebuild:
36 + Stop static libraries from being built entirely, instead of deleting them
37 + after the fact as suggested by Rafał "galtgendo" Mużyło in bug #380891.
38 + Removed old ebuild.
39
40 27 Aug 2011; Raúl Porcel <armin76@g.o> subversion-1.6.17.ebuild:
41 alpha/ia64/s390/sh/sparc stable wrt #369065
42
43
44
45 1.1 dev-vcs/subversion/subversion-1.6.17-r5.ebuild
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r5.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r5.ebuild?rev=1.1&content-type=text/plain
49
50 Index: subversion-1.6.17-r5.ebuild
51 ===================================================================
52 # Copyright 1999-2011 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r5.ebuild,v 1.1 2011/08/30 11:19:41 chainsaw Exp $
55
56 EAPI="3"
57 SUPPORT_PYTHON_ABIS="1"
58 RESTRICT_PYTHON_ABIS="3.* *-jython"
59 WANT_AUTOMAKE="none"
60 MY_P="${P/_/-}"
61
62 inherit autotools base bash-completion db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
63
64 DESCRIPTION="Advanced version control system"
65 HOMEPAGE="http://subversion.apache.org/"
66 SRC_URI="http://subversion.tigris.org/downloads/${MY_P}.tar.bz2"
67 S="${WORKDIR}/${MY_P}"
68
69 LICENSE="Subversion"
70 SLOT="0"
71 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
72 IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
73
74 CDEPEND=">=dev-db/sqlite-3.4
75 >=dev-libs/apr-1.3:1
76 >=dev-libs/apr-util-1.3:1
77 dev-libs/expat
78 sys-libs/zlib
79 berkdb? ( >=sys-libs/db-4.0.14 )
80 ctypes-python? ( =dev-lang/python-2* )
81 emacs? ( virtual/emacs )
82 gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
83 kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
84 perl? ( dev-lang/perl )
85 python? ( =dev-lang/python-2* )
86 ruby? ( >=dev-lang/ruby-1.8.2 )
87 sasl? ( dev-libs/cyrus-sasl )
88 webdav-neon? ( >=net-libs/neon-0.28 )
89 webdav-serf? ( >=net-libs/serf-0.3.0 )"
90 RDEPEND="${CDEPEND}
91 apache2? ( www-servers/apache[apache2_modules_dav] )
92 java? ( >=virtual/jre-1.5 )
93 kde? ( kde-base/kwalletd )
94 nls? ( virtual/libintl )
95 perl? ( dev-perl/URI )"
96 DEPEND="${CDEPEND}
97 !!<sys-apps/sandbox-1.6
98 ctypes-python? ( dev-python/ctypesgen )
99 doc? ( app-doc/doxygen )
100 gnome-keyring? ( dev-util/pkgconfig )
101 java? ( >=virtual/jdk-1.5 )
102 kde? ( dev-util/pkgconfig )
103 nls? ( sys-devel/gettext )
104 webdav-neon? ( dev-util/pkgconfig )"
105
106 PATCHES=(
107 "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
108 "${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch"
109 "${FILESDIR}/${PN}-1.6.3-kwallet_window.patch"
110 )
111
112 want_apache
113
114 pkg_setup() {
115 if use berkdb; then
116 local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
117 | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
118 | sed 's:.*b::')"
119 einfo
120 if [[ -z "${SVN_BDB_VERSION}" ]]; then
121 if [[ -n "${apu_bdb_version}" ]]; then
122 SVN_BDB_VERSION="${apu_bdb_version}"
123 einfo "Matching db version to apr-util"
124 else
125 SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
126 einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
127 fi
128 fi
129 einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
130 einfo
131
132 if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
133 eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
134 eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
135 eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
136 eerror "Aborting to avoid possible run-time crashes."
137 die "Berkeley DB version mismatch"
138 fi
139 fi
140
141 depend.apache_pkg_setup
142
143 java-pkg-opt-2_pkg_setup
144
145 if use ctypes-python || use python; then
146 python_pkg_setup
147 fi
148
149 if ! use webdav-neon && ! use webdav-serf; then
150 ewarn "WebDAV support is disabled. You need WebDAV to"
151 ewarn "access repositories through the HTTP protocol."
152 ewarn "Consider enabling one of the following USE-flags:"
153 ewarn " webdav-neon webdav-serf"
154 echo -ne "\a"
155 fi
156
157 if use debug; then
158 append-cppflags -DSVN_DEBUG -DAP_DEBUG
159 fi
160
161 # Allow for custom repository locations.
162 SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
163 }
164
165 src_prepare() {
166 base_src_prepare
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 sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
174
175 eautoconf
176 elibtoolize
177
178 sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
179 }
180
181 src_configure() {
182 local myconf
183
184 if use python || use perl || use ruby; then
185 myconf+=" --with-swig"
186 else
187 myconf+=" --without-swig"
188 fi
189
190 if use java; then
191 myconf+=" --without-junit"
192 fi
193
194 if use kde || use nls; then
195 myconf+=" --enable-nls"
196 else
197 myconf+=" --disable-nls"
198 fi
199
200 econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
201 $(use_with apache2 apxs "${APXS}") \
202 $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
203 $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
204 $(use_enable dso runtime-module-search) \
205 $(use_with gnome-keyring) \
206 $(use_enable java javahl) \
207 $(use_with java jdk "${JAVA_HOME}") \
208 $(use_with kde kwallet) \
209 $(use_with sasl) \
210 $(use_with webdav-neon neon) \
211 $(use_with webdav-serf serf "${EPREFIX}/usr") \
212 ${myconf} \
213 --with-apr="${EPREFIX}/usr/bin/apr-1-config" \
214 --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
215 --disable-experimental-libtool \
216 --without-jikes \
217 --enable-local-library-preloading \
218 --disable-mod-activation \
219 --disable-neon-version-check \
220 --disable-static \
221 --with-sqlite="${EPREFIX}/usr"
222 }
223
224 src_compile() {
225 emake local-all || die "Building of core of Subversion failed"
226
227 if use ctypes-python; then
228 python_copy_sources subversion/bindings/ctypes-python
229 rm -fr subversion/bindings/ctypes-python
230 ctypes_python_bindings_building() {
231 rm -f subversion/bindings/ctypes-python
232 ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
233 emake ctypes-python
234 }
235 python_execute_function \
236 --action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
237 --failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
238 ctypes_python_bindings_building
239 fi
240
241 if use python; then
242 python_copy_sources subversion/bindings/swig/python
243 rm -fr subversion/bindings/swig/python
244 swig_python_bindings_building() {
245 rm -f subversion/bindings/swig/python
246 ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
247 emake \
248 PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
249 PYTHON_VERSION="$(python_get_version)" \
250 swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
251 swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
252 swig-py
253 }
254 python_execute_function \
255 --action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
256 --failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
257 swig_python_bindings_building
258 fi
259
260 if use perl; then
261 emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
262 fi
263
264 if use ruby; then
265 emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
266 fi
267
268 if use java; then
269 emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
270 fi
271
272 if use emacs; then
273 elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed"
274 fi
275
276 if use extras; then
277 emake contrib || die "Building of contrib failed"
278 emake tools || die "Building of tools failed"
279 fi
280
281 if use doc; then
282 doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
283
284 if use java; then
285 emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
286 fi
287 fi
288 }
289
290 src_install() {
291 emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
292
293 if use ctypes-python; then
294 ctypes_python_bindings_installation() {
295 rm -f subversion/bindings/ctypes-python
296 ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
297 emake DESTDIR="${D}" install-ctypes-python
298 }
299 python_execute_function \
300 --action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
301 --failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
302 ctypes_python_bindings_installation
303 fi
304
305 if use python; then
306 swig_python_bindings_installation() {
307 rm -f subversion/bindings/swig/python
308 ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
309 emake \
310 DESTDIR="${D}" \
311 PYTHON_VERSION="$(python_get_version)" \
312 swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
313 swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
314 install-swig-py
315 }
316 python_execute_function \
317 --action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
318 --failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
319 swig_python_bindings_installation
320 fi
321
322 if use ctypes-python || use python; then
323 python_clean_installation_image -q
324 fi
325
326 if use perl; then
327 emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
328 fixlocalpod
329 find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
330 fi
331
332 if use ruby; then
333 emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
334 fi
335
336 if use java; then
337 emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
338 java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
339 java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
340 rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
341 fi
342
343 # Install Apache module configuration.
344 if use apache2; then
345 keepdir "${APACHE_MODULES_CONFDIR}"
346 insinto "${APACHE_MODULES_CONFDIR}"
347 doins "${FILESDIR}/47_mod_dav_svn.conf"
348 fi
349
350 # Install Bash Completion, bug 43179.
351 dobashcompletion tools/client-side/bash_completion subversion
352 rm -f tools/client-side/bash_completion
353
354 # Install hot backup script, bug 54304.
355 newbin tools/backup/hot-backup.py svn-hot-backup
356 rm -fr tools/backup
357
358 # Install svn_load_dirs.pl.
359 if use perl; then
360 dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl
361 fi
362 rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
363
364 # Install svnserve init-script and xinet.d snippet, bug 43245.
365 newinitd "${FILESDIR}"/svnserve.initd2 svnserve
366 newconfd "${FILESDIR}"/svnserve.confd svnserve
367 insinto /etc/xinetd.d
368 newins "${FILESDIR}"/svnserve.xinetd svnserve
369
370 # Install documentation.
371 dodoc CHANGES COMMITTERS README
372 dodoc tools/xslt/svnindex.{css,xsl}
373 rm -fr tools/xslt
374
375 # Install Vim syntax files.
376 if use vim-syntax; then
377 insinto /usr/share/vim/vimfiles/syntax
378 doins contrib/client-side/vim/svn.vim
379 fi
380 rm -f contrib/client-side/vim/svn.vim
381
382 # Install Emacs Lisps.
383 if use emacs; then
384 elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed"
385 elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed"
386 touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
387 elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
388 fi
389 rm -fr contrib/client-side/emacs
390
391 # Install extra files.
392 if use extras; then
393 cat << EOF > 80subversion-extras
394 PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
395 ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
396 EOF
397 doenvd 80subversion-extras
398
399 emake DESTDIR="${D}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
400 emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
401
402 find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
403 rm -fr contrib/client-side/svn-push
404 rm -fr contrib/server-side/svnstsw
405 rm -fr tools/client-side/svnmucc
406 rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
407 rm -fr tools/{buildbot,dev,diff,po}
408
409 insinto /usr/share/${PN}
410 doins -r contrib tools
411 fi
412
413 if use doc; then
414 dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
415
416 dodoc -r notes
417
418 if use java; then
419 java-pkg_dojavadoc doc/javadoc
420 fi
421 fi
422
423 find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
424 }
425
426 pkg_preinst() {
427 # Compare versions of Berkeley DB, bug 122877.
428 if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
429 OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
430 NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
431 if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
432 CHANGED_BDB_VERSION="1"
433 fi
434 fi
435 }
436
437 pkg_postinst() {
438 use emacs && elisp-site-regen
439 use perl && perl-module_pkg_postinst
440
441 if use ctypes-python; then
442 python_mod_optimize csvn
443 fi
444
445 if use python; then
446 python_mod_optimize libsvn svn
447 fi
448
449 if use apache2; then
450 elog " - http-based server:"
451 elog " 1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
452 elog " 2. Create an htpasswd file:"
453 elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
454 elog " 3. Fix the repository permissions (see \"Fixing the repository permissions\")"
455 elog " 4. Restart Apache: /etc/init.d/apache2 restart"
456 elog
457 fi
458
459 if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
460 ewarn "You upgraded from an older version of Berkeley DB and may experience"
461 ewarn "problems with your repository. Run the following commands as root to fix it:"
462 ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
463 ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
464 fi
465
466 ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
467 }
468
469 pkg_postrm() {
470 use emacs && elisp-site-regen
471 use perl && perl-module_pkg_postrm
472
473 if use ctypes-python; then
474 python_mod_cleanup csvn
475 fi
476
477 if use python; then
478 python_mod_cleanup libsvn svn
479 fi
480 }
481
482 pkg_config() {
483 # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
484 # already has EPREFIX in it
485 einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
486 if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
487 echo "A Subversion repository already exists and I will not overwrite it."
488 echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
489 else
490 mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
491
492 einfo "Populating repository directory..."
493 # Create initial repository.
494 "${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
495
496 einfo "Setting repository permissions..."
497 SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
498 SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
499 if use apache2; then
500 [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
501 [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
502 else
503 [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
504 [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
505 enewgroup "${SVNSERVE_GROUP}"
506 enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
507 fi
508 chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
509 chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
510 chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
511 fi
512 }