From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 28 Oct 2004 16:13:14 +0000 (+0000)
Subject: use tc-getCC and clean up (nick will probably kill me :p)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=10f654f285528e0417bd5509709682b35c6a47cb;p=gentoo.git

use tc-getCC and clean up (nick will probably kill me :p)
---

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index acaad8212eef..b6cfbf72f51f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 43adca5493df50ea54df162bccc490f9 portage-2.0.51_rc7.ebuild 11773
-MD5 9b79f11e4138dc0856732c34b1c77e87 portage-2.0.51-r2.ebuild 12210
-MD5 c2319f5f50294b32c0d1b9cfa1bee9d3 portage-2.0.50-r11.ebuild 11543
 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411
 MD5 c697b628359c7055961817876804f0a6 metadata.xml 221
-MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
+MD5 0470399965cfb502cde05cb35599b7f9 portage-2.0.51_rc7.ebuild 11795
+MD5 125f9d5c24c2cad5d72f9ba9144d5962 portage-2.0.51-r2.ebuild 12232
+MD5 63cadb5f6ef798aaa8b95a899fdea82f portage-2.0.50-r11.ebuild 11572
+MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
 MD5 3da3469e2b40b9a6b37fd54b2e6c7b98 files/digest-portage-2.0.51_rc7 71
 MD5 d2608171176cc00a43ead2ed136ed328 files/digest-portage-2.0.51-r2 70
 MD5 c87665ae99f2cf65afa22cc82bb67299 files/RequiredBinary.diff 399
-MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBfTZUBDOEqLMd+jQRAoK8AJ97pRUJOpKHahVb5kRiPo0SxXM1HQCgjhbm
-CoWmvEn0gL9kHCmZeMr3hHI=
-=KaMN
------END PGP SIGNATURE-----
+MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71
diff --git a/sys-apps/portage/portage-2.0.50-r11.ebuild b/sys-apps/portage/portage-2.0.50-r11.ebuild
index 253f52f2efc2..4e9e75d1bd0c 100644
--- a/sys-apps/portage/portage-2.0.50-r11.ebuild
+++ b/sys-apps/portage/portage-2.0.50-r11.ebuild
@@ -1,26 +1,34 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r11.ebuild,v 1.6 2004/10/10 05:02:53 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r11.ebuild,v 1.7 2004/10/28 16:13:14 vapier Exp $
 
-IUSE="build selinux"
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
 export SANDBOX_DISABLED="1"
 
-S=${WORKDIR}/${PF}
-SLOT="0"
 DESCRIPTION="Portage ports system"
+HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://gentoo.twobit.net/portage/${PF}.tar.bz2 http://dev.gentoo.org/~carpaski/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build selinux"
 # Contact carpaski with a reason before you modify any of these.
 KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc64  s390  sparc  x86"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
-LICENSE="GPL-2"
-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 ) selinux? ( dev-python/python-selinux )"
+RDEPEND="selinux? ( dev-python/python-selinux )
+	!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
+	)"
+
+S=${WORKDIR}/${PF}
 
 python_version() {
 	local tmpstr="$(/usr/bin/python -V 2>&1 )"
@@ -56,7 +64,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
+	cd ${S}/src; $(tc-getCC) ${CFLAGS} tbz2tool.c -o tbz2tool
 	cd ${S}/src/sandbox-1.1
 	case ${ARCH} in
 		"x86")
diff --git a/sys-apps/portage/portage-2.0.51-r2.ebuild b/sys-apps/portage/portage-2.0.51-r2.ebuild
index a3ebab183513..f3372681e41e 100644
--- a/sys-apps/portage/portage-2.0.51-r2.ebuild
+++ b/sys-apps/portage/portage-2.0.51-r2.ebuild
@@ -1,27 +1,35 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.3 2004/10/25 17:22:11 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51-r2.ebuild,v 1.4 2004/10/28 16:13:14 vapier Exp $
 
-IUSE="build selinux"
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
 export SANDBOX_DISABLED="1"
 
-S=${WORKDIR}/${PF}
-SLOT="0"
 DESCRIPTION="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo."
+HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
 RESTRICT="nosandbox sandbox"
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build selinux"
 # Contact carpaski with a reason before you modify any of these.
 KEYWORDS="  alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sparc  x86"
 #KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 
-LICENSE="GPL-2"
-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 ) selinux? ( >=dev-python/python-selinux-2.15 )"
+RDEPEND="selinux? ( dev-python/python-selinux )
+	!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
+	)"
+
+S=${WORKDIR}/${PF}
 
 python_version() {
 	local tmpstr="$(/usr/bin/python -V 2>&1 )"
@@ -55,7 +63,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
+	cd ${S}/src; $(tc-getCC) ${CFLAGS} tbz2tool.c -o tbz2tool
 	cd ${S}/src/sandbox-1.1
 	case ${ARCH} in
 		"x86")
diff --git a/sys-apps/portage/portage-2.0.51_rc7.ebuild b/sys-apps/portage/portage-2.0.51_rc7.ebuild
index b1532cd71f3f..9d8cc0f9fc44 100644
--- a/sys-apps/portage/portage-2.0.51_rc7.ebuild
+++ b/sys-apps/portage/portage-2.0.51_rc7.ebuild
@@ -1,27 +1,35 @@
 # Copyright 1999-2004 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_rc7.ebuild,v 1.3 2004/10/23 05:21:23 carpaski Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_rc7.ebuild,v 1.4 2004/10/28 16:13:14 vapier Exp $
 
-IUSE="build selinux"
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can
 # cause everything to segfault !!
 export SANDBOX_DISABLED="1"
 
-S=${WORKDIR}/${PF}
-SLOT="0"
 DESCRIPTION="The Portage Package Management System (Similar to BSD's ports). The primary package management and distribution system for Gentoo."
+HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://zarquon.twobit.net/gentoo/portage/${PF}.tar.bz2 http://gentoo.twobit.net/portage/${PF}.tar.bz2 mirror://gentoo/${PF}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org"
 RESTRICT="nomirror mirror"
 
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build selinux"
 # Contact carpaski with a reason before you modify any of these.
 #KEYWORDS="alpha  amd64  arm  hppa  ia64  mips  ppc  ppc-macos  ppc64  s390  sparc  x86"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
 
-LICENSE="GPL-2"
-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 ) selinux? ( >=dev-python/python-selinux-2.15 )"
+RDEPEND="selinux? ( dev-python/python-selinux )
+	!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
+	)"
+
+S=${WORKDIR}/${PF}
 
 python_version() {
 	local tmpstr="$(/usr/bin/python -V 2>&1 )"
@@ -55,7 +63,7 @@ src_unpack() {
 }
 
 src_compile() {
-	cd ${S}/src; ${CC:-gcc} ${CFLAGS} tbz2tool.c -o tbz2tool
+	cd ${S}/src; $(tc-getCC) ${CFLAGS} tbz2tool.c -o tbz2tool
 	cd ${S}/src/sandbox-1.1
 	case ${ARCH} in
 		"x86")