Version bump.

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

3 files changed, 105 insertions, 2 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 6f5f8da269c1..999539573b40 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.93 2010/04/18 17:25:21 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.94 2010/04/21 18:02:15 nelchael Exp $
+
+*scite-2.11 (21 Apr 2010)
+
+  21 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> +scite-2.11.ebuild:
+  Version bump.
 
   18 Apr 2010; <nixnut@gentoo.org> scite-2.03.ebuild:
   ppc stable #312851
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index e45ea2dcf175..2aed0caa66e1 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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-1.79-install.patch 796 RMD160 a83ffdf3e490015ccf1bd238c966a43d21e144db SHA1 7bd27b950293687a5ed0831dad23a790bbdd2ab9 SHA256 facc981015f07ad44433fc9df6d995e24da753afa89c4bbcaba62ba20e9812f6
@@ -8,10 +11,23 @@ DIST scite179.tgz 1719588 RMD160 e36f0e394d1afea007840ea1bb4fc660b0a59f1b SHA1 4
 DIST scite200.tgz 1810957 RMD160 ac58372bb1b12fcd43a6bdae8b017471b9a60cd9 SHA1 00b4f142976c16cc80325ee20ed8c29ca0979f2b SHA256 56be771b4aaf9a0e0b601dea374f12926fc1c2eb1b91ab8783165143c8d7b210
 DIST scite201.tgz 1810998 RMD160 e5ce57df0b834b29f1f3210b0f0e69fb9f327aba SHA1 ffa264a6d22c57f0c2fe47ce2d8efa348558a020 SHA256 32dc19abd1a042e5aa8b07ea83a5ef62ab9e3c3dfba3f962dcdd670ef8ab84c5
 DIST scite203.tgz 1850025 RMD160 47a521b47b3be7d6ba01b3a1872ae77de1795c07 SHA1 d75d7adc3a6536cda95b19e4039bfdc4e6bc0875 SHA256 e81395cbafbc11d5fa3677e4b9da03ac066f740aefe6f7479918a868935bd762
+DIST scite211.tgz 1784014 RMD160 c87dfb891555d0111b020575221f010b9592dff2 SHA1 d01f28b6a983191de6e9b848442c7cc805787a56 SHA256 bf0254e8eadbda1f32214a909b34c35bfb1f38f39551643c0445d92e224e34c8
 EBUILD scite-1.78.ebuild 1983 RMD160 5abe6b21fd1035207563ee7f282b0923b1483013 SHA1 b15081545eefd3ea1c82a99380b1bfb07a1e1818 SHA256 9adc3af24614f256648532b4b272b3e32bbaa63bae7879ea625e5275170de172
 EBUILD scite-1.79.ebuild 1987 RMD160 f57e21771a19853587a25faf8925137ed7977e61 SHA1 0e8aa2782fb0a6e8e6a64a9b7979f80383c78577 SHA256 ccef18df68e50b703d951173de6c1660192e0857c23b9ed5124d9b4c33c7e3f2
 EBUILD scite-2.00.ebuild 1998 RMD160 43ca323a1fb00ef6348504893da03e18c6f8d9de SHA1 89d6cd695596d7bd15da49fcf09cbc4093177f45 SHA256 70be15a81d803ae1eb708a3fdbca2c31da6718855eac04da2f3c7c32312d4972
 EBUILD scite-2.01.ebuild 1999 RMD160 cb8ac10c1d62d5716b00d73eae05d036f351dc14 SHA1 4cc85804d81ff49da5e080fe516bb23da650d353 SHA256 ea37ab97b28e1d5d4539725648108b6cb3fa0cc18e7bae0e3a16c63b74cc5baa
 EBUILD scite-2.03.ebuild 2119 RMD160 d51c5ce621b8c1dee655697575624d28e6621b19 SHA1 6f85fb769372c96f8fde74f3c582490c3793b229 SHA256 319dd5a3fc09d1d4ca7a172dfc19abc5f338d8a88ea97528a6fa3ac6d5c3b0c2
-MISC ChangeLog 13874 RMD160 caa95425fabb1d98b89236d538e93d4b034cb73b SHA1 c890ecbd3112bf9f5d7d6c790e0e8740d76f2ff8 SHA256 3fce6a573bd0eeeb87de3186014bc4a4c96b6e990b6b238e8d1efe7b2fabc5e9
+EBUILD scite-2.11.ebuild 2124 RMD160 4eb246b3db0d4f3ee56d28873a7262cc3441ce2b SHA1 7f8577a1cc3a3760d8d7a0f69a5d44b557f3c9b3 SHA256 bc0999224cbaff91ab8f2b96af0690173deb02d152a1a9f6a8eb7c4ac4d9b827
+MISC ChangeLog 13994 RMD160 72105c06c38af0ba9596e8d6ec0568ed24ce3d81 SHA1 e2a35c44c77eb4a041d3c04f92484afe54dd18fd SHA256 0dbc338e2a1c313728e58ad31f4f4879bdd556ab2414ff47253424e0f6cff742
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQEcBAEBAgAGBQJLzz20AAoJEBZyv1r2qA5GDH0IAIxLwPTGDMb4JLlieMtLk/xx
+R9WqbVEhEY0reFnkeGgRKrnCYiaMGQSeAgk9x0PBRDzHl1XvnUXNrJqpCmWfzhrV
+mT8aIsyR3FrX8klIkBlh8ukp9OMUFuqnCoxyNu9ysxgqZcTVo2fvsZCMcwmfEnNp
+9rH+e0frJ40N1MuWtinoIsxkhNGrAezTpUiB26M4XRlZyiZKFMl2axTeGc84Gls9
+3hQvQeITLlpOJmQJdqQKezUOKs0tLVfJv5lAbtn4ZDoF8v2dQx7Dhm46hM0198az
+AdqG2yooBTuvUN8Jti3kpf0ChG16rlozO+j8vXoHghGs98cfoXmxjecnJUSNdw4=
+=Ck17
+-----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-2.11.ebuild b/app-editors/scite/scite-2.11.ebuild
new file mode 100644
index 000000000000..23dc85bad855
--- /dev/null
+++ b/app-editors/scite/scite-2.11.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.11.ebuild,v 1.1 2010/04/21 18:02:15 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)#" \
+		-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}-1.79-install.patch"
+	epatch "${FILESDIR}/${PN}-1.79-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
+}