From: Fernando J. Pereda <ferdy@gentoo.org>
Date: Sat, 6 Jan 2007 00:32:19 +0000 (+0000)
Subject: Add a last-minute patch to 'Be less sensitive to vdb_path detection failure'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0bd4aca8fa41572518558dfcd555484ea887712;p=gentoo.git

Add a last-minute patch to 'Be less sensitive to vdb_path detection failure'
Package-Manager: portage-2.1.1-r2
---

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 7c057b388813..a81177d7ddf6 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.34 2007/01/05 20:05:08 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.35 2007/01/06 00:32:18 ferdy Exp $
+
+  06 Jan 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/paludis-0.14.1-vdb-path.patch, paludis-0.14.1.ebuild:
+  Add a last-minute patch to 'Be less sensitive to vdb_path detection failure'
 
 *paludis-0.14.1 (05 Jan 2007)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 7a4c25d81d73..6ff265280d3f 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX paludis-0.14.1-vdb-path.patch 567 RMD160 0b646d99ae23050d65b4106ddf6f491a92b51187 SHA1 51492aa10061a2ca820da6b4cad33f0541803ff8 SHA256 49e0f100e1c7ce66b3012060fc52c99e68106ce6f1a421d3880c7711d14a2b03
+MD5 f6568678175c1022c50f462722c4631e files/paludis-0.14.1-vdb-path.patch 567
+RMD160 0b646d99ae23050d65b4106ddf6f491a92b51187 files/paludis-0.14.1-vdb-path.patch 567
+SHA256 49e0f100e1c7ce66b3012060fc52c99e68106ce6f1a421d3880c7711d14a2b03 files/paludis-0.14.1-vdb-path.patch 567
 DIST paludis-0.12.0.tar.bz2 1144668 RMD160 a75b08a1387354a4e629539ad0884bf2fd585611 SHA1 5f84a6a022518946f00986df32619e381b3c3f13 SHA256 b108439321b17c315b567dc7d5a01eaaa58cff0c79723c10f2489fd09381f639
 DIST paludis-0.14.0.tar.bz2 1239890 RMD160 bcf5ec3d03a8b3072ea73abb309128d63204f6fd SHA1 3b49487ff98bf6e699ab6196cb09984a9d478c50 SHA256 fc09720cf03badb2097932a6dde760b8335bdfb7c161c1e71578e66c5c7fc7e2
 DIST paludis-0.14.1.tar.bz2 1250579 RMD160 176d8efbe04a260f8ea1c9ae1dde5a5a95478023 SHA1 f80ae0cdcb18e7cc22c3d616863fcbbb5f43adb1 SHA256 8c61e0db8a30acf33ed4ab2746cc0007e51a30e2bc07ab7be2a5c15827d958c5
@@ -9,14 +16,14 @@ EBUILD paludis-0.14.0.ebuild 3335 RMD160 e22e91e50b952aeda601830599df271c5c7642c
 MD5 87f0f00a72c51726f264ef2e6068730f paludis-0.14.0.ebuild 3335
 RMD160 e22e91e50b952aeda601830599df271c5c7642c4 paludis-0.14.0.ebuild 3335
 SHA256 d691d14cd12343c50770d1fd5dafa9d44d87d260b332faee294d4e91bfd625d0 paludis-0.14.0.ebuild 3335
