gentoo resync : 15.06.2021

4 files changed, 30 insertions, 33 deletions

diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index bd2fd750fef9..64e0b81ca168 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,5 @@
-DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
 DIST xapps-2.0.6.tar.gz 231023 BLAKE2B bc3907966c132c683e75769f8f45839d45229c77933ef861f58b03a21cca15a4f3dd610acb6a19fc16d35ddb189340cdef80704e78c89a3e49659a2f82be121e SHA512 bac6e105e2b1e237958fb610a9bd697a023c10a45131da7dee984532986022895414d81849f53bc0007c319c2139c6d39474e2e7fd9ce4e53365517f4ba4f012
-EBUILD xapps-1.8.9.ebuild 2159 BLAKE2B 15accf97f33c6fdc424b7f2bdadf3687d881ae03b459ba8bcb33dd199bde4580c8cf2617c5064f8a9aafcaa7d4f3524eb0ff02b4036f6b82eb333f0b9627bbd7 SHA512 65f7c1e45bc3dfaef4246ba025b55ab3601af36ff3e3d4dfcdda108fa4773f7a7a3acffec2a4797b503a001b5875b6b4ec04ce7914192d0bccbe826c2e603773
-EBUILD xapps-2.0.6.ebuild 2142 BLAKE2B b477ec01e1f7c69ad79d5079fb4b702016cdf0152eccff268f3325b9757f55d871b9b7c5d7dfc1b22d53fa69f9f59417802c4e7b24e8854f61bb8228dc179a7f SHA512 1792bc42eeb66d69267a2d55013a6b2115c8795ebd82f805e125c0e3a4fcf5fbcd7293de97c6f9f540c467acdfd357a8a933bfc16d45b9a633f9bb1367a89238
-MISC metadata.xml 621 BLAKE2B 63fd7221ebf1855af42a8ef0271608d308826118b6b4198b026773c0f936ea5bbf307639f9c8d93aa23eb98b7b35c8d632f18e425b7922cbcffc204ca8ea7869 SHA512 92b3b883df66a337d4e24b2cb6a935bb637c9bbe9fe1e10c61896431f98d044cefc1de28bdf20b17669cd9f33cb3e0c3bb69bb495bdd25778a5c2278f84c28e7
+DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
+EBUILD xapps-2.0.6.ebuild 2137 BLAKE2B 7d58cac8c262526bcab27af3cddb3ace003d65f89b4dbb41566e516a3e67fc515832115085c6c1f42e6a93bb02fdba198b665cf11a0ed0f246dad47bd51065bd SHA512 52d1fe7c51936c187a9c2bbb5ab7df97e657fa8a1ca5d0f874913bc75f5f25498abd28dc56c1fabd785d867f2cffe50abe36428f2afa8ea1797532eecc45e901
+EBUILD xapps-2.2.1.ebuild 2139 BLAKE2B 4a91afb77aadf2ffa5c7b31e06559f74be2c7f782bc7e491acad2e58e5fc3251dece2b9905d05e59c3608ccc776c964862b12a4c3c715b4c76e70317d732da7a SHA512 45d015894b5c354d486ae1f8bafac913b309a5ea86ec576396d4965664d7bd11f49ed83b3ec5a1b21ccc5f7b2a2ee36929e2d305ccbc5b54de0726be1065fe98
+MISC metadata.xml 484 BLAKE2B de6e513c5b0bf8090a3987c27f28c2c178ea1d4b7c90711dfed21e881989dd5894ee7a822f85135a4f2e0ca240d37158bce8206063892f4d9712387e6586926e SHA512 22a7d6e00716057a38f97ae73d4cb906bbc6c3aeabc23d586ba1788be0f77ebac6930870f55f931ab0fb6fa8ad41e7a6ac8e94eab3c459ebcb5f296b7f6dfcde
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index 47303987d492..a87c17eb9a80 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
-		<email>olivier.laurantin@laposte.net</email>
-		<name>Olivier Laurantin</name>
-	</maintainer>
-	<maintainer type="person" proxied="yes">
 		<email>sparky@bluefang-logic.com</email>
 		<name>Matthew Turnbull</name>
 	</maintainer>
diff --git a/x11-libs/xapps/xapps-2.0.6.ebuild b/x11-libs/xapps/xapps-2.0.6.ebuild
index 3059ed0a95c1..bade1ef0d30b 100644
--- a/x11-libs/xapps/xapps-2.0.6.ebuild
+++ b/x11-libs/xapps/xapps-2.0.6.ebuild
@@ -14,7 +14,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"
@@ -74,9 +74,9 @@ src_install() {
 	install_pygobject_override() {
 		PYTHON_GI_OVERRIDESDIR=$("${EPYTHON}" -c 'import gi;print(gi._overridesdir)' || die)
 		einfo "gobject overrides directory: ${PYTHON_GI_OVERRIDESDIR}"
-		mkdir -p "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		cp -r "${D}"/pygobject/* "${ED}/${PYTHON_GI_OVERRIDESDIR}/" || die
-		python_optimize "${ED}/${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
diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-2.2.1.ebuild
index 6245bcf0201c..a7434062a552 100644
--- a/x11-libs/xapps/xapps-1.8.9.ebuild
+++ b/x11-libs/xapps/xapps-2.2.1.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
+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"
@@ -13,7 +14,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"
@@ -21,36 +22,40 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2
+	>=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.3.16:3[introspection?]
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
 	x11-libs/libxkbfile
-	dev-libs/libdbusmenu[gtk3]
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gtk-doc? ( dev-util/gtk-doc )
-	$(vala_depend)
+DEPEND="
+	${RDEPEND}
 "
 BDEPEND="
 	${PYTHON_DEPS}
+	$(vala_depend)
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-util/glib-utils
 	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 schemas
+	python_fix_shebang meson-scripts
 }
 
 src_configure() {
@@ -63,22 +68,18 @@ 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 "${ED}/$PYTHON_GI_OVERRIDESDIR/"
+		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 -rf "${D}/pygobject" || die
+	rm -r "${D}/pygobject" || die
 }
 
 pkg_postinst() {