Version bumps. Fix lua support bug# 130085

Package-Manager: portage-2.1.1_pre1-r2

10 files changed, 233 insertions, 36 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 41edc89ba01f..10ff088bcda0 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.44 2006/03/19 19:02:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.45 2006/06/26 19:47:13 pythonhead Exp $
+
+*scite-1.70 (26 Jun 2006)
+*scite-1.69 (26 Jun 2006)
+
+  26 Jun 2006; Rob Cakebread <pythonhead@gentoo.org> scite-1.62.ebuild,
+  scite-1.66.ebuild, scite-1.67.ebuild, scite-1.68.ebuild,
+  +scite-1.69.ebuild, +scite-1.70.ebuild:
+  Version bumps. Fix lua support bug #130085 Thank you <basic@mozdev.org>
 
   19 Mar 2006; Mark Loeser <halcy0n@gentoo.org> scite-1.68.ebuild:
   Add DEPEND on app-arch/unzip
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 946da7bd71cc..3e80c876a274 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,9 +1,48 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7869da5bfb2269d558f887bf93f504c2 ChangeLog 7500
-RMD160 f7f24411f0d8bf22ddd509941b1a8d96d63e593c ChangeLog 7500
-SHA256 adc3660bc9318bbe41f8fc38e6a9cf8095fceea1681ff762591db9ff25026a66 ChangeLog 7500
+AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
+MD5 2561568c62ec3edc2b46be6638c80427 files/scite.desktop 169
+RMD160 760e2de111a56d037265b748ad65c621c1607c3b files/scite.desktop 169
+SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc files/scite.desktop 169
+DIST scite162.tgz 1140114
+DIST scite166.tgz 1259178
+DIST scite167.tgz 1262524 RMD160 61047ad98b413272f70a965681390b0b3fe2e352 SHA256 1bf089ba0dcc3670941b8934f7152e41fa27402a841412d12bea2fd88d9c141c
+DIST scite168.zip 1482048 RMD160 a5175b84082fb78d4cd1b0d1aae83bd2a03ca56a SHA256 f5f6fabee8901488471c68b1c229f5032f5959508e88ca9b1830adc0e8864662
+DIST scite169.tgz 1298003 RMD160 095638d547697bfe189753da7ffbfb5fb3e60a5c SHA1 1764a9e25495f3d4beff79d6a5c08f7a949364bd SHA256 f3a94aba658caa294aad5f59b950089933b762107ba743aaba1d6d2f4394c752
+DIST scite170.tgz 1298313 RMD160 34728bceb30912441e954dd2a76cbf67ecc9b071 SHA1 d261b0ee17f2a5427c19c4fb35954d3d48409780 SHA256 7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5
+EBUILD scite-1.62.ebuild 1803 RMD160 eb27e3793eb9a55a209cef9adf9b85efe1c01758 SHA1 992b3abb080e799f94f357a73000fc66fc85f2c1 SHA256 c8b872383770f1e4a19a3b667a3857790f347e455bb4537a26440f2a51efe75b
+MD5 bfeb3e0136c201379c6d79d8013718d8 scite-1.62.ebuild 1803
+RMD160 eb27e3793eb9a55a209cef9adf9b85efe1c01758 scite-1.62.ebuild 1803
+SHA256 c8b872383770f1e4a19a3b667a3857790f347e455bb4537a26440f2a51efe75b scite-1.62.ebuild 1803
+EBUILD scite-1.66.ebuild 1760 RMD160 5c8f7589793c62c29b0402cb7d366e4c78238383 SHA1 cd32b25c86ce7722ae1806f742d7fdacfcaed9a4 SHA256 b0793d4e7e31413aed8ac16981871ff7000f998bf5634b7631f5677af228023a
+MD5 71c01c43a2ca86975555843371723f70 scite-1.66.ebuild 1760
+RMD160 5c8f7589793c62c29b0402cb7d366e4c78238383 scite-1.66.ebuild 1760
+SHA256 b0793d4e7e31413aed8ac16981871ff7000f998bf5634b7631f5677af228023a scite-1.66.ebuild 1760
+EBUILD scite-1.67.ebuild 1760 RMD160 9f39926e71a9a539ab04120663e6bd78756d5e28 SHA1 300d1fc005f4aacad3f270aeb460bf750d2751b5 SHA256 6ca9312d6b0fef63c183b03b5e4e12d8a83d3f80cbadc84d8295614b214702d5
+MD5 151446b660171e660568b211b279fd46 scite-1.67.ebuild 1760
+RMD160 9f39926e71a9a539ab04120663e6bd78756d5e28 scite-1.67.ebuild 1760
+SHA256 6ca9312d6b0fef63c183b03b5e4e12d8a83d3f80cbadc84d8295614b214702d5 scite-1.67.ebuild 1760
+EBUILD scite-1.68.ebuild 1810 RMD160 d0ce82e0b9b38715508081f43f3dc9e31cf4006b SHA1 69854d970a0931c3ed5c0e6e4005ed55a3eead36 SHA256 8d1450b061a54456a05f77ae168b7963056e773c2e74daae16f1ce6498f0ae02
+MD5 851c2c0e8238c1e83bd8cca2db9189a0 scite-1.68.ebuild 1810
+RMD160 d0ce82e0b9b38715508081f43f3dc9e31cf4006b scite-1.68.ebuild 1810
+SHA256 8d1450b061a54456a05f77ae168b7963056e773c2e74daae16f1ce6498f0ae02 scite-1.68.ebuild 1810
+EBUILD scite-1.69.ebuild 1760 RMD160 fa5b876d46e209bae72176a134196e4d1969814e SHA1 eeda37066c5d6987fe50307108f33aee894fe76b SHA256 af66185606667f55a6ece67a6439ee37bc5b61db86e769b3fc0601f37942ad86
+MD5 ff6671a888b6a8d82f4fdc1a70ca1581 scite-1.69.ebuild 1760
+RMD160 fa5b876d46e209bae72176a134196e4d1969814e scite-1.69.ebuild 1760
+SHA256 af66185606667f55a6ece67a6439ee37bc5b61db86e769b3fc0601f37942ad86 scite-1.69.ebuild 1760
+EBUILD scite-1.70.ebuild 1760 RMD160 87f611a4a46280c52ffae363c010f7dc0c16a3c4 SHA1 532fb06aefe81f7615b0d3b49af28679c467965f SHA256 d31379e4e9f11aa58977f94c7a1f077c34dae25f4db294a4eb3ae01c60d1a810
+MD5 d76628e116b7d5ae30ea13439e015ad4 scite-1.70.ebuild 1760
+RMD160 87f611a4a46280c52ffae363c010f7dc0c16a3c4 scite-1.70.ebuild 1760
+SHA256 d31379e4e9f11aa58977f94c7a1f077c34dae25f4db294a4eb3ae01c60d1a810 scite-1.70.ebuild 1760
+MISC ChangeLog 7804 RMD160 a54439f9a38500d5c43226370ff777824af60b10 SHA1 c4620790aa026e6c9f4b4f226ab6876792140bdf SHA256 df3f54768f717a3a30e2d7b7ccb144bf37f3706a9e1805401e20d07d8be54b1b
+MD5 c911c088f58da05f11a1137dea0251b5 ChangeLog 7804
+RMD160 a54439f9a38500d5c43226370ff777824af60b10 ChangeLog 7804
+SHA256 df3f54768f717a3a30e2d7b7ccb144bf37f3706a9e1805401e20d07d8be54b1b ChangeLog 7804
+MISC metadata.xml 222 RMD160 110eadc4b2ded314e61ad9e0e5d48bf7f0934f69 SHA1 a87eff15b18dea9eb3959f47440351af8b3d580e SHA256 4a388911179518b0e527fcfae4bfcc1938efe3efe28e1d846c940ae7b008d978
+MD5 4eb1abff335478b86f5c65997e0148f2 metadata.xml 222
+RMD160 110eadc4b2ded314e61ad9e0e5d48bf7f0934f69 metadata.xml 222
+SHA256 4a388911179518b0e527fcfae4bfcc1938efe3efe28e1d846c940ae7b008d978 metadata.xml 222
 MD5 42ceb479aebfc9cd9818f0d6a0e39020 files/digest-scite-1.62 58
 RMD160 0e24fc841b6c681f5dc1dc0352308f3d99d40247 files/digest-scite-1.62 58
 SHA256 f45a3320857fe10f81a8aa895c081cf27aedab38cebfd876e01235d92c46a87c files/digest-scite-1.62 58
