More gracefully handle dependency between KDE & NLS USE-flags, as requested by Jeroen Roovers in bug #330941. Perfection would require EAPI=4, which I can not use yet. Tell user to restart daemon after upgrade, as requested by Joel Koglin in bug #337042. Use recursive dodoc instead of ecompressdir as requested by Ulrich Müller in bug #356503. Move the environment config back to inline for now, as Kent Fredric reports that variable substitution broke and caused env-update failures. Closes bug #379819. Killed old -r1 ebuild due to this problem.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 36 insertions, 23 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 13aed4469823..15301bd2f8df 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.45 2011/08/18 16:48:11 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.46 2011/08/19 10:40:53 chainsaw Exp $
+
+*subversion-1.6.17-r2 (19 Aug 2011)
+
+  19 Aug 2011; Tony Vroon <chainsaw@gentoo.org> -files/80subversion-extras,
+  -subversion-1.6.17-r1.ebuild, +subversion-1.6.17-r2.ebuild:
+  More gracefully handle dependency between KDE & NLS USE-flags, as requested
+  by Jeroen Roovers in bug #330941. Perfection would require EAPI=4, which I
+  can not use yet. Tell user to restart daemon after upgrade, as requested by
+  Joel Koglin in bug #337042. Use recursive dodoc instead of ecompressdir as
+  requested by Ulrich Müller in bug #356503. Move the environment config back
+  to inline for now, as Kent Fredric reports that variable substitution broke
+  and caused env-update failures. Closes bug #379819. Killed old -r1 ebuild due
+  to this problem.
 
   18 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   subversion-1.6.17.ebuild:
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 52d56b68b5b1..87697b625379 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,9 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 47_mod_dav_svn.conf 422 RMD160 658703e00882a0bce007709372cf40a407fee915 SHA1 3a1ffd40391a1cca3cb9cfb1b9d153c1a4f169a0 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27
 AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
-AUX 80subversion-extras 107 RMD160 ed314994ef77d96948b19631f323cc68c5c74215 SHA1 e5532d5ba2c076c1658d0ffbe73bcd086d81f542 SHA256 250038e4e007fa3bfd714a73723cb1c9b6302c46dd90ca9473055e54344bcfd7
 AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
 AUX subversion-1.6.2-local_library_preloading.patch 6412 RMD160 3b072c5f9d3c1f43e3be20959a24632db0c9f82c SHA1 85a3d394861a53e3919ef6fc243542af7df17b46 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d
 AUX subversion-1.6.3-kwallet_window.patch 10012 RMD160 d469e0fc8d9fd2ef8c857e5e303eeb24309e7f0d SHA1 9c99b63bc5abf54f642e447af1aa2f814cecb8ab SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de
@@ -16,14 +15,14 @@ DIST subversion-1.6.16.tar.bz2 5509729 RMD160 f12d7eb31372486290e08143ec1afda029
 DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7f47172 SHA1 6e3ed7c87d98fdf5f0a999050ab601dcec6155a1 SHA256 d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
 EBUILD subversion-1.6.15.ebuild 31841 RMD160 0b018adda55fc51e2a7fb05e7bfdeb1b11f318c4 SHA1 9f73ff35e92d60692d551382a68dac87b56655df SHA256 a1eba80dd50f7ec4092884c410228c7aa0778ca0a812c097deb36139c5907712
 EBUILD subversion-1.6.16.ebuild 31846 RMD160 c2714b45a69939db231e5f03ad26b6def895f397 SHA1 994949ce558dc39e8d8e9b0cf4d248937c628ef7 SHA256 8e4ae636dcb868a4a9ed17dc01c42451c62b8c73f890e99c3b16125c7267af11
-EBUILD subversion-1.6.17-r1.ebuild 15815 RMD160 0072f1f979a3a5c266ae3f787bccad3e03c8be94 SHA1 6c1c269453f3fb3eef8e247b1a9a544483fb6064 SHA256 71a160402df2c044836eb9f9f3c0739d027affea138591d6b9a44054b7635114
+EBUILD subversion-1.6.17-r2.ebuild 15900 RMD160 24083b9bf07c25ed30576340873036359d28f0d3 SHA1 ccb5eb9277bbb2eb1e719c6eba28ba8089d4aae1 SHA256 bca84bd62183398e3f2896adccb91ff330be2371c3bf0dfd19ebc541ccd3e877
 EBUILD subversion-1.6.17.ebuild 31736 RMD160 f737154399931fc9691ec0e3d377b0518f98a4c4 SHA1 2ede6c3c8c3dc36058e5dc9995fe10b3d1b040a7 SHA256 243009278832093ab797b7535d333da5cb5e4d9f0f02f95b31249a9fdd5a7625
