Version bump.

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

5 files changed, 127 insertions, 7 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 17b133df6565..c0e439eb1af8 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/scite
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.78 2009/02/02 23:42:06 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.79 2009/05/15 21:28:37 nelchael Exp $
+
+*scite-1.78 (15 May 2009)
+
+  15 May 2009; Krzysiek Pawlik <nelchael@gentoo.org> +scite-1.78.ebuild,
+  +files/scite-1.78-install.patch, +files/scite-1.78-no-lua.patch:
+  Version bump.
 
   02 Feb 2009; Krzysiek Pawlik <nelchael@gentoo.org> ChangeLog:
   Fix ChangeLog entries.
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index c2837d3ab331..a5621c2be071 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -5,17 +5,21 @@ AUX scite-1.76-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db
 AUX scite-1.76-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
 AUX scite-1.77-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db SHA1 7bd27b950293687a5ed0831dad23a790bbdd2ab9 SHA256 facc981015f07ad44433fc9df6d995e24da753afa89c4bbcaba62ba20e9812f6
 AUX scite-1.77-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
+AUX scite-1.78-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db SHA1 7bd27b950293687a5ed0831dad23a790bbdd2ab9 SHA256 facc981015f07ad44433fc9df6d995e24da753afa89c4bbcaba62ba20e9812f6
+AUX scite-1.78-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
 AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
 DIST scite176.tgz 1497197 RMD160 3e82bb6c425aaeaa9dd932e179e837e1fcce9d71 SHA1 46ef6c7d5f312ed68cac8431eab17efa0e618d5e SHA256 cea1f932cea33e93f018ac6929f1d18edd6cfe8fdcac73b05da4e721987285a0
 DIST scite177.tgz 1520037 RMD160 1aabe4899a2d7b57a397c0fdec961d0fdc05169e SHA1 9e49b13ada9aba10bed9db6ecdf5925f957caac5 SHA256 51b14c1fdff1b88f9361faef5030bc8df24cdc4b23d2d9181303a7708f2eb2af
+DIST scite178.tgz 1568994 RMD160 72cce4382d912fe3c13d9e290470ff2c5443e1be SHA1 4eb7ea958ae3bf48ab9a872481ffbebd46d89ce1 SHA256 e7a99b2111e7156e9568737e31950879f250f8facba94012a6ac5351107022e9
 EBUILD scite-1.76.ebuild 1949 RMD160 d989ef822b994c193b7312537c854ce05e2d6f12 SHA1 5010c7c6123137168f5f37999bb3befab62a0921 SHA256 4d9600f7828eaad3201c4a4845856360e3d5be7a582d113d58ddff0ea82a9efb
 EBUILD scite-1.77.ebuild 1953 RMD160 db439b2f242d16483659c41f02f5e3923deee1ad SHA1 b6d5658c8f35dd80f782b7705a85c4f819435a61 SHA256 ffcc8812ecbcb881c4688f549d793adc8c824a8c93bc459ba3ae7e1d7d3c7e0c
-MISC ChangeLog 12022 RMD160 06666e74d7c8a483784635a0567883038ad20188 SHA1 ce1faeacc6b5e69724c543ed5b81ce04cd9d7382 SHA256 7b14da6c6327ad7c23db310d3fe4b3eaeb5c52d354b4c7058d2a646f097bb608
+EBUILD scite-1.78.ebuild 1953 RMD160 e0ff61e01a60db519663633dfca7baf596db1879 SHA1 1e41ff0322cb5fea6eba2e15af00cb238b0699f4 SHA256 acb48733605c51ffc4cabea14d4948be2b9597596169c0d2261b7a5298ae7473
+MISC ChangeLog 12206 RMD160 0bdcb6d79c77226a4d8583bdbb11622d3db9436c SHA1 4a2442302025ef5645add30b8b35ad5fd754e7f5 SHA256 6de2ff81d0ac7cac54b41a1bb972979179063c8400b7119c225940cd7d0d5496
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmHhNQACgkQgo/w9rxVVVFZIQCfQJtLphoibfJAGiF4Nhzwlow8
-n4YAoJdhYzx1uP3BOlihWUwhmCfU4TbY
-=z0bY
+iEYEARECAAYFAkoN3ooACgkQgo/w9rxVVVEGyQCdFXCpQ7azjHi37REmMH0fGAJ1
+erYAn3EN3VpOmSU+pdJ6ZnU69lBt4BSA
+=g5OZ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/scite-1.78-install.patch b/app-editors/scite/files/scite-1.78-install.patch
new file mode 100644
index 000000000000..52f51e65b676
--- /dev/null
+++ b/app-editors/scite/files/scite-1.78-install.patch
@@ -0,0 +1,20 @@
+--- scite/gtk/makefile.orig	2006-10-09 06:26:55 -0300
++++ scite/gtk/makefile	2006-10-09 06:36:09 -0300
+@@ -123,11 +123,14 @@
+ 
+ ifdef gnomeprefix
+ ifdef GTK2
+-	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
++	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
+ else
+-	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
++	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
+ endif
+-	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++	$(INSTALL) -m 755 -d $(DESTDIR)$(pixmapdir)/
++	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ endif
+ 
+ uninstall:
diff --git a/app-editors/scite/files/scite-1.78-no-lua.patch b/app-editors/scite/files/scite-1.78-no-lua.patch
new file mode 100644
index 000000000000..2511cef0faf9
--- /dev/null
+++ b/app-editors/scite/files/scite-1.78-no-lua.patch
@@ -0,0 +1,15 @@
+--- scite/src/SciTEProps.cxx	2008-04-05 17:23:22.000000000 +0200
++++ scite/src/SciTEProps.cxx	2008-04-05 17:23:41.000000000 +0200
+@@ -1461,10 +1461,12 @@
+ 
+ // return the int value of the command name passed in.
+ int SciTEBase::GetMenuCommandAsInt(SString commandName) {
++#ifndef NO_LUA
+ 	int i = IFaceTable::FindConstant(commandName.c_str());
+ 	if (i != -1) {
+ 		return IFaceTable::constants[i].value;
+ 	}
++#endif
+ 	// Otherwise we might have entered a number as command to access a "SCI_" command
+ 	return commandName.value();
+ }
diff --git a/app-editors/scite/scite-1.78.ebuild b/app-editors/scite/scite-1.78.ebuild
new file mode 100644
index 000000000000..73186794e468
--- /dev/null
+++ b/app-editors/scite/scite-1.78.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.78.ebuild,v 1.1 2009/05/15 21:28:37 nelchael Exp $
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://scintilla.sourceforge.net/SciTE.html"
+SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
+
+LICENSE="Scintilla"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="lua"
+
+RDEPEND=">=x11-libs/gtk+-2
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=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}##' \
+		-e 's#-g root#-g 0#' \
+		|| die "error patching makefile"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${P}-install.patch"
+	epatch "${FILESDIR}/${P}-no-lua.patch"
+}
+
+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
+}