gentoo resync : 12.05.2022

3 files changed, 3 insertions, 97 deletions

diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest
index da7c43030cf7..20646b2bfda0 100644
--- a/x11-libs/xapp/Manifest
+++ b/x11-libs/xapp/Manifest
@@ -1,5 +1,3 @@
-DIST xapp-2.2.4.tar.gz 242171 BLAKE2B a2e53123776f3f0739778673d08f165d268f5d632ce57d722ac443a7201c22c14c1c88e08247f6c16dd708a01b2dd566d4bd9d55289d70eb50ba29b8f2a0987d SHA512 428fd4dc1911905d6f940c6e38fc8b572d55bcb2691d45ac807276ef554b781c9f6c57bbd6d0a95bf52ca1703a38d260f36a61b88a94bc2dc0812b575839a983
 DIST xapp-2.2.8.tar.gz 245519 BLAKE2B cea0999a544143b8bfdd77cfb19ac794806cf7f20ce85a16d682227c164633fdcd4aacddf0235ade19732007cccc62e789f420081b0094f890b41e703ec96ff1 SHA512 eb8da7bd0b5bcdef46ebc5caf7f688eaa3e4a11f4e54dd0f37f006c2f52356bd38d361b35ae7d670cb3e34bb6e9fed8b132d998750e9cd64c110d230437d5636
-EBUILD xapp-2.2.4.ebuild 2118 BLAKE2B b8ccd772054653324d7f0ea183327187e6b30219ca0705f6f2fd22f5488c9a4a73fbf1b4552b62895052d3fe0fd3b1084d535cd8a0d7d5550740db90a09e575c SHA512 d9d2c5ebb21ce54e90acfde1f4e2c08d6eb39b951e8f3fc433d3d9225d555ce315909d73d2437647e634a2d9a849d0ff1c07549a97c1f3ffc474ecccba38e7cd
-EBUILD xapp-2.2.8.ebuild 2095 BLAKE2B c0777f6b4b0121249a0c27797ee593176cefc08cc19eb6cc03a6c9ab2b383e204873cb17fbc1a2323d98d233b26989009cafe28852254b2d8ce9efc8d1446254 SHA512 ad8b93dbd49485d90b133e40396251008398c99c2fdc056154782c3ac131e4000423e37c37f25c43b8f4261f218873a1792253923c757da35d013f8465e5d6de
+EBUILD xapp-2.2.8.ebuild 2093 BLAKE2B 2eeca574fe5634019e4089f0fc367ad4ef3918210415f00ba7480b81baec2e2844895fae42fbbb1fbaaef100c6fdeec398e162d24b8ca127bda1cab146f25e52 SHA512 876e6d16dd995d84c2822454f626099f6b8cd96ec80b986325c2095589d86ba8a29aae206bf4d07dc05dda70979d26a88127393e0e1944e52c191b1768a74770
 MISC metadata.xml 485 BLAKE2B b5373ca9cd55c24bd3ea5b65bd11c5fd43519b6237ff1e73d08ee35303f2f1dd9805fe8a94343bddf2c044749a3914b4d76d1d1b71f02f52e6415c5ef6e1a91a SHA512 45a4105d5797c3ba05757cb93ae6a7e80c9283a9e31cf45cc8b6dcf0d8606e3b2c855bd85c9733750e927758982095047895cda09cc5f32a02cfdd840c101344
diff --git a/x11-libs/xapp/xapp-2.2.4.ebuild b/x11-libs/xapp/xapp-2.2.4.ebuild
deleted file mode 100644
index 88caf5d65c94..000000000000
--- a/x11-libs/xapp/xapp-2.2.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2-utils vala meson python-r1 xdg-utils
-
-DESCRIPTION="Cross-desktop libraries and common resources"
-HOMEPAGE="https://github.com/linuxmint/xapp/"
-LICENSE="GPL-3"
-
-SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-SLOT="0"
-IUSE="gtk-doc introspection static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.44.0:2
-	dev-libs/gobject-introspection:0=
-	dev-libs/libdbusmenu[gtk3]
-	gnome-base/libgnomekbd
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	x11-libs/libxkbfile
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	vala_src_prepare
-	default
-
-	# don't install distro specific tools
-	sed -i "/subdir('scripts')/d" meson.build || die
-
-	# Fix meson helpers
-	python_setup
-	python_fix_shebang meson-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dpy-overrides-dir="/pygobject"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# copy pygobject files to each active python target
-	# work-around for "py-overrides-dir" only supporting a single target
-	install_pygobject_override() {
-		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
-		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
-		mkdir -p "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		cp -r "${D}"/pygobject/* "${D}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		python_optimize "${D}/${PYTHON_GI_OVERRIDESDIR}/"
-	}
-	python_foreach_impl install_pygobject_override
-	rm -r "${D}/pygobject" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/x11-libs/xapp/xapp-2.2.8.ebuild b/x11-libs/xapp/xapp-2.2.8.ebuild
index 48803592d1e1..91e9c4562806 100644
--- a/x11-libs/xapp/xapp-2.2.8.ebuild
+++ b/x11-libs/xapp/xapp-2.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/linuxmint/xapp/"
 LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"