From 2a72b2ad27f552569a8f4e4bb74f365d4658da09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Nizio?= <slawomir.nizio@sabayon.org>
Date: Fri, 30 May 2014 21:49:32 +0200
Subject: [PATCH] [dev-vcs/subversion*,www-apache/mod_dav_svn] v. bump to 1.8.9

---
 dev-vcs/subversion-java/Manifest              |  3 +-
 ....5.ebuild => subversion-java-1.8.9.ebuild} | 13 ++--
 dev-vcs/subversion/Manifest                   |  3 +-
 ...n-1.8.5.ebuild => subversion-1.8.9.ebuild} | 70 ++++++++++---------
 www-apache/mod_dav_svn/Manifest               |  3 +-
 ...-1.8.5.ebuild => mod_dav_svn-1.8.9.ebuild} | 22 +++---
 6 files changed, 58 insertions(+), 56 deletions(-)
 rename dev-vcs/subversion-java/{subversion-java-1.8.5.ebuild => subversion-java-1.8.9.ebuild} (92%)
 rename dev-vcs/subversion/{subversion-1.8.5.ebuild => subversion-1.8.9.ebuild} (91%)
 rename www-apache/mod_dav_svn/{mod_dav_svn-1.8.5.ebuild => mod_dav_svn-1.8.9.ebuild} (95%)

diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest
index 010a1d7e7..508c4ba12 100644
--- a/dev-vcs/subversion-java/Manifest
+++ b/dev-vcs/subversion-java/Manifest
@@ -1,3 +1,4 @@
 DIST subversion-1.8.5-Gentoo-patches.tar.gz 2904 SHA256 6ddf6a5b5e5cd2a466d5d3a03bf7990f027e8454a55429e9462239047f56a33b SHA512 3ab1c3af45d2c8639de1e87f68f0a775da051a455895cce32566e3e9e76b7ca6bbe648b5d55cbc74b98c78e95699ea21d20662d70e30a3c95c845a75a9ce6233 WHIRLPOOL 23f063ea3b29bed0796deafb382261925170b0a7b19acab3316147e0d991254d2e27d49ed0079e45a6e6e015e02b33dab93735a4e31247e52674b3e97d70ace0
-DIST subversion-1.8.5.tar.bz2 6881572 SHA256 fd522bf1ecda1c09426ed6c436f0744ab95c31702b0904add089864c73ee7564 SHA512 1a7f19c2ea09c16f66cefef2454e8650f92caac0c505b83e52b32d51ccfece07d5623a26ee7b728c1c4c1bc6c5240cc2b5d65f9aab661d1094c04ed13339b1f6 WHIRLPOOL 89c3b5ea9f4bfe70a05d412a87f278ce74fdcb4b1fdad4905c60729f4a4e01c3a895178313a26358b2e5ab280f9fa8fd5c81c68af6f027d313b40ebcbcb5c3e0
 DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
+DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad
+DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
diff --git a/dev-vcs/subversion-java/subversion-java-1.8.5.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.9.ebuild
similarity index 92%
rename from dev-vcs/subversion-java/subversion-java-1.8.5.ebuild
rename to dev-vcs/subversion-java/subversion-java-1.8.9.ebuild
index 10afd5a73..1b8b1b304 100644
--- a/dev-vcs/subversion-java/subversion-java-1.8.5.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.8.9.ebuild
@@ -12,7 +12,7 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}"
 MY_SVN_CATEGORY="${CATEGORY}"
 
 # note: java-pkg-2, not java-pkt-opt-2
-SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.5-Gentoo-patches.tar.gz )
+SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz )
 inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib
 
 DESCRIPTION="Java bindings for Subversion"
@@ -39,7 +39,7 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
-	if use debug; then
+	if use debug ; then
 		append-cppflags -DSVN_DEBUG -DAP_DEBUG
 	fi
 	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
