[dev-vcs/subversion*,www-apache/mod_dav_svn] version bump to 1.8.5

dev-vcs/subversion-java/Manifest

@@ -1,2 +1,3 @@
-DIST subversion-1.7.13.tar.bz2 6043884 SHA256 e07b3b8559b7b74f8d8fd602424bfc9e4eef95b4ca415eab98a25439d97fe2e9 SHA512 85ebd0532959f98f71da1dfac77ac9e424a46d9327ec426854798a3c1f2897c5e515f76ee81e08514d05af5715cdc74d92504072bd19627d22d27574d5d9b5e4 WHIRLPOOL 234338ab9ee71fb15fda567a5e7c982180f4bf47bef2d47ef23bc8d131aee2a7409e413f04ecd29aa2e5425daf765e7ace2969cbf1bd53a5f705499908772ee2
 DIST subversion-1.7.14.tar.bz2 6045932 SHA256 c4ac8f37eb0ebd38901bfa6f1c7e4d7716d32d7460ee0cee520381ca2f5b120d SHA512 cc7df3a2d258cda65a3fefc1fb9bcc91f78ec817c8d32e561eae7cf59de3d1d5c843594150b63c60c724e4b3df88da319763f814f418d106461adcc78b323840 WHIRLPOOL 21d879775ed0bed15d17b83070eb26269f8d3cc0420be54e0d326b7b6f410b9fee11d2f8d2926f930c66c66a47a6396275ddf20120436b978c0a318bb963f0e0
+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

dev-vcs/subversion-java/subversion-java-1.8.5.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,11 +12,12 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}"
 MY_SVN_CATEGORY="${CATEGORY}"
 
 # note: java-pkg-2, not java-pkt-opt-2
-inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib
+SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.5-Gentoo-patches.tar.gz )
+inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib
 
 DESCRIPTION="Java bindings for Subversion"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
+SRC_URI+=" mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
 S="${WORKDIR}/${MY_SVN_P/_/-}"
 
 LICENSE="Subversion"
@@ -28,6 +29,7 @@ IUSE="debug doc nls"
 COMMON_DEPEND="~dev-vcs/subversion-${PV}"
 RDEPEND="
 	${COMMON_DEPEND}
+	app-arch/bzip2
 	>=virtual/jre-1.5"
 DEPEND="${COMMON_DEPEND}
 	>=virtual/jdk-1.5"
@@ -38,12 +40,12 @@ pkg_setup() {
 	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
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${MY_SVN_PN}-1.5.4-interix.patch \
-		"${FILESDIR}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \
-		"${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch
+	sab-patches_apply_all
 	epatch_user
 
 	fperms +x build/transform_libtool_scripts.sh
@@ -69,12 +71,6 @@ src_configure() {
 	myconf+=" --without-swig"
 	myconf+=" --without-junit"
 
-	if use nls; then
-		myconf+=" --enable-nls"
-	else
-		myconf+=" --disable-nls"
-	fi
-
 	case ${CHOST} in
 		*-aix*)
 			# avoid recording immediate path to sharedlibs into executables
@@ -108,6 +104,7 @@ src_configure() {
 	myconf+=" --disable-disallowing-of-undefined-references"
 
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--without-apache-libexecdir \
 		--without-apxs \
 		--without-berkeley-db \
 		--without-ctypesgen \
@@ -116,8 +113,8 @@ src_configure() {
 		--enable-javahl \
 		--with-jdk="${JAVA_HOME}" \
 		--without-kwallet \
+		$(use_enable nls) \
 		--without-sasl \
-		--without-neon \
 		--without-serf \
 		${myconf} \
 		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
@@ -125,7 +122,6 @@ src_configure() {
 		--disable-experimental-libtool \
 		--without-jikes \
 		--disable-mod-activation \
-		--disable-neon-version-check \
 		--disable-static
 }