-EBUILD paludis-0.14.1.ebuild 3070 RMD160 0ebc0e3eb09c91fcff29de453993fb84df819a72 SHA1 56d23de35005b1b36c3e88769c49203f41c489c6 SHA256 cf44ec6c2fc0d43ab1f5599ae73150ebbaf13bc6a03dd52904bd7c22d54bb520
-MD5 0486415a05f28dca2056cb0b8f6d318b paludis-0.14.1.ebuild 3070
-RMD160 0ebc0e3eb09c91fcff29de453993fb84df819a72 paludis-0.14.1.ebuild 3070
-SHA256 cf44ec6c2fc0d43ab1f5599ae73150ebbaf13bc6a03dd52904bd7c22d54bb520 paludis-0.14.1.ebuild 3070
-MISC ChangeLog 4634 RMD160 c6c769a4fc10cdaf19398d108681efefa03be42b SHA1 a8f2fd33767f1e0a60c7ce732ef92ef186e5a836 SHA256 c57ea8b7909501db7c91bc40856dd04eb448eab816b3177685fc8ac158ea78d3
-MD5 212f26ad6274b95fe59f2e8728295d79 ChangeLog 4634
-RMD160 c6c769a4fc10cdaf19398d108681efefa03be42b ChangeLog 4634
-SHA256 c57ea8b7909501db7c91bc40856dd04eb448eab816b3177685fc8ac158ea78d3 ChangeLog 4634
+EBUILD paludis-0.14.1.ebuild 3153 RMD160 0929a1dbdee271eafad4c1d5d184bce578abcb50 SHA1 082e70fba4cf130b1ddf910de356c520254bb8e0 SHA256 8c5fe1192a6e4e8e32cf715e33da9b66743bfaa2214aaecdfd14035dce58acab
+MD5 e4eb394210c1ea6c3674e55854be484e paludis-0.14.1.ebuild 3153
+RMD160 0929a1dbdee271eafad4c1d5d184bce578abcb50 paludis-0.14.1.ebuild 3153
+SHA256 8c5fe1192a6e4e8e32cf715e33da9b66743bfaa2214aaecdfd14035dce58acab paludis-0.14.1.ebuild 3153
+MISC ChangeLog 4829 RMD160 8d990212a6d576da6f10026b3d5fcb4c5494ca11 SHA1 793af6e595e4c9fe36f1bd27496928aecf1a35d1 SHA256 0d64874a37c07192976fe8235b24884e4f9df5b1c2ff42f95f17b68d6f3a8608
+MD5 4741df275e5df6642d66ea970366b4dd ChangeLog 4829
+RMD160 8d990212a6d576da6f10026b3d5fcb4c5494ca11 ChangeLog 4829
+SHA256 0d64874a37c07192976fe8235b24884e4f9df5b1c2ff42f95f17b68d6f3a8608 ChangeLog 4829
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215
 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215
@@ -30,3 +37,10 @@ SHA256 6ad13607788651c05366081951d91cea793728e5fcaa85a84250dd8d6b0f1981 files/di
 MD5 89cf491a51d3f7f8f6168ad6b6ea0c6b files/digest-paludis-0.14.1 250
 RMD160 05ccb3ceec3143867460a66a08318a4071430dce files/digest-paludis-0.14.1 250
 SHA256 ce089b72a59bc9d1e2ba69257181dc7c34d160f94f9c40cb48fcc10ee3b451ef files/digest-paludis-0.14.1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFFnu4gViELBEf1JB0RAtHVAJ9C7RNc2k1giRN/MOtCdXaQXZ/sigCfZJ2R
+IHfGV72oK2EX9F4yuxTPZuo=
+=kG6p
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/paludis/files/paludis-0.14.1-vdb-path.patch b/sys-apps/paludis/files/paludis-0.14.1-vdb-path.patch
new file mode 100644
index 000000000000..14b7e6e8fc4e
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.14.1-vdb-path.patch
@@ -0,0 +1,17 @@
+Index: trunk/ebuild/builtin_unmerge.bash
+===================================================================
+--- ebuild/builtin_unmerge.bash	(revision 2126)
++++ ebuild/builtin_unmerge.bash	(revision 2127)
+@@ -18,10 +18,11 @@
+ 
+ builtin_unmerge()
+ {
+-    local v=$(vdb_path)
++    local v=$(${PALUDIS_COMMAND} --configuration-variable installed location 2>/dev/null )
+     if [[ -z "${v}" ]] ; then
+         v=${ROOT}/var/db/pkg
+     fi
++
+     local dbdir="${v}/${CATEGORY}/${PF}" entry
+     [[ -d "${dbdir}" ]] || die "couldn't find pkg db directory (\"${dbdir}\")"
+ 
diff --git a/sys-apps/paludis/paludis-0.14.1.ebuild b/sys-apps/paludis/paludis-0.14.1.ebuild
index 796672faf3ec..f929651ccba0 100644
--- a/sys-apps/paludis/paludis-0.14.1.ebuild
+++ b/sys-apps/paludis/paludis-0.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.1.ebuild,v 1.1 2007/01/05 20:05:09 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.1.ebuild,v 1.2 2007/01/06 00:32:18 ferdy Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -47,6 +47,12 @@ pkg_setup() {
 	filter-ldflags -Wl,--as-needed --as-needed
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-vdb-path.patch
+}
+
 src_compile() {
 	local repositories=`echo default $(usev cran) | tr -s \  ,`
 	local clients=`echo default $(usev contrarius) | tr -s \  ,`