gentoo resync : 16.02.1018

2 files changed, 121 insertions, 0 deletions

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 7fab7d489a93..aa1f395d440c 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,8 +1,10 @@
 AUX scite.desktop 138 BLAKE2B f0cc28779504c505e8876fadaffc979939c48088e5cb5c1d0a8b2cd499ecc21806655415ba34b2ca5351a31a588c5818ed21e38c19233055386c0246c5aae4be SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6
+DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
 DIST scite355.tgz 2302137 BLAKE2B 5b36c68a5447b7fd0dd2fce51fc09cec0ee4a86be10f4f32fa7bf47354c56424cbead6cdfe819c8014be75e843c867ccaa137c5f7e32c3f9b0dabb6b9a5a9cb3 SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d
 DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd77772923ceeb249b3182dc47cb1e1097a4e0942b3a5c7528d0e80fe2314ed9d3d2b7f4e960a0f17ff2 SHA512 193dcb1f8787a7c7d520ce62462e5c95e7b6bcaf79f4ab23f9885474fb0444dbc5a69a0d45eafc592e5fff2a2e746a9aba599799e847e3c74d3436eed26580a9
 DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
 EBUILD scite-3.5.5.ebuild 2106 BLAKE2B 0fbf6349ae99aa3e489dbb025cb78c22038ddb5c4e232f2ef1f89ec0a0615ed8b1c463a3afe9cc727500f4d4cbf5bfc4c2a53e5dc8677b8b46462a828838f6d9 SHA512 e1d459d71002b5f9a856e7b7ad4c9ad43bb0883f382d19dea28c43588e5ef495bca3dc769859781e26a65745dca5a252bbc81a657e261d64556366ceb60a60c1
 EBUILD scite-3.6.5-r1.ebuild 2232 BLAKE2B 1b98e140a18dfa4c3b45a0d2febfe841af872df2cb508ac7c5f38ba04a463c182209b0530837208b81754c6b5d4bc2bc5fb02d9aeb1bbff7c6e319f0f94b1987 SHA512 ee976179aef40711c27e4f6edec220e20a4fcf08f3edc430a83e6eedf2b1b56ab57c907c333d358cfeb6b08da29aafdba1211a10168ccc0ab6eadb0648b7a611
 EBUILD scite-4.0.2.ebuild 2685 BLAKE2B 4bc65707a1cb11601a2118547882acda73c5d44d7b5f4d4fbfcde0734aac363d63399f046689ea9e5d47a6456dc07aa757f9ff86a6e8a08f0afb6f52f90990cf SHA512 bd98bfcaf33289cea962500ac87505b541e3496c019e4b88f3562b380c8b06c54a93c5ff761319c404b8512fca673b14c2b966d2ac1253a3bb64a4fef7d9ccb8
+EBUILD scite-4.1.3.ebuild 2988 BLAKE2B 660573fc9cc0f46bf10316e7478c6b02c725a43a4aa80849e70fab05179a39fc751db73b19769222016735f56d03003152739826140833572961788f4bcc3151 SHA512 bfdb80f6fd248dc6ca93457f54f56a1e378d6c03be5aa8586ca66a6caddc2761893382ce66efdbe287b6ec747467faea2134906343eb0fb9d59ff373a67d7c70
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.1.3.ebuild b/app-editors/scite/scite-4.1.3.ebuild
new file mode 100644
index 000000000000..fd4938711afc
--- /dev/null
+++ b/app-editors/scite/scite-4.1.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils toolchain-funcs xdg-utils
+
+MY_PV=${PV//./}
+DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="HPND lua? ( MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="lua"
+
+RDEPEND="
+	dev-libs/glib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3=
+	x11-libs/pango
+	lua? ( >=dev-lang/lua-5:= )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}/gtk"
+
+pkg_pretend() {
+	if tc-is-clang ; then
+		# need c++17 features
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(clang-major-version) -lt 5 ]] &&
+		die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5
+		($(clang-major-version))."
+
+	elif tc-is-gcc; then
+		# older gcc is not supported
+		[[ "${MERGE_TYPE}" != "binary" &&
+		$(gcc-major-version) -lt 7 ]] &&
+		die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7."
+	else
+		die "Either gcc or clang should be configured for building scite"
+	fi
+}
+
+src_prepare() {
+	# remove hardcoded CC, Optimizations and clang unknown flags
+	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
+		-e "s#^CC = gcc#CC = ${CC}#" \
+		-e "s#^CC = clang#CC = ${CC}#" \
+		-e "s#^CXX = clang++#CC = ${CXX}#" \
+		-e "s#-Os##" \
+		-e "s#-Wno-misleading-indentation##" \
+		|| die "error patching /scintilla/gtk/makefile"
+
+	sed -i "${S}/makefile" \
+		-e "s#^CC = clang#CC = ${CC}#" \
+		-e "s#^CXX = clang++#CC = ${CXX}#" \
+		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
+		-e "s#-Os##" \
+		|| die "error patching gtk/makefile"
+
+	# repair and enhance the .desktop file
+	sed -i "${S}/SciTE.desktop" \
+		-e "s#text/plain#text/\*;application/xhtml+xml#" \
+		-e "s#^Categories=\(.*\)#Categories=Development;#" \
+		|| die "error patching /scite/gtk/SciTe.desktop"
+
+	#  add the ebuild suffix as shell type for working with ebuilds
+	sed -i "${WORKDIR}/scite/src/perl.properties" \
+		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
+		|| die "error patching /scite/src/perl.prperties"
+
+	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
+	# Bug #576162
+
+	cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
+	eapply_user
+}
+
+src_compile() {
+	# prepare make options
+	local emake_pars="GTK3=1"
+
+	if tc-is-clang ; then
+		emake_pars+=" CLANG=1"
+	fi
+
+	if ! use lua; then
+		emake_pars+=" NO_LUA=1"
+	fi
+
+	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
+	emake "${emake_pars}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	# we have to keep this because otherwise it'll break upgrading
+	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
+	dosym scite /usr/bin/SciTE
+	doman ../doc/scite.1
+	dodoc ../README
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}