-MISC ChangeLog 77169 RMD160 726db781100ae99ea22a725a2559e9a1033c6d23 SHA1 77c75abe8b99eedd0dfb2f8c1b12825ddc11d85d SHA256 327079b052d5eb6a4ef1600850a40d6518da751887987024313d60618b631d83
+MISC ChangeLog 77909 RMD160 bfcfc99bf32cc836c2bd87e449df78dd7cca5202 SHA1 110f490167f94fe459b48db4e6ca81a7f22d106f SHA256 ce6435ee1d8773668b305e24e5b9e8e20df2af3b51229363b91c56a5f453dbca
 MISC metadata.xml 650 RMD160 17a1bcef59b035ceeb456ff3bcff9f121db2cc5e SHA1 677d1e573840f9f634abfa39dbce0dc4f11e4ee8 SHA256 ca7082ab0d3917e015b6532500bd31ef236513c3ad30782462823c947df1afdb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5NQlYACgkQuUQtlDBCeQJv7wCeKe+jChEsQ9o0CRWZRfkP6jvD
-HBgAn2061MGPEV0pz3zgEt+46ngi0olt
-=4cSs
+iEYEARECAAYFAk5OPb0ACgkQp5vW4rUFj5qsKwCcDapZ3Ns4q0yPqw4cmOEHag8P
+9cAAoImeRAnGgfOemW56eQD5Fsw0Wyuf
+=BuRy
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/files/80subversion-extras b/dev-vcs/subversion/files/80subversion-extras
deleted file mode 100644
index 5b28eb7856d9..000000000000
--- a/dev-vcs/subversion/files/80subversion-extras
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-
diff --git a/dev-vcs/subversion/subversion-1.6.17-r1.ebuild b/dev-vcs/subversion/subversion-1.6.17-r2.ebuild
index bf78e44bead3..9bcefc2e4c96 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r1.ebuild,v 1.1 2011/08/18 09:51:23 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r2.ebuild,v 1.1 2011/08/19 10:40:53 chainsaw Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -61,11 +61,6 @@ PATCHES=(
 want_apache
 
 pkg_setup() {
-	if use kde && ! use nls; then
-		eerror "Support for KWallet (KDE) requires Native Language Support (NLS)."
-		die "Enable \"nls\" USE flag"
-	fi
-
 	if use berkdb; then
 		einfo
 		if [[ -z "${SVN_BDB_VERSION}" ]]; then
@@ -138,6 +133,12 @@ src_configure() {
 		myconf+=" --without-junit"
 	fi
 
+	if use kde || use nls; then
+		myconf+=" --enable-nls"
+	else
+		myconf+=" --disable-nls"
+	fi
+
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use_with apache2 apxs "${APXS}") \
 		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
@@ -147,7 +148,6 @@ src_configure() {
 		$(use_enable java javahl) \
 		$(use_with java jdk "${JAVA_HOME}") \
 		$(use_with kde kwallet) \
-		$(use_enable nls) \
 		$(use_with sasl) \
 		$(use_with webdav-neon neon) \
 		$(use_with webdav-serf serf "${EPREFIX}/usr") \
@@ -337,7 +337,11 @@ src_install() {
 
 	# Install extra files.
 	if use extras; then
-		doenvd "${FILESDIR}/80subversion-extras"
+		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}" contribdir="/usr/$(get_libdir)/subversion/bin" install-contrib || die "Installation of contrib failed"
 		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
@@ -356,9 +360,7 @@ src_install() {
 	if use doc; then
 		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
 
-		insinto /usr/share/doc/${PF}
-		doins -r notes
-		ecompressdir /usr/share/doc/${PF}/notes
+		dodoc -r notes
 
 		if use java; then
 			java-pkg_dojavadoc doc/javadoc
@@ -405,6 +407,8 @@ pkg_postinst() {
 		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
 		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
 	fi
+
+	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
 }
 
 pkg_postrm() {