summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2008-04-10 19:02:24 +0000
committerBenedikt Boehm <hollow@gentoo.org>2008-04-10 19:02:24 +0000
commit1c34ba164325301fedd83ce1a64677b63ef47197 (patch)
tree1940933e77d71f487b6ca3700222bc73ced94d68 /dev-util
parentamd64 stable wrt bug #216987 (diff)
downloadhistorical-1c34ba164325301fedd83ce1a64677b63ef47197.tar.gz
historical-1c34ba164325301fedd83ce1a64677b63ef47197.tar.bz2
historical-1c34ba164325301fedd83ce1a64677b63ef47197.zip
fix #216992
Package-Manager: portage-2.1.5_rc2
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/subversion/ChangeLog6
-rw-r--r--dev-util/subversion/Manifest15
-rw-r--r--dev-util/subversion/subversion-1.4.6-r1.ebuild415
-rw-r--r--dev-util/subversion/subversion-1.4.6-r2.ebuild13
-rw-r--r--dev-util/subversion/subversion-1.4.6.ebuild13
5 files changed, 28 insertions, 434 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index e4a72b06613b..2ded80e24c65 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/subversion
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.296 2008/03/22 18:43:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.297 2008/04/10 19:02:24 hollow Exp $
+
+ 10 Apr 2008; Benedikt Böhm <hollow@gentoo.org> subversion-1.4.6.ebuild,
+ -subversion-1.4.6-r1.ebuild, subversion-1.4.6-r2.ebuild:
+ fix #216992
*subversion-1.4.6-r2 (22 Mar 2008)
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 7362bc4b6bb0..0055996b33fc 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -17,15 +17,14 @@ AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9
DIST subversion-1.4.5.tar.bz2 4722624 RMD160 159f3eac9168d856a19ffb235c5417757cd5a496 SHA1 acc80381cb670736ad626fee1eb04f36ba7e5fc8 SHA256 763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
EBUILD subversion-1.4.5.ebuild 13743 RMD160 d430ee15a0a191ad525bc2c2a049efbc0cebd3f8 SHA1 82b328cbdb8d18bc51d54d2927af4647c6e0ebb1 SHA256 f0fa626ddd93edfa4a02a61277a357696afce3d3dd00f10de387bd46842ad5ab
-EBUILD subversion-1.4.6-r1.ebuild 13788 RMD160 db0b3c8aa243d1f4971a6c36bb5971231c1c80c7 SHA1 7c26f809ea08c6b6a971066c5efb020236336fef SHA256 48a1a5e9305b1836b98d370fe25c04c5eb95cfa24357a02f80cbca216f7d4884
-EBUILD subversion-1.4.6-r2.ebuild 13795 RMD160 f548e35b83423eaee48e01fff4897df3e9ca8f73 SHA1 9a47d40fc8982807871c69e48327120051609c82 SHA256 a3e69460eab7cd892bd4c76c8355bb93aa1f2c44cb9120453b6b39885818a5c5
-EBUILD subversion-1.4.6.ebuild 13794 RMD160 5106b4348eb605d41b1f1480e8fbe158f0b4fb82 SHA1 94a4a5cd30ec56bb69453af5d2af16fc517eb3be SHA256 9b901eea36340e8936beedc5964ec86e60c00054201cea6a97589f4bfb6cdcdb
-MISC ChangeLog 51403 RMD160 82507b983c7285c23a89e79114d9b2c9bc0892d0 SHA1 34b8f21ac4b1ad259b96a5ecb6a84c8910de987e SHA256 7c92fdf3609e86f5766f1bdc542015a7bdb60ce770cea15e3de5caa7cb89964c
+EBUILD subversion-1.4.6-r2.ebuild 13833 RMD160 89985eb70d8ea9fbdd7093f969cfbdc53236258a SHA1 dfa0e471e23349d736678c230f39424f45798b47 SHA256 cf100757487158f953a086ff842085bcea383a713bd9294d1a28b6ead00ba022
+EBUILD subversion-1.4.6.ebuild 13831 RMD160 8c1d72a7dfd97f43aa4fa3c867764691d477eab4 SHA1 64ded53ad29fa2257d4f9668042b36e64c77921f SHA256 b8c815105045f6dd3c6fd7c3816daf72266b1450e1237a37f1e4562a7980ed2a
+MISC ChangeLog 51552 RMD160 014627acb99811293e32f3da01512ab9590c9c46 SHA1 3fe40555278c722f92c6e17ab5e3c0317dac0b04 SHA256 ad00b843a9164e16f3f53ba39d58d81e7a2d43251bb31ca6f7b4aa638cf918fc
MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
-iD8DBQFH5VNTmPFBzbX68WERAsZZAJ9qJsNY+tbk21uu8Fxf8MSeJRVTBACgmyWW
-FGTlBeqBQpieAvYVsyVhSJI=
-=h+iT
+iEYEARECAAYFAkf+ZEoACgkQmPFBzbX68WG7JQCeOb4vfP+BNxD7zjrVNqZWMA/M
+YM4An3DLj33ksU7uow0jegX9nxla0jqm
+=mpXc
-----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.4.6-r1.ebuild b/dev-util/subversion/subversion-1.4.6-r1.ebuild
deleted file mode 100644
index 613087ded814..000000000000
--- a/dev-util/subversion/subversion-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r1.ebuild,v 1.1 2008/03/02 11:26:25 hollow Exp $
-
-inherit autotools bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-DESCRIPTION="A compelling replacement for CVS."
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Subversion"
-SLOT="0"
-IUSE="apache2 berkdb debug doc emacs extras java nls nowebdav perl python ruby svnserve vim-syntax"
-RESTRICT="test"
-
-COMMONDEPEND=">=dev-libs/apr-util-1.2.8
- berkdb? ( =sys-libs/db-4* )
- doc? ( app-doc/doxygen )
- emacs? ( virtual/emacs )
- nls? ( sys-devel/gettext )
- !nowebdav? ( >=net-misc/neon-0.26.4 )
- ruby? ( >=dev-lang/ruby-1.8.2 dev-lang/swig )
- perl? ( >=dev-lang/perl-5.8.8 dev-lang/swig )
- python? ( >=dev-lang/python-2.0 dev-lang/swig )"
-
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.4 )
- perl? ( dev-perl/URI )"
-
-DEPEND="${COMMONDEPEND}
- java? ( >=virtual/jdk-1.4 )
- >=sys-devel/autoconf-2.59"
-
-want_apache
-
-S="${WORKDIR}"/${P/_rc/-rc}
-
-# Allow for custom repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-pkg_setup() {
- if use berkdb ; then
- if ! built_with_use 'dev-libs/apr-util' berkdb ; then
- eerror "dev-libs/apr-util is missing USE=berkdb"
- die "dev-libs/apr-util is missing USE=berkdb"
- fi
-
- if has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]] ; then
- echo
- ewarn "Presently you have $(best_version dev-util/subversion) installed."
- ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
- ewarn "So you MUST dump your repositories before upgrading."
- ewarn
- ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
- ewarn
- ewarn "More details on dumping:"
- ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
- echo
- die "Ensure that you dump your repository first"
- fi
- fi
-
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # assure we don't use the included libs by accident
- rm -Rf neon apr apr-util
-
- epatch "${FILESDIR}"/subversion-1.4-db4.patch
- epatch "${FILESDIR}"/subversion-1.1.1-perl-vendor.patch
- epatch "${FILESDIR}"/subversion-hotbackup-config.patch
- epatch "${FILESDIR}"/subversion-apr_cppflags.patch
- epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
- epatch "${FILESDIR}"/subversion-1.4.6-neon-0.28.patch
-
- sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0"/' \
- -i configure.in
-
- sed -e "s:apr-config:apr-1-config:g" \
- -e "s:apu-config:apu-1-config:g" \
- -i build/ac-macros/{find_,}ap*
-
- eautoreconf
-
- sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-
- elibtoolize
-
- use emacs && cp "${FILESDIR}"/vc-svn.el "${S}"/contrib/client-side/vc-svn.el
-}
-
-src_compile() {
- local myconf=
-
- myconf="${myconf} $(use_enable java javahl)"
- use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
-
- if use python || use perl || use ruby ; then
- myconf="${myconf} --with-swig"
- else
- myconf="${myconf} --without-swig"
- fi
-
- if use nowebdav ; then
- myconf="${myconf} --without-neon"
- else
- myconf="${myconf} --with-neon=/usr"
- fi
-
- append-flags $(/usr/bin/apr-1-config --cppflags)
-
- econf ${myconf} \
- --with-apr=/usr/bin/apr-1-config \
- --with-apr-util=/usr/bin/apu-1-config \
- $(use_with apache2 apxs ${APXS}) \
- $(use_with berkdb berkeley-db) \
- $(use_enable debug maintainer-mode) \
- $(use_enable nls) \
- --disable-experimental-libtool \
- --disable-mod-activation \
- || die "econf failed"
-
- # Respect the user LDFLAGS
- export SWIG_LDFLAGS="${LDFLAGS}"
-
- # Build subversion, but do it in a way that is safe for parallel builds.
- # Also apparently the included apr has a libtool that doesn't like -L flags.
- # So not specifying it at all when not building apache modules and only
- # specify it for internal parts otherwise.
- ( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "Compilation of ${PN} failed"
-
- if use python ; then
- # Building fails without the apache apr-util as includes are wrong.
- emake swig-py || die "Compilation of ${PN} Python bindings failed"
- fi
-
- if use perl ; then
- # Work around a buggy Makefile.PL, bug 64634
- mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
- emake -j1 swig-pl || die "Compilation of ${PN} Perl bindings failed"
- fi
-
- if use ruby ; then
- emake swig-rb || die "Compilation of ${PN} Ruby bindings failed"
- fi
-
- if use java ; then
- # ensure that the destination dir exists, else some compilation fails
- mkdir -p "${S}"/subversion/bindings/java/javahl/classes
- # Compile javahl
- make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "make javahl failed"
- fi
-
- if use emacs ; then
- einfo "Compiling emacs support"
- elisp-compile "${S}"/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
- elisp-compile "${S}"/contrib/client-side/vc-svn.el || die "emacs modules failed"
- elisp-compile "${S}"/doc/svn-doc.el || die "emacs modules failed"
- elisp-compile "${S}"/doc/tools/svnbook.el || die "emacs modules failed"
- fi
-
- if use doc ; then
- doxygen doc/doxygen.conf || die "doxygen failed"
- fi
-}
-
-src_install () {
- python_version
- PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
- make DESTDIR="${D}" install || die "Installation of ${PN} failed"
-
- if use python ; then
- make DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
- || die "Installation of ${PN} Python bindings failed"
-
- # move python bindings
- dodir "${PYTHON_DIR}/site-packages"
- mv "${D}"/usr/$(get_libdir)/svn-python/svn "${D}${PYTHON_DIR}/site-packages"
- mv "${D}"/usr/$(get_libdir)/svn-python/libsvn "${D}${PYTHON_DIR}/site-packages"
- rm -Rf "${D}"/usr/$(get_libdir)/svn-python
- fi
-
- if use perl ; then
- make DESTDIR="${D}" install-swig-pl || die "Installation of ${PN} Perl bindings failed"
- fixlocalpod
- fi
-
- if use ruby ; then
- make DESTDIR="${D}" install-swig-rb || die "Installation of ${PN} Ruby bindings failed"
- fi
-
- if use java ; then
- make DESTDIR="${D}" install-javahl || die "make install-javahl failed"
- java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so
- java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
- rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar
- fi
-
- # Install apache2 module config
- if use apache2 ; then
- MOD="${APACHE_MODULESDIR/${APACHE_BASEDIR}\//}"
- dodir "${APACHE_MODULES_CONFDIR}"
- cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
-<IfDefine SVN>
- <IfModule !mod_dav_svn.c>
- LoadModule dav_svn_module ${MOD}/mod_dav_svn.so
- </IfModule>
- <IfDefine SVN_AUTHZ>
- <IfModule !mod_authz_svn.c>
- LoadModule authz_svn_module ${MOD}/mod_authz_svn.so
- </IfModule>
- </IfDefine>
-
- # example configuration:
- #<Location /svn/repos>
- # DAV svn
- # SVNPath ${SVN_REPOS_LOC}/repos
- # AuthType Basic
- # AuthName "Subversion repository"
- # AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
- # Require valid-user
- #</Location>
-</IfDefine>
-EOF
- fi
-
- # Bug 43179 - Install bash-completion if user wishes
- dobashcompletion tools/client-side/bash_completion subversion
- rm -f tools/client-side/bash_completion
-
- # Install hot backup script, bug 54304
- newbin tools/backup/hot-backup.py svn-hot-backup
- rm -fr tools/backup
-
- # The svn_load_dirs script is installed by Debian and looks like a good
- # candidate for us to install as well
- if use perl ; then
- newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
- fi
- rm -f contrib/client-side/svn_load_dirs.pl
-
- # Install svnserve init-script and xinet.d snippet, bug 43245
- if use svnserve; then
- newinitd "${FILESDIR}"/svnserve.initd svnserve
- if use apache2 ; then
- newconfd "${FILESDIR}"/svnserve.confd svnserve
- else
- newconfd "${FILESDIR}"/svnserve.confd2 svnserve
- fi
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/svnserve.xinetd svnserve
- fi
-
- # Install documentation
- dodoc BUGS CHANGES COMMITTERS HACKING INSTALL README TRANSLATING
- dodoc tools/xslt/svnindex.{css,xsl}
- rm -fr tools/xslt
-
- if use doc ; then
- dohtml doc/doxygen/html/*
- cp -R notes "${D}usr/share/doc/${PF}"
- ecompressdir "/usr/share/doc/${PF}/notes"
- fi
-
- # Install Vim syntax files.
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/client-side/svn.vim
- fi
- rm -f contrib/client-side/svn.vim
-
- # Install emacs lisps
- if use emacs ; then
- elisp-install ${PN} contrib/client-side/psvn/psvn.el*
- elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
- elisp-install ${PN} doc/svn-doc.el*
- elisp-install ${PN} doc/tools/svnbook.el*
- touch "${D}${SITELISP}/${PN}/compat/.nosearch"
-
- elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
- fi
- rm -fr contrib/client-side/psvn/
- rm -f contrib/client-side/vc-svn.el*
-
- # Install extra files
- if use extras ; then
- find contrib tools '(' -name "*.bat" -o -name "*.in" ')' -print0 | xargs -0 rm -f
- rm -fr tools/{dev,po}
- dodir "/usr/share/${PN}"
- cp -R contrib tools "${D}usr/share/${PN}"
- fi
-}
-
-pkg_preinst() {
- # Compare versions of Berkeley DB.
- if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
- OLD_BDB_VERSION="$(scanelf -qn "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- NEW_BDB_VERSION="$(scanelf -qn "${D}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
- CHANGED_BDB_VERSION=1
- fi
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- use perl && perl-module_pkg_postinst
-
- elog "Subversion Server Notes"
- elog "-----------------------"
- elog
- elog "If you intend to run a server, a repository needs to be created using"
- elog "svnadmin (see man svnadmin) or the following command to create it in"
- elog "${SVN_REPOS_LOC}:"
- elog
- elog " emerge --config =${CATEGORY}/${PF}"
- elog
- elog "Subversion has multiple server types, take your pick:"
- elog
- if use svnserve; then
- elog " - svnserve daemon: "
- elog " 1. edit /etc/conf.d/svnserve"
- elog " 2. start daemon: /etc/init.d/svnserve start"
- elog " 3. make persistent: rc-update add svnserve default"
- elog
- elog " - svnserve via xinetd:"
- elog " 1. edit /etc/xinetd.d/svnserve (remove disable line)"
- elog " 2. restart xinetd.d: /etc/init.d/xinetd restart"
- elog
- fi
- elog " - svn over ssh:"
- elog " 1. Fix the repository permissions:"
- elog " groupadd svnusers"
- elog " chown -R root:svnusers ${SVN_REPOS_LOC}/repos/"
- elog " chmod -R g-w ${SVN_REPOS_LOC}/repos"
- elog " chmod -R g+rw ${SVN_REPOS_LOC}/repos/db"
- elog " chmod -R g+rw ${SVN_REPOS_LOC}/repos/locks"
- elog " 2. create an svnserve wrapper in /usr/local/bin to set the umask you"
- elog " want, for example:"
- elog " #!/bin/bash"
- elog " . /etc/conf.d/svnserve"
- elog " umask 002"
- elog " exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
- elog
- if use apache2; then
- elog " - http-based server:"
- elog " 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
- elog " 2. create an htpasswd file:"
- elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
- elog
- fi
-
- elog "If you intend to use svn-hot-backup, you can specify the number of"
- elog "backups to keep per repository by specifying an environment variable."
- elog "If you want to keep e.g. 2 backups, do the following:"
- elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
- elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
- elog
-
- if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
- ewarn "You upgraded from an older version of Berkely DB and may experience"
- ewarn "problems with your repository. Run the following commands as root to fix it:"
- ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
- ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use perl && perl-module_pkg_postrm
-}
-
-pkg_config() {
- if [[ ! -x "${ROOT}usr/bin/svnadmin" ]] ; then
- die "You seem to only have built the Subversion client"
- fi
-
- einfo ">>> Initializing the database in ${ROOT}${SVN_REPOS_LOC} ..."
- if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]] ; then
- echo "A subversion repository already exists and I will not overwrite it."
- echo "Delete ${ROOT}${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
- else
- mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
-
- einfo ">>> Populating repository directory ..."
- # create initial repository
- "${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
-
- einfo ">>> Setting repository permissions ..."
- if use svnserve; then
- SVNSERVE_USER="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_USER})"
- SVNSERVE_GROUP="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_GROUP})"
- fi
- if use apache2 ; then
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
- else
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
- enewgroup "${SVNSERVE_GROUP}"
- enewuser "${SVNSERVE_USER}" -1 -1 ${SVN_REPOS_LOC} "${SVNSERVE_GROUP}"
- fi
- chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
- chmod -Rf 755 "${ROOT}${SVN_REPOS_LOC}/repos"
- fi
-}
diff --git a/dev-util/subversion/subversion-1.4.6-r2.ebuild b/dev-util/subversion/subversion-1.4.6-r2.ebuild
index 3416cd78d1ec..bc205764eb6a 100644
--- a/dev-util/subversion/subversion-1.4.6-r2.ebuild
+++ b/dev-util/subversion/subversion-1.4.6-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r2.ebuild,v 1.1 2008/03/22 18:43:19 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r2.ebuild,v 1.2 2008/04/10 19:02:24 hollow Exp $
inherit autotools bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
@@ -21,17 +21,20 @@ COMMONDEPEND=">=dev-libs/apr-util-1.2.8
emacs? ( virtual/emacs )
nls? ( sys-devel/gettext )
!nowebdav? ( >=net-misc/neon-0.26.4 )
- ruby? ( >=dev-lang/ruby-1.8.2 dev-lang/swig )
- perl? ( >=dev-lang/perl-5.8.8 dev-lang/swig )
- python? ( >=dev-lang/python-2.0 dev-lang/swig )"
+ ruby? ( >=dev-lang/ruby-1.8.2 )
+ perl? ( >=dev-lang/perl-5.8.8 )
+ python? ( >=dev-lang/python-2.0 )"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.4 )
perl? ( dev-perl/URI )"
DEPEND="${COMMONDEPEND}
+ >=sys-devel/autoconf-2.59
java? ( >=virtual/jdk-1.4 )
- >=sys-devel/autoconf-2.59"
+ ruby? ( dev-lang/swig )
+ perl? ( dev-lang/swig )
+ python? ( dev-lang/swig )"
want_apache
diff --git a/dev-util/subversion/subversion-1.4.6.ebuild b/dev-util/subversion/subversion-1.4.6.ebuild
index 9b5e64d8c0f7..34c82543713f 100644
--- a/dev-util/subversion/subversion-1.4.6.ebuild
+++ b/dev-util/subversion/subversion-1.4.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.10 2008/02/17 12:45:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.11 2008/04/10 19:02:24 hollow Exp $
inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
@@ -21,17 +21,20 @@ COMMONDEPEND=">=dev-libs/apr-util-1.2.8
emacs? ( virtual/emacs )
nls? ( sys-devel/gettext )
!nowebdav? ( >=net-misc/neon-0.26.4 )
- ruby? ( >=dev-lang/ruby-1.8.2 dev-lang/swig )
- perl? ( >=dev-lang/perl-5.8.8 dev-lang/swig )
- python? ( >=dev-lang/python-2.0 dev-lang/swig )"
+ ruby? ( >=dev-lang/ruby-1.8.2 )
+ perl? ( >=dev-lang/perl-5.8.8 )
+ python? ( >=dev-lang/python-2.0 )"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.4 )
perl? ( dev-perl/URI )"
DEPEND="${COMMONDEPEND}
+ >=sys-devel/autoconf-2.59
java? ( >=virtual/jdk-1.4 )
- >=sys-devel/autoconf-2.59"
+ ruby? ( dev-lang/swig )
+ perl? ( dev-lang/swig )
+ python? ( dev-lang/swig )"
want_apache