Use toolchain-funcs eclass to get $\{CXX\}, removed ancient version. Closes bug# 68979

10 files changed, 39 insertions, 79 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index dc05182395f0..f61194e37f44 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.29 2004/10/05 12:19:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.30 2004/10/27 05:00:36 pythonhead Exp $
+
+  26 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> -scite-1.4.9.ebuild,
+  scite-1.5.6.ebuild, scite-1.5.7.ebuild, scite-1.5.8.ebuild,
+  scite-1.5.9.ebuild, scite-1.6.0.ebuild, scite-1.6.1.ebuild:
+  Use toolchain-funcs eclass to get ${CXX}, removed ancient version. Closes bug# 68979
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> scite-1.5.6.ebuild,
   scite-1.5.7.ebuild, scite-1.5.8.ebuild, scite-1.5.9.ebuild,
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 446f851d3831..b270541841bf 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,13 +1,11 @@
-MD5 630c2366342cce649f8d19d41d22a95f ChangeLog 5240
+MD5 a42dcc76c132b5e89aff50b7381590ae ChangeLog 5528
 MD5 4eb1abff335478b86f5c65997e0148f2 metadata.xml 222
-MD5 a2d0ff7c24d9002c119a42de143a4022 scite-1.4.9.ebuild 1338
-MD5 bca3df1dbe0f7f9cd851255489ac6f0b scite-1.5.6.ebuild 1648
-MD5 fac7babcdc8edb53cb2d3e2486dc1abc scite-1.5.7.ebuild 1831
-MD5 8e94b6a72eaf1f8b26f34a6d0c40222f scite-1.5.8.ebuild 1832
-MD5 e347f5a5aa51fee4f4afb42b8afdb520 scite-1.5.9.ebuild 1833
-MD5 ea09056bcf9dcb256d98d64db5d1e7da scite-1.6.0.ebuild 1865
-MD5 0abd2525b4eb5ff523302a6a131f64f2 scite-1.6.1.ebuild 1859
-MD5 e21b1647de51e2cea2682beaf5522ea7 files/digest-scite-1.4.9 57
+MD5 18d5a21ca6fb6abcfaebc272f9a441ca scite-1.5.6.ebuild 1675
+MD5 8deeabe08715a4944a465f716f924a03 scite-1.5.7.ebuild 1860
+MD5 b4ec385f69cfb65de306b27a63f36d12 scite-1.5.8.ebuild 1860
+MD5 7343443b02e3bff422ab3616591f3440 scite-1.5.9.ebuild 1861
+MD5 c1dd705687cdff94c730fa8eb4221c31 scite-1.6.0.ebuild 1892
+MD5 3934feba047fa7c68b209fc9f2df589b scite-1.6.1.ebuild 1888
 MD5 80608721073d877a62ab114df64994fe files/digest-scite-1.5.6 57
 MD5 db1df48699c3abfa8938d151233eaefc files/digest-scite-1.5.7 57
 MD5 3c64c2bf7e3e5fc10e24e76b905dfdcb files/digest-scite-1.5.8 57
diff --git a/app-editors/scite/files/digest-scite-1.4.9 b/app-editors/scite/files/digest-scite-1.4.9
deleted file mode 100644
index dda6e3f4336b..000000000000
--- a/app-editors/scite/files/digest-scite-1.4.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a60e1ff31b5f97106a6e2b6be013d92 scite149.tgz 727913
diff --git a/app-editors/scite/scite-1.4.9.ebuild b/app-editors/scite/scite-1.4.9.ebuild
deleted file mode 100644
index b91f12d9480a..000000000000
--- a/app-editors/scite/scite-1.4.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.4.9.ebuild,v 1.8 2004/09/21 23:40:56 pythonhead Exp $
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="http://www.scintilla.org/"
-SRC_URI="http://www.scintilla.org/${PN}${MY_PV}.tgz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="gnome"
-
-DEPEND="virtual/libc
-	=x11-libs/gtk+-1.2*"
-RDEPEND=""
-S=${WORKDIR}/$PN/gtk
-
-src_compile() {
-	make -C ../../scintilla/gtk || die
-	sed -e 's#usr/local#usr#g' -e 's#$(datadir)#${D}$(datadir)#g' \
-		makefile > Makefile.good || die
-	mv Makefile.good makefile
-	sed -e 's#Exec=SciTE#Exec=scite#g' \
-		-e 's#Type=Application#Type=Development#g' \
-		SciTE.desktop > SciTE.desktop.good
-	mv SciTE.desktop.good SciTE.desktop
-	emake || die
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	dodir /usr/share
-	dodir /usr/share/pixmaps
-	dodir /usr/share/gnome/apps/Applications
-	make prefix=${D}/usr install || die
-	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
-	doman ../doc/scite.1
-	dodoc ../License.txt ../readme
-
-	if use gnome ;
-	then
-		# fix category (this is a developers tool)
-		mv ${D}/usr/share/gnome/apps/Applications \
-			${D}/usr/share/gnome/apps/Development
-	else
-		rm -rf ${D}/usr/share/gnome
-	fi
-}
diff --git a/app-editors/scite/scite-1.5.6.ebuild b/app-editors/scite/scite-1.5.6.ebuild
index 53313b3e3655..9493ef91b5a5 100644
--- a/app-editors/scite/scite-1.5.6.ebuild
+++ b/app-editors/scite/scite-1.5.6.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.6.ebuild,v 1.7 2004/10/05 12:19:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.6.ebuild,v 1.8 2004/10/27 05:00:36 pythonhead Exp $
 
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful editor for programmers"
@@ -29,7 +30,7 @@ src_unpack() {
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
 }
