various fixes

3 files changed, 31 insertions, 19 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index cddb788e9d29..4f37c3686fb5 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.50 2004/02/11 10:05:57 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.51 2004/02/13 19:55:21 pauldv Exp $
+
+  13 Feb 2004; <paul@gentoo.org> subversion-0.37.0.ebuild:
+  Make emacs regeneration more tolerant (bug #41411)
 
   11 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-0.37.0.ebuild:
   Add optional emacs dependency
@@ -8,10 +11,16 @@
   05 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-0.37.0.ebuild:
   Some autoconf changes
 
+  04 Feb 2004; <paul@gentoo.org> subversion-0.37.0.ebuild:
+  Some more explanations
+
   04 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-0.37.0.ebuild:
   Take the new FHS's /srv directory into account, moving the default location
   from /var
 
+  03 Feb 2004; <paul@gentoo.org> subversion-0.37.0.ebuild:
+  Hopefully fix emacs module compilation problems
+
 *subversion-0.37.0 (28 Jan 2004)
 
   28 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> subversion-0.37.0.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 10cbb3bfbbf5..2b70f36cb722 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,20 +1,20 @@
-MD5 722119af145ccc96f0798145c6009e1c subversion-0.28.0.ebuild 8032
+MD5 50a5db919bcec9af2c95ffa024825bee subversion-0.37.0.ebuild 8169
+MD5 48e87e9f0ce09bda6fdaff08cd99b29d subversion-0.35.1.ebuild 7737
 MD5 75c2bee0ffc04b77b670a39f4c93e195 subversion-0.34.0.ebuild 7735
 MD5 90baa3c06a36189018ce4d4016f9e943 subversion-0.30.0.ebuild 7570
-MD5 d66517f3894e405a439d98619dbd406d subversion-0.37.0.ebuild 7987
-MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
-MD5 a9aa9e5f5f0fcbd193421b243e7fde9d ChangeLog 8985
-MD5 a6e39b789f01207748b9eda8df8ba72c subversion-0.32.1.ebuild 8136
 MD5 96c37b538c43b2213ed1222415c91cac subversion-0.27.0.ebuild 7887
+MD5 a6e39b789f01207748b9eda8df8ba72c subversion-0.32.1.ebuild 8136
 MD5 acedaafe3f4b8379055c983cade07dfc subversion-0.31.0.ebuild 8277
-MD5 48e87e9f0ce09bda6fdaff08cd99b29d subversion-0.35.1.ebuild 7737
+MD5 722119af145ccc96f0798145c6009e1c subversion-0.28.0.ebuild 8032
+MD5 f6bb87e94e4d751598a77983c6806ee7 ChangeLog 9293
+MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
+MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
 MD5 c055aef559559580f75e60ede5051e79 files/digest-subversion-0.28.0 130
+MD5 c239e1be5d94572ff970508d3ac8f9b0 files/digest-subversion-0.30.0 135
+MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0 132
+MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
 MD5 335ccf779acbf11679a47b048afd56d0 files/digest-subversion-0.34.0 70
 MD5 2addfcd2a73da5548c1fcbb279794e8f files/digest-subversion-0.35.1 70
-MD5 e232822bee0a8ed00f6b9d7805b83307 files/digest-subversion-0.27.0 132
-MD5 69cf99186dd88a6b26c6c121fc4c16a9 files/digest-subversion-0.32.1 132
-MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 1f6ba3ba6f91cb0b284c0a8facb912e6 files/digest-subversion-0.37.0 70
+MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 72aa5ab58a4d6274b6035ce3370e5c3f files/subversion-db4.patch 556
-MD5 c239e1be5d94572ff970508d3ac8f9b0 files/digest-subversion-0.30.0 135
-MD5 86365b02198a65328b2f189759d9e3d3 files/digest-subversion-0.31.0 132
diff --git a/dev-util/subversion/subversion-0.37.0.ebuild b/dev-util/subversion/subversion-0.37.0.ebuild
index 343d3c69a625..7072b97cac4f 100644
--- a/dev-util/subversion/subversion-0.37.0.ebuild
+++ b/dev-util/subversion/subversion-0.37.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.37.0.ebuild,v 1.6 2004/02/11 10:05:57 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.37.0.ebuild,v 1.7 2004/02/13 19:55:21 pauldv Exp $
 
 inherit elisp-common libtool
 
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 	)"
 
 pkg_setup() {
-	if has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
+	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [ "${SVN_DUMPED}" == "" ]; then
 		einfo ""
 		ewarn ":  Now you have $(best_version subversion)"
 		ewarn " Subversion has changed the repository filesystem schema from 0.34.0."
@@ -59,12 +59,13 @@ pkg_setup() {
 
 	if use apache2; then
 		einfo "The apache2 subversion module will be built, and libapr from the"
-		einfo "apache package will be used instead of the included"
+		einfo "apache package will be used instead of the included."
 	else
 		einfo "Please note that subversion and apache2 cannot be installed"
 		einfo "simultaneously without specifying the apache2 use flag. This is"
 		einfo "because subversion installs its own libapr and libapr-util in that"
-		einfo "case."
+		einfo "case. Specifying the apache2 useflag will also enable the building of"
+		einfo "the apache2 module."
 	fi
 }
 
@@ -126,9 +127,11 @@ src_compile() {
 			fi
 		fi
 	fi
+	cd ${S}
 	if use emacs; then
-		emacs -batch -f batch-byte-compile contrib/client-side/vc-svn.el || die
-		emacs -batch -f batch-byte-compile contrib/client-side/psvn/psvn.el || die
+		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
 }
 
@@ -239,7 +242,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use emacs && elisp-site-regen
+	has_version virtual/emacs && elisp-site-regen
 }
 
 pkg_config() {