version bump, bug 547276, thanks Ervin Peters

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

3 files changed, 94 insertions, 24 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 66a29047b721..dfdd3d8df860 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.181 2015/04/07 14:06:33 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.182 2015/05/11 08:58:39 dlan Exp $
+
+*scite-3.5.5 (11 May 2015)
+
+  11 May 2015; Yixun Lan <dlan@gentoo.org> +scite-3.5.5.ebuild:
+  version bump, bug 547276, thanks Ervin Peters
 
 *scite-3.5.4 (10 Mar 2015)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index cebf85344159..7f6fffa9f1b4 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,30 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-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 scite352.tgz 2277393 SHA256 d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836 SHA512 01bf36dbb4d02f3693a759f778110b913dfbb733d0a5d006c5de78cb627c3511e821b62fa0a410174c09917a09d41d9a94535a14b7a4c77801eafaace15a586d WHIRLPOOL ee39f57944ef60182a3ac8a409cfd4829cfdee85a7b9b91b2722bd3d9d8b2a6f480cd8db1281826f4a9543575ae99dfc66cfe905592a2acae9ad7728d5862695
 DIST scite354.tgz 2301246 SHA256 96041bb6a3aed321e353db7c8fcde720b99cab98cbfa2ef62a5e07dd523e1495 SHA512 213f9d3ac359541f8ae2ec6166770b6cd20631ffc82e9de3b0a23753c2913f232544b4a8001a697042ff7bb4dec72f1d0b1148124fea386d925a7d394b8995e7 WHIRLPOOL 348c64b4d7019935cac018d1f2fcb8aac4713762ffdd766c309a8d7114bbe58f769709a3e5d8d446d58f60f8715d4b1e0ef04dc36b69096d7f9ce0f2c7d50a30
+DIST scite355.tgz 2302137 SHA256 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d WHIRLPOOL c901804481042b859be68f44ab728544e97975d61219a4bb576ba3da00bd663c8877e9b23b981a0295d759cae3e9afd037d981923086c6850ff29f01c43ec9f6
 EBUILD scite-3.5.2.ebuild 2205 SHA256 a663a0ef739711cf968a47b4cb578e55e71d1e36f49c2e65a06c3176efbad092 SHA512 046c3a1dcc1329a5492583a09fc9499ac57e283e7571fedeb7b94ee0238110b7cdd1fd4e47f004c3fac88abf71b911b3b497b7c862c3280ee7f8b0d56ac37c97 WHIRLPOOL 83e861e5896862ef56b2b945b7a94475424e216b9541e506c6df8983eb1e8aed7688b97bd75db4766e6c3ec6ea092e3089e18fb7282abef880a9165fa1b9c8fa
 EBUILD scite-3.5.4.ebuild 2144 SHA256 8f5c3d03863fbe9857c45b33cca7b78b9686b29949d98a3397fbd03d95dc3387 SHA512 da09b8a8b11504d37898c87e7b3cd59320c6111cf2f8d84b904455e3dd4748934f7f9ff32ce26ff63c2d08c31b7c2f76dea6fd3eff57c0c21cb8e8107ccf9b78 WHIRLPOOL 33851ab0c1dc4e98629a75a3e701e01065d8891ef358fe960b6f5a5e411518ef147600330c5af060bc118e0e19b4f26277faebe6e65d52890b7600388ec33100
