gentoo auto-resync : 04:12:2022 - 09:02:03

4 files changed, 0 insertions, 179 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 6e545efd751a..362a4a886d40 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,11 +1,7 @@
-AUX 41.2-meson-0.61.patch 1775 BLAKE2B b169bd8ea9d84c074426219fcf9b2a37557490c1dc3a2e647016b6c46d2ecbc02000f9595da9375cf9a4b00d22c95ad831ef72fceb3192030bcefcdc073afe8c SHA512 50500f5ddaf5eafb1299f24d1b1dba4b0808c9a140f1d7c0748cc73d8da25e0a444bcd1a1293c331158a3f0f96af1ab9cb27c37498437f0bdbffb191d93777ac
 AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
-AUX 41.2-webkitgtk40.patch 1174 BLAKE2B 9c93f1d8b214f8569f560de51d3e8f308e2ecb4dd00f8dc1e4daef5eef87a785289c1ab53b94de0e8e75493015fa13669c1a7b0cdfe7750617275fa13e830a47 SHA512 22b45421fe5e0e312cff0128f98fce32f76a15b5316ca8a4065db3a300dc0e12e04ac2a0a6c47e47ca7ff49c4a4e0c2e0a4accd10981f05eb6bf312860da0138
 AUX 41.3-webkitgtk40.patch 1005 BLAKE2B 59b4d5d197be0837f166ddebbaa63abd235934398b6df3c7a715ce05a13c006e20fe83ab91604ac2fce2a737e46812011f8dac7158b2b77cf1f85742a949ca17 SHA512 8afaea3f0ae6ebb64b5ea4518f091aee6fa90f63badbcfaef5d06d411300d93027c8e64ce3f3e4fcee7e7a31c53627afeaf0ce1c83797fd348163277a88726c5
-DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
 DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d
 DIST devhelp-43.0.tar.xz 327508 BLAKE2B 455015ec115610f27c2a1d9c3a8a21f50d8b061de7524371d892aba35173278f3aabe623b0b6770437b1501e6af795a9a12c9cc3ae238d8691d00e27388ae1a4 SHA512 92f147659754480ac4aa02f21558572d4bb8a034251225d344a8cae16824d9c14071751dfca6439f98dc7f7884fb35ef2d9c708e42f11bb6b3dfd8648b784654
