gentoo resync : 25.08.2020

6 files changed, 19 insertions, 255 deletions

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index bd6e7567b233..68e971a87d8d 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,11 +1,7 @@
-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
-EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
-EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
-EBUILD scite-4.2.1.ebuild 2940 BLAKE2B 17e953bc8efaf403ad7d00beff04386dd3f9b8204fb243eddb243d696b4d39b07a7d351271e6ca3aad641154e35a98b2256f34543770290c3e39ce1716397144 SHA512 e0cf697468ce209fc8552f702196e689045fb2af46f41957444338be50b4f9840dd03ebfc0285710a6f81f3ecafdc137bf74b745d10719ee5ae49a8b6f9d4440
-EBUILD scite-4.3.2.ebuild 2824 BLAKE2B bf682868c83293e9af524157bdac3fdf585a604ae9bc250e5af7befc905c5a84392f919a08893bfc26b5eacbb2fb4d925fd9ce8d430d8b80c85ac6049d7f37f4 SHA512 7e94a32030d4bf858288906901dadff3c533faa42e8f8e6c1823f560f8d1cacfff44f5b4abfd9346b8221691bc62e81b69b0a8379b1247218d7febb187568c35
-EBUILD scite-4.3.3.ebuild 2824 BLAKE2B bf682868c83293e9af524157bdac3fdf585a604ae9bc250e5af7befc905c5a84392f919a08893bfc26b5eacbb2fb4d925fd9ce8d430d8b80c85ac6049d7f37f4 SHA512 7e94a32030d4bf858288906901dadff3c533faa42e8f8e6c1823f560f8d1cacfff44f5b4abfd9346b8221691bc62e81b69b0a8379b1247218d7febb187568c35
+DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0
+EBUILD scite-4.2.1.ebuild 2972 BLAKE2B 670cbed1ba766c7bbd3aae02dffd4eb6e78491b85f49f5353f3de5173717b4a9386e36d26e4a32a6db05938b9e7ea572b466753c24efdd50b172c57ec5dc02b8 SHA512 8f91f1ccd3ab9fc6ee30c6811a64b30c93f2b7a4b2feb1d2d192b2178ea2aba3b41d6d90a3380276302d117a414c7f13e0478ad919b5c2d74398cb82dab406ab
+EBUILD scite-4.3.3.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
+EBUILD scite-4.4.4.ebuild 2856 BLAKE2B 0010ecbd066cc84290367a9d939dc251d5044b482096f3f50442158f0046c99373940f74a3ebdd862df63df39e24e1c89c1a3573ae5f734f78b075ddf1891750 SHA512 50023c0ad6abeaa05aa425f92df97ef2a200440ae30f8f2f1f0f33b63561350ed474d535df10b336826bd8c76697fa99c9487cfd2445a87c5a904f609c9f549e
 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
deleted file mode 100644
index 01cbf1b36376..000000000000
--- a/app-editors/scite/scite-4.1.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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="https://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 ~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
-}
diff --git a/app-editors/scite/scite-4.2.0.ebuild b/app-editors/scite/scite-4.2.0.ebuild
deleted file mode 100644
index fecd4f286206..000000000000
--- a/app-editors/scite/scite-4.2.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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="https://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 ~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
-}
diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index 6b9aa913c832..648761d8d38b 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -47,18 +47,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"
@@ -72,7 +74,7 @@ src_prepare() {
 	#  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"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
index 186e3d50d591..9878fd6a6b64 100644
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -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"
@@ -75,7 +77,7 @@ src_prepare() {
 	#  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"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162
diff --git a/app-editors/scite/scite-4.3.2.ebuild b/app-editors/scite/scite-4.4.4.ebuild
index 186e3d50d591..9878fd6a6b64 100644
--- a/app-editors/scite/scite-4.3.2.ebuild
+++ b/app-editors/scite/scite-4.4.4.ebuild
@@ -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"
@@ -75,7 +77,7 @@ src_prepare() {
 	#  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"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162