Fix 401099: replace gcc with tc-getCC, fix dependencies.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 32 insertions, 16 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 73fc233eb807..081b14a7bf5e 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.126 2012/01/27 22:19:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.127 2012/01/27 23:21:34 nelchael Exp $
+
+  27 Jan 2012; Krzysztof Pawlik <nelchael@gentoo.org> scite-3.0.1.ebuild,
+  scite-3.0.2.ebuild:
+  Fix 401099: replace gcc with tc-getCC, fix dependencies.
 
 *scite-3.0.2 (27 Jan 2012)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 8def6b3be07c..7022f0bf4e29 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -18,18 +18,18 @@ EBUILD scite-2.25.ebuild 2115 RMD160 c7b8f0e30ae65ce5aaab25eda2ee2028f6277ae4 SH
 EBUILD scite-2.26.ebuild 2165 RMD160 2f8eb1fad5bdfc5961b932f41dd93fd12950d3f1 SHA1 d9a0262990261f40e8a27cfb9cdc02e6b945e3f5 SHA256 3c1c23d95924a3a3771f076e85d8cfeae6977ceaab21e78811f5775d0e7dd034
 EBUILD scite-2.27.ebuild 2166 RMD160 c5411b60f0364b263a8c6734d33d3e80fabd0beb SHA1 5cb7eb855892b896e991c94b2d0564b9483e8cca SHA256 f7c92601930ec5b6239f4dd46bfe939cfcf48d51ac5617c5a7c9ed801df56d43
 EBUILD scite-2.28.ebuild 2187 RMD160 1c24a960eb11944a8ec5fb55903e046864a63189 SHA1 52189d52206acd9c6b15830f2bd69f3b7835a459 SHA256 89f96ff2b74b729c3882d3b7cd99e91fc0c75bd127278fe8979ef35bab6bf216
-EBUILD scite-3.0.1.ebuild 1998 RMD160 91c3c6292c82f66fe431dfe26eff3fc3f260473a SHA1 f18f8e0d359fc7b98688d4791778a1cdfe989aed SHA256 6ce997a9b4013821fed86ab13c1eab777fee42aa49ba9d7836b6cea2ef1e0787
-EBUILD scite-3.0.2.ebuild 1998 RMD160 91c10ab00415ccc2e9440fcd36dc9fc6db2eef1e SHA1 60afce76df696f2542ed624897ea242d8005517e SHA256 b0a3860bf1877567ad01335ef2f497ac02d80b12922d417db57423eb8eee8d42
-MISC ChangeLog 18187 RMD160 aff1fad1e3e0e5acbba36762cebbd426582a5d27 SHA1 70889aaf8f30708f4da1ee9456ff8d2b5934dd97 SHA256 5713de04138a11cbf3908ac4b1bbc88024163f2fde4a23accd0b37207dd3b99f
+EBUILD scite-3.0.1.ebuild 2160 RMD160 679c2588af725e97884fbe9bd1bd61b312edea6d SHA1 7e6a4b9fea32503c37f367e1c91845903d961fe4 SHA256 b25042cffc6c1d50d8b61e02aadfe5ab47816aed2c62a5c750f8b66d90d92987
+EBUILD scite-3.0.2.ebuild 2160 RMD160 4aa229c7f99fba2f6e166d75bf12574b1245ffcb SHA1 508684e9060645101a7b83318ce9064f3b7ee311 SHA256 d7ae5d4a5d7225bd9895d3264c51983fb13b15355db5d7397a3226bfee070a9c
+MISC ChangeLog 18343 RMD160 f4009d4cb2063b93e12a2977b8059d8797030b10 SHA1 a68482e8ffd003cfe877bee7e9801c68a551492d SHA256 88854f7f18c21429d13df82020a9e71e2d2f98f45abbe065f80dbc2ecaf2d8ec
 MISC metadata.xml 209 RMD160 aad874f8991659f1214c1215c75597afc907d471 SHA1 9475be91874cb1e048ab26d4ea5ada17adcbc03f SHA256 ea9eb35c2edee74ca39c4e351322e86c12f3c37ce8a2bf1daa17ca5d07a578b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPIyLdAAoJEBZyv1r2qA5GGzIH/jPhbHfin/Dj60pezN6hzOno
