Version bump to 3.3.1, remove old

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

4 files changed, 24 insertions, 107 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index c60427f6a27b..60d42c90186c 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,12 @@
 # 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.156 2013/04/17 10:36:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.157 2013/04/17 10:38:21 ago Exp $
+
+*scite-3.3.1 (17 Apr 2013)
+
+  17 Apr 2013; Agostino Sarubbo <ago@gentoo.org> +scite-3.3.1.ebuild,
+  -scite-3.2.3.ebuild, -scite-3.2.4.ebuild:
+  Version bump to 3.3.1, remove old
 
   17 Apr 2013; Agostino Sarubbo <ago@gentoo.org> scite-3.2.5.ebuild:
   Stable for x86, wrt bug #466214
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 765f27125d8a..ca38321418cf 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -3,28 +3,26 @@ Hash: SHA512
 
 AUX scite-3.0.1-no-lua.patch 632 SHA256 30a228b95cfbdfd3c9dbe01e78a2ed887dbff92f7e3b04fbb254a5777cc66bfb SHA512 7aaf72b7e58bcfdf4278c6dce4f62f5679513f1de68744e7bc842ff7e4c6ab792c5149df07f50206c638a70d1be1261fb21e3cd1fe603c13f9350674a6bbdf45 WHIRLPOOL 770367be441ffd06a3db7d0503ba9b2a5d163afdb6ba503624c79b9ad4417e097b338ce65ba54a3bc072bdb7c99c75359df7e4fe6e4e0a90bc0dfd80d9f9a1c3
 AUX scite.desktop 138 SHA256 f91b1e14fdb6f78901001ece140eaf1dc60efe6fc0364f6f145671964a0c40bd SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6 WHIRLPOOL 6a0de80f0eb8479e54e644e8a729d4b45bba6b0ce2fd0662309ed4f6e70b4e36ff531cf23a220485e0ec26bb0349efe782279d9a7e66d1d54af99f3520a1de60
-DIST scite323.tgz 2053250 SHA256 d0d324a5e420ff96db6cd1c6eeac23b6f4c046e7545e73c4625ab2add90e4a65 SHA512 70125c33a8bcb68d428a6f006d1043a9398ce34ef11f2287ebdcd84bab132c515d176ec247c2c0d3321b2f8cfa9f4a01c67526f48d2ae1d00d6d3429e2616990 WHIRLPOOL 5f260a7b11869dd41047fab3dbeebc8bbd0b7cb70d6129efb28459648ad42b1d99895ac9b5baf239a0d684c3a3205fbe6190213b72da66ec3daf150d4e082c67
-DIST scite324.tgz 1956084 SHA256 bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08 SHA512 974d8609e663808b1f7bcb290f97ac4fbb61cc13c9328dd357960c637b50326fb7d75de6e19fe53cdfe4df5f5fb41c8a9dd23494715b43e4b56834aaae67b485 WHIRLPOOL 46950463738ae3098da594476d101f28941b26127fcd140c0879b48ffbe73f2f5bcc3750fa301ee5d40c9e7c46e5868fb2f1377a6485c2dd4b9c2fd7f5a4d8fd
 DIST scite325.tgz 1974782 SHA256 ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef SHA512 2ebd98a2ae064630d4b784d9be91f2727e17d95deac6ef3e096c1df86540546aee174d770e14efe10f1cb4d1c11e68d98bec47ad108219a781dd01bcf0137716 WHIRLPOOL dcfbc7839d3fc3aba0c05868e417a95fd8d264e38c4a81cc2e5c613b284758ea04c41511c0b99890f4d40b6d1f6d2af046a545c3ff53f9c99e49a85949795619