-EBUILD devhelp-41.2.ebuild 1987 BLAKE2B 6a1fce0b8bf95a811b8e19133779ba29ec708f9f19c7da726c6a4eaa75b300d8d1a885de8b7a01cfb7507f7684325200b435210e88656de508089f4a1e2a1017 SHA512 223d44651c3e98b1837e4012ad4bec4144d440e780b9cdb548e96656934b1cea06808aa0902d2aa37379e66c9485fa9d999f53c4c1c0cee8d94b1144fae9f0fa
 EBUILD devhelp-41.3.ebuild 1947 BLAKE2B 8299890f3c1e0b01aa9f058831d4a423b88d0b8daeebc4b896b15f33d12c7dfecee66f0e8f7c14051cdf979f7ee5ae24163b37ee2d1a2a9e906429b9dad4531a SHA512 861738789082d443f1641869cac127d2ed44bc628f9f21be1c69e8384e594265a39aae0a82cd8f6e2b0fd43da6dcffe15a0f92f88faed31a0c03e78794546615
 EBUILD devhelp-43.0.ebuild 1905 BLAKE2B c3674d55fe2bc7b05810badaa3300dcd3bf400be3a3f6464164c9d7b0ed0fb7c296ebf13eced5eef2ff4304f16d953d6d720d0c86070e9a93f2f6a5141eafbc7 SHA512 344001aa1709810a25b57568fa6492957fa61e05d399981230662a642531b0f6bbb25051dfe08ca5c11464346561177e8e9ce90240606d5a4689a57aded56744
 MISC metadata.xml 443 BLAKE2B 87f4012dd8dac2a075656c3da08e1c95b7d14d2182d0309c8d55136ed8acb86309f5eb76b3fb0330964bd3484d99a1b7545da30e8210b53a52ac07bd00ef6327 SHA512 5cb45a90194fd472afb7abef7907d4e77b7bbafb35d9bcf901ef6e26b36203200777b1a7f96fe504801ac52920e1fc0ca7a1411b15ddc92fa51997cdf640d368
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
deleted file mode 100644
index 98fc2847065b..000000000000
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="+gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.26:4[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-optional-introspection.patch
-	"${FILESDIR}"/${PV}-webkitgtk40.patch
-
-	"${FILESDIR}"/${PV}-meson-0.61.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dplugin_emacs=true
-		$(meson_use gedit plugin_gedit)
-		-Dplugin_vim=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch
deleted file mode 100644
index dd75f802056a..000000000000
--- a/dev-util/devhelp/files/41.2-meson-0.61.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch
-https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch
-https://bugs.gentoo.org/831928
-
-From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
-From: r-value <i@rvalue.moe>
-Date: Wed, 17 Nov 2021 18:02:20 +0800
-Subject: [PATCH] Remove incorrect arg for i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments and
-explicitly rejects with error "ERROR: Function does not take
-positional arguments" since meson 0.60.0
----
- data/meson.build                 | 2 --
- plugins/gedit-plugin/meson.build | 1 -
- 2 files changed, 3 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index c6aeffb4..0bc531a2 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
- appdata_conf.set('application_id', APPLICATION_ID)
- appdata = APPLICATION_ID + '.appdata.xml'
- appdata_file = I18N.merge_file(
--  appdata,
-   input: configure_file(
-     input: 'org.gnome.Devhelp.appdata.xml.in.in',
-     output: APPLICATION_ID + '.appdata.xml.in',
-@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
- desktop_conf.set('application_id', APPLICATION_ID)
- desktop = APPLICATION_ID + '.desktop'
- desktop_file = I18N.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: 'org.gnome.Devhelp.desktop.in.in',
-diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
-index 4f779886..877a01ff 100644
---- a/plugins/gedit-plugin/meson.build
-+++ b/plugins/gedit-plugin/meson.build
-@@ -7,7 +7,6 @@ install_data(
- 
- plugin_info_file = 'devhelp.plugin'
- I18N.merge_file(
--  plugin_info_file,
-   type: 'desktop',
-   input: plugin_info_file + '.desktop.in',
-   output: plugin_info_file,
--- 
-GitLab
-
diff --git a/dev-util/devhelp/files/41.2-webkitgtk40.patch b/dev-util/devhelp/files/41.2-webkitgtk40.patch
deleted file mode 100644
index 967d276bfa83..000000000000
--- a/dev-util/devhelp/files/41.2-webkitgtk40.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7b0ef55edd63c71be209aa3b57e2190d4ce4fb90 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 3 Oct 2021 23:52:27 +0300
-Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
-
-That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
-so it wouldn't be picked up automagically once it's added or comes from some
-overlay.
-
-This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
----
- meson.build | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e57e466e..492aafed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -46,15 +46,10 @@ lt_revision = 3
- lt_age = 0
- LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
- 
--webkit_dep = dependency('webkit2gtk-4.1', required : false)
--if not webkit_dep.found()
--  webkit_dep = dependency('webkit2gtk-4.0')
--endif
--
- LIBDEVHELP_PUBLIC_DEPS = [
-   dependency('gio-2.0', version: '>= 2.64'),
-   dependency('gtk+-3.0', version: '>= 3.22'),
--  webkit_dep,
-+  dependency('webkit2gtk-4.0', version: '>= 2.26'),
- ]
- LIBDEVHELP_PRIVATE_DEPS = [
-   dependency('gsettings-desktop-schemas'),
--- 
-2.32.0
-