gentoo resync : 02.09.2020

4 files changed, 183 insertions, 2 deletions

diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 68f81254678e..0a0a19885cb9 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,4 +1,5 @@
 AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68281b95f34c993f39c8c47b56c17209d84e9a72a818e930f8c1b89dbe7986530a879293b496504b418 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2
+AUX 4.6-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
@@ -7,5 +8,6 @@ DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733
 EBUILD gtksourceview-2.10.5-r3.ebuild 1347 BLAKE2B 906f89f5840c70e6b971f5ee4d4a84cdce5ad71081d1762c434d34ebf6534eff74450ae81bc796201fb74c20537eaec76a97774d9f5eb1a6cb2c65a20a29b4f0 SHA512 c864e339c432308d99a494da8a3366de9c299cad4c109fa2d96aea4ae82a3f7be9453a5c5ab1f8648233d922f90343fcf5ad85b33defb3f0e37f3937d1bbb7ef
 EBUILD gtksourceview-3.24.11.ebuild 1272 BLAKE2B d606bbfed3a72adf6478175516be05045a5ccdeace5b4f6e36c1f9cce337e01f27ab680f1da56462c187b5085a543cfe272088f3dc9ca385ee1c3b28af2ea2e1 SHA512 f54f0e0a88a3e5310c75f985eee92ff3cfe0db3b930c7eb520879b519d214394604c84155c3ee9fef23a12477b81d4de1848ee1c29aa6c352af986b0247b3489
 EBUILD gtksourceview-4.4.0.ebuild 1729 BLAKE2B 35d5b3c27652d73df5968a62721e8de720eab4519491d9416076e3b40d9ccb8fbfe919da4e65e8c4350bb179621c9b8ece601592f8e68b6748343fc91c4a32b5 SHA512 4df46bc6ee781206e15e57d79285052bcb7d0ed48d11eac641529f45515ab83a83592062cd04f51d1c9d2d844044b21b7369f914737b6862a21b042eeec3b3ef
-EBUILD gtksourceview-4.6.1.ebuild 1735 BLAKE2B 5492f9b865213c8f07cd2aeb7ccf65cacfc0acd4bb87a046e49ae7cace8abee7226e1f661e555d3cfe149ffa3a4ef7bac8eb6dc02e18bd2fa44ec1106e38c48b SHA512 5056cdc4c0dfaca8d2c838c31ee5e8324e4860357c21d998127bc58a8876fc575276abd680aceb92220f8887a2600469d12e41ad439d77c430200ea35e271cce
+EBUILD gtksourceview-4.6.1-r1.ebuild 1744 BLAKE2B 7e0b47972e2dafaa46425cd8a190d3125d1eec8e0550f2b24eba4c9dd64bed71335848af25567d1dcbd6358ec4152e08f7c60b8ab01252179f36e6dd272c4739 SHA512 dc39f252f7d291c6b6ad57af42ab799ab44e4393143a2b27654a6659852d2fab7a308458888bef27ea00f0a656334dc64a4f9e7a401a12a16ebfaca5a733d000
+EBUILD gtksourceview-4.6.1.ebuild 1731 BLAKE2B 2cecc61b07eacf60ede14fdaad3f86f8799a62001ad5e93bcd0ee6b07697fc6582d929114503e6cb3a3515f525410506383bbff767e4c581f2a1650e05d30fb2 SHA512 560df5a55b48e0a61952bee2456b7b0c094157c62d4e2c01bb62915274a0dd6371578ce8322c3bea2133a2bd61c150cd74e676cbd7f2e0e8cc3b87e69399d2a4
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/files/4.6-gentoo.lang b/x11-libs/gtksourceview/files/4.6-gentoo.lang
new file mode 100644
index 000000000000..8d539a8a9f3c
--- /dev/null
+++ b/x11-libs/gtksourceview/files/4.6-gentoo.lang
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	GtkSourceView syntax highlight for Gentoo-specific files
+
+	Originally written for gtksourceview-1.x by:
+		Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
+	Rewritten for gtksourceview-2 by:
+		Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
+	
+	Distributed under the same license(s) as gtksourceview.
+
+	TODO:
+	- do not highlight "enable" in the configure options
+	- perhaps highlight portage variables and portage functions different
+
+-->
+
+<language name="gentoo" id="gentoo" version="2.0" _section="Scripts">
+	<metadata>
+		<property name="globs">*.ebuild;*.eclass</property>
+		<property name="line-comment-start">#</property>
+	</metadata>
+
+	<styles>
+		<style id="variable" _name="Portage variables" map-to="def:builtin" />
+		<style id="command" _name="Portage command" map-to="def:type" />
+		<style id="function" _name="Portage function" map-to="def:function" />
+		<style id="string" _name="String" map-to="def:string" />
+	</styles>
+
+	<definitions>
+
+		<!-- rewrite shell string to show highlighted variables -->
+		<context id="string" style-ref="def:string">
+			<start>"</start>
+			<end>"</end>
+			<include>
+				<context ref="def:escape"/>
+				<context ref="def:line-continue"/>
+				<context ref="sh:variable"/>
+			</include>
+		</context>
+
+		<context id="string-2" style-ref="def:string">
+			<start>'</start>
+			<end>'</end>
+			<include>
+				<context ref="def:escape"/>
+				<context ref="def:line-continue"/>
+				<context ref="sh:variable"/>
+			</include>
+		</context>
+
+		<!-- subprograms:
+			- $(..) is not supported currently in the normal sh.lang
+			- `...` is interpreted as string - I think the subshell behavior is more acurate -->
+		<context id="subprogram">
+      		<start>\$\(</start>
+      		<end>\)</end>
+			<include>
+				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+				<context ref="gentoo"/>
+			</include>
+		</context>
+
+		<context id="subprogram-2">
+			<start>`</start>
+      		<end>`</end>
+			<include>
+				<context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+				<context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+				<context ref="gentoo"/>
+			</include>
+		</context>
+
+		<!-- portage variables - currently unused -->
+		<context id="portvars" style-ref="variable">
+			<match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match>
+		</context>
+
+		<!-- portage functions - currently unused -->
+		<context id="portfuncs" style-ref="function">
+			<match>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</match>
+		</context>
+
+		<!-- extra portage commands -->
+		<context id="portcmds" style-ref="command">
+			<match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+		</context>
+		
+		<context id="built-in-command">
+			<include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
+				<context ref="sh:reserved-word" />
+				<context ref="sh:let-command" />
+				<context ref="portcmds" />
+			</include>
+		</context>
+
+		<!-- gentoo is just a shell with the replacements -->
+		<replace id="sh:built-in-command" ref="built-in-command" />
+		<replace id="sh:backtick-subshell" ref="subprogram-2" />
+		<context id="gentoo">
+			<include>
+				<context ref="subprogram"/>
+				<context ref="sh:sh"/>
+			</include>
+		</context>
+	</definitions>
+</language>
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..4c9609147318
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.6.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libxml2-2.6:2
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	>=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		-Dinstall_tests=false
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /usr/share/${PN}-4/language-specs
+	newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
+
+	# Avoid conflict with gtksourceview:3.0 glade-catalog
+	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+	if use glade; then
+		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+	fi
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
index 7de4201a29d2..bdfd63a50a4b 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
@@ -14,7 +14,7 @@ SLOT="4"
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2