update subversion checks wrt #219475

(Portage version: 2.1.5_rc6)

4 files changed, 32 insertions, 22 deletions

diff --git a/dev-util/rapidsvn/ChangeLog b/dev-util/rapidsvn/ChangeLog
index bb27b3bafe9e..42511b81cbe4 100644
--- a/dev-util/rapidsvn/ChangeLog
+++ b/dev-util/rapidsvn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/rapidsvn
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.55 2008/04/02 02:33:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/ChangeLog,v 1.56 2008/04/30 20:42:07 hollow Exp $
+
+  30 Apr 2008; Benedikt Böhm <hollow@gentoo.org> rapidsvn-0.9.3.ebuild,
+  rapidsvn-0.9.4.ebuild, rapidsvn-0.9.6.ebuild:
+  update subversion checks wrt #219475
 
 *rapidsvn-0.9.6 (02 Apr 2008)
 
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
index a52c218dcacb..9bde095e22d3 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.3.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/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.22 2008/04/02 02:33:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.3.ebuild,v 1.23 2008/04/30 20:42:07 hollow Exp $
 
 inherit eutils libtool autotools wxwidgets flag-o-matic fdo-mime
 
@@ -35,13 +35,15 @@ src_unpack() {
 }
 
 src_compile() {
-	einfo "Checking for subversion compiled with neon support..."
-	if built_with_use dev-util/subversion nowebdav; then
-	    ewarn "SVN (dev-util/subversion) must be compiled with neon support."
-	    ewarn "Please re-emerge subversion without the nowebdav USE flag."
-	    die "SVN merged with nowebdav USE flag"
+	einfo "Checking for subversion compiled with WebDAV support..."
+	if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \
+	built_with_use --missing false dev-util/subversion nowebdav; then
+		ewarn "SVN (dev-util/subversion) must be compiled with WebDAV support."
+		ewarn "Please re-emerge subversion with webdav-neon or webdav-serf USE flag"
+		ewarn "and without the nowebdav USE flag."
+		die "SVN merged without WebDAV support"
 	else
-	    einfo "Found neon support; continuing..."
+		einfo "Found WebDAV support; continuing..."
 	fi
 
 	# if you compiled subversion without (the) apache2 (flag) and with the
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
index 15697686830c..7724564c7433 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.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/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.19 2008/01/10 18:07:23 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.4.ebuild,v 1.20 2008/04/30 20:42:07 hollow Exp $
 
 inherit eutils libtool autotools wxwidgets flag-o-matic fdo-mime
 
@@ -35,13 +35,15 @@ src_unpack() {
 }
 
 src_compile() {
-	einfo "Checking for subversion compiled with neon support..."
-	if built_with_use dev-util/subversion nowebdav; then
-		ewarn "SVN (dev-util/subversion) must be compiled with neon support."
-		ewarn "Please re-emerge subversion without the nowebdav USE flag."
-		die "SVN merged with nowebdav USE flag"
+	einfo "Checking for subversion compiled with WebDAV support..."
+	if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \
+	built_with_use --missing false dev-util/subversion nowebdav; then
+		ewarn "SVN (dev-util/subversion) must be compiled with WebDAV support."
+		ewarn "Please re-emerge subversion with webdav-neon or webdav-serf USE flag"
+		ewarn "and without the nowebdav USE flag."
+		die "SVN merged without WebDAV support"
 	else
-		einfo "Found neon support; continuing..."
+		einfo "Found WebDAV support; continuing..."
 	fi
 
 	# if you compiled subversion without (the) apache2 (flag) and with the
diff --git a/dev-util/rapidsvn/rapidsvn-0.9.6.ebuild b/dev-util/rapidsvn/rapidsvn-0.9.6.ebuild
index 474276ee6e87..544b15739b51 100644
--- a/dev-util/rapidsvn/rapidsvn-0.9.6.ebuild
+++ b/dev-util/rapidsvn/rapidsvn-0.9.6.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/rapidsvn/rapidsvn-0.9.6.ebuild,v 1.1 2008/04/02 02:33:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/rapidsvn/rapidsvn-0.9.6.ebuild,v 1.2 2008/04/30 20:42:07 hollow Exp $
 
 WANT_AUTOCONF="2.5"
 inherit versionator eutils libtool autotools wxwidgets flag-o-matic fdo-mime
@@ -34,13 +34,15 @@ src_unpack() {
 }
 
 src_compile() {
-	einfo "Checking for subversion compiled with neon support..."
-	if built_with_use dev-util/subversion nowebdav; then
-		ewarn "SVN (dev-util/subversion) must be compiled with neon support."
-		ewarn "Please re-emerge subversion without the nowebdav USE flag."
-		die "SVN merged with nowebdav USE flag"
+	einfo "Checking for subversion compiled with WebDAV support..."
+	if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \
+	built_with_use --missing false dev-util/subversion nowebdav; then
+		ewarn "SVN (dev-util/subversion) must be compiled with WebDAV support."
+		ewarn "Please re-emerge subversion with webdav-neon or webdav-serf USE flag"
+		ewarn "and without the nowebdav USE flag."
+		die "SVN merged without WebDAV support"
 	else
-		einfo "Found neon support; continuing..."
+		einfo "Found WebDAV support; continuing..."
 	fi
 
 	# if you compiled subversion without (the) apache2 (flag) and with the