-EBUILD scite-3.2.3.ebuild 2181 SHA256 bc7167fe60e7c0b9eacb3513780f42a0bedb9aac46d734d7607161d60441f0ba SHA512 63cfddbcd62e1279824c7865850ec65832ce373edc491cca0f4f10c8a2ef9898d448627024e62223a696d88fbdea7bd736fe0182c1ad39cc92f6ba741f1157aa WHIRLPOOL c7487998576f87bbf23337fa413ebc754dbf38564524cae941d362e44a03b853d710ef6c2847d279e2e3175ea8e973d89f2e03662301c4d32e9f9991b035f2e6
-EBUILD scite-3.2.4.ebuild 2199 SHA256 b9e83dfa754a6b53da0cfa6ee8092c6e25fe0a66c5a6d114c7bf92118258cbe0 SHA512 1aa23ec5bb3078f7aa06e16bcbb6716a4f1887ca2392110ec3dd8986ffbf47d231c7d2e319ee483c8537d8b629bf77db0cd037b5cf919b442edb7ac4e77be572 WHIRLPOOL 38bf8158c9eda8116152c1f055a1f1eb60c8319095b26119352c64c87ad38611e607235c858b1f4918eedd364853571f19422256b14a804b205748cb203ddc73
+DIST scite331.tgz 1983596 SHA256 96f1b74f728375e405a39f210b34dfabbbd2654b9c30ba886d8c3b4acbafc717 SHA512 171b39cff7068fa4aca35e0597a27547465bd5f299b78a2b5ed6cebdf5341ee73973f6904b2f40c880127afd1f30d05e2b2e63003016aa5e726376d306ccf0d9 WHIRLPOOL 727a565bd0599fcd55b9b37ac0ee7374f972ea5f6fb2dcc1e0fbad6050f139600101530be2294eb89601f261f8b16a7ad78f57e0a13eaa587129da14d154aa92
 EBUILD scite-3.2.5.ebuild 2192 SHA256 3649fdb4d126b28ba22db3ae8158cacde23cad6e37fdf0e51195a4a4dfc3fc91 SHA512 bb36ddd50590ee3fa7968040b2409f3a41e3d3c94cce805e9b56a205f1b3f4943d236fa7e59b2ae2e346a824351e7892ab70226d5f946e9973e09329a96a3506 WHIRLPOOL eedc7f78eabd7a234f4c022343d3fc5e9a2b39ee589116008d102b49b57e8f4cfaf50347b7855cf24f27acdbe6d3bc57aafece511be04c1fe8bf51e97e473ae4
