Version bumps. Fix lua support bug# 130085

(Portage version: 2.1.1_pre1-r2)

9 files changed, 181 insertions, 11 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/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
+}