-mCysPwMfO6TO5kMaEYEtCc817a9d2DiPIZLIQ0jwaOlfBP3btIsfWN3s/pjyAwtX
-38/6cLH6/eY73XEhaEL/fS9mW7RxxFVJl7u2w0Ztx1VBXuHvTgJoDwgCZXozPca5
-roYtSuvS6FcMMHS2TCZ1qVaH5Q6U7m/Ph9LsVeOyDfhVOUxonvQLD/w3nupX01Cn
-QG+6lhSB4pTzVwo3yNpQNWAjklhPsmo8Exb4y7ns3PGijFYOxSv3jYngLqTfIgE7
-UwLcWc4TKUXqoXrIjjF+A2nbzT1Ps6sWWO+PCHJd+FuARRzV4/YxY7qnl61Nz2c=
-=ACQX
+iQEcBAEBCgAGBQJPIzGEAAoJEBZyv1r2qA5GEvQH/it3jVpdf1jKchdPCuA3VDP/
+0iq/jFEWHJhqZ0pOIezJxa9Ra0MllSR6TGR7oV4i5rTrOjFEPxVh9SViEW2Wy5gp
+R1nEMCMbX5wmtF2h1fAA99WlX1vcsX0chHl95H1xZKOAbWcNbpgSP+9lNx/c3tcG
+dBjiMyriOjeE18SH/8Ivb1Uwk4/8U8MDmv5f1eoOluqn3l85qGgnG9jDb5bCKnk+
+IL27GnPGqziOMRQCDRI+Y6gCUfDRzBmwTpS/wTwc/utxDEh8vAGd6n9M5KhVGDEn
+yqN9D/jgVpjq/yWRgPj7ClOGpMGdLieU2bytrqQvvTf/X9D0iJXVtpiE5WVBhno=
+=bMZ2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.0.1.ebuild b/app-editors/scite/scite-3.0.1.ebuild
index 8f1bfafc3abc..6492474ce8e6 100644
--- a/app-editors/scite/scite-3.0.1.ebuild
+++ b/app-editors/scite/scite-3.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.1.ebuild,v 1.2 2011/11/30 19:05:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.1.ebuild,v 1.3 2012/01/27 23:21:34 nelchael Exp $
 
 EAPI="4"
 
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="lua"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
 	lua? ( >=dev-lang/lua-5 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -30,6 +34,7 @@ src_prepare() {
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e "s#-Os##" \
 		|| die "error patching makefile"
 
@@ -45,6 +50,7 @@ src_prepare() {
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e 's#${D}##' \
 		-e 's#-g root#-g 0#' \
 		-e "s#-Os##" \
diff --git a/app-editors/scite/scite-3.0.2.ebuild b/app-editors/scite/scite-3.0.2.ebuild
index 34ef1e1f82bb..c96df5bf4c13 100644
--- a/app-editors/scite/scite-3.0.2.ebuild
+++ b/app-editors/scite/scite-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.2.ebuild,v 1.1 2012/01/27 22:19:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.0.2.ebuild,v 1.2 2012/01/27 23:21:34 nelchael Exp $
 
 EAPI="4"
 
@@ -16,7 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="lua"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
 	lua? ( >=dev-lang/lua-5 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -30,6 +34,7 @@ src_prepare() {
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e "s#-Os##" \
 		|| die "error patching makefile"
 
@@ -45,6 +50,7 @@ src_prepare() {
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
 		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
 		-e 's#${D}##' \
 		-e 's#-g root#-g 0#' \
 		-e "s#-Os##" \