-MISC ChangeLog 25077 SHA256 fc220d6f80280bf2fa95ee529a20aab24288499d25617f538514153d1c8d06d1 SHA512 0968908edc3516c623b28ce0220a2678e7b4cdb7103f2dd8475f6c80c89fd5b802e5ba27a211ea57a014f9d121acd94d99c0e3b75845bfb99777fd8075690528 WHIRLPOOL 1c1949517d3900b470341b35590a647e6d09008b1c8b1e4e78491dfc098317081e1b92a5d97539d5a01492e4563bf9cad0aa4ebf23362fea3774a26fcea76022
+EBUILD scite-3.5.5.ebuild 2144 SHA256 04a9a2b763e59246e10bb0ef11336b6fe59dd34ae66e10c4278c50a8de4d375d SHA512 56a5125fd380465b419c369e837b1a43c159bbc7c62de68a0719026f622b7d149132600ccd4c9a0a5a99d86c132c8b28ab66283243a4f6b7e84eb5cf96903a8b WHIRLPOOL 0cbd8cf279587e5c9585e18d80992ec4c26e32b9d37185df73e5d549045fe5b18d0941e7a92039f5611937a25e99001075d934692ed19e1665c64be943594a67
+MISC ChangeLog 25218 SHA256 a268442540790d4c83b3bbf3d75322fa8af934225ccdf92aa96fad0936797c47 SHA512 3a6f2af06b1fa3f47b6d26f2d2ea302747680fa1483e74c8ea39d4d5dc14cee5a49303925121d8cebd0e65044039401c09c6498e665479906e155c8196a9f350 WHIRLPOOL 370fbf55c7596e2066c50c4b31f44c4fd5e04f152ba2d1a56975951c57145283eca72f679b1f521ad1bffe7d5dcc940ae321955e471c7f5caecbaa1cb776e203
 MISC metadata.xml 329 SHA256 f632088d3836f99589a97e8775549daa47daa4457514361e0d0db8582cdb9412 SHA512 93ec545888e84209f8d979147c7e29426e99f1302939cf3546196e088a2c462331dca395cf885de10c0058eded6d6d84ef51526b089f54196191c44209bf2b89 WHIRLPOOL 95c5217189606f2d719b98232f6e73894eb14528b7379148b4d3cf6868164ceefdfffe946353778367e75020fc8ad440406c3567775957f06a2a13d0d0cf2bf1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJVI+RqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir2m4P/jcaQl4e6NSEOukzDN1wTNeR
-HYpFDkHDt1NClS2kuyCTVGvVVr65IpyuqQjmQETplM9tccvUf/zuMdxk+ZFPbE/5
-Fzi9Xuw61xKwbtGCLRo9osCiVRWVRKYvNItGm9Ld6ulQJXo7lNVMV0KXteaekPU/
-ts3scj7VAKg5Edr9IeBl9VKvp0GNO2eXlNRkBIrxzYvmeFrgykDB+jAFSztJHxp3
-nCgDtIhio6LCcrw4KRbRMZYbEarch4x7MBx/WUE5/+CIgyn2Jfn+VZigOsT/Sto7
-NLDYqBWumPRzaZjPUqkIOVif3QLf1sdDy/vHRsQuB2y13Ns+emzs5aG3pmByRRRd
-D5HvBxYa9nkN/vM5Y343IU933Su0lhruKecvpnuVZ5Zj1WJD7sfyYjB4myDmFnE+
-E8StybbzxwGEQy95WCGQsNSuZS5Ni3YSWxmGBlTvriQ/+WcSb4NOeb59neooXpNd
-d7sXuCko3oCwfY9xS+ohDj68MrvF4ZGM/qxlrlkk7WIZrjVkVaZYfUb4gKs9jk6m
-VMzGN29muOfQHRzLA9gkfJyrBYBA2/CoFyv+3Gu9q0JE/+nyZmpfqP3g+AuVV/4d
-oVQL/RHwq9pK3eTDbrvo9+0US27prbnSrOYT3HaylCu1uOn5m6UYhWy7Ud/smy62
-9UZmVfKae9eLCxZm5uvo
-=vm/Y
------END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.5.5.ebuild b/app-editors/scite/scite-3.5.5.ebuild
new file mode 100644
index 000000000000..57e5d62b64b3
--- /dev/null
+++ b/app-editors/scite/scite-3.5.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.5.5.ebuild,v 1.1 2015/05/11 08:58:39 dlan 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:2
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5:0= )"
+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"
+}
+
+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
+}