gentoo resync : 02.02.2022

4 files changed, 0 insertions, 169 deletions

diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 4e0f449d7f08..d36a937bbf56 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,14 +1,10 @@
 AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68281b95f34c993f39c8c47b56c17209d84e9a72a818e930f8c1b89dbe7986530a879293b496504b418 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2
 AUX 4.6-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e08756f49d1d73c14c9505a19d9354671254cbfe0bfdc69545c3d5b761998037ab2ec57ce58bb2d7 SHA512 fffb635074ed0de4cedb3836f37322c7b9b58b65e91a014b72bd6a41bcaf195f0b25d4031d65d60fa5abd1c7f4f5aaf19d61a77eb91ab6f59df814dacf0a0595
-AUX 4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch 971 BLAKE2B 0ff23c398baf4b0bc324b2fbc9227798efdb87262a6165cc92d5756bfb1987250a7cda195c905954cec3d557ec16a83e47044a8af1c50c51f6a578794b18e38c SHA512 036fe1cb0d3f460635dc738f2d06c15d233409285e3df513946ce995b5a651b06602e4923a9f9756a2504bd7f3404fdcf6117ed75fb217c06d5dc0b9a635870b
-AUX 4.8.1-build-ensure-access-to-resources-in-corelib-build.patch 1631 BLAKE2B 2535dea32425643cc47aa26571e9c2cb2c02553357f7efafaa03b7fdcdc28a88f5739d5310362f4321a50676eceab06b12d4d4f49bc25271710fceb7409458f7 SHA512 496acbeb7e92eaf5e56ec67f40e1a8d2c0759c22cefacaecf039b93cf3099a0441931f2e3e01ce219ca6ab3040dae797abd172b644e44e61e3287547478cb06c
 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
-DIST gtksourceview-4.8.1.tar.xz 1160032 BLAKE2B 3ed93f056ca8c6ae1982e28a675ccec448c301999f058abc5b9ec46f609c2649ac807fc20379480a8eb00408496912e1554e08d55ce5da70a97cee34be10fc20 SHA512 fe3bc05e81f881b97a53e6dfb807ded314f1953ebe74424b515d6c1333e72011e3b756b958cca40becad0f66434cf16c56d42fff950b8d643e65c9a03e9cb88b
 DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04
 EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
 EBUILD gtksourceview-3.24.11.ebuild 1279 BLAKE2B d4e7fb2cccc4d617b9c6a3fe8cc11ecbaf6c3907df32b1251bdc56819b4e85cb945dc224e9c468f69d7077f8645e135b0aa98815bda7339ad553f9f85dfd0dd2 SHA512 2ab149f2e157beada8d782292d96e6aa117364c7815cf83b7f847c46c652442baa0409e12531786b0dcbbf176bdfd634a13f513f28390a9d90b9458e993de145
-EBUILD gtksourceview-4.8.1.ebuild 1920 BLAKE2B 2b90c412ec50adab0d9285c69d99feb7b39f77e5cfd08ff2e99e44edb0aa20a12a0532222b5c4493140edca87b212f29edd8927f7f2985b18afc69064ea78d8d SHA512 101c0f21491ab5b205408be73d43c51a6183313c7387a3454f7d37433d9ff27e6b5c72b277b9b21c11b216f992ab21f352db3e57128fec15a834f51aa590024f
 EBUILD gtksourceview-4.8.2.ebuild 1751 BLAKE2B d20f94cd5f313cf4fed081b8ac6a39894ef809e14e9f3eeeb7822a27ac42833aa1af048ce57e1fc5d5ef93103d93a363ae7349bd380222303295945ac94e09b1 SHA512 738aec48327b3c17fafdf334b5b031fed2e962b518864dfd354074fbf29efad73a8438c51475f102661ac4a1ade9b872fb33ffb73e124613234968da8b4d9cba
 MISC metadata.xml 319 BLAKE2B 383670a9fec1362b5c4cc12cc93d8f94140d3ba3c09ac64f125de13ea990d4fbaad7eae555c864dc18b1c5f1ddcf631e1125d161cffdea9fa97d76f775f42d7b SHA512 dabf9cb57c228ea197a473292336bad77024b7ea122c121a385755096201097215925bb8281359d3cfcdf7879d80c93d522b6f9dd08b5a33df826b8c310ce074
