gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 92 deletions

diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index 1f2f9eb2bc82..a69f231b5e1f 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,3 @@
-DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad
 DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
-EBUILD xapps-1.8.4.ebuild 2044 BLAKE2B 604dd1658fc1a5cb2033defcec921bfb3217feae2d443a656e5f2eafcd03d6eab09b93f850c59c80eb4c48c4823e8c057affdced3cc51cfc34ea1c3f954b0070 SHA512 dbd39ff32234abc3bf8ed777ccea0e6fb586b5ec8d882beb63e6e1b4176731fc555fef2a7c67505988283ab80279b05bd9afbbcf2b4be83032ba85fb4c8ebfcc
-EBUILD xapps-1.8.9.ebuild 2108 BLAKE2B 06b128765e850184429940c95fdb45a198f628a28231d5ed20583344c7f61f1980b08495c0e2179e7fd70b1cd7076c82d3c8fbc30c02bdf1614e3d31934d0fbe SHA512 da7dd2e8368ecb0def80ecb874adb2a27d293db03798e673f269fe08d35bb97b488965365fc08a462e81036c9b09ad39f611e738d1dabb466797d85bcdb51f7d
+EBUILD xapps-1.8.9.ebuild 2107 BLAKE2B 12c92981529531e42640885ccebdd0407f70da60113b350c935360e49c2ec5798dbb952fe808571046bc9d0fd252404f8eb42cc5254277945ef53ab0363d2000 SHA512 19ac65a8baee5398a1929bf59f5a3803e0dc7a00811a333881d37b57340ecba2f8143271a8951fbb191b9ddaf2192b5ca50f4116815a8c9a1abb61c0c95101df
 MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
diff --git a/x11-libs/xapps/xapps-1.8.4.ebuild b/x11-libs/xapps/xapps-1.8.4.ebuild
deleted file mode 100644
index 2768e92fb440..000000000000
--- a/x11-libs/xapps/xapps-1.8.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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/xapps/"
-LICENSE="GPL-3"
-
-SRC_URI="https://github.com/linuxmint/xapps/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-IUSE="gtk-doc introspection static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2
-	dev-libs/gobject-introspection:0=
-	gnome-base/libgnomekbd
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.22.0:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	x11-libs/libxkbfile
-	dev-libs/libdbusmenu[gtk3]
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gtk-doc? ( dev-util/gtk-doc )
-	$(vala_depend)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-"
-
-src_prepare() {
-	xdg_environment_reset
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dpy-overrides-dir="/pygobject"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	rm -rf "${ED}/usr/bin" || die
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	# 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=$("${PYTHON}" -c 'import gi;print(gi._overridesdir)') || die
-		einfo "gobject overrides directory: $PYTHON_GI_OVERRIDESDIR"
-		mkdir -p "${ED}/$PYTHON_GI_OVERRIDESDIR/"
-		cp -r "${D}"/pygobject/* "${ED}/$PYTHON_GI_OVERRIDESDIR/" || die
-		python_optimize
-	}
-	python_foreach_impl install_pygobject_override
-	rm -rf "${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/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-1.8.9.ebuild
index dd0832591bb0..24b3b24bb2fd 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-1.8.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 SLOT="0"
 IUSE="gtk-doc introspection static-libs"