Version bump to 3.3.6, wrt bug #488944

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

3 files changed, 110 insertions, 16 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index b8b2a437d368..04913fed50a3 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.164 2013/10/05 10:36:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.165 2013/10/25 12:55:30 ago Exp $
+
+*scite-3.3.6 (25 Oct 2013)
+
+  25 Oct 2013; Agostino Sarubbo <ago@gentoo.org> +scite-3.3.6.ebuild:
+  Version bump to 3.3.6, wrt bug #488944
 
 *scite-3.3.5 (05 Oct 2013)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index c47c4a6eb192..bd4db8907bf2 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -6,25 +6,27 @@ AUX scite.desktop 138 SHA256 f91b1e14fdb6f78901001ece140eaf1dc60efe6fc0364f6f145
 DIST scite333.tgz 1992362 SHA256 ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 SHA512 d1bfcf9b83ccd5423c47169f33880b25736931a9a42e543cccd1101fd915ea3b14a51aa74c0879d908f4bb69852059c89f6fdb621731ec43afb6b96b564a7ac3 WHIRLPOOL 390d9d157d8f802ea05db41668115e61cbdb0f47ee81daa85fbbba87d322b527cc33f20af3381db72ce4d9d1eefc7e54188f15397ec5404347ef0a3b45780c8e
 DIST scite334.tgz 2017827 SHA256 47107d9f063a0f1928add39c8b82d2d1745228bfd25c313f98f19dbabf75c04b SHA512 a4b67607e9f883e13409c1b96dcf250f4836cd97106f6d73ac07d41ace09473ef78687c82463661229d917a327140b5e1f4f43eb5d8cdb2b3ff94316deb95019 WHIRLPOOL 366348d777262a3cc770846411433bb9418841f5edc3caf19b307eaee54f7d18aeab5dedcb234f087bd360ecd68f55156fc59408548f8ae25ecaf8c18171ece8
 DIST scite335.tgz 2099170 SHA256 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 SHA512 a8a976e58e8190d46162a6ef0834403702460c703bc5904fff95610a40014ed024307d6c0ae727e9bb71868fc4ef339878595e879fcfdec4076ea4e656d6b584 WHIRLPOOL fdd89b02fed78feb50e3ae885a8b918541d949625cee88318db7c066f3ad8f288ee8ae87c627d9eed8217a4a5628acd2ddd56b5421a2ac3b848999a148bae4bd
+DIST scite336.tgz 2125559 SHA256 9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5 SHA512 da4869fee62e606d44579ffba736b2944c8425e741b6499776aa258275ab5a0def28e0672a7d36da083a39f6acff464158af1e13d197a769c53d90ac5c016312 WHIRLPOOL 3172ba4916c7071d9d83337d779275c5d413450b91a13c6d081c757e504e8e9ff7fe0d3887ae20245c9669404ef9bc19eb0e659cd5f6fb464ce0e2e10a299be8
 EBUILD scite-3.3.3.ebuild 2192 SHA256 c7db3746a1efb2e8fada4d8e80feaa08b147b99a688e7fc38a7a8601435d0e12 SHA512 3ac9b3eed859b5e43d0af7055780d6044f1273e5a8dff554d499872b4dc5107a6fe37f2a42e7eee74d5f0a39c2a84cbbcbb4533378ff0a0ed7c43d21b45b9ddc WHIRLPOOL 2639d876e1c0c616b635980b47ea07e3ba5e4e05d3e205075542843fd1ce87536239fdbc145b342d547fb3de444a0c79202c9f70b2b2bfad0a12b3f6474bb39f
 EBUILD scite-3.3.4.ebuild 2195 SHA256 08c181b1ccf93471a98d0df5fad5fb9e176949e66f9cf6c8ff92af828c89c7b3 SHA512 da1853b28b8b45aa05c3b6f6b90c9a41189412d0d68bac011b9bfa8427c6651e52f7c034d4c85cb7cea1000af0934f0d93d68c6ef551b5d8acb7c788e90af3b7 WHIRLPOOL b62f46f14296a9607a6d3f847d900a585e43ed8212c97ef3e1005ecdf147fb6e8b225fba3ce2241d6a7d6199f323817ae0f4a2fc4c99d6e6b34b31261fb1bb90
 EBUILD scite-3.3.5.ebuild 2195 SHA256 293bf9bceecfe7a7507577a50c8db5bf67b7a5cb63aee8f0b8f8e2650c3abfed SHA512 74b5819f4ec92c62f97507e038844642cd5026bda0dfb42ba61e99a72b3c36195ccf55c0b91631d91456a227810c40a3c3e9260e4272ee424cfc7e7bd3349552 WHIRLPOOL af12d6d3c723bcc67a86723832a0b7318c0aac10fcd50739be869cca895c3f0e870789be511cfd383a60890f3a055cab665a4d52d08d6281c163fd9c035fffac