diff --git a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch b/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
deleted file mode 100644
index e13a65c3bc4d..000000000000
--- a/x11-libs/gtksourceview/files/4.8.1-build-disable-Werror-for-incompatible-pointer-types.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d1ed58b2ab82bd5be55881088fc17ff1527511db Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Thu, 15 Apr 2021 08:11:22 -0700
-Subject: [PATCH] build: disable -Werror for incompatible-pointer-types
-
-This causes an issue with volatile and GLib in some configurations, so
-just keep it out for now. We will bring it back at some point going
-forward.
-
-We are already doing the same in 5.0.
-
-Fixes #179
----
- meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 826a3121..6ff5b155 100644
---- a/meson.build
-+++ b/meson.build
-@@ -181,7 +181,8 @@ else
-     '-Werror=empty-body',
-     '-Werror=implicit',
-     '-Werror=implicit-function-declaration',
--    '-Werror=incompatible-pointer-types',
-+    # Disabled due to volatile changes in GLib
-+    # '-Werror=incompatible-pointer-types',
-     '-Werror=init-self',
-     '-Werror=int-conversion',
-     '-Werror=int-to-pointer-cast',
--- 
-2.26.3
-
diff --git a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch b/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
deleted file mode 100644
index 3fde96b14850..000000000000
--- a/x11-libs/gtksourceview/files/4.8.1-build-ensure-access-to-resources-in-corelib-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9bea9d1c4a56310701717bb106c52a5324ee392a Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Sun, 7 Mar 2021 08:54:15 -0800
-Subject: [PATCH] build: ensure access to resources in corelib build
-
-This should help with some transient build failures in dependent projects.
----
- gtksourceview/meson.build | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build
-index fd080a9c..b6192604 100644
---- a/gtksourceview/meson.build
-+++ b/gtksourceview/meson.build
-@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file(
-     install_dir: join_paths(pkgincludedir, 'gtksourceview'),
- )
- 
-+gtksource_res = gnome.compile_resources(
-+  'gtksourceview-gresources',
-+  'gtksourceview.gresource.xml'
-+)
-+
- core_sources = [
-   core_public_c,
-   core_private_c,
-   core_enums,
-   gtksourceversion_h,
-   core_marshallers,
-+  gtksource_res,
- ]
- 
- install_headers(
-@@ -216,11 +222,6 @@ extra_public_sources = []
- 
- subdir('completion-providers')
- 
--gtksource_res = gnome.compile_resources(
--  'gtksourceview-gresources',
--  'gtksourceview.gresource.xml'
--)
--
- 
- # We can't use the static libs on Visual Studio builds
- # to form our DLL here directly, so we must use
-@@ -233,7 +234,7 @@ foreach int_lib : gtksource_libs
-   gtksource_objs += int_lib.extract_all_objects()
- endforeach
- 
--gtksource_lib = shared_library(package_string, gtksource_res,
-+gtksource_lib = shared_library(package_string,
-                 version: lib_version,
-         darwin_versions: lib_osx_version,
-     include_directories: gtksourceview_include_dirs,
--- 
-2.26.3
-
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
deleted file mode 100644
index 1693f4853c98..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-4.8.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.48:2
-	>=x11-libs/gtk+-3.24: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) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-build-disable-Werror-for-incompatible-pointer-types.patch
-	"${FILESDIR}"/${PV}-build-ensure-access-to-resources-in-corelib-build.patch
-)
-
-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
-}