Update dependency on sys-apps/sandbox (bug #271424). Backport some updates from trunk ebuild.

(Portage version: 13794-svn/cvs/Linux x86_64)

4 files changed, 23 insertions, 5 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index d71356b564c6..403d359c6e3a 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/subversion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.388 2009/07/03 13:43:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.389 2009/07/06 19:14:54 arfrever Exp $
+
+  06 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  subversion-1.6.2.ebuild, subversion-1.6.2-r10.ebuild,
+  subversion-1.6.3.ebuild:
+  Update dependency on sys-apps/sandbox (bug #271424). Backport some updates
+  from trunk ebuild.
 
   03 Jul 2009; Brent Baude <ranger@gentoo.org> subversion-1.6.2.ebuild:
   Marking subversion-1.6.2 ppc64 and ppc for bug 273304
diff --git a/dev-util/subversion/subversion-1.6.2-r10.ebuild b/dev-util/subversion/subversion-1.6.2-r10.ebuild
index 7fdf43919927..57abeeff362a 100644
--- a/dev-util/subversion/subversion-1.6.2-r10.ebuild
+++ b/dev-util/subversion/subversion-1.6.2-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2-r10.ebuild,v 1.3 2009/06/22 21:57:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2-r10.ebuild,v 1.4 2009/07/06 19:14:54 arfrever Exp $
 
 EAPI="2"
 
@@ -39,6 +39,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/URI )"
 
 DEPEND="${CDEPEND}
+	>=sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
 	gnome-keyring? ( dev-util/pkgconfig )
diff --git a/dev-util/subversion/subversion-1.6.2.ebuild b/dev-util/subversion/subversion-1.6.2.ebuild
index 5e030ff0f766..05615793eaa1 100644
--- a/dev-util/subversion/subversion-1.6.2.ebuild
+++ b/dev-util/subversion/subversion-1.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2.ebuild,v 1.12 2009/07/03 13:43:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2.ebuild,v 1.13 2009/07/06 19:14:54 arfrever Exp $
 
 EAPI="2"
 
@@ -37,6 +37,7 @@ RDEPEND="${CDEPEND}
 	perl? ( dev-perl/URI )"
 
 DEPEND="${CDEPEND}
+	>=sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
 	gnome-keyring? ( dev-util/pkgconfig )
diff --git a/dev-util/subversion/subversion-1.6.3.ebuild b/dev-util/subversion/subversion-1.6.3.ebuild
index c654a71ac551..cbff1aa2c293 100644
--- a/dev-util/subversion/subversion-1.6.3.ebuild
+++ b/dev-util/subversion/subversion-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.3.ebuild,v 1.3 2009/06/26 11:35:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.3.ebuild,v 1.4 2009/07/06 19:14:54 arfrever Exp $
 
 EAPI="2"
 
@@ -41,6 +41,7 @@ APACHE_TEST_DEPEND="|| (
 	=www-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_authn_file,apache2_modules_dav,apache2_modules_log_config]
 	)"
 DEPEND="${CDEPEND}
+	>=sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
 	gnome-keyring? ( dev-util/pkgconfig )
@@ -401,6 +402,10 @@ set_tests_variables() {
 }
 
 src_test() {
+	if ! use test; then
+		die "Invalid configuration"
+	fi
+
 	local fs_type fs_types ra_type ra_types options failed_tests
 
 	fs_types="fsfs"
@@ -410,6 +415,11 @@ src_test() {
 	use webdav-neon && ra_types+=" neon"
 	use webdav-serf && ra_types+=" serf"
 
+	local pid_file
+	for pid_file in svnserve.pid apache.pid memcached.pid; do
+		rm -f "${T}/${pid_file}"
+	done
+
 	termination() {
 		local die="$1" pid_file
 		if [[ -n "${die}" ]]; then
@@ -460,7 +470,7 @@ src_test() {
 			einfo
 			set_tests_variables ${ra_type}
 			time emake check FS_TYPE="${fs_type}" BASE_URL="${base_url}" HTTP_LIBRARY="${http_library}" CLEANUP="1" ${options} || failed_tests="1"
-			mv tests.log tests-ra_${ra_type}-${fs_type}.log
+			mv tests.log "${T}/tests-ra_${ra_type}-${fs_type}.log"
 		done
 	done
 	unset base_url http_library