From cf7fd6a20f46c0518839cd563f49d7b52147530e Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sat, 1 Oct 2005 13:13:04 +0000 Subject: [PATCH] Disabling compiling of missing-os as it's presently hardcoded to require python-2.2 Package-Manager: portage-1.524.2.76-cvs --- sys-apps/portage/Manifest | 10 ++++++++++ sys-apps/portage/portage-2.0.53_rc1.ebuild | 22 ++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index d57dfd6d2b6a..4db2bd949fc7 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 fc0f2ec6f18f9744037a47705057b9d1 ChangeLog 1108 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 MD5 f29e1e5ab80c7078b004e60002173ccb files/2.0.51.22-fixes.patch 9339 @@ -14,3 +17,10 @@ MD5 a4921b091c6057013549c33f933bfd40 portage-2.0.51.22-r2.ebuild 5708 MD5 d84a1f0f9b6dad85ff874923647de011 portage-2.0.52-r1.ebuild 3640 MD5 cf8e91b8d75b20761e495ae9923be783 portage-2.0.53_rc1.ebuild 3731 MD5 7c109f64a1b96c1134ac490d0233fa3b portage-2.1.0_alpha20050718.ebuild 2566 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDPouNxvWNPsk/ZP4RAhrIAJ9kN9yqI+q0BV/lopIQ7zkdIwCy5gCfYgc2 +o/IfbQsrDeNSxdwFBNA2dN8= +=5ruY +-----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.0.53_rc1.ebuild b/sys-apps/portage/portage-2.0.53_rc1.ebuild index 67527ca95fda..b151333a12fa 100644 --- a/sys-apps/portage/portage-2.0.53_rc1.ebuild +++ b/sys-apps/portage/portage-2.0.53_rc1.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.53_rc1.ebuild,v 1.1 2005/10/01 12:01:32 jstubbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.53_rc1.ebuild,v 1.2 2005/10/01 13:13:04 jstubbs Exp $ inherit toolchain-funcs @@ -29,11 +29,12 @@ src_compile() { cd "${S}"/src $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c - if ! use ppc-macos; then - cd "${S}"/src/python-missingos - chmod +x setup.py - ./setup.py build || die "Failed to build missingos module" - fi + #Removing until next rc as the compile script points to python-2.2 + #if ! use ppc-macos; then + # cd "${S}"/src/python-missingos + # chmod +x setup.py + # ./setup.py build || die "Failed to build missingos module" + #fi if use x86-fbsd; then cd "${S}"/src/bsd-flags @@ -56,10 +57,11 @@ src_install() { newins make.conf make.conf.example fi - if ! use ppc-macos; then - cd "${S}"/src/python-missingos - ./setup.py install --root ${D} || die "Failed to install missingos module" - fi + #Removing until next rc as the compile script points to python-2.2 + #if ! use ppc-macos; then + # cd "${S}"/src/python-missingos + # ./setup.py install --root ${D} || die "Failed to install missingos module" + #fi if use x86-fbsd; then cd "${S}"/src/bsd-flags -- 2.26.2