Version bump.

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

5 files changed, 133 insertions, 9 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 14f76182a0fb..0bdd2bf65127 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.96 2010/05/19 18:31:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.97 2010/06/23 19:14:16 nelchael Exp $
+
+*scite-2.12 (23 Jun 2010)
+
+  23 Jun 2010; Krzysztof Pawlik <nelchael@gentoo.org> +scite-2.12.ebuild,
+  +files/scite-2.12-install.patch, +files/scite-2.12-no-lua.patch:
+  Version bump.
 
   19 May 2010; Krzysztof Pawlik <nelchael@gentoo.org> -scite-1.78.ebuild,
   -files/scite-1.78-install.patch, -files/scite-1.78-no-lua.patch,
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 78e8197c4ca5..61af3cfa02fc 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -3,21 +3,25 @@ Hash: SHA1
 
 AUX scite-1.79-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db SHA1 7bd27b950293687a5ed0831dad23a790bbdd2ab9 SHA256 facc981015f07ad44433fc9df6d995e24da753afa89c4bbcaba62ba20e9812f6
 AUX scite-1.79-no-lua.patch 532 RMD160 333dce2ef1f121dcd59da05b9bf101e495c2a7ad SHA1 d2f2eb289591fd4f748de25e454ff5d4e8c74f1f SHA256 3214bd9468ca2adb550f8e135b88da3c42ed3b2c22519ea8590d32bd7055416e
+AUX scite-2.12-install.patch 664 RMD160 d44e1b0eec27a83920cb6218c3b9f887f02d9673 SHA1 23da4c0bcee4d7435db86bb8696441d95a9e857f SHA256 f9739808e1241f7ed3957ae10cb6dfcad623267142de52b75d8426ee0b0e65c4
+AUX scite-2.12-no-lua.patch 628 RMD160 114f97ae9f4a2c43591f75f2d877b054291eff85 SHA1 f6f947c015f3bde670d93cfdaea867806690573e SHA256 1e541670b13d67f0e8d5d906415c392178d86dc44dfb1c349d855cd7b75e6fc8
 AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
 DIST scite203.tgz 1850025 RMD160 47a521b47b3be7d6ba01b3a1872ae77de1795c07 SHA1 d75d7adc3a6536cda95b19e4039bfdc4e6bc0875 SHA256 e81395cbafbc11d5fa3677e4b9da03ac066f740aefe6f7479918a868935bd762
 DIST scite211.tgz 1784014 RMD160 c87dfb891555d0111b020575221f010b9592dff2 SHA1 d01f28b6a983191de6e9b848442c7cc805787a56 SHA256 bf0254e8eadbda1f32214a909b34c35bfb1f38f39551643c0445d92e224e34c8
+DIST scite212.tgz 1930331 RMD160 1ae5fe53d71d57f3e37b6f786b55d858060642f3 SHA1 33cc698940626678133c929e4878a753e222a78b SHA256 e1da8da68a75237b6c0d25533c92192564fc9a0df4f1f44665f241991d49963b
 EBUILD scite-2.03.ebuild 2119 RMD160 07582fa5e4439fdaa6ee5e57c825c7ae8a3bd889 SHA1 7d254e4fc4a8bf88ac754dc432e2759a518f338a SHA256 da8e2e3e09d5772601ddf42f9ab0de8a89cc6b9abd5569863f660558bc03c2c6
 EBUILD scite-2.11.ebuild 2124 RMD160 4eb246b3db0d4f3ee56d28873a7262cc3441ce2b SHA1 7f8577a1cc3a3760d8d7a0f69a5d44b557f3c9b3 SHA256 bc0999224cbaff91ab8f2b96af0690173deb02d152a1a9f6a8eb7c4ac4d9b827
