version bump to 3.5.2 wrt bug #531966

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

3 files changed, 109 insertions, 15 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index fd822098af92..9574ae3d90be 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.175 2014/10/18 14:19:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.176 2014/12/08 11:55:02 ago Exp $
+
+*scite-3.5.2 (08 Dec 2014)
+
+  08 Dec 2014; Agostino Sarubbo <ago@gentoo.org> +scite-3.5.2.ebuild:
+  version bump to 3.5.2 wrt bug #531966
 
   18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> scite-3.5.0.ebuild:
   Stable for ppc, wrt bug #523638
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index b4e0cc3a8af9..41372a48532e 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -7,26 +7,28 @@ DIST scite335.tgz 2099170 SHA256 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c
 DIST scite339.tgz 2229269 SHA256 cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775 SHA512 f64c044c62123c57f18de2e5e27733827118a442818ffc071d44f5a0cf191e7192c73c3cb3d872678b8fb2f1ed03f7f391d02583c2bb79b0cb6ebf0e2efa5824 WHIRLPOOL 30fc86dd1b6db97b83981adaf29c0e008fb84091891fd0b88d79456e1ff3753c5fe28d075561b08ebf3f306081cbeda6832065c48c934e71ff1cea26efc10bca
 DIST scite341.tgz 2237159 SHA256 ab2940ba6ad3f1c7c33aea233dd5b44efc75319062fe0b3625db04c747bf3341 SHA512 66f19d2654f7ad40e8d237a05e7c393aafa3faf79d0125b6c7acadf4f701ef0ba2db31380c4c72640afc8cf2436f24cf17172d5f10fa552817fb3eff9c616aff WHIRLPOOL 90e2fc7da519dee62a3016ab9b5721406fd9fdee5d360b122d336eb560d87fae3e6464fdb2af498c9aa92661c37ad3acaab26955d716df203cfb541c3e15fc02
 DIST scite350.tgz 2265217 SHA256 bf7260a7538a642ad008db067ddf5f1752c3326059a5a7ae4885f08431f1d0b5 SHA512 96ce19112707f6150751ab09e6c2fbb9822573d025c0f49062c6b95d1ab4b218123500fc4a1a8a175729afd9444a9ebf36892007ad4cd7a3bd55239e50a21b70 WHIRLPOOL a3d41e16e27ca69bec4b13656ab3f74358e8e77a1359c9fd104af4547359e8c29af9820290833b679931d115a09342473113af584a2af57258a757e2622aff32
