app-editors/scite: Version Bump to 4.4.3.

app-editors/scite/Manifest

@@ -1,5 +1,3 @@
-DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
-DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
 DIST scite-4.2.1.tgz 2633438 BLAKE2B cddf23f60eb1791266e38eba03ed8708aa02e0d91470344b19bfad7519930691a4b6a79b1eed3ac06234509b20fbd6b299c13c48a6990e0d8ced1a99a1d01220 SHA512 b2ad499f1c4d1a15b009516d24186c7d84f48ccdd40d2e9ca614de3cf36725a710523beaacda499186f040869e87339c2292e23eec959c2cdaa5fedfbb94d565
-DIST scite-4.3.2.tgz 2710026 BLAKE2B dd53eb2c3214033976ae4c5f63f75ea19d691ac9362e9d8ed527aff6b34d16e029d404d9731e3097cdf36d4c4594b427aa26bc9b83cb6a6ed05741e61fe4dfd4 SHA512 fd29369787f16c8357ae4bfd82b7f621ebb399e93e77c7540296c2a3c8b4e403071359f67f59bb5bd59216ae7e9cfa8aabfc38e200d59bea2c13e96991a3c9b8
 DIST scite-4.3.3.tgz 2714086 BLAKE2B f31db7147c102ea19317d5a0bfb64e2ccd34914a8b615cd6c02f2e79f1788433dd3ecd6a565599d43a0c4da34ac30e9434037a042d77170f14969d3b008a742f SHA512 85bc76bc9bb817fb0f7ddecad5e01d83d7090e788c2f74b9b23a86284f452a62c2fed64d0cf7c24cb57043228b8c91212742b644756d2ab185b10ead8785b82b
+DIST scite-4.4.3.tgz 2747774 BLAKE2B daaa9e6a8f52418c2ae6c429a06d2082e47da14179ad550f5f80f863cbe1879d28232901fcc37d1ada905e9527281b0d0cc8547bd364412c177d9bddfb1f5568 SHA512 d5a09735694996cddb023ab155f75f47a831d74ece2977781e4919752289953cfc4342df13ccb45d33b0631c8c62c1171d009c063e49be96a8e19de16eb260a0

app-editors/scite/scite-4.2.1.ebuild

@@ -5,27 +5,30 @@ EAPI=7
 
 inherit toolchain-funcs xdg-utils
 
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
+DESCRIPTION="A powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
+SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="
-	dev-libs/glib:=
+	dev-libs/glib:2
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3=
+	x11-libs/gtk+:3
 	x11-libs/pango
 	lua? ( >=dev-lang/lua-5:= )"
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	virtual/pkgconfig"
 
+DOCS=("../README")
+
 S="${WORKDIR}/${PN}/gtk"
 
 pkg_pretend() {
@@ -47,18 +50,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# 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#^CXX = clang++#CXX = ${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#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@@ -83,28 +88,20 @@ src_prepare() {
 
 src_compile() {
 	# prepare make options
-	local emake_pars="GTK3=1"
+	local emake_pars=("GTK3=1")
 
-	if tc-is-clang ; then
-		emake_pars+=" CLANG=1"
-	fi
+	tc-is-clang && emake_pars+=("CLANG=1")
+	use !lua    && emake_pars+=("NO_LUA=1")
 
-	if ! use lua; then
-		emake_pars+=" NO_LUA=1"
-	fi
-
-	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars}"
-	emake "${emake_pars}"
+	emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}"
+	emake "${emake_pars[@]}"
 }
 
-src_install() {
-	emake DESTDIR="${ED}" install
+# want to use the base src_install() as base_src_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
+src_install() {
+	default
+	dosym SciTE /usr/bin/scite
 }
 
 pkg_postinst() {

app-editors/scite/scite-4.3.3.ebuild

@@ -5,8 +5,8 @@ EAPI=7
 
 inherit toolchain-funcs xdg-utils
 
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
+DESCRIPTION="A powerful, highly configurable, small editor with syntax coloring"
+HOMEPAGE="http://www.scintilla.org/SciTE.html"
 SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
@@ -50,18 +50,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# 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#^CXX = clang++#CXX = ${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#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"