Version bump to 3.3.4

Package-Manager: portage-2.1.12.2/cvs/Linux ppc64
Manifest-Sign-Key: 0x7194459F

3 files changed, 109 insertions, 15 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 89badfebca9f..ae12d53d2b9c 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.162 2013/07/02 11:00:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.163 2013/07/22 13:11:25 ago Exp $
+
+*scite-3.3.4 (22 Jul 2013)
+
+  22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> +scite-3.3.4.ebuild:
+  Version bump to 3.3.4
 
   02 Jul 2013; Agostino Sarubbo <ago@gentoo.org> -scite-3.2.5.ebuild,
   -scite-3.3.1.ebuild:
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 393feb68cefe..b8cac3d6d585 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -4,23 +4,25 @@ 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 scite333.tgz 1992362 SHA256 ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3 SHA512 d1bfcf9b83ccd5423c47169f33880b25736931a9a42e543cccd1101fd915ea3b14a51aa74c0879d908f4bb69852059c89f6fdb621731ec43afb6b96b564a7ac3 WHIRLPOOL 390d9d157d8f802ea05db41668115e61cbdb0f47ee81daa85fbbba87d322b527cc33f20af3381db72ce4d9d1eefc7e54188f15397ec5404347ef0a3b45780c8e
+DIST scite334.tgz 2017827 SHA256 47107d9f063a0f1928add39c8b82d2d1745228bfd25c313f98f19dbabf75c04b SHA512 a4b67607e9f883e13409c1b96dcf250f4836cd97106f6d73ac07d41ace09473ef78687c82463661229d917a327140b5e1f4f43eb5d8cdb2b3ff94316deb95019 WHIRLPOOL 366348d777262a3cc770846411433bb9418841f5edc3caf19b307eaee54f7d18aeab5dedcb234f087bd360ecd68f55156fc59408548f8ae25ecaf8c18171ece8
 EBUILD scite-3.3.3.ebuild 2192 SHA256 c7db3746a1efb2e8fada4d8e80feaa08b147b99a688e7fc38a7a8601435d0e12 SHA512 3ac9b3eed859b5e43d0af7055780d6044f1273e5a8dff554d499872b4dc5107a6fe37f2a42e7eee74d5f0a39c2a84cbbcbb4533378ff0a0ed7c43d21b45b9ddc WHIRLPOOL 2639d876e1c0c616b635980b47ea07e3ba5e4e05d3e205075542843fd1ce87536239fdbc145b342d547fb3de444a0c79202c9f70b2b2bfad0a12b3f6474bb39f