@@ -16,28 +55,16 @@ SHA256 3a8a8f7d654d1a8c6e493d54d3b9b0d6eca32f14963cc2064447b06a9ed38b6e files/di
 MD5 84ef7fcc07e6b930a570470bf803288f files/digest-scite-1.68 220
 RMD160 8dde00fc432a40d37ace31f56e7c8ac31e27bb65 files/digest-scite-1.68 220
 SHA256 1a1da966349f8102de8e71e2ce9ca33d8ca6ca3c902a69f3b33aa0ffb144211b files/digest-scite-1.68 220
-MD5 2561568c62ec3edc2b46be6638c80427 files/scite.desktop 169
-RMD160 760e2de111a56d037265b748ad65c621c1607c3b files/scite.desktop 169
-SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc files/scite.desktop 169
-MD5 4eb1abff335478b86f5c65997e0148f2 metadata.xml 222
-RMD160 110eadc4b2ded314e61ad9e0e5d48bf7f0934f69 metadata.xml 222
-SHA256 4a388911179518b0e527fcfae4bfcc1938efe3efe28e1d846c940ae7b008d978 metadata.xml 222
-MD5 afa9fae61dff938f93a078b406b43b2e scite-1.62.ebuild 1733
-RMD160 7176524a79c68fac772e25aa8927c77766cb9ad3 scite-1.62.ebuild 1733
-SHA256 0bf50f1bd86a9fbc236065133cdd9024bdff2b5f24ff32c8fef56de3499aab44 scite-1.62.ebuild 1733
-MD5 203e6adb4bed3d4d828a113d32e9e881 scite-1.66.ebuild 1690
-RMD160 eb52e03dd6792bf6c2b0e9f139f90840cee61c22 scite-1.66.ebuild 1690
-SHA256 afbff65479b04001ec79c8988296cb7c0aad24d4d333b0b4f18eb6cd277cabad scite-1.66.ebuild 1690
-MD5 b16310b19928cd59103f3f98d93cbc8c scite-1.67.ebuild 1693
-RMD160 87b4c3da765627c4b284cdcaee868c12b11429ba scite-1.67.ebuild 1693
-SHA256 0bc414e4926bd0a5e34c1f30474e60d6ae77d48ecdc872c5812e40cbb79854f1 scite-1.67.ebuild 1693
-MD5 2abab6ed6a1cfb65edad47eb2de4f233 scite-1.68.ebuild 1740
-RMD160 eab32cccf62c76f523c94eeddc6e6e80bea363a8 scite-1.68.ebuild 1740
-SHA256 16a6175bb5e3fa1afd20187209224d0fe3a166a58586538ed7fb8e25244fda2f scite-1.68.ebuild 1740
+MD5 a2e00842bc84f7b1870917e3367e285e files/digest-scite-1.69 220
+RMD160 e99417e45f5a73b3073d6ee35a51f785c36fb779 files/digest-scite-1.69 220
+SHA256 13cc1309ccd07a87eacfb092ef895a80154e07b4c1c9b8888ed02d6d6407fa2c files/digest-scite-1.69 220
+MD5 6df6a987bf6f6a404ff2f1a48659c2e0 files/digest-scite-1.70 220
+RMD160 7a8771088d3dea38981837a9e5b4e61cd1c34f23 files/digest-scite-1.70 220
+SHA256 16120e38b6aae8858754a0be5e7516354f51d6fe60fb05c1493baab5fd2f0afc files/digest-scite-1.70 220
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEHaq/CRZPokWLroQRAik+AJ0Xnjz9epI7+ymKj6xtv0xqVt/a4QCgu2cU
-0oBzCMQ6EHokHFy2nNlRRJY=
-=dci3
+iD8DBQFEoDnvTry2jroju7wRAm+7AJ4vChG1rRorKWROI5SFT9iqQZsLZwCfVLDD
+nT16swm+ElWNMy6s+kaZUUA=
+=fWdf
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/digest-scite-1.69 b/app-editors/scite/files/digest-scite-1.69
new file mode 100644
index 000000000000..e5305128f4a1
--- /dev/null
+++ b/app-editors/scite/files/digest-scite-1.69
@@ -0,0 +1,3 @@
+MD5 3f84986922ccf9c21a1481ba85153be6 scite169.tgz 1298003
+RMD160 095638d547697bfe189753da7ffbfb5fb3e60a5c scite169.tgz 1298003
+SHA256 f3a94aba658caa294aad5f59b950089933b762107ba743aaba1d6d2f4394c752 scite169.tgz 1298003
diff --git a/app-editors/scite/files/digest-scite-1.70 b/app-editors/scite/files/digest-scite-1.70
new file mode 100644
index 000000000000..d59469b35a43
--- /dev/null
+++ b/app-editors/scite/files/digest-scite-1.70
@@ -0,0 +1,3 @@
+MD5 bf7509820b23438e272d7526e1058bff scite170.tgz 1298313
+RMD160 34728bceb30912441e954dd2a76cbf67ecc9b071 scite170.tgz 1298313
+SHA256 7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5 scite170.tgz 1298313
diff --git a/app-editors/scite/scite-1.62.ebuild b/app-editors/scite/scite-1.62.ebuild
index 42633d8f00f9..e39f2ca9e214 100644
--- a/app-editors/scite/scite-1.62.ebuild
+++ b/app-editors/scite/scite-1.62.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.62.ebuild,v 1.2 2005/11/03 20:58:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.62.ebuild,v 1.3 2006/06/26 19:47:13 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -44,7 +44,11 @@ src_unpack() {
 
 src_compile() {
 	make -C ../../scintilla/gtk || die "prep make failed"
-	emake || die "make failed"
+	if use lua; then
+		emake || die "make failed"
+	else
+		emake NO_LUA=1 || die "make failed"
+	fi
 }
 
 src_install() {
diff --git a/app-editors/scite/scite-1.66.ebuild b/app-editors/scite/scite-1.66.ebuild
index 888f6b7b4283..faf9c802bd28 100644
--- a/app-editors/scite/scite-1.66.ebuild
+++ b/app-editors/scite/scite-1.66.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.66.ebuild,v 1.2 2005/11/03 20:58:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.66.ebuild,v 1.3 2006/06/26 19:47:13 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -43,7 +43,11 @@ src_unpack() {
 
 src_compile() {
 	make -C ../../scintilla/gtk || die "prep make failed"
-	emake || die "make failed"
+	if use lua; then
+		emake || die "make failed"
+	else
+		emake NO_LUA=1 || die "make failed"
+	fi
 }
 
 src_install() {
diff --git a/app-editors/scite/scite-1.67.ebuild b/app-editors/scite/scite-1.67.ebuild
index 8767b5c6139e..f490d1fa1e0d 100644
--- a/app-editors/scite/scite-1.67.ebuild
+++ b/app-editors/scite/scite-1.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.67.ebuild,v 1.1 2006/03/15 21:23:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.67.ebuild,v 1.2 2006/06/26 19:47:13 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -43,7 +43,11 @@ src_unpack() {
 
 src_compile() {
 	make -C ../../scintilla/gtk || die "prep make failed"
-	emake || die "make failed"
+	if use lua; then
+		emake || die "make failed"
+	else
+		emake NO_LUA=1 || die "make failed"
+	fi
 }
 
 src_install() {
diff --git a/app-editors/scite/scite-1.68.ebuild b/app-editors/scite/scite-1.68.ebuild
index 37f9146f5504..737fc2907630 100644
--- a/app-editors/scite/scite-1.68.ebuild
+++ b/app-editors/scite/scite-1.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.68.ebuild,v 1.2 2006/03/19 19:02:12 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.68.ebuild,v 1.3 2006/06/26 19:47:13 pythonhead Exp $
 
 inherit toolchain-funcs
 
@@ -45,7 +45,11 @@ src_unpack() {
 
 src_compile() {
 	make -C ../../scintilla/gtk || die "prep make failed"
-	emake || die "make failed"
+	if use lua; then
+		emake || die "make failed"
+	else
+		emake NO_LUA=1 || die "make failed"
+	fi
 }
 
 src_install() {
diff --git a/app-editors/scite/scite-1.69.ebuild b/app-editors/scite/scite-1.69.ebuild
new file mode 100644
index 000000000000..c291267d2c48
--- /dev/null
+++ b/app-editors/scite/scite-1.69.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.69.ebuild,v 1.1 2006/06/26 19:47:13 pythonhead Exp $
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="Scintilla"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="lua"
+
+RDEPEND=">=x11-libs/gtk+-2
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}/gtk
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/scintilla/gtk
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		|| die "error patching makefile"
+
+	cd ${S}
+	sed -i makefile \
+		-e 's#usr/local#usr#g' \
+		-e 's#/gnome/apps/Applications#/applications#' \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e 's#${D}##' \
+		|| die "error patching makefile"
+}
+
+src_compile() {
+	make -C ../../scintilla/gtk || die "prep make failed"
+	if use lua; then
+		emake || die "make failed"
+	else
+		emake NO_LUA=1 || die "make failed"
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/{pixmaps,applications}
+
+	make prefix=${D}/usr install || die
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	insinto /usr/share/applications
+	rm -f ${D}/usr/share/applications/SciTE.desktop
+	doins ${FILESDIR}/scite.desktop
+
+	doman ../doc/scite.1
+	dodoc ../README
+}
diff --git a/app-editors/scite/scite-1.70.ebuild b/app-editors/scite/scite-1.70.ebuild
new file mode 100644
index 000000000000..73fc5ce93596
--- /dev/null
+++ b/app-editors/scite/scite-1.70.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.70.ebuild,v 1.1 2006/06/26 19:47:13 pythonhead Exp $
+
+inherit toolchain-funcs
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="Scintilla"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
+IUSE="lua"
+
+RDEPEND=">=x11-libs/gtk+-2
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}/gtk
+
+src_unpack() {
+	unpack ${A}
+	cd ${WORKDIR}/scintilla/gtk
+	sed -i makefile \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		|| die "error patching makefile"
+
+	cd ${S}
+	sed -i makefile \
+		-e 's#usr/local#usr#g' \
+		-e 's#/gnome/apps/Applications#/applications#' \
+		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
+		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
+		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
+		-e 's#${D}##' \
+		|| die "error patching makefile"
+}
+
+src_compile() {
+	make -C ../../scintilla/gtk || die "prep make failed"
+	if use lua; then
+		emake || die "make failed"
+	else
+		emake NO_LUA=1 || die "make failed"
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/{pixmaps,applications}
+
+	make prefix=${D}/usr install || die
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv ${D}/usr/bin/SciTE ${D}/usr/bin/scite
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	insinto /usr/share/applications
+	rm -f ${D}/usr/share/applications/SciTE.desktop
+	doins ${FILESDIR}/scite.desktop
+
+	doman ../doc/scite.1
+	dodoc ../README
+}