-MISC ChangeLog 22860 SHA256 2c214dd883a192868930bc58777dd9cd8ebd129f84fea7c762971cae90b24baa SHA512 c89a85a896817ed45ff429c06e84ba1e011bb82109a22e7e0fb5e6d389bbe4cdeb2f96b6001528adbfefdecfdbe0a6eae65f6a604c71a709a6e5d8e0af7a166e WHIRLPOOL fed1f203ab9a2da8e21f9dcfe02af7a3ac08a11a3486a2a324f484fdf98703e9a0718003ec8da02c37c2699c8cac8c195106667ec281fb9a0568a33015f5502e
+EBUILD scite-3.3.6.ebuild 2195 SHA256 5cf857455a0aa4e30b4c7882aeb638a600a3510a5234ef3089680d2963f06c3d SHA512 69aaaa4c34ed7761127552940ebd767fe0b3b04125371965b49bbc81e0c874f58ecaa62a2e4b5b329fc5606f879db3ad7c0c3866df407cd46b1eb6c2774dbb42 WHIRLPOOL 8a0aecd7679f2c61ba313c6c7c42a22bb3242d61a3ad57c5129b48a81ab8b9369198b5913251e6b6dd00ae8d6c9256cce7307f3e15870a1f1a0188cfa8c70d1c
+MISC ChangeLog 23000 SHA256 afd1c08bebe89618e4635fa1bbbba78d58bbc1e756579e59c7c16d43044989a7 SHA512 c45215ea83af6b6d6afcba5fd186254ef83244d840ba27726c061196d5a5234a561052a8eb79404b6c6bb82d49f582ebcbd297ce9e96423baa37786ba685ba34 WHIRLPOOL 5b68dae518d7c65aa05ea6b38db6e33355195cbbd01da2867fe150826389f9bd6ec1931ad5d0861d241d2cc0975bcbabdaa181c4c1cfe6146444322a79d15b02
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJST+uEAAoJELp701BxlEWf1NUQAJXlw+W+Ivg/nfSaFoKVk+Zd
-WuHiYYa8cjh38LD4Fkr5DsIEkEwscTTDWGomWFM1zfpxYzeP5LQITYtJ6YeErPgz
-aW/w6JYtjpA/eIk6q+xkzT1wA0v0hGwdlJya6+Eh1oWdyTV3TBKHTDv0RYLdMFPA
-6qoZ0RLsvyexzHxaSLlpPlFf8LOa+bba/JwQrqvPsuIv2miouPBVDbEHIrpXPmsU
-7ClXsnZuANZYPox3UOgK4tnxk3c21+7cQd9TzAdaTDJLSFyln6HEqZDtNla/VExZ
-lhT+jCHSSuiqAwFyvpiKzb7SizheDzo0qTVopaOy9U/SSAUY/CPEcAbEUZIOTjgq
-RyFlsd2l3rZlEOFkr1eAqV2IDfHjroetWHLcwka76/G1uZ7x4DB3SmUNlJeA8WGX
-yjc6+hJrm7hpAvnF+BA3PDDRWDPaWCZWj8jeSmiLvy5uee+4sa4EWE4D7npqWJ86
-CVb/BLIpWZxP75/BGa+x4tbsje1cH42nXTrHyf751mox1Gd6IDDmQD/w2+0pNnXo
-Yb/c8CatN1KAmb0MQ/cpe8eft8KFKx7Ew1FQQblugb+JtH+CXHR8Z5juHqJnVnS/
-fb0V6sgpwQbesppRFbTnJGJ2DMZRRGy+h4SXukP34yrNHvdQNVqchdUDJk6HN8RA
-wQM69OmWFRWR9PlZG1ra
-=qFQN
+iQIcBAEBCgAGBQJSampCAAoJELp701BxlEWftNoP/iCdg31770Apaz6SLYO0gCiz
+RWilZMTnoiA+iUqzJKUKIAnkS/Vz7Bz7NUbQH7mkthQnGL4+vte8k8+l18UCm+YK
+PZiaGcsFG8lMWerf4+HK0Nx5jiTgUyn9702W4sms835QCJ3EVyMfz2+2QHcX8zCD
+gNPPER99b64HjsRfc3eI3iO3Is760zONAs4lisdBOkM9B6ExIDBP6fcJsXtkPhqu
+Zq8zfWpognJbpk4vrzNuOXXPHuRQxjnxCebfSrB12ME1g1YIT5Kdy8WMovh9Kr68
+UPJxjTCJujMPVjjryva7g7gwmftIlGjgfudGJQ8sWPcVLnHHr+pgKke4U3h8zugd
+risjOnH8jdlV4Sc/Tzjfbv8+SJ0y0tqq80dfLglI3A/adV+TV8smf0+FpR0m6vRq
+kOtuMTnPkfy0kwFLwwBAsx6dG672Mudj4GRQ0+GPaxqpsiK/ScZe3DL62mac7suc
+Iy+7TEGvZQBSpPTS14c+t86IkO89BKt0bFf+pqgyJukIkDmDAcDe2wsRd03YbmBt
+NSkRtEOsbKK/pHcF4CusQS5l+Tsdrguj77qlqAxraVbA9aMHxjJAHHMSwf6JYMjb
+LJmeCsAD+rQVBmxXN37iR17ilrpV6mlxqFBGBCyBazCzO19oaMnUxXwoMA/r531H
+1aljQ7Um0lI7XB9h0Fg/
+=qrwd
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.3.6.ebuild b/app-editors/scite/scite-3.3.6.ebuild
new file mode 100644
index 000000000000..fa03298e8353
--- /dev/null
+++ b/app-editors/scite/scite-3.3.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.6.ebuild,v 1.1 2013/10/25 12:55:30 ago Exp $
+
+EAPI="4"
+
+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="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${PN}/gtk"
+
+src_prepare() {
+	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#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+		-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#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
+		-e 's#${D}##' \
+		-e 's#-g root#-g 0#' \
+		-e "s#-Os##" \
+		|| die "error patching makefile"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-3.0.1-no-lua.patch"
+}
+
+src_compile() {
+	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
+	if use lua; then
+		emake
+	else
+		emake NO_LUA=1
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/{pixmaps,applications}
+
+	emake prefix="${ED}/usr" install
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
+	dosym /usr/bin/scite /usr/bin/SciTE
+
+	# replace .desktop file with our own working version
+	rm -f "${ED}/usr/share/applications/SciTE.desktop"
+	domenu "${FILESDIR}/scite.desktop"
+
+	doman ../doc/scite.1
+	dodoc ../README
+}