gentoo resync : 20.03.2022

3 files changed, 2 insertions, 93 deletions

diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 1e48707d1f9d..f8e559f369d9 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,6 +1,4 @@
 AUX 41-fix-build-with-meson-0.61.1.patch 1182 BLAKE2B d835f58c4514103f1a09cb5ddc14f98a1d3559045cc747c228b88970b8323f77537a6bd51b30e93f0ac2b572e544d16ffff6656dc0e9a11feace2896ef641515 SHA512 1bb4a7d79694fc10cabf39234eea7e78ad96a484c183333469a1907402ea2b8da8c497f8b4da85e021defeaed4587fba5a7319b169b8ab8819b0d238d4040898
-DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
 DIST gitg-41.tar.xz 10604696 BLAKE2B bc8a07565338f77a0a4706d6ff145ed09096acb0230fb160218a6374b87968ffde6615b6e2970ca9162ef542f877c3c8ab2023396c13e023cc47dd5bf466f22c SHA512 4e8fe0b1ab5302f975f58277e5ae42300a96d20bb1c41426d8c0e058a53420fcca73f75566f593f5aa2882b3a0e1608cdd542bc4f68c731153ba9185972d6f51
-EBUILD gitg-3.32.1-r1.ebuild 1952 BLAKE2B 1f5b072583bd1777ab7b54bed220921ea94880b46d94ac06bddcdbc5b9828cbb386152b381fcc6d5a106dc9b0abe00911fa235ac46abb486bcf6f5b045ecc3ef SHA512 be9308fd5438f6867b275ae7afa01cc12bcb1bd36213b0456614571604f386d9ec358d2e7039322ad8901deced33688e44529a5fb10cbd77ec28a536c2a37ecc
-EBUILD gitg-41.ebuild 2135 BLAKE2B 703b1b8357abdbe8ad4f29f55f9a034bf6f7f7cc0a3397573479630836eda19725eb81776cd55507ebcb03330d92f4497bed1839451b5ecb8cd471039461e3bd SHA512 6e9bc9be3ab904ec644f7ae53f10fc9d30641ca17841867a008235f703e1544ca1b0a177fd4da2275e6790a32fd18fc50f5f1caf9047c29485bf0e47afd2e446
+EBUILD gitg-41.ebuild 2133 BLAKE2B a8e5a7180e4b5c6507c7425c000fde7c4cb4f4047548a28596fc7a2950c5295faaca42470b133e2a598c8782fb1103e9c09bfa5eeefd8a0debbfefb41682e60d SHA512 ae4864582f21296f910c4ac1a9e81855e11342c780bec054dd8c77fdc601761ff52976639837628a98da41c6cb316381c64c989f149b7ba9a765058d6acd8212
 MISC metadata.xml 825 BLAKE2B 80afe83910f10e46ef7367897965440086ac6d0af1d88d24501f83ee79e3f1e0f6616bb8b76e89822a496ed5101fefe9ac927a773543b8f84bc9f7ad08bfdec2 SHA512 397f02a9fe2d282a12e1128210c5818e86cc123729aaabcdbdc038a319132d9c16e9b8a30ecc54ef1c03da0bc35892a9b1093eaa02aba60789ba43de9969fcb8
diff --git a/dev-vcs/gitg/gitg-3.32.1-r1.ebuild b/dev-vcs/gitg/gitg-3.32.1-r1.ebuild
deleted file mode 100644
index a90016480eb4..000000000000
--- a/dev-vcs/gitg/gitg-3.32.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-# vala-0.36 fails to build, https://bugs.gentoo.org/692538
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret[vala]
-	>=app-text/gtkspell-3.0.3:3[vala]
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libdazzle[vala]
-	dev-libs/libgee:0.8[introspection]
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.27[ssh]
-	<dev-libs/libgit2-glib-1
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		# we install the module manually anyway
-		-Dpython=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgitg-ext/GitgExt.py
-	fi
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-vcs/gitg/gitg-41.ebuild b/dev-vcs/gitg/gitg-41.ebuild
index 01bf024b29a0..2bd9b394ef18 100644
--- a/dev-vcs/gitg/gitg-41.ebuild
+++ b/dev-vcs/gitg/gitg-41.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"