Add sandbox depend.

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index e8ce92e15fc423c70fe30b33fac2c1ec4a43d59c..27d7f281297286359dc7f9c3bc0778d4fbc0ff01 100644 (file)
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.84 2006/11/24 15:50:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.85 2006/12/04 21:35:50 chtekk Exp $
+
+  04 Dec 2006; Luca Longinotti <chtekk@gentoo.org> PEAR-PEAR-1.4.11.ebuild:
+  Add sandbox depend to avoid lots of bugreports due to users still having old
+  sandbox installs around that don't work well with PEAR-PEAR.
 
   24 Nov 2006; Luca Longinotti <chtekk@gentoo.org>
   -PEAR-PEAR-1.4.9-r1.ebuild, PEAR-PEAR-1.4.11.ebuild:

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 1ecb43a1ef4537cf118c032bcecd6015c38a470d..9372133b696e18c190ce25ee215e320b73376fdc 100644 (file)
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -6,14 +6,14 @@ DIST Archive_Tar-1.3.1.tgz 15102 RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac
 DIST Console_Getopt-1.2.tgz 3370 RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 SHA1 706a9fb1724ef97ee333dadcda95cc7cc50c0c43 SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
 DIST PEAR-1.4.11.tgz 283272 RMD160 bb047d4fb64691e2518ccdba0ced30eb6dd502cd SHA1 dbf2f31166efbe7cddc296f5a821806850772b27 SHA256 2ea2f7d0364db443fea39dc9bc96adebfce9fa45ffb035dbfc7b6a1cc5325600
 DIST XML_RPC-1.5.0.tgz 31619 RMD160 866d2edcb68d6bb400d5a0364852ac62e267a3c4 SHA1 0c8de819abaebc37a77546b21499430147bfaf6b SHA256 d1e42d0e11a649cd0ca5cd3bbb3ced2f0984cdcde263d9c45ce6737405258edf
-EBUILD PEAR-PEAR-1.4.11.ebuild 4748 RMD160 ded6e47d9ee69f6d8219a0c31183fb35d5be1463 SHA1 4fcf0b468bfe95450ac2df1f906d0e0a32a0f421 SHA256 85304bfe7d2df56d1ce1b636ef08c17aa781ccea6e25f1496749312ad67d68a0
-MD5 d6221e9e20c662b6485356696d513a70 PEAR-PEAR-1.4.11.ebuild 4748
-RMD160 ded6e47d9ee69f6d8219a0c31183fb35d5be1463 PEAR-PEAR-1.4.11.ebuild 4748
-SHA256 85304bfe7d2df56d1ce1b636ef08c17aa781ccea6e25f1496749312ad67d68a0 PEAR-PEAR-1.4.11.ebuild 4748
-MISC ChangeLog 11756 RMD160 151f6e2d46ebe0dfbc7a268e941cc4454f35fec6 SHA1 9c9282ae24a5f7e87536e7d2acee70983e8d40aa SHA256 59f5aaaff1cbb1bc61c5decd992e3dd64bae323acf1f35e4f34fe586730d6294
-MD5 357e721f86bbf7775834b674287cc995 ChangeLog 11756
-RMD160 151f6e2d46ebe0dfbc7a268e941cc4454f35fec6 ChangeLog 11756
-SHA256 59f5aaaff1cbb1bc61c5decd992e3dd64bae323acf1f35e4f34fe586730d6294 ChangeLog 11756
+EBUILD PEAR-PEAR-1.4.11.ebuild 4896 RMD160 a669eea6933e20ca248bfeb0c3161321b7d72f79 SHA1 bcf5618663681ae47520786014ba304aff1533f5 SHA256 83cbd08dc4413b797cbeed5e4fe73e200fc0b87d8c2277a65a9726a941b31013
+MD5 3ca0b546e3282f272e17d8e21865986c PEAR-PEAR-1.4.11.ebuild 4896
+RMD160 a669eea6933e20ca248bfeb0c3161321b7d72f79 PEAR-PEAR-1.4.11.ebuild 4896
+SHA256 83cbd08dc4413b797cbeed5e4fe73e200fc0b87d8c2277a65a9726a941b31013 PEAR-PEAR-1.4.11.ebuild 4896
+MISC ChangeLog 11975 RMD160 a9a45ea0b0e8ffc5e0dc1272c5c636ab96c377aa SHA1 3d72f04561edfcc7ccba3b25513a6314c99f41be SHA256 dce95adb4423b965a1999c4dfd0b656389101008acae4fa15bd13c417a015356
+MD5 51aa6900d30dd88f52277b8d3c7f1fe4 ChangeLog 11975
+RMD160 a9a45ea0b0e8ffc5e0dc1272c5c636ab96c377aa ChangeLog 11975
+SHA256 dce95adb4423b965a1999c4dfd0b656389101008acae4fa15bd13c417a015356 ChangeLog 11975
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157

diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild
index c628829938bc379ea9752ba2b2e0fb934f7499c3..8da646b1dfdf1d5c610ad86985e5f4600e0da370 100644 (file)
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild,v 1.13 2006/11/24 15:50:27 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.11.ebuild,v 1.14 2006/12/04 21:35:50 chtekk Exp $
 
 inherit depend.php
 
@@ -11,6 +11,8 @@ XML_RPC="1.5.0"
 
 [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="/var/cache/pear"
 
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+
 DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, XML_RPC)."
 HOMEPAGE="http://pear.php.net/"
 SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
@@ -20,12 +22,13 @@ SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 # we deliberately force people to remove their old PEAR installations,
 # and any package which may have put an old-style PEAR installation onto
-# the box
+# their box
+# we also depend on a recent sandbox version to mitigate problems users
+# have been experiencing
 
 DEPEND="dev-lang/php
                !dev-php/php
@@ -34,7 +37,9 @@ DEPEND="dev-lang/php
                !<dev-php/PEAR-PEAR-1.3.6-r2
                !dev-php/PEAR-Archive_Tar
                !dev-php/PEAR-Console_Getopt
-               !dev-php/PEAR-XML_RPC"
+               !dev-php/PEAR-XML_RPC
+               >=sys-apps/sandbox-1.2.17"
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
        # we call this here, to ensure that the eclass picks the right