-MISC ChangeLog 21891 SHA256 ed815e2bb717de61e65e797105ffd4f91f7ea09815a2a7dd33b717f815bda53e SHA512 d16e6bfda6d579f1c43e43ca1fd33073b71de9ecc86b01ce918a1d808d34bb907b7966aa490f3538ca34f7baadc3479c203d7d9054d4efc0832693a5170ee589 WHIRLPOOL 796f13b2d8da9b18ceb2913e1ae2f0eb4828cbf4b8aceea14fc97d1ef052d8e4c600aaece1a40b9c25546ec756fafb627db32c14c18aa5fa51ae2fe9f4002623
+EBUILD scite-3.3.1.ebuild 2195 SHA256 65e15c3d2f7d0ca2e80cf2151cf7e32818bbc4ee97bc33bc8d43fda617a8ec2a SHA512 e42e8fabe114539dd5e142a94daba00d633051673ecb59e0bf03876d7d878092d49f0957dd17940b77a954a2ef5bc1a70805a85ad50b32af876f4329f1dcdd30 WHIRLPOOL 1ce125fd57ef9b3a6156628224abe58cba2bc022cf991561d8aad2ada8afe9d9397958e5271eadb2edd91555546f941682c5950a02096bd7b51b1c1c5d3439d1
+MISC ChangeLog 22070 SHA256 aa1879ec1b5561961c71c80daf16311ebb88ad0475e35ab41c62df8bbdb66aed SHA512 ec545edf02ffaabb5f1daf5015116e01f8b30466138471374ce547f230d21867f625deb8ec68dbd78486d98e236d16c14f2877ec2b0217ced2d9d9fbf0ce9759 WHIRLPOOL 381c70685964ba7605c5081f1181fd3212e445895ee49c3fb653ac0213044dd41727fdc7c4f3c895213415aa00477725901abf47c6acee5a898c36d2b5c32ddf
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRbns+AAoJELp701BxlEWf+eYP/2Dh55vzzL3hWmhDox9ZUg49
-jiquwEWjkGEJNdTLapgEASaMEpMEIrnqM1J9srhEvTWaIL9Iai/X9vAas1Lgn5iC
-qSTVZrd8IVgt5OpAMqFoUSZVGElDMObSujr4HVMy5fnikJdzGyYEqAImk182qddv
-NS6XGqaUD01vfarYNwEB6A70qZw4ZpeHeeBcOWwXG/lZS6nhp/WuKOJNo6RLrF2i
-UkWm/WbKleBjGLSSZ3TKaOlv2aDb0ooVcy5tBPAPVBHXvn1u7vbgogXrIUTKSXzt
-J9ScRL7Jjs41hCj4SyZYy2IZ0PbZedc0156URKWf30O+NJK945qKj3HpbQ0w2VIv
-sO443XaNi1vxQlkdzguTIGyL342wC6hkGZgj9vF3NIEUjq0hXUjTgD2WiO0QDoCr
-SThWPj01RsCoTFVaHHGzgM09oc+zOQbpRK706t2E3cfDFr+12mQq8Ee+WJL7LhWd
-GXddB1/wunr38iVQA4rx+uvuhqsPgdyK31XtUmhNqruMAfdGX8ieoChAVje2UrW3
-ZKt8SlZXZj+WHPsjVzj78HGLZoKWE5BRW+QfRNMSYDGp4rurLXTCPTkNqc9lyNzC
-aUzu6ASPIHddHKv00fhOq0ue8YO7oK32MiRWHfc5qThmucdEWQvndc4wc1e5cILn
-hhGFepKPeRW8v+KKhmKG
-=GZWR
+iQIcBAEBCgAGBQJRbnueAAoJELp701BxlEWftiwP/RNKOJr4dh6x0Z85WBRSDuZZ
+SyctIXJbLedhqXEQP+C1r+DzKGw4FroVIh3XsgTfQ5DyQeNCBIdO9KugN874UJwR
+0cCxaEeKpx4dzjDrC8XJRyZqkBedpRXs63uao8XfPc2QpQbAiq6/od8X3qWDeCLJ
+P1H6ofA01fV2GDe4Ral6QhnCYSRT+Fgrde6aFlaIBQ30skktvhJp+Ofg5u68ao9l
+htQDPgFDJOc23rUfHCtFplHyyBAx+z+i48O2pGfCeXqQ2sIyeWczcnCNCVNnDmhk
+lLO+4Tdt9I2T/WZTGFPWzkgSqVtd6JZNfB9anLKv61Au34+J8cgI/z1x1p9y5NlX
+lQ2HqNLJJ1uFi9GkRCUR3+FvWSGbpD6chhCQDts4rxfhveuytOACJuAYlkXTOt4Y
+tsdc/4nK5fQXk7OMOqpmHpLpdN8tMaOI3b4d3r175ZEe+wm0jzENcCZhVzPJnfCj
+pcPq99IIsjC/CRgJFNToVZ/KxiasjLz6OegdgE5L9flw4ClnK9iajz2TGQL3k6zR
+svRqEJGS823h9nqfeoTWWN5KtTxejyhn+eJp51c/6OZkSFR6GtWlS3t4PTirueWo
+AOOz47YBZCjozGTm5+otc4fMp/U/QSUHcodQvKsLNM8m3Yj6U9dlBcmjZ7EUhxDx
+VY4z3HvtpkR6iZxnWZ5y
+=/9Mt
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.2.3.ebuild b/app-editors/scite/scite-3.2.3.ebuild
deleted file mode 100644
index 3c8300f7d378..000000000000
--- a/app-editors/scite/scite-3.2.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.2.3.ebuild,v 1.5 2013/02/21 21:52:08 ulm 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 ~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
-}
diff --git a/app-editors/scite/scite-3.2.4.ebuild b/app-editors/scite/scite-3.3.1.ebuild
index 8a7049e336e7..a91c9ac28dcc 100644
--- a/app-editors/scite/scite-3.2.4.ebuild
+++ b/app-editors/scite/scite-3.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.4.ebuild,v 1.3 2013/02/22 20:57:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.3.1.ebuild,v 1.1 2013/04/17 10:38:21 ago Exp $
 
 EAPI="4"