-MISC ChangeLog 14317 RMD160 730f56b144f9c3f6141a142105ba0fdfdee85525 SHA1 41cc1d8417578d18ec25fd261fbd0292b496ceef SHA256 8ffcedcc929d50312b6810b7743905eed5afd268a3d4488c1b39db45bccbad61
+EBUILD scite-2.12.ebuild 2116 RMD160 bd54b9ecd92d0e4950deef8ebb930746c029765a SHA1 bf09d7cd42b05e85a90529ed2b6ae631b2f12f89 SHA256 923b57c352ff4a066e76f000308b9a48dac4a65b9903d8cb451d090173424610
+MISC ChangeLog 14502 RMD160 7cc9e4ebee4924c30e0f398dab0ca4ad864547d7 SHA1 22146e58c67c0f14e09199169bfee1c8b206a477 SHA256 e594d15c01cc36d9a6c4832199ceed91332e74b440800648726883a481632596
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBAgAGBQJL9C6mAAoJEBZyv1r2qA5GQQAH/j+0tqL7wPCkEHqu1gnoD1Yp
-q0ciAN3/O4+Zkp1iQPAZ6rq8HBJ60C+D/sdGPOIEEFaBLPo6KK0xIXyA4A00x5v+
-LOh/HSLZ/TsmiKrK+9FI99biEkTWk+0iWiizKrKuF7SP7TEujKw2aJfOl8nWvsEK
-LXr1bsghaxcbeURGpo0fLCYTmEmEdfRHk8ljZ2gSG6g4rY/2xHCyqaccC8FeGC0o
-TdvTI8WQjJATSGP3dIWnYR4l3r36HQoCnjaNZPtTMEBFbsZW1MJE5veu8LhKgjLg
-3oVHNYOPKKK/G+0uZeIjiFpuxv7Y6ARuBBenkRRlPWYzNY+MXuwPT01A+auROco=
-=CB3C
+iQEcBAEBAgAGBQJMIl0UAAoJEBZyv1r2qA5Gi5kH/jpL4w6rOkr3Abn6eHtx5Ys1
+jqp/AUKaX52Cwr7/o+AVaxB7dM9qIN8NOZqzutzcS3NbdyF05fQgxyh4RldURd7p
+zHXi7eL+cwx16705QVOM2LcQd7EPpbW5YFz/tvF83Qcrh+07UOH/qLSNlEB5djG6
+Q4RzyGnMDv4vZFom5QYTLorr6X1RFT5M29bjN8She48Q4rGBmQat4m18yqXHG9pX
+UdK3zRx1AQag8sH2M5XIuupQcgd+9EL4M+s1jg+JwGujiYJKfItiSsP8ikE+a0j/
+0AXDs9lf2hsJsb/2SwgP37QBQF1jAJp3y83SKAGAvVasexv7WfLB96PQ+FgnGzs=
+=4l8R
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/files/scite-2.12-install.patch b/app-editors/scite/files/scite-2.12-install.patch
new file mode 100644
index 000000000000..ccce6fe145f1
--- /dev/null
+++ b/app-editors/scite/files/scite-2.12-install.patch
@@ -0,0 +1,16 @@
+diff -Nru vanilla//scite/gtk/makefile patched//scite/gtk/makefile
+--- vanilla//scite/gtk/makefile	2010-06-23 18:04:42.631333431 +0100
++++ patched//scite/gtk/makefile	2010-06-23 18:06:11.150336242 +0100
+@@ -107,8 +107,10 @@
+ 	done
+ 
+ ifdef gnomeprefix
+-	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+-	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
++	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
++	$(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-2.12-no-lua.patch b/app-editors/scite/files/scite-2.12-no-lua.patch
new file mode 100644
index 000000000000..106c2453aa44
--- /dev/null
+++ b/app-editors/scite/files/scite-2.12-no-lua.patch
@@ -0,0 +1,16 @@
+diff -Nru vanilla//scite/src/SciTEProps.cxx patched//scite/src/SciTEProps.cxx
+--- vanilla//scite/src/SciTEProps.cxx	2010-06-23 18:04:42.639336085 +0100
++++ patched//scite/src/SciTEProps.cxx	2010-06-23 18:07:00.606351119 +0100
+@@ -1532,10 +1532,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-2.12.ebuild b/app-editors/scite/scite-2.12.ebuild
new file mode 100644
index 000000000000..c0e13d18cc3f
--- /dev/null
+++ b/app-editors/scite/scite-2.12.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.12.ebuild,v 1.1 2010/06/23 19:14:16 nelchael Exp $
+
+inherit toolchain-funcs eutils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful editor for programmers"
+HOMEPAGE="http://www.scintilla.org/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)#" \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+
+	cd "${WORKDIR}/scite/gtk"
+	sed -i makefile \
+		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+		|| 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#' \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-2.12-install.patch"
+	epatch "${FILESDIR}/${PN}-2.12-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
+}