version bump per maintainer request, bug 523068, thanks Ervin Peters

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

3 files changed, 110 insertions, 16 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 0523bf8f5086..181b579522b9 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.171 2014/05/01 20:24:54 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.172 2014/09/18 02:31:47 dlan Exp $
+
+*scite-3.5.0 (18 Sep 2014)
+
+  18 Sep 2014; Yixun Lan <dlan@gentoo.org> +scite-3.5.0.ebuild:
+  version bump per maintainer request, bug 523068, thanks Ervin Peters
 
 *scite-3.4.1 (01 May 2014)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 871828012359..49446c5914ce 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -6,25 +6,27 @@ AUX scite.desktop 138 SHA256 f91b1e14fdb6f78901001ece140eaf1dc60efe6fc0364f6f145
 DIST scite335.tgz 2099170 SHA256 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89 SHA512 a8a976e58e8190d46162a6ef0834403702460c703bc5904fff95610a40014ed024307d6c0ae727e9bb71868fc4ef339878595e879fcfdec4076ea4e656d6b584 WHIRLPOOL fdd89b02fed78feb50e3ae885a8b918541d949625cee88318db7c066f3ad8f288ee8ae87c627d9eed8217a4a5628acd2ddd56b5421a2ac3b848999a148bae4bd
 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
 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
-MISC ChangeLog 23814 SHA256 0a4f1c5c337d703047c20a965f00e9f155a789b7ca3feaa3f4f97f942fb44f3e SHA512 2c686810f7d3eb9b0a91dad3c07125aaf04d560b45fbc9b19e4a52524fec7a645df4382be6d822e220ae64090dd9c00dd8b876f72a3fcfeb9621afa36a05cf0d WHIRLPOOL 830419b905d6f9a29d2f76619370e7dc8e63845daa4c09802ba19977a81d8c4a61d9a0773d6e24f6a86538157dc85795abbae009baece2f6cce99a211c310fe6
+EBUILD scite-3.5.0.ebuild 2203 SHA256 9be22f83ca0da63075c616482a9cf2898750c91548111a37037a8e18089252e0 SHA512 a6d0b57d9d25f4388c7881b15698877f47247425c810c39786d1997e2bda6254eee8c40173b37aedb6e9f84922f9e0741268d83eef6185cd2ba87b7943d84bb3 WHIRLPOOL a8281115ff120cdbf4763e9902c5dff07f7c67227ee0cbf0b5834166033bdf54485b60ac7a817811a6b692f08c398942697a72042024fe8b4618df9912290bc9
+MISC ChangeLog 23977 SHA256 6b87ebb8d0107a1803d7fbb8cc25ee80ebeca8dedc08a171039d17503e1d518c SHA512 93a1a091511c973834b8e4058af3353bcd267540c93a007026ce1264526b9c61284c7f17602940cc0e71bd2a2c9c6a6a462fb194c8308f1e5d07752d9a1e46e7 WHIRLPOOL f3d732999956fadfd683bc2fff849c6df64e8014a6266d1fd866b5b654f30747e4611cf4adb8b2ebef058c4ba6ecb7e20c3e45eeea162c3296ba361da7af25de
 MISC metadata.xml 329 SHA256 f632088d3836f99589a97e8775549daa47daa4457514361e0d0db8582cdb9412 SHA512 93ec545888e84209f8d979147c7e29426e99f1302939cf3546196e088a2c462331dca395cf885de10c0058eded6d6d84ef51526b089f54196191c44209bf2b89 WHIRLPOOL 95c5217189606f2d719b98232f6e73894eb14528b7379148b4d3cf6868164ceefdfffe946353778367e75020fc8ad440406c3567775957f06a2a13d0d0cf2bf1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTYq2EAAoJEC7dUkA7aK9H+FAQAItkMJweNM9LUWRo7C1ogsDS
-/FCjt1qIK7I8bVUEYK/aIswuCGd0Uy0074KOl/LoOl5Ud6HyIjzUc2tefXLsNW2D
-b0K3TF63+5hNpJfUR08Z5VHizmv9BlHgKD+WwG/jNOodoA7KYMGoablFqPRyDyCN
-mWF9u8TNGw/mAkf2H7OpFLSxZezCBJbp/R+7R16P/HVds+Y+KXDVq3YHqKoDve7X
-b6is4OswvHdRjqeG3v091fxWPH+OdQszmJ+bdW09VRJdpr/p2QFyYaqB/CBmXZW3
-yNKmk/hh+BNC43nSETtlNWnyy2/lBT0eTdCG2hKu9BXFd8/eQWnZwPA2mGI/DSvK
-UKDSGZBtyGqjE1ITxCHOUeSDh40PnqWq1KO+aSE6DqT5fN3gqOYxoiyOQxDrkt/7
-gsHjtFuF9kMjifOwgaQTWXEv5Iw7uD4qc1lYo92Bx9JIiqV1uPODMQ3uIfU7uu6U
-tjfbkAthZ92E3iLlfR2d5XMGAR96DiTbc9RnRdJrpb7LXrADtJCQEPUoPkns4nJR
-g/WKMKk10ukagB0nCRFpInZj8Svw0sjwnXUBgaboo8N3HTejT/xwHhGcHS5pIDC0
-hWMAMwKpNVAjQQw9UYkWwVQGL96mMLbPy6JrSR7FUu9s2zVS3JQqGku3QgpCPpRs
-n60iRI9S0/iMkyEf7oaC
-=Npoz
+iQIcBAEBCAAGBQJUGkQfAAoJEJIMDbyqvv1VC9oP/i/76dx8odnGqhLn6yfyrNXX
+cpoyNkopXBZ0Mj57cBnGeaVXU6aYlo/bgYEaLAv3g6Hg2sWsTg/gy9zcDqL2e5xe
+Bhdh8LnKATPOmUgWJI/1P6MdXkWGUUTjPw1KR2vcHQwbfNhnHieXlFdt0tqeSxY+
+lMCpkAzUwEbEbST+Lr2s0loFjCS64Mcu19yzAcwth/AqY3tLmD2Vz4uklF4Q8wyC
+uCD0FTqBjNxE5wfYiztXwMwFXrefLuUCEyHp82XCLAYEazBlPQBA2AEttmSazLOc
+46JoeE8jrqWEBcJCZcGTUyn25xscAzKqYcdDIlvvXxsoQ8S87YkvXZfh1qLO9aqV
+dUhjQn49Zjut902/3IJpRBLKWvFA5ImrkCBaJz5Iuqz6Zc+eEmDYIYiLV2bfLosC
+19JG7CJIvozgyymBhyvofX9i0OlpdIcrkOQdRnCGXyTVbjtBMP4UsWeK05bTlLRn
+L8tmawrjSAYAoj9mBzz7I0UhLQmAl65nbE7Y5fdOPwiGhoj2XyobPuXvrI7LvkHE
+R/l6k89T90jzFuFsm25wfZF1mfjY3iCQRT8KcW60Ega8LaZWtjUz6woHjHPrZi5x
+h3TZFU81CA00m34vTESabfO5a0Xg3CAGTeuccpzRwHze7XbOZZtX8BFTdSjTImGW
+6QpjQSQMom1XSKXd8Phn
+=Ev9c
 -----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.5.0.ebuild b/app-editors/scite/scite-3.5.0.ebuild
new file mode 100644
index 000000000000..1b426efbce22
--- /dev/null
+++ b/app-editors/scite/scite-3.5.0.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.0.ebuild,v 1.1 2014/09/18 02:31:47 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
+	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
+}