version bump wrt #241398, fixes emacs support wrt #237528

(Portage version: 2.1.4.5)

3 files changed, 21 insertions, 55 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index d98c19f4b2b8..7f3e15776a64 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.332 2008/10/18 15:12:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.333 2008/10/25 12:48:45 hollow Exp $
+
+*subversion-1.5.4 (25 Oct 2008)
+
+  25 Oct 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/1.5.0/http-library.patch, -subversion-1.5.0.ebuild,
+  +subversion-1.5.4.ebuild:
+  version bump wrt #241398, fixes emacs support wrt #237528
 
   18 Oct 2008; Raúl Porcel <armin76@gentoo.org> subversion-1.5.2.ebuild:
   ia64 stable wrt #241584
diff --git a/dev-util/subversion/files/1.5.0/http-library.patch b/dev-util/subversion/files/1.5.0/http-library.patch
deleted file mode 100644
index 6d67465a076f..000000000000
--- a/dev-util/subversion/files/1.5.0/http-library.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: subversion-1.5.0-rc9/configure.ac
-===================================================================
---- subversion-1.5.0-rc9.orig/configure.ac
-+++ subversion-1.5.0-rc9/configure.ac
-@@ -84,9 +84,19 @@ AC_ARG_ENABLE(neon-version-check,
-   [])
- SVN_LIB_NEON($NEON_ALLOWED_LIST, $NEON_RECOMMENDED_VER, $NEON_URL)
- 
-+if test "$svn_lib_neon" = "yes"; then
-+  AC_DEFINE([SVN_HAVE_NEON], 1,
-+            [Defined if support for Neon is enabled])
-+fi
-+
- dnl Search for serf as an alternative to neon
- SVN_LIB_SERF
- 
-+if test "$svn_lib_serf" = "yes"; then
-+  AC_DEFINE([SVN_HAVE_SERF], 1,
-+            [Defined if support for Serf is enabled])
-+fi
-+
- dnl Set up a number of directories ---------------------
- 
- dnl Create SVN_BINDIR for proper substitution
-Index: subversion-1.5.0-rc9/subversion/libsvn_ra/ra_loader.c
-===================================================================
---- subversion-1.5.0-rc9.orig/subversion/libsvn_ra/ra_loader.c
-+++ subversion-1.5.0-rc9/subversion/libsvn_ra/ra_loader.c
-@@ -59,7 +59,7 @@
-    ### any code which uses the pre-1.2 API svn_ra_get_ra_library
-    ### instead of svn_ra_open. */
- 
--#if defined(SVN_LIBSVN_CLIENT_LINKS_RA_NEON) && defined (SVN_LIBSVN_CLIENT_LINKS_RA_SERF)
-+#if defined(SVN_HAVE_NEON) && defined(SVN_HAVE_SERF)
- #define MUST_CHOOSE_DAV
- #endif
- 
diff --git a/dev-util/subversion/subversion-1.5.0.ebuild b/dev-util/subversion/subversion-1.5.4.ebuild
index 6b33a9e26e33..3757ed8509b8 100644
--- a/dev-util/subversion/subversion-1.5.0.ebuild
+++ b/dev-util/subversion/subversion-1.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.0.ebuild,v 1.1 2008/06/21 12:07:43 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.4.ebuild,v 1.1 2008/10/25 12:48:45 hollow Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="none"
@@ -9,8 +9,7 @@ inherit autotools bash-completion confutils depend.apache elisp-common eutils fl
 
 DESCRIPTION="Advanced version control system"
 HOMEPAGE="http://subversion.tigris.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2
-	mirror://gentoo/${P}-merge-improvements.patch.bz2"
+SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
 
 LICENSE="Subversion"
 SLOT="0"
@@ -71,9 +70,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/1.5.0/http-library.patch
 	epatch "${FILESDIR}"/1.5.0/disable-unneeded-linking.patch
-	epatch "${WORKDIR}"/${P}-merge-improvements.patch
 
 	sed -i \
 		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
@@ -119,9 +116,6 @@ src_compile() {
 		--without-junit \
 		--disable-mod-activation
 
-	# Respect the user LDFLAGS when building Subversion SWIG bindings.
-	export SWIG_LDFLAGS="${LDFLAGS}"
-
 	emake local-all || die "Building of core Subversion failed"
 
 	if use python; then
@@ -142,10 +136,9 @@ src_compile() {
 	fi
 
 	if use emacs; then
-		elisp-compile contrib/client-side/emacs/dsvn.el || die "Compilation of Emacs module failed"
-		elisp-compile contrib/client-side/emacs/psvn.el || die "Compilation of Emacs module failed"
-		elisp-compile doc/svn-doc.el || die "Compilation of Emacs module failed"
-		elisp-compile doc/tools/svnbook.el || die "Compilation of Emacs module failed"
+		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el \
+			doc/svn-doc.el doc/tools/svnbook.el \
+			|| die "Compilation of Emacs modules failed"
 	fi
 
 	if use extras; then
@@ -257,11 +250,14 @@ EOF
 
 	# Install Emacs Lisps.
 	if use emacs; then
-		elisp-install ${PN} contrib/client-side/emacs/dsvn.el*
-		elisp-install ${PN} contrib/client-side/emacs/psvn.el*
-		elisp-install ${PN} doc/svn-doc.el*
-		elisp-install ${PN} doc/tools/svnbook.el*
-		elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el
+		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} \
+			doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} \
+			|| die "Installation of Emacs modules failed"
+		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} \
+			|| die "Installation of Emacs modules failed"
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/1.5.0/70svn-gentoo.el \
+			|| die "Installation of Emacs site-init file failed"
 	fi
 	rm -fr contrib/client-side/emacs