-MISC ChangeLog 22614 SHA256 dcfb98d2c4e7b465376f2dac13b385a26d2d5d55b21dd0326d8b93e92cd1882c SHA512 1f384ef199e82943334e026185854fcf9e363466bad5dc3314133d1d50b7d0a1184277409a4ba32949ca32353a8bd67e0f4f5d3d5d2c9f09b752ab289c6ca01f WHIRLPOOL 23dc8522c11c21b9e095d3ff772c814d0745919c827818549641a8e69cbce63aa1719afdac6a6fbda7c908c43666281ed44b8d1f160eef298af3232813023db5
+EBUILD scite-3.3.4.ebuild 2195 SHA256 08c181b1ccf93471a98d0df5fad5fb9e176949e66f9cf6c8ff92af828c89c7b3 SHA512 da1853b28b8b45aa05c3b6f6b90c9a41189412d0d68bac011b9bfa8427c6651e52f7c034d4c85cb7cea1000af0934f0d93d68c6ef551b5d8acb7c788e90af3b7 WHIRLPOOL b62f46f14296a9607a6d3f847d900a585e43ed8212c97ef3e1005ecdf147fb6e8b225fba3ce2241d6a7d6199f323817ae0f4a2fc4c99d6e6b34b31261fb1bb90
+MISC ChangeLog 22737 SHA256 7deb9980492b8f598857921d9cea40603ea9c73183f7cda2602576693fabf488 SHA512 0aaedddb42ec0bbd57f4c2c0dc791bb53e9bb1895f214285d92f965fd9efcf6df7201ce82ca88917c15f9c3af80ab5adf2aea2cfbcfef65655dd8041b9835091 WHIRLPOOL c08fae119476625e225fa5bb19147f5aee4c0be1ebe329663a708f892551375664b1c678ed11c1ae08cf2ac7261e16bb874294be4eae34b97e884d15d49a175b
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0rKyAAoJELp701BxlEWfEy0P/RGuKiwF4bg9M8Vxm3ft2yzZ
-VN9ZL4fb57VdMIuTNaIxsPUVVpH0xyYTcJ258aQa5RbVlq5OpvnvKI1UzwptzZRz
-5ijOW9uu7etTSaiPLE750ZsEuGAQ3X8bh4tYqz/ye5cOrRyGl9Fckfrr8SE7yDAz
-9xTkyeI4KouqQOwOYF2k12AVfN0dFwumnhlRPGESpYMvfdrj9sFofJKD2sQzQKqt
-KY0whsciPSTHx9dGGoigdk7HlZruXAKbSoCBpFDsg+g4m1RxGOVExuY3rSuwg1Nq
-aQVw8cn/3b2eICLzOW1sST/OLDH4pXQT2lQXh2nKjnYma4qU+lpZVOhBFWA0slI2
-DGUpUtxBqxT+r3bYXRFJHgZe2rfFZzyVazv3Xy6rnLg2azrZfkcm+u34xu6u6Po2
-8XA7TqMuJ93JjH5cYxpe/YehFMogW5wZC4q+ip0ZlyQjvyZyWb14Wy2S2I/LHZrq
-29rbZtHyQpJcGjT++fadNDeePZZ5JkGp5KQkLF4YQIf1rTNI6DSRTsUifMt8FLLl
-22BT27K0HqReGdsgCCzzIspU4x8/jUMx0yrm/zSpyFMmPKNIpTnoC4NK8xl5wZ+z
-r8CjdrudJ5M4QFM/4yOoPedelH4nLXOGwC6eNddS3kimlQcHj0s+UfdJFYY+5dNR
-nYJqBDTImzX0BvgB7/ls
-=r/Hs
+iQIcBAEBCgAGBQJR7S7CAAoJELp701BxlEWfl/oP/jAABow1B9zXo15BOUhtXx++
+/agcHrFTtpSEgCW090xvYWKtGjhTfPoiwklNNkfaUrWgN7Al37/RcQZNIWbu0iKn
+4WaFsDg/q8BRCfkT6gRvOJ3EmJwfi4TWSUeTLZGxFXqiA4ggUs0QL1hvctG7xpKv
+s27wXQDZa/L8UE1S8XILftQglmbUXAD6fEj+pj3+lYIVOo0ns6X/PacZwNnfOR2B
+O/pevEAImSYgGTglPqyLE1LJ+0oth/FTQ43w2JnEOBVtLPSei0UCY3nPf+A9+7Ie
+V6iJlxPBbLWvPMs4hqT95LVLI5gv99IsdxrYlzsBa0wZ/eew6JbYDc0ncaaq2EbF
+TTWTVdXCvkl4n/9DQnffHCeVvYY2C4Tiy/aM1P4pvJMlIAdHRrsoFeRAJvM43vJw
+k74YJpe15sH4R1rqvSM49xISSDthMMY300K24YdRKJGOwR9tNbn2l0vO8udfY9/o
+70gKc9K9d6NajUcoaZfdN+6U8ZouXzV0lL2hsQbAOdpsg3WMQe+E7ycJ+Sm1NgXt
+VQ8EN80XcQMS/HnW07nDbdaDGbkxD9tU37PT9MCbKgsAnHLzNaECldO6CIJrnt0l
+MKkQseKWnGn5nNAegnRCiss2rsEjpoMqiuswwsrxQoWI98hmhpnhKfZQvASfu3TJ
+hAyU9bps2ez8znbyusZu
+=trYN
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.3.4.ebuild b/app-editors/scite/scite-3.3.4.ebuild
new file mode 100644
index 000000000000..a2f14cde8c45
--- /dev/null
+++ b/app-editors/scite/scite-3.3.4.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.4.ebuild,v 1.1 2013/07/22 13:11:25 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
+}