diff options
| author |   Jason Stubbs <jstubbs@gentoo.org> | 2005-04-23 15:53:58 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-04-23 15:53:58 +0000 |
| commit | 017dc41c60ea997b6dc4b1cfbca659dfd5c9b872 (patch) | |
| tree | b05b88dcb953686214882390cb535963f81c90e5 /sys-apps | |
| parent | Stable on x86. (diff) | |
| download | gentoo-2-017dc41c60ea997b6dc4b1cfbca659dfd5c9b872.tar.gz gentoo-2-017dc41c60ea997b6dc4b1cfbca659dfd5c9b872.tar.bz2 gentoo-2-017dc41c60ea997b6dc4b1cfbca659dfd5c9b872.zip | |
Fixed make.globals make.conf mixup. Removed sandbox USE flag.
(Portage version: 1.524.2.59-cvs)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 12 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.51.20-r2.ebuild | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 913fc7c58795..86f290797437 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,12 +1,9 @@ ------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 64e15526a9f073bce10b50fa9c6326f7 portage-2.0.51.20-r2.ebuild 6164 +MD5 d46668bf0ec7622814beef5c08fe891c portage-2.0.51.20-r2.ebuild 6220 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 @@ -16,10 +13,3 @@ 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-r2 70 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCamJjxvWNPsk/ZP4RAleCAJ40F5tulB43EIy2NbCMc7QDZwNxyACgsVG7 -zYdhh3rKG4lkk4AOAc8svtM= -=CMA+ ------END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.0.51.20-r2.ebuild b/sys-apps/portage/portage-2.0.51.20-r2.ebuild index 073478a47384..87f00571302c 100644 --- a/sys-apps/portage/portage-2.0.51.20-r2.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-r2.ebuild,v 1.1 2005/04/23 14:57:19 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.20-r2.ebuild,v 1.2 2005/04/23 15:53:58 jstubbs Exp $ inherit toolchain-funcs @@ -18,9 +18,9 @@ RESTRICT="nosandbox sandbox multilib-pkg-force" # Disable the sandbox on portages that don't support RESTRICT="nosandbox" export SANDBOX_DISABLED="1" -IUSE="build sandbox selinux" +IUSE="build selinux" DEPEND="" -RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) sandbox? ( sys-apps/sandbox ) selinux? ( >=dev-python/python-selinux-2.15 )" +RDEPEND="!build? ( >=sys-apps/sed-4.0.5 dev-python/python-fchksum >=dev-lang/python-2.2.1 sys-apps/debianutils >=app-shells/bash-2.05a ) !x86-fbsd? ( !ppc-macos? ( sys-apps/sandbox ) ) selinux? ( >=dev-python/python-selinux-2.15 )" S=${WORKDIR}/${PN}-${PV} @@ -58,7 +58,7 @@ src_install() { cd ${S}/cnf insinto /etc doins etc-update.conf dispatch-conf.conf make.globals - if [ -f "make.globals.${ARCH}" ]; then + if [ -f "make.conf.${ARCH}" ]; then newins make.conf.${ARCH} make.conf.example else eerror "" @@ -99,6 +99,7 @@ src_install() { dosym ../lib/portage/bin/repoman /usr/bin/repoman dosym ../lib/portage/bin/tbz2tool /usr/bin/tbz2tool dosym ../lib/portage/bin/portageq /usr/bin/portageq + dosym ../lib/portage/bin/ebuild /usr/bin/ebuild dosym ../lib/portage/bin/quickpkg /usr/bin/quickpkg dosym ../lib/portage/bin/g-cpan.pl /usr/bin/g-cpan.pl |