@@ -97,9 +97,6 @@ src_configure() {
 		;;
 	esac
 
-	#workaround for bug 387057
-	has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
-
 	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
 	#compile for x86 on amd64, so workaround this issue again
 	#check newer versions, if this is still/again needed
@@ -130,7 +127,7 @@ src_configure() {
 src_compile() {
 	emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
 
-	if use doc; then
+	if use doc ; then
 		emake doc-javahl
 	fi
 }
@@ -144,9 +141,9 @@ src_install() {
 
 	mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die
 
-	if use doc; then
+	if use doc ; then
 		java-pkg_dojavadoc doc/javadoc
 	fi
 
-	find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
+	prune_libtool_files --all
 }
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 010a1d7e7..508c4ba12 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,3 +1,4 @@
 DIST subversion-1.8.5-Gentoo-patches.tar.gz 2904 SHA256 6ddf6a5b5e5cd2a466d5d3a03bf7990f027e8454a55429e9462239047f56a33b SHA512 3ab1c3af45d2c8639de1e87f68f0a775da051a455895cce32566e3e9e76b7ca6bbe648b5d55cbc74b98c78e95699ea21d20662d70e30a3c95c845a75a9ce6233 WHIRLPOOL 23f063ea3b29bed0796deafb382261925170b0a7b19acab3316147e0d991254d2e27d49ed0079e45a6e6e015e02b33dab93735a4e31247e52674b3e97d70ace0
-DIST subversion-1.8.5.tar.bz2 6881572 SHA256 fd522bf1ecda1c09426ed6c436f0744ab95c31702b0904add089864c73ee7564 SHA512 1a7f19c2ea09c16f66cefef2454e8650f92caac0c505b83e52b32d51ccfece07d5623a26ee7b728c1c4c1bc6c5240cc2b5d65f9aab661d1094c04ed13339b1f6 WHIRLPOOL 89c3b5ea9f4bfe70a05d412a87f278ce74fdcb4b1fdad4905c60729f4a4e01c3a895178313a26358b2e5ab280f9fa8fd5c81c68af6f027d313b40ebcbcb5c3e0
 DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
+DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad
+DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
diff --git a/dev-vcs/subversion/subversion-1.8.5.ebuild b/dev-vcs/subversion/subversion-1.8.9.ebuild
similarity index 91%
rename from dev-vcs/subversion/subversion-1.8.5.ebuild
rename to dev-vcs/subversion/subversion-1.8.9.ebuild
index b1a63c597..38dbdb35e 100644
--- a/dev-vcs/subversion/subversion-1.8.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.9.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 GENTOO_DEPEND_ON_PERL="no"
 
-SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.5-Gentoo-patches.tar.gz )
+SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz )
 inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils
 
 MY_P="${P/_/-}"
@@ -63,13 +63,13 @@ REQUIRED_USE="
 want_apache
 
 pkg_setup() {
-	if use berkdb; then
+	if use berkdb ; then
 		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
 			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
 			| sed 's:.*b::')"
 		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			if [[ -n "${apu_bdb_version}" ]]; then
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
 				SVN_BDB_VERSION="${apu_bdb_version}"
 				einfo "Matching db version to apr-util"
 			else