+DIST scite352.tgz 2277393 SHA256 d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836 SHA512 01bf36dbb4d02f3693a759f778110b913dfbb733d0a5d006c5de78cb627c3511e821b62fa0a410174c09917a09d41d9a94535a14b7a4c77801eafaace15a586d WHIRLPOOL ee39f57944ef60182a3ac8a409cfd4829cfdee85a7b9b91b2722bd3d9d8b2a6f480cd8db1281826f4a9543575ae99dfc66cfe905592a2acae9ad7728d5862695
 EBUILD scite-3.3.5.ebuild 2192 SHA256 65fc76c48da48e065cc108349f65b439f71af7e2d560e16d7a781e6201a9a4e0 SHA512 af69f1f376e04e64cdd23a3d000a64d39702986ce75eb450681818397710a601a242ee3a288ac2cf3574cfbee57d389c9b5c05048b29924d83c3eeeb559ecc4d WHIRLPOOL 1df65a4881e66bb171b6782274986fe59bfa8013b58d5c2bb9377c4922ef75711af222e3246b6557c47e35ef251d6093fb718e8ffc36e9ef52d34bd4953348d9
 EBUILD scite-3.3.9.ebuild 2195 SHA256 6860eb220a6a6030dfb9b628424d009f9dd5cdee23a75c3ca8c3f2d6b0c3fd02 SHA512 e34be14d4c746ec06bfa47a05de7ab079bfdaab4f6d4f39dadc4887cdeec070e6bc2e79dc4f32f6eb7f3ce7cd62696de6d575e688646c42ea2b2b8adb109f3c1 WHIRLPOOL 057457da068c7d12228e56dc52bbdae557d8b07cd949f57626f6ab4dac5e3dfafc190c797515a0b26f69c84cd41c69cf1fc950a2f910397602619d96de15f53d
 EBUILD scite-3.4.1.ebuild 2197 SHA256 abb69c880f0b3f277afec7534f6ca403061a845a00cff233056c91b1329858c4 SHA512 66254ef76ea1914ac2314b2456b2540d5d4e8decb551603638be5ae764af9c886cfb3b36b98199ce6ffc21a186b935afca21c448185b2961eb8b68ee2d8cf925 WHIRLPOOL e47f8da6586fd43d6172946317a69b1e7edc63c50e896349c99f068b04e1241d94a913ec3f3f59143636873da70ac8cd97b1d88c75277b98f5bac04f057a3266
 EBUILD scite-3.5.0.ebuild 2199 SHA256 9ac6fa73efd18fbc4fefc54b42e11821dfc4969f332914af5b3e81ded1ae12d4 SHA512 1e879cd6b67c29a0d9e281abde728278e18a0af2dacf046379a07b26f00ea3c355b3c782207d8ab91c129db7843d93f67ea8b283465f3389b72ab448bf27842a WHIRLPOOL e891d4ba0c239fd375c8132037b097828041e3c740796b7fb6f2033a3ef4eb958e765cf4009e978445244d80a419a6608aeeed15125d56e678409f3fdfab0134
-MISC ChangeLog 24290 SHA256 6ebee43e0dc249b29a1934d56b7724aecef45fcd4768f00ba9e5b9a2296d9978 SHA512 d50af3538cc6f3ca703ccf62d67c99451dc4dfef8fe187a896d698abd8f40509d8584e10f4250f5b6cf0e239fef350c860a64afd82abe964aea668f0eea7140a WHIRLPOOL dba10bf5ce4c0de962e9fc6af2188781db7922986f47824266346dc2289d86ff5d319b66833e4d73e6208a934bf678c2f9b4c6f44c2c263d3972b3b456962272
+EBUILD scite-3.5.2.ebuild 2202 SHA256 3685b1640668943184ea11926359b77997756620de67abb71f7a445e3fbf5453 SHA512 e6ec72bee069315de46e2cfcd9543554689ff9a54aeccf770a97708af9ec5e579f998fe8af36ad57997eb18edd25e7aaa38d0d41f4e5672b638c2363674daf54 WHIRLPOOL df6686727c32f9f50182bfaef059cb338953a5934e5a1b406dd53e6ba92a039e5c31093ac1c92930b842cc286102fd5a4aafeeca86da788df9586a6e2e9e27ce
+MISC ChangeLog 24429 SHA256 2607487883fadd77589204ac0cb7d52098d046b9115c3935818ac143290228cc SHA512 d82649cd76a184d84b4abe157d5da3f2d31296861bfc9d51390bcd2fdfa91744083340117f4526448533d8d4a31e5792234bd8b4a7d47cfa72d42343cd38d5b0 WHIRLPOOL d6c283403701dc450061a23670c6d8fb844d7336abe8cc4855cae7cdb4f1866cf676f97e94c0b93a300f8d92ebee29a86b72a8a6df6ce09372ed195b5407e0b6
 MISC metadata.xml 329 SHA256 f632088d3836f99589a97e8775549daa47daa4457514361e0d0db8582cdb9412 SHA512 93ec545888e84209f8d979147c7e29426e99f1302939cf3546196e088a2c462331dca395cf885de10c0058eded6d6d84ef51526b089f54196191c44209bf2b89 WHIRLPOOL 95c5217189606f2d719b98232f6e73894eb14528b7379148b4d3cf6868164ceefdfffe946353778367e75020fc8ad440406c3567775957f06a2a13d0d0cf2bf1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUQncEAAoJELp701BxlEWfJxgQAIRmG8iOvFBQShWCuB2KO7hJ
