Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).

Package-Manager: portage-13625-svn/cvs/Linux x86_64

6 files changed, 23 insertions, 12 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index f6d335661d5a..488032cb4543 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # 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.377 2009/05/18 05:47:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.378 2009/05/26 17:02:05 arfrever Exp $
+
+  26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  subversion-1.5.5.ebuild, subversion-1.5.6.ebuild, subversion-1.6.1.ebuild,
+  subversion-1.6.2.ebuild:
+  Call depend.apache_pkg_setup() in pkg_setup() (bug #268371).
 
   18 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   subversion-1.6.2.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 8b19697cefac..4841cd3c8234 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -15,9 +15,9 @@ DIST subversion-1.5.5.tar.bz2 4940482 RMD160 6400e387b3505180206b61729cb0b11baea
 DIST subversion-1.5.6.tar.bz2 4946600 RMD160 5883f925e19e719c8656b5488ed9b00c0f7c3a79 SHA1 774b6dbd4245c36e86289393e651e36dedf17018 SHA256 f701fe75fecc43d9aecf717260ca18661469128a2f28a57c7e6672f3f64f46c2
 DIST subversion-1.6.1.tar.bz2 5462507 RMD160 b3cc8e6cf46c8e4ad4adbee6e3dec186ae790257 SHA1 de01efed25505d689c369a67fbf9b2d2f02e4795 SHA256 cdd4a7a4e2c6e67967b99fe7857a409b2ff5e57126214fdc0f6d835ff789e6ca
 DIST subversion-1.6.2.tar.bz2 5470969 RMD160 b20b4950188f2482984a1e7b0e5e0bdfccb06b09 SHA1 f3b7f35dee4772a25646fe1fbb5108a6569803d1 SHA256 9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
-EBUILD subversion-1.5.5.ebuild 13389 RMD160 7919e6076dc2340f69a53b263eef90b752d5ad75 SHA1 c1daa6c240f93b5e4865a09568645e026df2233d SHA256 1d4b0e1cd10f7e61bcee2aa4fefbb62ee7d1ec972f951d2fc0af6b3f976ac072
-EBUILD subversion-1.5.6.ebuild 13425 RMD160 624622f7a952843d9548866c4591843a8cb70b9a SHA1 4f7cf75b1b5f0d404c9f38f38c1aee2a705a8797 SHA256 fc46fe2ecfb09717d1c233b85716ebb35166a262a98429703edca343ee9d474f
-EBUILD subversion-1.6.1.ebuild 17067 RMD160 55ebc3467c8fad3869aa741293a1ac0790c61687 SHA1 fdf01e1c4031910066c232aa069c94416b7a6bce SHA256 34b0627bcdcddfc41323def494e963b5baafd3eb2037395706e4dc5eabb98521
-EBUILD subversion-1.6.2.ebuild 26092 RMD160 6bfe60cc78668a5f6b423dfdf4b603a6e7513626 SHA1 67aa298a0d5b2493cf58cdff83f1cfd79475de70 SHA256 12d492c1e91253931fb3e9ee9e46d50b56c001c6f7bd2e4f5745f485b1b3ce0b
-MISC ChangeLog 63098 RMD160 d50066f54b65841a2e27bddd58876c9a8c768c86 SHA1 c4c5ec1afcc4fda9d773d2bdac6783a4184f00b7 SHA256 41ed0eb842bd968c0be1d019c84c9311d663edf3c1f3f4974c1539a35ac2fcfd
+EBUILD subversion-1.5.5.ebuild 13419 RMD160 73f39c2107995846e249135a90fd9c9f76db2e7f SHA1 36462e2c37f7b20f04ff4f1c274565f69a66dcbf SHA256 fab6e710e6d26f16661964378499b4649ac72a545d7f7e3ccdea706aad575ea2
+EBUILD subversion-1.5.6.ebuild 13452 RMD160 fb3ea80c24ba77186e181848d0d38c3876086903 SHA1 cfb7388239014503ac4931b635b265c4907c6100 SHA256 72d150bf80bd01bf9d05f3f597f56e34ad3fa3af5dc8598276cdff2224aba528
+EBUILD subversion-1.6.1.ebuild 17094 RMD160 8bab64e4d8ecf283c6402b42b7e3a45a5252e4d0 SHA1 36dde599532738402cea840358658fb5d8981e3c SHA256 3eccbc96d87e28f79c05b3e23de018cfcf0cc48a326b7704387ae52e001a9a87
+EBUILD subversion-1.6.2.ebuild 26118 RMD160 d7ddabdc63fb98e4db00d361f08d7175b0cd5bfc SHA1 36b9b310e2c60ff20db211dfce4d26c0f96f3bba SHA256 1609449b87a42be5fbbb730ac5250ac7385c44ef08a89e57a92e2bfd23cc7c55
+MISC ChangeLog 63339 RMD160 a20f6bb592ce02a289a8e8795f1662956563390a SHA1 2bb7a3d2f3fc2434a59631e6776bafc23d29ffa1 SHA256 36211d32f547597f8442f63c6c305defe5ee32598bc67122694a7cfd2d205b1e
 MISC metadata.xml 794 RMD160 6e8968481ac256000ec54f71bac21c7b4cbde1cc SHA1 c753273c54c52d52187cb886e35dc08726f1b97e SHA256 3d7a28065aaf0e28837de71ccde29de53a074b5b3ede715c1b412cf5a43aaeac
diff --git a/dev-util/subversion/subversion-1.5.5.ebuild b/dev-util/subversion/subversion-1.5.5.ebuild
index 65029337bd1d..f242c516e839 100644
--- a/dev-util/subversion/subversion-1.5.5.ebuild
+++ b/dev-util/subversion/subversion-1.5.5.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.5.5.ebuild,v 1.7 2009/03/06 01:47:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.5.ebuild,v 1.8 2009/05/26 17:02:05 arfrever Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="none"
@@ -48,6 +48,7 @@ S="${WORKDIR}"/${P/_/-}
 : ${SVN_REPOS_LOC:=/var/svn}
 
 pkg_setup() {
+	depend.apache_pkg_setup
 	confutils_use_depend_built_with_all berkdb dev-libs/apr-util berkdb
 	java-pkg-opt-2_pkg_setup
 
diff --git a/dev-util/subversion/subversion-1.5.6.ebuild b/dev-util/subversion/subversion-1.5.6.ebuild
index 28837ddd076e..26afae6c6ca9 100644
--- a/dev-util/subversion/subversion-1.5.6.ebuild
+++ b/dev-util/subversion/subversion-1.5.6.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.5.6.ebuild,v 1.6 2009/05/03 18:40:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.5.6.ebuild,v 1.7 2009/05/26 17:02:05 arfrever Exp $
 
 EAPI="1"
 WANT_AUTOMAKE="none"
@@ -48,6 +48,7 @@ S="${WORKDIR}"/${P/_/-}
 : ${SVN_REPOS_LOC:=/var/svn}
 
 pkg_setup() {
+	depend.apache_pkg_setup
 	confutils_use_depend_built_with_all berkdb dev-libs/apr-util berkdb
 	java-pkg-opt-2_pkg_setup
 
diff --git a/dev-util/subversion/subversion-1.6.1.ebuild b/dev-util/subversion/subversion-1.6.1.ebuild
index 9dbbfa4e055d..03096965a126 100644
--- a/dev-util/subversion/subversion-1.6.1.ebuild
+++ b/dev-util/subversion/subversion-1.6.1.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.1.ebuild,v 1.5 2009/04/23 09:14:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.1.ebuild,v 1.6 2009/05/26 17:02:05 arfrever Exp $
 
 EAPI="1"
 
@@ -80,6 +80,8 @@ pkg_setup() {
 		fi
 	fi
 
+	depend.apache_pkg_setup
+
 	java-pkg-opt-2_pkg_setup
 
 	if ! use webdav-neon && ! use webdav-serf; then
diff --git a/dev-util/subversion/subversion-1.6.2.ebuild b/dev-util/subversion/subversion-1.6.2.ebuild
index 525010ce55d6..0e438b16723c 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.2 2009/05/18 05:47:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.2.ebuild,v 1.3 2009/05/26 17:02:05 arfrever Exp $
 
 EAPI="2"
 
@@ -80,6 +80,8 @@ pkg_setup() {
 		fi
 	fi
 
+	depend.apache_pkg_setup
+
 	java-pkg-opt-2_pkg_setup
 
 	if ! use webdav-neon && ! use webdav-serf; then
@@ -370,8 +372,8 @@ EOF
 initialize_tests_environment() {
 	[[ "$1" == "local" ]] && base_url="file://${S}/subversion/tests/cmdline" http_library=""
 	[[ "$1" == "svn" ]] && base_url="svn://127.0.0.1" http_library=""
-	[[ "$1" == "neon" ]] && base_url="http://localhost" http_library="neon"
-	[[ "$1" == "serf" ]] && base_url="http://localhost" http_library="serf"
+	[[ "$1" == "neon" ]] && base_url="http://127.0.0.1" http_library="neon"
+	[[ "$1" == "serf" ]] && base_url="http://127.0.0.1" http_library="serf"
 
 	[[ "$1" == "svn" ]] && LC_ALL="C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline" --listen-port "${SVN_TEST_SVNSERVE_PORT}" --pid-file "${T}/svnserve.pid"
 	[[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid"