diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-04-23 14:57:20 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-04-23 14:57:20 +0000 |
| commit | b918df7d1fdd659c6bc3ea1acb7b17adfcc5f56b (patch) | |
| tree | 55428981a01891468104757f1ac6f516b381d157 /sys-apps | |
| parent | Removed problematic entries from CIDFnmap.CJK. Added patches for better CJK h... (diff) | |
| download | gentoo-2-b918df7d1fdd659c6bc3ea1acb7b17adfcc5f56b.tar.gz gentoo-2-b918df7d1fdd659c6bc3ea1acb7b17adfcc5f56b.tar.bz2 gentoo-2-b918df7d1fdd659c6bc3ea1acb7b17adfcc5f56b.zip | |
Added tove's fix for incorrect detection of sandbox with usersandbox enabled.
(Portage version: 1.524.2.59-cvs)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 15 | ||||
| -rw-r--r-- | sys-apps/portage/files/digest-portage-2.0.51.20-r2 (renamed from sys-apps/portage/files/digest-portage-2.0.51.20-r1) | 0 | ||||
| -rw-r--r-- | sys-apps/portage/files/portage-fixes.patch | 11 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.51.20-r2.ebuild (renamed from sys-apps/portage/portage-2.0.51.20-r1.ebuild) | 3 |
4 files changed, 16 insertions, 13 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 99ae429f53d3..f5c9171a74bb 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,24 +1,15 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 30d382e0a20f8b25e643e0e4ac60e949 ChangeLog 806 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221 MD5 b169f143c9eb3069924e41f10e8d40ac portage-2.0.51-r15.ebuild 13133 MD5 f9fd4371c2fb44b47a0a5d3cfd4f118c portage-2.0.51.18.ebuild 13211 MD5 985b398e1a2d623efa13c1c1fbe18119 portage-2.0.51.19.ebuild 13211 -MD5 8e2752c4a938fa86fb65ad1cc28f6aac portage-2.0.51.20-r1.ebuild 6107 +MD5 3f8e9e716de783e12d9fb669334e9054 portage-2.0.51.20-r2.ebuild 6164 MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 MD5 99e1115b7cb92bf81695feace57456da files/digest-portage-2.0.51-r15 71 MD5 4458663c2aa36fb828981a89ffcaac97 files/digest-portage-2.0.51.18 70 MD5 f8627c17a73d8568e94f92ea15c69360 files/digest-portage-2.0.51.19 70 MD5 8c6ba58bbfddca72824b15dacbed69ec files/gcc-2.95-libsandbox.patch 1163 +MD5 ddcd57a496ee08ec51f06b031d54601e files/portage-fixes.patch 582 MD5 47a7436ab36074e8d1c7db19edb2c65a files/dispatch-conf-fixes.patch 1244 MD5 502ca546fcf8ca5141435a9edee6a57f files/repoman-fixes.patch 417 -MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r1 70 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCajvOxvWNPsk/ZP4RAhZKAJwPihMmOyP/z+hPbXTWoxr8Zv9oDQCbBshJ -ea85GODNyyNxk8eZ+rlN9+A= -=Kf53 ------END PGP SIGNATURE----- +MD5 5f2f342d78aec333f4136420afd6a31f files/digest-portage-2.0.51.20-r2 70 diff --git a/sys-apps/portage/files/digest-portage-2.0.51.20-r1 b/sys-apps/portage/files/digest-portage-2.0.51.20-r2 index 50f1663b40b0..50f1663b40b0 100644 --- a/sys-apps/portage/files/digest-portage-2.0.51.20-r1 +++ b/sys-apps/portage/files/digest-portage-2.0.51.20-r2 diff --git a/sys-apps/portage/files/portage-fixes.patch b/sys-apps/portage/files/portage-fixes.patch new file mode 100644 index 000000000000..801a460733e7 --- /dev/null +++ b/sys-apps/portage/files/portage-fixes.patch @@ -0,0 +1,11 @@ +--- pym/portage.py 23 Apr 2005 07:26:04 -0000 1.524.2.59 ++++ pym/portage.py 23 Apr 2005 14:48:34 -0000 +@@ -1192,7 +1192,7 @@ + if "maketest" in self.features and "test" not in self.features: + self.features.append("test") + +- if not portage_exec.sandbox_capable and "sandbox" in self.features or "usersandbox" in self.features: ++ if not portage_exec.sandbox_capable and ("sandbox" in self.features or "usersandbox" in self.features): + writemsg(red("!!! Problem with sandbox binary. Disabling...\n\n")) + if "sandbox" in self.features: + self.features.remove("sandbox") diff --git a/sys-apps/portage/portage-2.0.51.20-r1.ebuild b/sys-apps/portage/portage-2.0.51.20-r2.ebuild index dec7b42b3611..073478a47384 100644 --- a/sys-apps/portage/portage-2.0.51.20-r1.ebuild +++ b/sys-apps/portage/portage-2.0.51.20-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r1.ebuild,v 1.1 2005/04/23 12:12:44 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r2.ebuild,v 1.1 2005/04/23 14:57:19 jstubbs Exp $ inherit toolchain-funcs @@ -31,6 +31,7 @@ python_has_lchown() { src_unpack() { unpack ${A} + patch -d ${S} -p0 -g0 < ${FILESDIR}/portage-fixes.patch patch -d ${S} -p0 -g0 < ${FILESDIR}/dispatch-conf-fixes.patch patch -d ${S} -p0 -g0 < ${FILESDIR}/repoman-fixes.patch } |