Version bump.

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

3 files changed, 105 insertions, 2 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 1acea98101fd..9723685e2ad8 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # 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.101 2010/09/18 18:23:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.102 2010/10/08 12:36:58 nelchael Exp $
+
+*scite-2.21 (08 Oct 2010)
+
+  08 Oct 2010; Krzysztof Pawlik <nelchael@gentoo.org> +scite-2.21.ebuild:
+  Version bump.
 
   18 Sep 2010; Raúl Porcel <armin76@gentoo.org> scite-2.12.ebuild:
   sparc stable wrt #333447
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 1490b3b9566e..d0df0b8538f6 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
@@ -7,9 +10,22 @@ DIST scite203.tgz 1850025 RMD160 47a521b47b3be7d6ba01b3a1872ae77de1795c07 SHA1 d
 DIST scite211.tgz 1784014 RMD160 c87dfb891555d0111b020575221f010b9592dff2 SHA1 d01f28b6a983191de6e9b848442c7cc805787a56 SHA256 bf0254e8eadbda1f32214a909b34c35bfb1f38f39551643c0445d92e224e34c8
 DIST scite212.tgz 1930331 RMD160 1ae5fe53d71d57f3e37b6f786b55d858060642f3 SHA1 33cc698940626678133c929e4878a753e222a78b SHA256 e1da8da68a75237b6c0d25533c92192564fc9a0df4f1f44665f241991d49963b
 DIST scite220.tgz 1946185 RMD160 ad25f2d72cddb47da49cb0e1ebefc4026b109b1d SHA1 ce3fbad9b5fa5c53787c6388eca17806a1cb65e2 SHA256 9e598a7d14445a23d6ba7148e421188879dc5836f76c63878a75083f4b94c8e4
+DIST scite221.tgz 1920326 RMD160 962934931f4b5e8212a1344b6cb9494e0c68d60c SHA1 580887b308e0b84c6f709affa972572edaa5761f SHA256 ba86521be3eab1cb55572d5b717e4717a3eec56ef8d9d62c0dcdded239e9cfa7
 EBUILD scite-2.03.ebuild 2119 RMD160 07582fa5e4439fdaa6ee5e57c825c7ae8a3bd889 SHA1 7d254e4fc4a8bf88ac754dc432e2759a518f338a SHA256 da8e2e3e09d5772601ddf42f9ab0de8a89cc6b9abd5569863f660558bc03c2c6
 EBUILD scite-2.11.ebuild 2124 RMD160 4eb246b3db0d4f3ee56d28873a7262cc3441ce2b SHA1 7f8577a1cc3a3760d8d7a0f69a5d44b557f3c9b3 SHA256 bc0999224cbaff91ab8f2b96af0690173deb02d152a1a9f6a8eb7c4ac4d9b827
 EBUILD scite-2.12.ebuild 2112 RMD160 eee1ea285d9ed1567635aaadf84ef9d57b354ef9 SHA1 97a74f68d1ca1585084ba3c8aa2d2255423ecdca SHA256 a463278d7e5cc3726c478bb146e52edb130eb80ef50a37f6df30c1f7e512cfd6
 EBUILD scite-2.20.ebuild 2116 RMD160 23694ef2e89bf813e8373ef84555dbac605c4101 SHA1 481af78cb5d613a4d1e7460fd7bbb7df55fd9d4f SHA256 a958849a653b7cda57603aa0aaf6b1637cfa0994f080a34ca33a6d810cc23af5
-MISC ChangeLog 14927 RMD160 90ec8b63cf1976f821d6a7697a41f55ff0ddd0ed SHA1 492f3d210493e093291bec6748103ac21e5668a6 SHA256 42d296ca71ef10ec51ed69a1bb01d7f427bf17fb62069e092723d51586eeef3e
+EBUILD scite-2.21.ebuild 2116 RMD160 73f137939d432d357867061becd74a5d9e5419e7 SHA1 4e65959ef3fd8242adb860354b5126bf9032df35 SHA256 5422d692364062ff890ccc9fd81ba89cf4cbf0f57d255c6ebc2c09040aec7da7
+MISC ChangeLog 15046 RMD160 a6e620a7b5ba23ef107a89a3ea1daa216006be7d SHA1 dfff0cfa20b7531fb00d2233933fbf7f91a41c81 SHA256 02f5a9a601d215f26c5facb1586a39174ec7df93dc34efd078bc4a62c4317123
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMrxBxAAoJEBZyv1r2qA5GxasIAJLChv4Yrm9R8giAxx8WrlYU
+Q1yTk+/OH8IAXVr9HiuGV4A4+0DcagbHBPRceGja5BQJ+zHZapcRBlSwTam/oxKB
+TpgrvP2bJKr2mtUJZnsX4ULNf64dW5J8PraXxmWizj5OBIRNJaVn9KQxnaa1WMhn
+Guo3U1GoWtr8lwGkDQcygj+xzdKwOybuAnTK2rSFLI99tBaFqtx8y2Ux01EwVom3
+qslR9x1Q8jMX1c60Wsz68NPiFngfDDL+8VNuiZ20gmYFwfJnkZHebC5walCVbx4N
+Uttj5jnmIlmcrMmNxOXiMmgHbbOO+EBR1n6jzOe6qi/FSvM0Y9QoP9XZea7f8gM=
+=awTM
+-----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-2.21.ebuild b/app-editors/scite/scite-2.21.ebuild
new file mode 100644
index 000000000000..a9c128808f37
--- /dev/null
+++ b/app-editors/scite/scite-2.21.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.21.ebuild,v 1.1 2010/10/08 12:36:58 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
+}