@@ -98,7 +98,7 @@ pkg_setup() {
 		echo -ne "\a"
 	fi
 
-	if use debug; then
+	if use debug ; then
 		append-cppflags -DSVN_DEBUG -DAP_DEBUG
 	fi
 
@@ -129,13 +129,13 @@ src_prepare() {
 	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
 		-i build-outputs.mk || die "sed failed"
 
-	if use python; then
+	if use python ; then
 		if [[ ${CHOST} == *-darwin* ]] ; then
 			# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E
 			# in short, we don't have gnome-keyring stuff here, patch
 			# borrowed from MacPorts
 			die "Darwin not supported; use Gentoo ebuild" # no need to bother with the patch for our needs
-			#epatch "${FILESDIR}"/${P}-swig-python-no-gnome-keyring.patch
+			#epatch "${FILESDIR}"/...swig-python-no-gnome-keyring.patch
 		fi
 
 		# XXX: make python_copy_sources accept path
@@ -177,9 +177,6 @@ src_configure() {
 		;;
 	esac
 
-	#workaround for bug 387057
-	has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
-
 	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
 	#compile for x86 on amd64, so workaround this issue again
 	#check newer versions, if this is still/again needed
@@ -196,8 +193,8 @@ src_configure() {
 		export ac_cv_python_compile="$(tc-getCC)"
 	fi
 
-	#force ruby-1.8 for bug 399105
-	#allow overriding Python include directory
+	# force ruby-1.9
+	# allow overriding Python include directory
 	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -224,7 +221,7 @@ src_configure() {
 src_compile() {
 	emake local-all
 
-	if use ctypes-python; then
+	if use ctypes-python ; then
 		# pre-generate .py files
 		use ctypes-python && emake ctypes-python
 
@@ -233,7 +230,7 @@ src_compile() {
 		popd >/dev/null || die
 	fi
 
-	if use python; then
+	if use python ; then
 		swig_py_compile() {
 			local p=subversion/bindings/swig/python
 			rm -f ${p} || die
@@ -250,27 +247,32 @@ src_compile() {
 		python_foreach_impl swig_py_compile
 	fi
 
-	if use perl; then
+	if use perl ; then
 		emake swig-pl
 	fi
 
-	if use ruby; then
+	if use ruby ; then
 		emake swig-rb
 	fi
 
-	if use extras; then
+	if use extras ; then
 		emake tools
 	fi
 
-	if use doc; then
+	if use doc ; then
 		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
 	fi
 }
 
 src_test() {
+	if ! has_version ~${CATEGORY}/${P} ; then
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed."
+	fi
+
 	default
 
-	if use ctypes-python; then
+	if use ctypes-python ; then
 		python_test() {
 			"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
 				|| die "ctypes-python tests fail with ${EPYTHON}"
@@ -279,7 +281,7 @@ src_test() {
 		distutils-r1_src_test
 	fi
 
-	if use python; then
+	if use python ; then
 		swig_py_test() {
 			pushd "${BUILD_DIR}" >/dev/null || die
 			"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
@@ -294,13 +296,13 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" local-install
 
-	if use ctypes-python; then
+	if use ctypes-python ; then
 		pushd subversion/bindings/ctypes-python >/dev/null || die
 		distutils-r1_src_install
 		popd >/dev/null || die
 	fi
 
-	if use python; then
+	if use python ; then
 		swig_py_install() {
 			local p=subversion/bindings/swig/python
 			rm -f ${p} || die
@@ -317,18 +319,18 @@ src_install() {
 		python_foreach_impl swig_py_install
 	fi
 
-	if use perl; then
+	if use perl ; then
 		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		fixlocalpod
 		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
 	fi
 
-	if use ruby; then
+	if use ruby ; then
 		emake DESTDIR="${D}" install-swig-rb
 	fi
 
 	# Install Apache module configuration.
-	if use apache2; then
+	if use apache2 ; then
 		keepdir "${APACHE_MODULES_CONFDIR}"
 		insinto "${APACHE_MODULES_CONFDIR}"
 		doins "${FILESDIR}/47_mod_dav_svn.conf"
@@ -362,14 +364,14 @@ src_install() {
 	rm -fr tools/xslt
 
 	# Install extra files.
-	if use extras; then
+	if use extras ; then
 		cat << EOF > 80subversion-extras
 PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
 ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
 EOF
 		doenvd 80subversion-extras
 
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
 
 		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
 		rm -fr tools/client-side/svnmucc
@@ -381,11 +383,11 @@ EOF
 		doins -r tools
 	fi
 
-	if use doc; then
+	if use doc ; then
 		dohtml -r doc/doxygen/html/*
 	fi
 
-	find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
+	prune_libtool_files --all
 
 	cd "${ED}"usr/share/locale
 	for i in * ; do
@@ -395,10 +397,10 @@ EOF
 
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
+	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then
 		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/")"
 		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/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
 			CHANGED_BDB_VERSION="1"
 		fi
 	fi
@@ -407,7 +409,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use perl && perl-module_pkg_postinst
 
-	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
 		ewarn "You upgraded from an older version of Berkeley 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"
@@ -425,7 +427,7 @@ pkg_config() {
 	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
 	# already has EPREFIX in it
 	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
+	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
@@ -438,7 +440,7 @@ pkg_config() {
 		einfo "Setting repository permissions..."
 		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
 		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2; then
+		if use apache2 ; then
 			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
 			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
 		else
diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest
index 010a1d7e7..508c4ba12 100644
--- a/www-apache/mod_dav_svn/Manifest
+++ b/www-apache/mod_dav_svn/Manifest
@@ -1,3 +1,4 @@
 DIST subversion-1.8.5-Gentoo-patches.tar.gz 2904 SHA256 6ddf6a5b5e5cd2a466d5d3a03bf7990f027e8454a55429e9462239047f56a33b SHA512 3ab1c3af45d2c8639de1e87f68f0a775da051a455895cce32566e3e9e76b7ca6bbe648b5d55cbc74b98c78e95699ea21d20662d70e30a3c95c845a75a9ce6233 WHIRLPOOL 23f063ea3b29bed0796deafb382261925170b0a7b19acab3316147e0d991254d2e27d49ed0079e45a6e6e015e02b33dab93735a4e31247e52674b3e97d70ace0
-DIST subversion-1.8.5.tar.bz2 6881572 SHA256 fd522bf1ecda1c09426ed6c436f0744ab95c31702b0904add089864c73ee7564 SHA512 1a7f19c2ea09c16f66cefef2454e8650f92caac0c505b83e52b32d51ccfece07d5623a26ee7b728c1c4c1bc6c5240cc2b5d65f9aab661d1094c04ed13339b1f6 WHIRLPOOL 89c3b5ea9f4bfe70a05d412a87f278ce74fdcb4b1fdad4905c60729f4a4e01c3a895178313a26358b2e5ab280f9fa8fd5c81c68af6f027d313b40ebcbcb5c3e0
 DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
+DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad
+DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.8.5.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.8.9.ebuild
similarity index 95%
rename from www-apache/mod_dav_svn/mod_dav_svn-1.8.5.ebuild
rename to www-apache/mod_dav_svn/mod_dav_svn-1.8.9.ebuild
index d706a24ca..f52b85644 100644
--- a/www-apache/mod_dav_svn/mod_dav_svn-1.8.5.ebuild
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.8.9.ebuild
@@ -10,7 +10,7 @@ MY_SVN_PN="subversion"
 MY_SVN_P="${MY_SVN_PN}-${PV}"
 MY_SVN_PF="${MY_SVN_PN}-${PVR}"
 
-SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.5-Gentoo-patches.tar.gz )
+SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz )
 inherit sab-patches autotools db-use depend.apache flag-o-matic libtool multilib eutils
 
 DESCRIPTION="Subversion WebDAV support"
@@ -68,13 +68,13 @@ RDEPEND="${MY_CDEPS}
 need_apache # was: want_apache
 
 pkg_setup() {
-	if use berkdb; then
+	if use berkdb ; then
 		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
 			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
 			| sed 's:.*b::')"
 		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			if [[ -n "${apu_bdb_version}" ]]; then
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
 				SVN_BDB_VERSION="${apu_bdb_version}"
 				einfo "Matching db version to apr-util"
 			else
@@ -96,7 +96,7 @@ pkg_setup() {
 
 	# depend.apache_pkg_setup
 
-	if use debug; then
+	if use debug ; then
 		append-cppflags -DSVN_DEBUG -DAP_DEBUG
 	fi
 
@@ -169,8 +169,8 @@ src_configure() {
 	#check newer versions, if this is still/again needed
 	myconf+=" --disable-disallowing-of-undefined-references"
 
-	#force ruby-1.8 for bug 399105
-	#allow overriding Python include directory
+	# force ruby-1.9
+	# allow overriding Python include directory
 	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -211,17 +211,17 @@ src_install() {
 
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
+	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then
 		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/")"
 		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/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
 			CHANGED_BDB_VERSION="1"
 		fi
 	fi
 }
 
 pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
 		ewarn "You upgraded from an older version of Berkeley 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"
@@ -254,7 +254,7 @@ pkg_config() {
 	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
 	# already has EPREFIX in it
 	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
+	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