From 22a27edade87c5c3e76480d85326bd12e2b20251 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 26 Feb 2007 18:40:03 +0000 Subject: [PATCH] Portage 2.1 is horribly broken on ppc-macos, 2.0.51 too old. Dropped ppc-macos keyword, your only resort is now Gentoo/Alt:Prefix Package-Manager: portage-2.1.2-r9 --- sys-apps/portage/ChangeLog | 8 +++- sys-apps/portage/Manifest | 50 ++++++++------------ sys-apps/portage/portage-2.0.51.22-r3.ebuild | 12 ++--- sys-apps/portage/portage-2.1.1-r2.ebuild | 4 +- sys-apps/portage/portage-2.1.2-r11.ebuild | 4 +- sys-apps/portage/portage-2.1.2-r9.ebuild | 4 +- 6 files changed, 39 insertions(+), 43 deletions(-) diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 6a1246cf4e23..dfb14f156a8d 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.357 2007/02/26 14:11:03 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.358 2007/02/26 18:40:03 grobian Exp $ + + 26 Feb 2007; Fabian Groffen + portage-2.0.51.22-r3.ebuild, portage-2.1.1-r2.ebuild, + portage-2.1.2-r9.ebuild, portage-2.1.2-r11.ebuild: + Portage 2.1 is horribly broken on ppc-macos, 2.0.51 too old. Dropped + ppc-macos keyword, your only resort is now Gentoo/Alt:Prefix 26 Feb 2007; Zac Medico portage-2.1.2-r9.ebuild, portage-2.1.2-r11.ebuild: diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 89948d2cb235..3b8bc63b68cd 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d SHA1 2af2c9a7ce535c36749dfe81b6555426225620e2 SHA256 dbe8db19d03b39ad2b7f9f6dfcd24c615a14886b3fe6d5ce4dd88bac27c0e225 MD5 d5d5b818347fd87b290ecb0b17516b34 files/05portage.envd 34 RMD160 014194a1786a0983a8ba91c3924b798f353c330d files/05portage.envd 34 @@ -22,26 +19,26 @@ DIST portage-2.1.2.tar.bz2 311900 RMD160 75da869c02e3574babc2f40e07b18686f384cf9 DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea51da205ad SHA1 6ec21b29a3eff4a034ea68b4e6a889c8f95dcc3e SHA256 28176c04290478ba4373c28ea047edbdf3a40d3ff69bf92da55d1cfcb828ea5b DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817 -EBUILD portage-2.0.51.22-r3.ebuild 5755 RMD160 9c11b6afd5f874832151338107383761ca3320be SHA1 d9b77f37278257e16b45f77bb898f62ecd84c297 SHA256 db3df1d62f4b301c038b5019325a59f81fa73331fc7b24bf246f86ef5950fbc0 -MD5 460a97dfbe68ca47d24d1416b32271a8 portage-2.0.51.22-r3.ebuild 5755 -RMD160 9c11b6afd5f874832151338107383761ca3320be portage-2.0.51.22-r3.ebuild 5755 -SHA256 db3df1d62f4b301c038b5019325a59f81fa73331fc7b24bf246f86ef5950fbc0 portage-2.0.51.22-r3.ebuild 5755 -EBUILD portage-2.1.1-r2.ebuild 7232 RMD160 657e45df59f9332cc8db23ac0bda477163ab4769 SHA1 192b0b69e58231b9a3d143f81b64c56d0959b720 SHA256 59c208fdebaa9c93215b781375f658c5c581080eee34461c52fc8f934d939cae -MD5 a97dfdde23732042510bbe4b8ed0a37c portage-2.1.1-r2.ebuild 7232 -RMD160 657e45df59f9332cc8db23ac0bda477163ab4769 portage-2.1.1-r2.ebuild 7232 -SHA256 59c208fdebaa9c93215b781375f658c5c581080eee34461c52fc8f934d939cae portage-2.1.1-r2.ebuild 7232 -EBUILD portage-2.1.2-r11.ebuild 7085 RMD160 ce84946685956f12080b3ebbf704ceedc2134c48 SHA1 8340a221b71524e28c2aeb5ed3dd85ecf126c408 SHA256 47cf9fa3046d9d33aecc72dc007ecd786b16ada9392df0b33d3fefa74fc65e5f -MD5 d8c0f3cc028ae2c6934ac213f64e5232 portage-2.1.2-r11.ebuild 7085 -RMD160 ce84946685956f12080b3ebbf704ceedc2134c48 portage-2.1.2-r11.ebuild 7085 -SHA256 47cf9fa3046d9d33aecc72dc007ecd786b16ada9392df0b33d3fefa74fc65e5f portage-2.1.2-r11.ebuild 7085 -EBUILD portage-2.1.2-r9.ebuild 6937 RMD160 d33dc5a9c0bd8a1c120e4c84ea4cf62151c1e85f SHA1 d656962d2c9e55a84ed29c9ec9c598ab80c84cb9 SHA256 21f3907643f60be0a0cd2498bede488211e95529e34d63ce1ffa064f9ae4d758 -MD5 3d6e5812aedfd78ca6c413f702e0489a portage-2.1.2-r9.ebuild 6937 -RMD160 d33dc5a9c0bd8a1c120e4c84ea4cf62151c1e85f portage-2.1.2-r9.ebuild 6937 -SHA256 21f3907643f60be0a0cd2498bede488211e95529e34d63ce1ffa064f9ae4d758 portage-2.1.2-r9.ebuild 6937 -MISC ChangeLog 18120 RMD160 3a9c67baa6bb81d607502f9bb974186cd83d592a SHA1 69fb795e1276c69657960ea36f5ba8cd42ebc547 SHA256 01de326f899676c4d3366dc2f86c799ab7b02f13a503f9837a1902b59a62f953 -MD5 a0b3285d32ba0ac0e43580f23ffdd922 ChangeLog 18120 -RMD160 3a9c67baa6bb81d607502f9bb974186cd83d592a ChangeLog 18120 -SHA256 01de326f899676c4d3366dc2f86c799ab7b02f13a503f9837a1902b59a62f953 ChangeLog 18120 +EBUILD portage-2.0.51.22-r3.ebuild 5691 RMD160 519b48433efa74be656629821536c486d7b1d9ca SHA1 1c44e93d0112ac5f443c014650a57e64f3fb5b05 SHA256 e73e3df270ad6cd3dc645cc49a1a7db7383d811177f3cc44dee4d3c7d9de4008 +MD5 1f42a33ee034a26c93260d71f877c380 portage-2.0.51.22-r3.ebuild 5691 +RMD160 519b48433efa74be656629821536c486d7b1d9ca portage-2.0.51.22-r3.ebuild 5691 +SHA256 e73e3df270ad6cd3dc645cc49a1a7db7383d811177f3cc44dee4d3c7d9de4008 portage-2.0.51.22-r3.ebuild 5691 +EBUILD portage-2.1.1-r2.ebuild 7223 RMD160 47f9d8c0f9a4d5860fff8c8aac8a589816e5ac11 SHA1 db7b9ee5dc85c8bfa9e031ccf4687915bc13d5cc SHA256 f113b16b9e7ac6756ab75a99057b7a956de7c2d90dc681df6f41ee87518e06ba +MD5 45a27b243a84ea96fd2eca5de47beb61 portage-2.1.1-r2.ebuild 7223 +RMD160 47f9d8c0f9a4d5860fff8c8aac8a589816e5ac11 portage-2.1.1-r2.ebuild 7223 +SHA256 f113b16b9e7ac6756ab75a99057b7a956de7c2d90dc681df6f41ee87518e06ba portage-2.1.1-r2.ebuild 7223 +EBUILD portage-2.1.2-r11.ebuild 7074 RMD160 fe015bfb7ebddb92e7ab4a3c18fc916a34236204 SHA1 31e4563f8bf52c5cd90028449079429efafe89e0 SHA256 d4629ad072e8db9b2607900720f277e7de1cdf19e0a4fb58671ec360ef22f335 +MD5 28f85bd749b96e91f3c14302a56925de portage-2.1.2-r11.ebuild 7074 +RMD160 fe015bfb7ebddb92e7ab4a3c18fc916a34236204 portage-2.1.2-r11.ebuild 7074 +SHA256 d4629ad072e8db9b2607900720f277e7de1cdf19e0a4fb58671ec360ef22f335 portage-2.1.2-r11.ebuild 7074 +EBUILD portage-2.1.2-r9.ebuild 6926 RMD160 7e76724ca5b6c91df87001c46da9caa354f21a70 SHA1 8efc1afb2ba3b527551869ed4d59829e9bdcc4b4 SHA256 2aeb3be0f96a07f4e30f33f701f8dc77914c113215719de3498437dc6d3b0431 +MD5 5d2f5123b0e9b00f81cf6b0c226f76ef portage-2.1.2-r9.ebuild 6926 +RMD160 7e76724ca5b6c91df87001c46da9caa354f21a70 portage-2.1.2-r9.ebuild 6926 +SHA256 2aeb3be0f96a07f4e30f33f701f8dc77914c113215719de3498437dc6d3b0431 portage-2.1.2-r9.ebuild 6926 +MISC ChangeLog 18415 RMD160 9f018336449e95d11e8eb1ca666f560aa958d004 SHA1 6f5701b6ff986e5d641f407f1633a6932950c378 SHA256 d27f2b32988bb52813d7711b3df392bd28ba4c3b6ca08963dfe7250411b0a312 +MD5 55844113a5c5df335df7adcdb6461720 ChangeLog 18415 +RMD160 9f018336449e95d11e8eb1ca666f560aa958d004 ChangeLog 18415 +SHA256 d27f2b32988bb52813d7711b3df392bd28ba4c3b6ca08963dfe7250411b0a312 ChangeLog 18415 MISC metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 SHA1 6c41671928300da9f983586503dabcd90062b4dd SHA256 27d358e2646578efe2f2050052d739b641e49325565ec9cab345030420505d46 MD5 bd1d8da118e08d72f8ea20785a604acf metadata.xml 282 RMD160 ba620b1a97d40fc10a4503f404c6b45b86e361d9 metadata.xml 282 @@ -58,10 +55,3 @@ SHA256 14b725f25ee62390c2df6c85df90c95d59d72e10063980f8dc7b0ea944079920 files/di MD5 c8470f45ecc797cf3d11955e8f289f27 files/digest-portage-2.1.2-r9 762 RMD160 a8ddfbbe84d19146aeca5f44c6996c9d5b6fe476 files/digest-portage-2.1.2-r9 762 SHA256 c5dca1f067e2d2e51ede6a1a1fea63510256018bc286401be1f55f9d2307bfa0 files/digest-portage-2.1.2-r9 762 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF4up8/ejvha5XGaMRAgmSAJ9EyoFs3Q2WkK/vLZDmuwAbr1MPPQCg349w -1XYgjiVna7rdEh2fxNwinno= -=2wUJ ------END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.0.51.22-r3.ebuild b/sys-apps/portage/portage-2.0.51.22-r3.ebuild index ff17957297ac..066e7e8ef8d3 100644 --- a/sys-apps/portage/portage-2.0.51.22-r3.ebuild +++ b/sys-apps/portage/portage-2.0.51.22-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.22-r3.ebuild,v 1.8 2006/11/02 23:59:06 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.9 2007/02/26 18:40:03 grobian Exp $ inherit toolchain-funcs flag-o-matic @@ -9,12 +9,12 @@ HOMEPAGE="http://www.gentoo.org/" SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2 http://dev.gentoo.org/~jstubbs/releases/${PN}-${PV}.tar.bz2" LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" SLOT="0" IUSE="build doc selinux" DEPEND=">=dev-lang/python-2.2.1" -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? ( !mips? ( >=sys-apps/sandbox-1.2.17 ) ) ) 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? ( !mips? ( >=sys-apps/sandbox-1.2.17 ) ) selinux? ( >=dev-python/python-selinux-2.15 )" PDEPEND="doc? ( app-portage/portage-manpages )" PROVIDE="virtual/portage" @@ -36,7 +36,7 @@ src_compile() { cd "${S}"/src $(tc-getCC) ${CFLAGS} -o tbz2tool tbz2tool.c - if ! use ppc-macos && ! python_has_lchown; then + if ! python_has_lchown; then cd "${S}"/src/python-missingos chmod +x setup.py ./setup.py build || die "Failed to build missingos module" @@ -63,7 +63,7 @@ src_install() { newins make.conf make.conf.example fi - if ! use ppc-macos && ! python_has_lchown; then + if ! python_has_lchown; then cd "${S}"/src/python-missingos ./setup.py install --root ${D} || die "Failed to install missingos module" fi diff --git a/sys-apps/portage/portage-2.1.1-r2.ebuild b/sys-apps/portage/portage-2.1.1-r2.ebuild index 25e9057b3966..30a2846a5d03 100644 --- a/sys-apps/portage/portage-2.1.1-r2.ebuild +++ b/sys-apps/portage/portage-2.1.1-r2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1-r2.ebuild,v 1.12 2007/02/06 09:45:27 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1-r2.ebuild,v 1.13 2007/02/26 18:40:03 grobian Exp $ inherit toolchain-funcs eutils flag-o-matic DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" PROVIDE="virtual/portage" SLOT="0" # USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5). diff --git a/sys-apps/portage/portage-2.1.2-r11.ebuild b/sys-apps/portage/portage-2.1.2-r11.ebuild index ad859d11ff51..ac45068cfc62 100644 --- a/sys-apps/portage/portage-2.1.2-r11.ebuild +++ b/sys-apps/portage/portage-2.1.2-r11.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r11.ebuild,v 1.2 2007/02/26 14:11:03 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r11.ebuild,v 1.3 2007/02/26 18:40:03 grobian Exp $ inherit toolchain-funcs eutils flag-o-matic multilib DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" PROVIDE="virtual/portage" SLOT="0" # USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5). diff --git a/sys-apps/portage/portage-2.1.2-r9.ebuild b/sys-apps/portage/portage-2.1.2-r9.ebuild index fd6a2cbae033..1a0ce30ccef2 100644 --- a/sys-apps/portage/portage-2.1.2-r9.ebuild +++ b/sys-apps/portage/portage-2.1.2-r9.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r9.ebuild,v 1.12 2007/02/26 14:11:03 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.2-r9.ebuild,v 1.13 2007/02/26 18:40:03 grobian Exp $ inherit toolchain-funcs eutils flag-o-matic DESCRIPTION="The Portage Package Management System. The primary package management and distribution system for Gentoo." HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml" LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" PROVIDE="virtual/portage" SLOT="0" # USE_EXPAND_HIDDEN hides ELIBC and USERLAND expansions from emerge output (see make.conf.5). -- 2.26.2