Sync changes to 1.4.4 ebuild, fixes bug #182870.

(Portage version: 2.1.2.7)

6 files changed, 381 insertions, 512 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 8eaa29a28e75..40b13cf19271 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.266 2007/06/22 08:21:43 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.267 2007/06/22 12:01:24 chtekk Exp $
+
+*subversion-1.4.4-r2 (22 Jun 2007)
+
+  22 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/subversion-apr-version.patch, -files/subversion-neon-config.patch,
+  -subversion-1.4.4-r1.ebuild, +subversion-1.4.4-r2.ebuild:
+  Sync changes to 1.4.4 ebuild, fixes bug #182870.
 
   22 Jun 2007; Luca Longinotti <chtekk@gentoo.org>
   subversion-1.3.2-r4.ebuild, -subversion-1.4.3.ebuild,
diff --git a/dev-util/subversion/files/digest-subversion-1.4.4-r1 b/dev-util/subversion/files/digest-subversion-1.4.4-r2
index e3c9fe8133a5..e3c9fe8133a5 100644
--- a/dev-util/subversion/files/digest-subversion-1.4.4-r1
+++ b/dev-util/subversion/files/digest-subversion-1.4.4-r2
diff --git a/dev-util/subversion/files/subversion-apr-version.patch b/dev-util/subversion/files/subversion-apr-version.patch
deleted file mode 100644
index 201a127d9853..000000000000
--- a/dev-util/subversion/files/subversion-apr-version.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(revision 19124)
-+++ configure.in	(revision 19125)
-@@ -84,14 +84,13 @@
- 
- dnl verify apr version and set apr flags
- dnl These regular expressions should not contain "\(" and "\)".
--APR_VER_REGEX=["0\.9\.[5-9]"]
--APR_VER_REGEX_TOO="1\."
--APU_VER_REGEX=["0\.9\.[5-9]"]
--APU_VER_REGEX_TOO="1\."
- 
--SVN_LIB_APR($APR_VER_REGEX, $APR_VER_REGEX_TOO)
--SVN_LIB_APRUTIL($APU_VER_REGEX, $APU_VER_REGEX_TOO)
-+APR_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
-+APU_VER_REGEXES=["0\.9\.[5-9] 0\.9\.1[0-9] 1\."]
- 
-+SVN_LIB_APR($APR_VER_REGEXES)
-+SVN_LIB_APRUTIL($APU_VER_REGEXES)
-+
- dnl What version of Expat are we using? -----------------
- 
- APU_HAVE_OLD_EXPAT="`$apu_config --old-expat`"
-Index: build/ac-macros/aprutil.m4
-===================================================================
---- build/ac-macros/aprutil.m4	(revision 19124)
-+++ build/ac-macros/aprutil.m4	(revision 19125)
-@@ -15,8 +15,7 @@
- 
- AC_DEFUN(SVN_LIB_APRUTIL,
- [
--  APRUTIL_WANTED_REGEX="$1"
--  APRUTIL_WANTED_REGEX_TOO="$2"
-+  APRUTIL_WANTED_REGEXES="$1"
- 
-   AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
- 
-@@ -49,9 +48,16 @@
-   fi
-   AC_MSG_RESULT([$apu_version])
- 
--  if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
--       -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
--    echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
-+  APU_WANTED_REGEX_MATCH=0
-+  for apu_wanted_regex in $APRUTIL_WANTED_REGEXES; do
-+    if test `expr $apu_version : $apu_wanted_regex` -ne 0; then
-+      APU_WANTED_REGEX_MATCH=1
-+      break
-+    fi
-+  done
-+
-+  if test $APU_WANTED_REGEX_MATCH -eq 0; then
-+    echo "wanted regexes are $APRUTIL_WANTED_REGEXES"
-     AC_MSG_ERROR([invalid apr-util version found])
-   fi
- 
-Index: build/ac-macros/apr.m4
-===================================================================
---- build/ac-macros/apr.m4	(revision 19124)
-+++ build/ac-macros/apr.m4	(revision 19125)
-@@ -10,8 +10,7 @@
- 
- AC_DEFUN(SVN_LIB_APR,
- [
--  APR_WANTED_REGEX="$1"
--  APR_WANTED_REGEX_TOO="$2"
-+  APR_WANTED_REGEXES="$1"
- 
-   AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
- 
-@@ -36,9 +35,16 @@
-   fi
-   AC_MSG_RESULT([$apr_version])
- 
--  if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
--       -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
--    echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
-+  APR_WANTED_REGEX_MATCH=0
-+  for apr_wanted_regex in $APR_WANTED_REGEXES; do
-+    if test `expr $apr_version : $apr_wanted_regex` -ne 0; then
-+      APR_WANTED_REGEX_MATCH=1
-+      break
-+    fi
-+  done
-+      
-+  if test $APR_WANTED_REGEX_MATCH -eq 0; then
-+    echo "wanted regexes are $APR_WANTED_REGEXES"
-     AC_MSG_ERROR([invalid apr version found])
-   fi
- 
diff --git a/dev-util/subversion/files/subversion-neon-config.patch b/dev-util/subversion/files/subversion-neon-config.patch
deleted file mode 100644
index bb25adc8528e..000000000000
--- a/dev-util/subversion/files/subversion-neon-config.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- subversion-1.3.0/configure.in.orig	2006-02-21 21:51:41.000000000 +0100
-+++ subversion-1.3.0/configure.in	2006-02-21 21:52:08.000000000 +0100
-@@ -227,8 +227,8 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4"
--NEON_LATEST_WORKING_VER=0.25.4
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
-+NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- dnl You can skip the neon version check only if you know what you are doing 
- AC_ARG_ENABLE(neon-version-check,
---- subversion-1.3.0/build/ac-macros/neon.m4.orig	2006-02-27 16:13:32.000000000 +0100
-+++ subversion-1.3.0/build/ac-macros/neon.m4	2006-02-27 16:19:34.000000000 +0100
-@@ -142,7 +142,7 @@
-       if test -z $svn_allowed_neon_on_system; then
-         echo "You have neon version $NEON_VERSION,"
-         echo "but Subversion needs neon $NEON_LATEST_WORKING_VER."
--        SVN_DOWNLOAD_NEON()
-+        SVN_DOWNLOAD_NEONFAIL()
-       fi
- 
-     else
-@@ -177,3 +177,23 @@
-   AC_MSG_RESULT([no suitable neon found])
-   svn_lib_neon="no"
- ])
-+
-+dnl SVN_DOWNLOAD_NEONFAIL()
-+dnl no neon found, print out a message telling the user what to do
-+AC_DEFUN(SVN_DOWNLOAD_NEONFAIL,
-+[
-+  echo ""
-+  echo "An appropriate version of neon could not be found, so libsvn_ra_dav"
-+  echo "will not be built.  If you want to build libsvn_ra_dav, please either"
-+  echo "install neon ${NEON_LATEST_WORKING_VER} on this system"
-+  echo ""
-+  echo "or"
-+  echo ""
-+  echo "get neon ${NEON_LATEST_WORKING_VER} from:"
-+  echo "    ${NEON_URL}"
-+  echo "unpack the archive using tar/gunzip and rename the resulting"
-+  echo "directory from ./neon-${NEON_LATEST_WORKING_VER}/ to ./neon/"
-+  echo ""
-+  AC_MSG_FAILURE([no suitable neon found])
-+  svn_lib_neon="no"
-+])
diff --git a/dev-util/subversion/subversion-1.4.4-r1.ebuild b/dev-util/subversion/subversion-1.4.4-r1.ebuild
deleted file mode 100644
index 03d221095dcb..000000000000
--- a/dev-util/subversion/subversion-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r1.ebuild,v 1.1 2007/06/17 16:37:31 phreak Exp $
-
-inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
-
-DESCRIPTION="A compelling replacement for CVS"
-HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
-RESTRICT="test"
-
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-	!apache2? ( >=dev-libs/apr-util-0.9.7 )
-	python? ( >=dev-lang/python-2.0 )
-	perl? ( >=dev-lang/perl-5.8.6-r6
-		!=dev-lang/perl-5.8.7 )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	!nowebdav? ( net-misc/neon )
-	berkdb? ( =sys-libs/db-4* )
-	java? ( >=virtual/jdk-1.4 )
-	emacs? ( virtual/emacs )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-DEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion 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 && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
-		echo
-		ewarn "Presently you have $(best_version dev-util/subversion)"
-		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
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	unpack $A
-	cd ${S}
-
-	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-1.3.1-neon-config.patch
-	epatch ${FILESDIR}/subversion-apr_cppflags.patch
-	epatch ${FILESDIR}/subversion-1.4.3-debug-config.patch
-	epatch ${FILESDIR}/subversion-1.4.3-neon-0.26.3.patch
-	# rapidsvn developers work with 1.3.2
-
-	export WANT_AUTOCONF=2.5
-	autoconf
-	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-	local apr_suffix=""
-
-	if use apache2; then
-		myconf="--with-apxs=${APXS2}"
-		apache_minor="$(best_version net-www/apache | cut -d. -f2)"
-		if [ ${apache_minor} -gt 0 ]; then
-			apr_suffix="-1"
-		fi
-	else
-		if has_version ">dev-libs/apr-util-1"; then
-			apr_suffix="-1"
-		fi
-		myconf="--without-apxs"
-	fi
-
-	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${apr_suffix}-config --cppflags )
-
-	econf ${myconf} \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_enable nls) \
-		--with-apr="/usr/bin/apr${apr_suffix}-config" \
-		--with-apr-util="/usr/bin/apu${apr_suffix}-config" \
-		--disable-experimental-libtool \
-		--disable-mod-activation || die "econf failed"
-
-	# Respect the user LDFLAGS
-	export EXTRA_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 "make of subversion failed"
-
-	if use python; then
-		# Building fails without the apache apr-util as includes are wrong.
-		emake swig-py || die "subversion 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}
-		make swig-pl || die "Perl library building failed"
-	fi
-
-	if use ruby; then
-		make swig-rb || die "Ruby library building 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 "Compilation 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"
-	fi
-}
-
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	make DESTDIR=${D} install || die "Installation of subversion failed"
-
-#	This might not be necessary with the new install
-#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
-#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
-#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
-#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
-#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
-#		fi
-#	fi
-
-
-	dobin svn-config
-	if use python; then
-		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}	LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
-
-		# move python bindings
-		mkdir -p ${D}${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
-		rmdir ${D}/usr/$(get_libdir)/svn-python
-	fi
-	if use perl; then
-		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
-		fixlocalpod
-	fi
-	if use ruby; then
-		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
-	fi
-	if use java; then
-		make DESTDIR="${D}" install-javahl || die "installation failed"
-		java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
-		java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install apache module config
-	if useq apache2; then
-		MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"`
-		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
-		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
-	</IfModule>
-	<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 SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd ${FILESDIR}/svnserve.initd svnserve
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
-
-	if use apache2 >/dev/null; then
-		newconfd ${FILESDIR}/svnserve.confd svnserve
-	else
-		newconfd ${FILESDIR}/svnserve.confd2 svnserve
-	fi
-
-	# Install documentation
-
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p ${D}/usr/share/doc/${PF}/
-	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
-	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# 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*
-		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
-
-		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing does not work for subversion"
-}
-
-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 "/var/svn:"
-	elog
-	elog "	  emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "	  db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "	  chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	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
-	elog " - svn over ssh:"
-	elog "	 1. Fix the repository permissions:"
-	elog "		  groupadd svnusers"
-	elog "		  chown -R root:svnusers /var/svn/repos/"
-	elog "		  chmod -R g-w /var/svn/repos"
-	elog "		  chmod -R g+rw /var/svn/repos/db"
-	elog "		  chmod -R g+rw /var/svn/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 "		   umask 002"
-	elog "		   exec /usr/bin/svnserve \"\$@\""
-	elog
-
-	if use apache2 >/dev/null; 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 ""
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-
-	if use python ; then
-		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/svn
-		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/libsvn
-	fi
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]]; then
-		die "You seem to only have built the subversion client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p ${SVN_REPOS_LOC}/conf
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
-
-		einfo ">>> Setting repository permissions ..."
-		if use apache2 >/dev/null; then
-			chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
-		else
-			enewgroup svnusers
-			enewuser svn -1 -1 /var/svn svnusers
-			chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos
-		fi
-		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.4.4-r2.ebuild b/dev-util/subversion/subversion-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..33a7620a37c3
--- /dev/null
+++ b/dev-util/subversion/subversion-1.4.4-r2.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r2.ebuild,v 1.1 2007/06/22 12:01:24 chtekk Exp $
+
+inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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="Apache-1.1"
+SLOT="0"
+IUSE="apache2 berkdb emacs java nls nowebdav perl python ruby"
+RESTRICT="test"
+
+COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
+			>=dev-libs/apr-util-1.2.8
+			perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+			python? ( >=dev-lang/python-2.0 )
+			ruby? ( >=dev-lang/ruby-1.8.2 )
+			!nowebdav? ( >=net-misc/neon-0.26 )
+			berkdb? ( =sys-libs/db-4* )
+			emacs? ( virtual/emacs )"
+
+RDEPEND="${COMMONDEPEND}
+		java? ( >=virtual/jre-1.4 )"
+
+DEPEND="${COMMONDEPEND}
+		java? ( >=virtual/jdk-1.4 )
+		>=sys-devel/autoconf-2.59"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+# Allow for custion repository locations.
+# This can't be in pkg_setup because the variable needs to be available to
+# pkg_config.
+: ${SVN_REPOS_LOC:=/var/svn}
+
+discover_apr_suffix() {
+	if use apache2 ; then
+		if has_version '=net-www/apache-2.0*' ; then
+			aprsuffix=""
+		else
+			aprsuffix="-1"
+		fi
+	else
+		aprsuffix="-1"
+	fi
+
+	echo "${aprsuffix}"
+}
+
+pkg_setup() {
+	if use berkdb && 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
+
+	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-1.3.1-neon-config.patch
+	epatch "${FILESDIR}"/subversion-apr_cppflags.patch
+	epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
+	epatch "${FILESDIR}"/subversion-1.4.3-neon-0.26.3.patch
+
+	if [[ "$(discover_apr_suffix)" == "-1" ]] ; then
+		sed -e s:apu-config:apu-1-config:g \
+			-e s:apr-config:apr-1-config:g \
+			-i build/ac-macros/{find_,}ap*
+	fi
+
+	export WANT_AUTOCONF=2.5
+	autoconf
+
+	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
+
+	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
+	use apache2 || myconf="${myconf} --without-apxs"
+
+	apr_suffix="$(discover_apr_suffix)"
+	myconf="${myconf} --with-apr=/usr/bin/apr${apr_suffix}-config --with-apr-util=/usr/bin/apu${apr_suffix}-config"
+	append-flags $(/usr/bin/apr${apr_suffix}-config --cppflags)
+
+	econf ${myconf} \
+		$(use_with berkdb berkeley-db) \
+		$(use_with python) \
+		$(use_enable nls) \
+		--disable-experimental-libtool \
+		--disable-mod-activation \
+		|| die "econf failed"
+
+	# Respect the user LDFLAGS
+	export EXTRA_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}
+		make swig-pl || die "Compilation of ${PN} Perl bindings failed"
+	fi
+
+	if use ruby ; then
+		make 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"
+	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
+		mkdir -p "${D}${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="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
+		mkdir -p "${D}/${APACHE2_MODULES_CONFDIR}"
+		cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
+<IfDefine SVN>
+	<IfModule !mod_dav_svn.c>
+		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
+	</IfModule>
+	<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 SVN_AUTHZ>
+		<IfModule !mod_authz_svn.c>
+			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
+		</IfModule>
+	</IfDefine>
+</IfDefine>
+EOF
+	fi
+
+	# Bug 43179 - Install bash-completion if user wishes
+	dobashcompletion tools/client-side/bash_completion subversion
+
+	# Install hot backup script, bug 54304
+	newbin tools/backup/hot-backup.py svn-hot-backup
+
+	# The svn_load_dirs script is installed by Debian and looks like a good
+	# candidate for us to install as well
+	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245
+	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
+
+	# Install documentation
+	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
+	dodoc CHANGES
+	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+	find contrib tools -name \*.in -print0 | xargs -0 rm -f
+	mkdir -p "${D}/usr/share/doc/${PF}/"
+	cp -R tools/{client-side,examples,hook-scripts} "${D}/usr/share/doc/${PF}/"
+	cp -R contrib/hook-scripts "${D}/usr/share/doc/${PF}/"
+
+	docinto notes
+	for f in notes/*
+	do
+		[[ -f ${f} ]] && dodoc ${f}
+	done
+
+	# Install emacs lisps
+	if use emacs ; then
+		insinto /usr/share/emacs/site-lisp/subversion
+		doins contrib/client-side/psvn/psvn.el*
+		doins contrib/client-side/vc-svn.el*
+
+		elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
+	fi
+}
+
+src_test() {
+	ewarn "Testing disabled for ${PN}"
+}
+
+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 "/var/svn:"
+	elog
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog
+	elog "If you upgraded from an older version of berkely db and experience"
+	elog "problems with your repository then run the following commands as root:"
+	elog "    db4_recover -h ${SVN_REPOS_LOC}/repos"
+	elog "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	elog
+	elog "Subversion has multiple server types, take your pick:"
+	elog
+	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
+	elog " - svn over ssh:"
+	elog "   1. Fix the repository permissions:"
+	elog "        groupadd svnusers"
+	elog "        chown -R root:svnusers /var/svn/repos/"
+	elog "        chmod -R g-w /var/svn/repos"
+	elog "        chmod -R g+rw /var/svn/repos/db"
+	elog "        chmod -R g+rw /var/svn/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 "         umask 002"
+	elog "         exec /usr/bin/svnserve \"\$@\""
+	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
+}
+
+pkg_postrm() {
+	has_version virtual/emacs && elisp-site-regen
+	use perl && perl-module_pkg_postrm
+}
+
+pkg_config() {
+	if [[ ! -x /usr/bin/svnadmin ]] ; then
+		die "You seem to only have built the ${PN} client"
+	fi
+
+	einfo ">>> Initializing the database in ${SVN_REPOS_LOC} ..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
+		echo "A subversion repository already exists and I will not overwrite it."
+		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo ">>> Populating repository directory ..."
+		# create initial repository
+		/usr/bin/svnadmin create "${SVN_REPOS_LOC}/repos"
+
+		einfo ">>> Setting repository permissions ..."
+		if use apache2 ; then
+			chown -Rf apache:apache "${SVN_REPOS_LOC}/repos"
+		else
+			enewgroup svnusers
+			enewuser svn -1 -1 /var/svn svnusers
+			chown -Rf svn:svnusers "${SVN_REPOS_LOC}/repos"
+		fi
+		chmod -Rf 755 "${SVN_REPOS_LOC}/repos"
+	fi
+}