gentoo resync : 16.09.2020

5 files changed, 100 insertions, 11 deletions

diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index cc1a7ace1ad5..0add21e1d094 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,5 +1,7 @@
 DIST xapps-1.4.2.tar.gz 69709 BLAKE2B 514e4cb2e614ccd9fa303625eb5ffb818847447b29d6d989c2abdc90b6b9840dac6124d8484b71ffc2e489a925f83dae597c0904aa79cd5d5a0c27d44420da96 SHA512 2d16bd893a16876270c41d755c62ca454f561931750acc719c480e63036b70dca8dae25e6a313f13ed0daae09fd650e0efcef9d272c405ccd9c04147aaf59fe2
 DIST xapps-1.8.4.tar.gz 179340 BLAKE2B f6558b87320cbd73e73c5294f48a3c0c94c7239abc9ede9cd88e66ccd53fd0c9cba9c638837efbd5eecd8a4f372262fde759e05ba9e97ad9955ab74464c34c21 SHA512 483e8e334d4883e2172e06835d690d20af2752fcc195f63776053b83abc0ffcb25c757633450a02b153e70e67e98c477754de12169c167a2f9f3fea103e12bad
-EBUILD xapps-1.4.2.ebuild 1160 BLAKE2B d086673cc4e148393b122af0ac0ee1b9b2561b732095e0e622766e9719bec529af134586ff6934b56b50cbfddfc67ef8dce7e7473480869b934d9645ba24c088 SHA512 ac27b0e47ae63463599cf0a72cce821a47541118d47234349c2cedc2f68398c381669308be9916126bad857a12d358bf39ba9a456b72a7742f46d9a76d995a78
-EBUILD xapps-1.8.4.ebuild 2023 BLAKE2B 4415eb0ad87329d28a39de45a5bc97e39901f2219433a407227cf9dc0ac38894fce8a00e49e979b0a8e5e54705ee677139f10310f456d2ef95b9b52ec4c2311b SHA512 d20845e80cf01dfe39a6872596c4543a3a95f6c0d1cae3fedba20630baaa361ff5f33bfbbd1f1ecb9ba5c837ff3880e364cac9719c66466537f8ac588403d9b3
-MISC metadata.xml 690 BLAKE2B 08cdd7b976068fb4e8744b8092952e95696bf7bcbc8d08d079cc22990152b59e3362473dd23561404947e12ad837cb791cf58e3e45acebf2fc8a14a9e1c38e4e SHA512 b179ee513fe2b71444f8b28fe706f0c918d5e9fcdaf2c236f77fa0041137a1593b0bcb81e36f5a9222a46bee663158368f6e87daecfddbdfbb873b52e2bc48a4
+DIST xapps-1.8.9.tar.gz 187789 BLAKE2B 37b2d2677cb6483533d79853a83d77b30033313c06db89e93491076bb017122f77cd97b30d5ba64ce53fb41a37736791e97da785f516953b76b1d979d341e2fc SHA512 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
+EBUILD xapps-1.4.2.ebuild 1181 BLAKE2B ede71dd76c683ac4e05a4dba2679b16db5b653aaaaca9134f20b35fda0f374ac7a3ca11a9eac6c976b5babdebc451ef242d09ea0cb0be614ee67883512013bb7 SHA512 65eab865b8b232c4ab9aaa2d3a664a8961132d3a7d3a79482a4353390eee954de39bf0aa752f728f393bf73ab9e3ebfb6a3cf77a96e18aa6d7247b80c67cae54
+EBUILD xapps-1.8.4.ebuild 2044 BLAKE2B 604dd1658fc1a5cb2033defcec921bfb3217feae2d443a656e5f2eafcd03d6eab09b93f850c59c80eb4c48c4823e8c057affdced3cc51cfc34ea1c3f954b0070 SHA512 dbd39ff32234abc3bf8ed777ccea0e6fb586b5ec8d882beb63e6e1b4176731fc555fef2a7c67505988283ab80279b05bd9afbbcf2b4be83032ba85fb4c8ebfcc
+EBUILD xapps-1.8.9.ebuild 2101 BLAKE2B 77736fc9943ef13943773fa18feb1876aa5dba32084abae260ade71ee456213376a4664026984b38d0033acf0d3b597e0875c7a21b3e3c6a563d1998fd543c6c SHA512 5606c183f79557682cee07caf074d1d70ef229bbb76d7624e610fcb1bd2dab08b57c67f51b1064f1b94c527de2f16bf0025dc04ae9738bf4bd5b320f63200a40
+MISC metadata.xml 577 BLAKE2B ed5786f6e30619e209d841a04547b52f7a9a09eeb5a64f0fcbe9f33031e936610aaef4b80cd29f45d662ac23295448ba336786c31a2b5f302332750497d0f545 SHA512 3af23ee720d2691213fccfbcdde69b5af42259fb0acee32e499c51e13dc8a5414fed038372b2a485db65548b38163886911d4b44ebaaca8ff0e0274c4c40d48b
diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapps/metadata.xml
index 0f3abac753e0..24251f3f0eef 100644
--- a/x11-libs/xapps/metadata.xml
+++ b/x11-libs/xapps/metadata.xml
@@ -5,18 +5,14 @@
 		<email>olivier.laurantin@laposte.net</email>
 		<name>Olivier Laurantin</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">linuxmint/xapps</remote-id>
 	</upstream>
diff --git a/x11-libs/xapps/xapps-1.4.2.ebuild b/x11-libs/xapps/xapps-1.4.2.ebuild
index 91cf0720f3f4..762e94721fd8 100644
--- a/x11-libs/xapps/xapps-1.4.2.ebuild
+++ b/x11-libs/xapps/xapps-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ RDEPEND="
 	x11-libs/libxkbfile
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	sys-devel/gettext
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
diff --git a/x11-libs/xapps/xapps-1.8.4.ebuild b/x11-libs/xapps/xapps-1.8.4.ebuild
index 6e106233d427..2768e92fb440 100644
--- a/x11-libs/xapps/xapps-1.8.4.ebuild
+++ b/x11-libs/xapps/xapps-1.8.4.ebuild
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 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
diff --git a/x11-libs/xapps/xapps-1.8.9.ebuild b/x11-libs/xapps/xapps-1.8.9.ebuild
new file mode 100644
index 000000000000..dd52321b47f3
--- /dev/null
+++ b/x11-libs/xapps/xapps-1.8.9.ebuild
@@ -0,0 +1,89 @@
+# 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/xapp/"
+LICENSE="GPL-3"
+
+SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xapp-${PV}"
+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 "${ED}/$PYTHON_GI_OVERRIDESDIR/"
+	}
+	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
+}