diff --git a/app-editors/scite/scite-1.5.7.ebuild b/app-editors/scite/scite-1.5.7.ebuild
index 2bade2c9bdf2..bd1ebe80d63d 100644
--- a/app-editors/scite/scite-1.5.7.ebuild
+++ b/app-editors/scite/scite-1.5.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.7.ebuild,v 1.7 2004/10/05 12:19:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.7.ebuild,v 1.8 2004/10/27 05:00:36 pythonhead Exp $
+
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 
@@ -25,7 +27,7 @@ src_unpack() {
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
 	cd ${S}
@@ -34,7 +36,7 @@ src_unpack() {
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		-e 's#${D}##' \
 		|| die "error patching makefile"
 
diff --git a/app-editors/scite/scite-1.5.8.ebuild b/app-editors/scite/scite-1.5.8.ebuild
index 84e553bd5c97..7681afd3fe98 100644
--- a/app-editors/scite/scite-1.5.8.ebuild
+++ b/app-editors/scite/scite-1.5.8.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.8.ebuild,v 1.6 2004/10/05 12:19:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.8.ebuild,v 1.7 2004/10/27 05:00:36 pythonhead Exp $
 
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 
@@ -26,7 +27,7 @@ src_unpack() {
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
 	cd ${S}
@@ -35,7 +36,7 @@ src_unpack() {
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		-e 's#${D}##' \
 		|| die "error patching makefile"
 
diff --git a/app-editors/scite/scite-1.5.9.ebuild b/app-editors/scite/scite-1.5.9.ebuild
index 856520844e2b..1fde4fc257ff 100644
--- a/app-editors/scite/scite-1.5.9.ebuild
+++ b/app-editors/scite/scite-1.5.9.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.9.ebuild,v 1.5 2004/10/05 12:19:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.5.9.ebuild,v 1.6 2004/10/27 05:00:36 pythonhead Exp $
 
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 
@@ -26,7 +27,7 @@ src_unpack() {
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
 	cd ${S}
@@ -35,7 +36,7 @@ src_unpack() {
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		-e 's#${D}##' \
 		|| die "error patching makefile"
 
diff --git a/app-editors/scite/scite-1.6.0.ebuild b/app-editors/scite/scite-1.6.0.ebuild
index 7204b3fc755b..ff1a41d7d68a 100644
--- a/app-editors/scite/scite-1.6.0.ebuild
+++ b/app-editors/scite/scite-1.6.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.0.ebuild,v 1.6 2004/09/21 23:40:56 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.0.ebuild,v 1.7 2004/10/27 05:00:36 pythonhead Exp $
+
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 
@@ -23,7 +25,7 @@ src_unpack() {
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
 	cd ${S}
@@ -32,7 +34,7 @@ src_unpack() {
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		-e 's#${D}##' \
 		|| die "error patching makefile"
 
diff --git a/app-editors/scite/scite-1.6.1.ebuild b/app-editors/scite/scite-1.6.1.ebuild
index 39cf727a128d..25346d54dc52 100644
--- a/app-editors/scite/scite-1.6.1.ebuild
+++ b/app-editors/scite/scite-1.6.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.1.ebuild,v 1.7 2004/10/05 12:19:44 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.6.1.ebuild,v 1.8 2004/10/27 05:00:36 pythonhead Exp $
+
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful editor for programmers"
@@ -22,7 +24,7 @@ src_unpack() {
 	sed -i makefile \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		|| die "error patching makefile"
 
 	cd ${S}
@@ -31,7 +33,7 @@ src_unpack() {
 		-e 's#/gnome/apps/Applications#/applications#' \
 		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
 		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = ${CXX:-g++}#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
 		-e 's#${D}##' \
 		|| die "error patching makefile"