-wged1hFt+5nyqLLPsd8qVABFlEjtSzGndho7pPs8Q7z/FNWnqYtbVYypAG19MpSn
-7uEMPRkD60FE56nY5ri4g63MngW+sfJz5m8TsPRL9M74cLVDhIht1Vtxw/JvNElh
-L/Fb/YaDByFse/K9zSnIlV+qiLQWbyhvbtv4VS/D84YooU6BV06QLDJZ40PRO237
-OLXMn6v1MTMyiS84Vc4aeUh4/KnGCK96OMyzDh1tXCRgPZ3QXQf3br7doc88+ubB
-OEHDEpBcRqPvyKYgTiXOH5b1dG1mPe69GfXC2JNX8inXkfEKDaxBc4i8cVm1wiyq
-dtRgtBQjN7BuILaIjYHXgbvch0U9P77mmx7imZI1TLa9pxng95rT/X/1Mm54zxXz
-AdZzdCP0KXeCkyBY+xsv2SBfl+aiW40yIiS0cGu7S5DDZ8K2uFwSakZIiBFoKaEM
-Vvz0Z8RpOip3kRFGfcgVYXwBWM9j6OLWTJ9NAXIulKm8m+k+ggwiGeLN3j9VeW49
-Obalg2aDyT9ll3O1eEUd5LFapP0UkaVFAWEdEg8LQWU3yIfY01XoNl3B6oTnLe9p
-RJ8TE/ME6BTK/g7tpmp0Bm4GwF4QZ6KeA787+UN9B76r2bMvTGXVGE9870rCH/wb
-L7Lce5vtxLHyb7UfPhHK
-=HzFS
+iQIcBAEBCAAGBQJUhZGXAAoJELp701BxlEWflEAQAIvd6yDivDAsns13zIzy0WFC
+KhH8aYZNG6GxXkd/jOyRnLMJ4JVqhpR6HOz9XQ+QtdMYst8NCnxuSHMD2hM989/Z
+pcvX01B9lWwP6kZzpYS0lQsKFjHPZkTqbmnu9zv5LPKO05ExmV/IqUZjBavxaX4L
+mNQYCRoZ1RY9FJiuKya8lOomwraa2l2Ja4S5vwWNuUOHxrDkt3zy6bzRGrb9CLrf
+ATS9tAEiwhrKiGmsB4aTwXT8DBM3GVwOZuZRaZOO8m/1JEfwh9u7GuGH4PQJOtkP
+eie7zCUmjuxGW6neIaM10PSR5rk8ScPgQIXnUSBR0RduxMv9493j+1NiUxjMmM76
+bHJuHTQSEq09FeHrgRqbQ7rvvhrhXaH8drm4PDuwXjwGHnRdASiMTwONiTJcOaya
+ns7nuAvrKMx/xEHCo9EAKxyRiWMp/sdsIhRopXLpML0qY1FoINUR6LaT0BryuR6Y
+MQpDrFoIePt2q8YlO4QzfNhSG9TVWCrA/2MKIc2vwUM5/Tl6oI0hWfcTVVtm55pQ
+Q0T1erJbV9SoY0x4EaD3tpCg0p8P2Ey1UIEVvdBePV3LRVfVY4WrX3XE2ZKWBvfx
+c2Q6qwe7zDKoEImQN4Fbyys+4Ozk/8uIS0b41vmKTgGmHnkUwsqweAH7y9IZ6z5A
+DX8fWyG0e6elNXuurEI3
+=CGfl
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.5.2.ebuild b/app-editors/scite/scite-3.5.2.ebuild
new file mode 100644
index 000000000000..427133a66597
--- /dev/null
+++ b/app-editors/scite/scite-3.5.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.2.ebuild,v 1.1 2014/12/08 11:55:02 ago Exp $
+
+EAPI="5"
+
+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" || die
+	domenu "${FILESDIR}/scite.desktop"
+
+	doman ../doc/scite.1
+	dodoc ../README
+}