Version bump.

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

3 files changed, 100 insertions, 9 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index e5a25a23d3ca..2a284ea7c1c2 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.112 2011/05/07 21:57:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.113 2011/06/06 16:58:11 nelchael Exp $
+
+*scite-2.26 (06 Jun 2011)
+
+  06 Jun 2011; Krzysztof Pawlik <nelchael@gentoo.org> +scite-2.26.ebuild:
+  Version bump.
 
 *scite-2.25 (07 May 2011)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index b02312f40780..e10a24e33224 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -9,19 +9,21 @@ AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81
 DIST scite222.tgz 1816710 RMD160 812b1be76aa2eb24ec5e67a2da64f4cedf450673 SHA1 09b1fc2f693c1934f90287671ba5f0e9b4258620 SHA256 95b904318414c5910a1e1c8c0c631b761563db83cc75cd5a9244da156b592a8e
 DIST scite224.tgz 1829813 RMD160 a11dfc9251d804cd5f699bf1fe15688b65106544 SHA1 4e624655c28481507d44126a3c6dbf5bf9a7a244 SHA256 b2de71d4e9d36465e410dd41186ab86d287be5a00e3d06037cb40bb4510f7360
 DIST scite225.tgz 1843570 RMD160 3b86042411f2272fa87428883386e5a7e5d86653 SHA1 6b33f254cc4760fdd861223573524e270b735a0b SHA256 e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f
+DIST scite226.tgz 1882394 RMD160 e55abe75f34234899738cab0d1da03aea2ca267c SHA1 ebb4e4cc1d663f97bfd31dd3554764bb108e2cff SHA256 41587ed05295f72600967e3b8668f47a8d529d6e4e8be5980070ebfd13ef83f3
 EBUILD scite-2.22.ebuild 2120 RMD160 cbeb79174f05884f076b0f1c8497d94b9f646ea1 SHA1 f56d1c304bd1bee1bff6ff62c226c82c7347b444 SHA256 fac8851a5577a3211f0b9b1d5b2f3a01959380c18ab25b89c2c799dbd3d3d4e7
 EBUILD scite-2.24.ebuild 2124 RMD160 1a36746da8835987090789eb51991fddac96d4be SHA1 41ae7c7f870c9f21df44af1533690afdf4237dd7 SHA256 f53bafc581689752322a4da6961d18dcba9ea6287a46308b767b2b6d8aac9805
 EBUILD scite-2.25.ebuild 2124 RMD160 8c3c8931715af7d85e2ba141ac25f64178c58bca SHA1 58122b3aca4d1fab5ecc5c51959b6e8c100e577c SHA256 7609c2fd2969a6073fa99d4349ea8458fb3cb2fa4a016db7a760d1a988a0aff1
-MISC ChangeLog 16249 RMD160 0a3903937efa79a7f058017aad159502b19aa9f7 SHA1 3f94a6bbd25baa4169529d2fed6e93c9cf14bd09 SHA256 8d1c3fbbcdb4f906f61af2ec9b1758f3e70111d58c1eb992f8f95292e4b541e4
+EBUILD scite-2.26.ebuild 2173 RMD160 50cae7c66556122cb9434bc7113c342b3a30a10f SHA1 89fc17c6dd75511b7359779bd88d90a874c7539c SHA256 334f8b8c528c21dcaaffc043471d73ee05bba0765f91435d7cfe292936475133
+MISC ChangeLog 16367 RMD160 330e380df9c8d4d42bab44b51d6d62f3a40f4a2b SHA1 483773fc1ec3844d980be5430851b0434644d991 SHA256 0be63dad0dfdd2fb3d0a9265fde51ebfeb383121ac2eab275cb7dacb02f45c89
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJNxcBjAAoJEBZyv1r2qA5G+RcIAIL5vDdl7wh2dlSrO+AHDEx6
-HWiBa47zsH0bG8RycMZZZSsEHLa/n7kMVoQBHN6Q9eZnSkTcZ/UJGKpdkXHwcALC
-eiLz6DpDzpp1JJSLbXOb0OpN3T2km2w8B3yn0FrXrDU/KBFpTU+cPKkomgjvI1Cg
-tW4NQREdoOuvkMBC3BeCr08SDRtIQljIY9KsMLH4Ky6058OkBgJwPVbm+5OuJEET
-xxSEDJrERAtsoCiek0srTwsscNH/1NJKuzB5xoCA29tUztWwQXisaiPXmdpaABu/
-bG1GyfJPwy2WhMjrG+eWU0eAEvoMcOlJEU6jA6z/FrW96lhhiLhKIFpYe7iR88M=
-=pYts
+iQEcBAEBCgAGBQJN7QcpAAoJEBZyv1r2qA5Gd8UIAJhKCQmgm++DZfW/28ieaoHO
+Ql3NHqo6f0Cr8TK6xYQtq6sUScmbY6x8WFRtDxMZuUOAkySZlzx9WZ1FnBtDBFC+
+EKkMi6sjmFZm2YXs+zeYWFByYIFR8KpzsEuXiWwt9Ln2+oyIKG0LCngyxuzk92Ot
+qdfRteSVReIU2q8X9myrdNtH5F+BHOGX20vPV5jLmgqRBVSYigRMXab+jONTg6B2
+0iDNQjtphAC5atIaSFQCTI8bRqGWjcwk4OraQahlkOEQiFLIdXn0cHQxOTTaPNfa
+kr7DiGP4U+kOyKbLYOpamsPIDkoz1FWP858bfxTCNVTDmPLsGiE7DkAtrmuW1jg=
+=1u9V
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-2.26.ebuild b/app-editors/scite/scite-2.26.ebuild
new file mode 100644
index 000000000000..fbf96cb78061
--- /dev/null
+++ b/app-editors/scite/scite-2.26.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-2.26.ebuild,v 1.1 2011/06/06 16:58:11 nelchael Exp $
+
+EAPI="1"
+
+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 || die
+	dodir /usr/share/{pixmaps,applications} || die
+
+	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" || die
+	dosym /usr/bin/scite /usr/bin/SciTE || die
+
+	# replace .desktop file with our own working version
+	rm -f "${D}/usr/share/applications/SciTE.desktop"
+	insinto /usr/share/applications
+	doins "${FILESDIR}/scite.desktop" || die
+
+	doman ../doc/scite.1 || die
+	dodoc ../README || die
+}