Fix a few items wrt Gentoo Prefix support, signed off by maintainer

Package-Manager: portage-2.1.10.3/cvs/Linux i686

3 files changed, 19 insertions, 24 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index edce344e3e9d..3c86d3b44d10 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.52 2011/08/25 16:57:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.53 2011/08/26 15:17:35 darkside Exp $
+
+  26 Aug 2011; Jeremy Olexa <darkside@gentoo.org> subversion-1.6.17-r4.ebuild:
+  Fix a few items wrt Gentoo Prefix support, signed off by maintainer
 
   25 Aug 2011; Jeroen Roovers <jer@gentoo.org> subversion-1.6.17.ebuild:
   Stable for HPPA (bug #369065).
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 4a17c30b488e..8074cb635dfb 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 47_mod_dav_svn.conf 422 RMD160 658703e00882a0bce007709372cf40a407fee915 SHA1 3a1ffd40391a1cca3cb9cfb1b9d153c1a4f169a0 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27
 AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
@@ -16,14 +13,7 @@ DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7
 EBUILD subversion-1.6.15.ebuild 31841 RMD160 0b018adda55fc51e2a7fb05e7bfdeb1b11f318c4 SHA1 9f73ff35e92d60692d551382a68dac87b56655df SHA256 a1eba80dd50f7ec4092884c410228c7aa0778ca0a812c097deb36139c5907712
 EBUILD subversion-1.6.16.ebuild 31846 RMD160 c2714b45a69939db231e5f03ad26b6def895f397 SHA1 994949ce558dc39e8d8e9b0cf4d248937c628ef7 SHA256 8e4ae636dcb868a4a9ed17dc01c42451c62b8c73f890e99c3b16125c7267af11
 EBUILD subversion-1.6.17-r3.ebuild 15724 RMD160 73203087957b369a94065a009e42e44080b3aaae SHA1 5c1251a4e2036b26ea997b0eac50e11e5b53fdd0 SHA256 f4be56bcf98c467e97a085ff9e1c4a1eaa09f2095710b4a97387b2f5c7acb7c9
-EBUILD subversion-1.6.17-r4.ebuild 15828 RMD160 6456ed98e51e0aba85383c9537f82e7559b73595 SHA1 6722c73c4462211e6e8a0303f9eeb8f3ef48f50b SHA256 fc1163781433aca7c9bc83879af5127e46246b70419fd4d8566d8c7ab51440ef
+EBUILD subversion-1.6.17-r4.ebuild 15936 RMD160 644dbaa1eb80eab3001675a27ba94734642913bd SHA1 eebe7e972a16a090cd09fac9aa087e736cf58389 SHA256 c2f70bc6fc5600a0ac8ff069ed5210f869a8a08aa31230f373e59eea847b94f4
 EBUILD subversion-1.6.17.ebuild 31727 RMD160 7c579f4f857a3fbb576cd6a551dd98e73e944d63 SHA1 99fade73bc60e31760ef887b9308623607db9d80 SHA256 89c02c4519f44b10243e6e3e9c8f31573310b8a43fe33ea183ec1d2703b154b8
-MISC ChangeLog 79298 RMD160 24a9ae13fbe761dbbd450373444c1c65113b9f27 SHA1 627e9255e55ba05f0aeadbd02df212651feeba14 SHA256 25b8e5fa7b5b1ed839ecb4061a6dbb2d16ff02bb0ea1df5844517f0882193716
+MISC ChangeLog 79453 RMD160 0a35732e19d07dd3474fd9679fa07c959604f019 SHA1 b3694fcd4335d9a198c1518884dcb942ca89a6a5 SHA256 820dfd0ae74d2f110ffc49b6abb7c99fec484b1367663dbaebb7cd76b96fb215
 MISC metadata.xml 650 RMD160 17a1bcef59b035ceeb456ff3bcff9f121db2cc5e SHA1 677d1e573840f9f634abfa39dbce0dc4f11e4ee8 SHA256 ca7082ab0d3917e015b6532500bd31ef236513c3ad30782462823c947df1afdb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5WgPAACgkQVWmRsqeSphN0ygCeMR9iKPIE+Go1bYmIlzahkFo8
-JukAn3xKNCFT/Nf+AbN6NxBZyUwZFj44
-=VcdS
------END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.6.17-r4.ebuild b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
index 9487a639c4ef..59818f1f4b25 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.3 2011/08/23 08:12:07 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.4 2011/08/26 15:17:35 darkside Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -62,8 +62,8 @@ want_apache
 
 pkg_setup() {
 	if use berkdb; then
-		local apu_bdb_version="$(/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I/usr/include/db[[:digit:]]\.[[:digit:]]' \
+		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
+			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
 			| sed 's:.*b::')"
 		einfo
 		if [[ -z "${SVN_BDB_VERSION}" ]]; then
@@ -428,16 +428,18 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Initializing the database in ${EROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${EROOT}${SVN_REPOS_LOC}/repos" ]]; then
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
+	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
 		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${EROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
 	else
-		mkdir -p "${EROOT}${SVN_REPOS_LOC}/conf"
+		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
 
 		einfo "Populating repository directory..."
 		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${EROOT}${SVN_REPOS_LOC}/repos"
+		"${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
 
 		einfo "Setting repository permissions..."
 		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
@@ -451,8 +453,8 @@ pkg_config() {
 			enewgroup "${SVNSERVE_GROUP}"
 			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
 		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${EROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${EROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${EROOT}${SVN_REPOS_LOC}/repos"
+		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
 	fi
 }