gentoo resync : 05.04.2019

9 files changed, 122 insertions, 25 deletions

diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 8c3e7e78aab7..19445c235747 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index 2a9b9686430b..889bd36db7a1 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST mate-power-manager-1.18.1.tar.xz 3210144 BLAKE2B 7ab427acefd02b4aeea6fa2dd3052e2eaa9de3231ed9f8aa7b81af3a46fbf15da20925b568364ff802598738a7c3387d1b1fa620bef3ff2fd5522bb6247c2f3c SHA512 f4b42f66607e54020901f1f686cb018962c419294e50e0b37724bfddb462cf98a2e74e7ed980c3fe968873ca3848ff401839b39f53f1b40876773bfbf91b51c1
 DIST mate-power-manager-1.22.0.tar.xz 3182040 BLAKE2B 3635001cab5551a29ecf57ebfd84cb6f3dff9f3e16cefdbc7811c1ce9d140e543f6054925b460714ebd4aa8749e39326663866535394664b5ec2f0e94d92337e SHA512 d36ec8d328e00ccc14b26c36ded74f20ea80578870541899560c6a744018e5e91b08ec9b4d517548404e82da6f1868ed1f2fcc0aada1223f98e68dd6e6009503
 EBUILD mate-power-manager-1.18.1.ebuild 1524 BLAKE2B 46d737ef12bb186fb6d12ab081903869c9b0588e607d0c6e99028580211b37cbccfb25dc45a7500fdeb12dc0137cd1b660ca86adbb494eefe3d0408419642b57 SHA512 235ed9ad8df77b4fed90d11b39bc9cd37b2aa58aa313c0bcc6f506a020cb454a498c6e01e4969318a45f1ff4437fa9721aed3a1655ec79b1622033737eb3a020
-EBUILD mate-power-manager-1.22.0.ebuild 1504 BLAKE2B 4b31d723e01bbfef8b4dcceec844afc63718e78ae2e201544afb5076860a3d7d5b48cc5bf97ef08d80c6345ac2a6f43cd6a1f9c6aabcc42ae9d44b001e78248c SHA512 05762099eb368db52d9a22cd04b2438cb97085ed2e1ed3b3b7466aaf67c5274c8c0af05a6a20e736db21e5cb6c697758a821ab9bda4f35f3336dd5344f929568
+EBUILD mate-power-manager-1.22.0.ebuild 1600 BLAKE2B e862da75759f53096a3e37d14c4e4a633bae945ff36a69b30fcb0608e78b0b59730b961504f07a4603a24297052ddadf2bd90cce9ace33177cebfb6808412102 SHA512 126a64b5632522be9d20f876f7fb9b70b2ae4e1c7f5e499703d72be480fbd8a33300f744202aa0e918f5fc4c213fe8ee99a232764e08ffb9b76b34c67c4a4411
 MISC metadata.xml 427 BLAKE2B 2a15897025c6693a2e99c56ee66f3c4da0fc62655c9d6e062451f7f8ef9d82b1fc8bd162d54b5fdee4a1cda0135f09c594f63c1609b622c9570568be05b2e6d7 SHA512 6922ccd9022b2b15fe7d57f196aa715aeed17f5f08d92444f3f07d8ef50f37dd48b62000adc5188076805138f651afea6af02c89d13f4abb3c66cd2419ccb30f
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
index 6414a546dfbc..9b2c5e906964 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.22.0.ebuild
@@ -10,10 +10,12 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="+applet elogind gnome-keyring policykit systemd test"
 
-IUSE="+applet gnome-keyring policykit systemd test"
+REQUIRED_USE="?? ( elogind systemd )"
 
 # Interactive testsuite.
 RESTRICT="test"
@@ -33,12 +35,15 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.70
 	x11-libs/pango
 	applet? ( >=mate-base/mate-panel-1.17.0 )
 	gnome-keyring? ( >=gnome-base/libgnome-keyring-3 )
-	>=sys-power/upower-0.9.23:=
-	systemd? ( sys-apps/systemd )
-	!systemd? ( >=sys-auth/consolekit-0.9.2 )"
+	>=sys-power/upower-0.9.23:="
 
 RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
+	policykit? ( >=mate-extra/mate-polkit-1.6 )
+	systemd? ( sys-apps/systemd )
+	!systemd? (
+		elogind? ( sys-auth/elogind )
+		!elogind? ( >=sys-auth/consolekit-0.9.2 )
+	)"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.3
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 8df7fddd344e..45a769e329e0 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -2,5 +2,5 @@ AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb
 DIST mate-screensaver-1.18.2.tar.xz 4926748 BLAKE2B 7790a579991886617accd3f38146b624c81145c588fbc93fe78b0015669ca53e493aca0689e157fc0c11b86248bbc3d00b479ad8c4c1c01288e853c1ef3dd40c SHA512 b8ec5705f1810ecb1b887d1c9ad2a5eca2a39f7a093154d45c8cfdbcef664520b09be0ed4ab5992b001a4445e71e4eefd4e28d83e22c7536788c9d32f703283e
 DIST mate-screensaver-1.22.0.tar.xz 4959732 BLAKE2B 23d7622ea992c8a29966a12a4e8db36fb489d0d07124907cb3fc2325dedb7fb99394bc551b0d889247989bbea27ba540fb17f55dbd12644e10a9abc242b07d8a SHA512 e253495ad700264ee7833d7b5a732cabff53058384801ff5e874d45f812cea1e4bd3877a1688ecec6197c37f32761f69a4924a47a6556332f1fec736e540e333
 EBUILD mate-screensaver-1.18.2.ebuild 3027 BLAKE2B 4fcaa0fc8c5ba82d31fcb8594b46033964ce8aeb71aedbc5f2876bb61bbc7a1681006e3752145d6b072ea5e5f8aeba59e89e8fa7ca52a89ec1411713d0a3754e SHA512 7aff1f0f02fa1a3095405716d53bea7d380bd9acb931bc7bff5dc9775aea9aa7684742f95a4626a506c3731c655a1ce75ef8074c530979ae8d05bfca56ef2e3f
-EBUILD mate-screensaver-1.22.0.ebuild 2978 BLAKE2B eede89b600a5baf3e2fb4459b78ac2dace66d284e548d74f1b0af75487c4b763fcadc0d4cd851597d14f0764f4eef788827d549184a26b4671910ec6ba2d4c2e SHA512 8e9357fb56a42b2b798d5f7853857d6fa501b37d056601376d11f7e1c6e35a59684b0c8ad9c0b88c954eecfd5b50007ad9d947b8b136e23a2578a1b9fe87518d
+EBUILD mate-screensaver-1.22.0.ebuild 3253 BLAKE2B 87bfaf8fd0d174fb9a66f8cbf8c65cf4689225ee8af9ac91caf81a57d1a10618b8a31d67ed99a75da0d0bd5c3b47006bd0f5e5a6c28904a1f257c58c1c3fc5ca SHA512 26ca99778f2482e749ced813ce4596be2b728d72819b639d0279e1cccaa7cdedd0836b350832f08028046bf700491a2caa61e7f19aebd04f5d2e426fa59773b1
 MISC metadata.xml 447 BLAKE2B febc277d7b427ae9a48c3c6e318b779f8a3fb9e27f896b17a3ebafec9bc8b03c4af3f30de7881fcc7feff674fdc0106d0b46f91d72d7267d4c4eeffb1dbe341a SHA512 29d7b99ddd69b2503d91f185679e1811403ba34443e20e2b17782878ee509565dcd62c2e3339709b3d29f568168c9c5c5a9284823d0187392220e781792b73e8
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
index afbb7b7d8e62..cea71578dfcb 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
@@ -10,10 +10,11 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE="X debug consolekit kernel_linux libnotify opengl pam systemd"
+IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 DOC_CONTENTS="
 	Information for converting screensavers is located in
@@ -45,6 +46,7 @@ COMMON_DEPEND="
 	opengl? ( virtual/opengl )
 	pam? ( gnome-base/gnome-keyring virtual/pam )
 	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd:= )
 	!!<gnome-extra/gnome-screensaver-3"
 
@@ -58,19 +60,30 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig:*"
 
 src_configure() {
-	mate_src_configure \
-		--enable-locking \
-		--with-kbd-layout-indicator \
-		--with-xf86gamma-ext \
-		--with-xscreensaverdir=/usr/share/xscreensaver/config \
-		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
-		$(use_with X x) \
-		$(use_with consolekit console-kit) \
-		$(use_with libnotify) \
-		$(use_with opengl libgl) \
-		$(use_with systemd) \
-		$(use_enable debug) \
+	local myconf=(
+		--enable-locking
+		--with-kbd-layout-indicator
+		--with-xf86gamma-ext
+		--with-xscreensaverdir=/usr/share/xscreensaver/config
+		--with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+		$(use_with X x)
+		$(use_with consolekit console-kit)
+		$(use_with libnotify)
+		$(use_with opengl libgl)
+		$(use_with systemd)
+		$(use_enable debug)
 		$(use_enable pam)
+	)
+
+	if use elogind; then
+		myconf+=(
+			--with-systemd
+			SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+
+	mate_src_configure "${myconf[@]}"
 }
 
 src_install() {
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 4ff1096bb570..10b92ae9654b 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,5 +1,6 @@
 DIST mate-sensors-applet-1.18.3.tar.xz 385728 BLAKE2B 42a38121db367788af906aec08261512b8aa96ad3782c1aca0d29b8371a598855ee0d7a3c63306929d45e4d58fb01e117efd91b4bd6b104c49790ff8e73c292f SHA512 39e23839eebe460a99d002d6f897d3053a6940cb33a24c923790e976b72be7a260cd06be326abbb3917b85b6b6fa779cc5f1c06dbf9c19c45ec3f1bf6a93a96e
 DIST mate-sensors-applet-1.22.0.tar.xz 511876 BLAKE2B 6e2008d60a5530ab233da0fe67a38fea2abfba0d745386d82d44e21e59a5d7a08e7f97390f3b8e3df16699c8b69bf1f9c3d4762b45f4652838672c57ec91bf34 SHA512 f756fdff4dd8fe824fbe41956411ca1e6ce251fc1d43276c7244a8a806e91bacc283c412b831935136682971509e23c08538264963af31488bee15ce5644d5cb
 EBUILD mate-sensors-applet-1.18.3.ebuild 1411 BLAKE2B ef15529ff5db1a8909f6c76d6188b348ad34ddbe7206cbf290810524c12237a667499ce8b37a3d7845735a478635ff790abbcdaaa268fdbd7edfe6b63034c3da SHA512 9ac6a446f48023d70f2f9f2de2a70dc8c865d49a08c9cc8d06538e8f7d0b2815a59b2f60d0d12b88405acaa3a0146325f84f64c5e256e4beaffcb32e581ff51e
+EBUILD mate-sensors-applet-1.22.0-r1.ebuild 1343 BLAKE2B a98f8642e50aa7dc991c87112186fb2bb47661f75c5a662efccfc35eb7c4d8ee963c6056e5be59b724066e6e1c2dd10f0008001282f8d1f5d62737cabdeb7fa8 SHA512 711a98f3a37c7e1de8355983c57ba0b73a72176562d12ac93cd295facb2aafc1fd5ad6b303b5d5419a580ce9fa4e90b0d3aa4a6ccea6d90e4621220c20fdff0a
 EBUILD mate-sensors-applet-1.22.0.ebuild 1405 BLAKE2B cbe36508a6a65e4ae7761c5f31471090e8e4c4caedde23f9689de54873562a46a87ce3e787c3a5baa4cedf2bacdd9d1008c17d21feef8e3141368980f14dcf3b SHA512 72388e89950c8f986b87d34cfc54137d4bb76e273a316b41128a18a71faadb2ae448e24f1d926ea0052961b6c624da2928b22b227a6ef59a0793fd5d0562a87b
 MISC metadata.xml 348 BLAKE2B 3e34850491c3dce6bfe3771ed94ea37e68d9c8131594f4056c40e754f5556a4dbf03e434a0f3d19eaa6177a0a484a1b50b8de1c67a4eadf1faf6e5b56fa70166 SHA512 32cad99749c326ae12caa346b0bbf85779cbf9f35b85c4f729358dd7171d468f486c761e33d2938fcac445485ec256d733150d7dedc7c9e6b271702ba7c454ab
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..1bbeca988faf
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/cairo-1.0.4
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	virtual/libintl
+	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	video_cards_nvidia? ( || (
+		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
+	) )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
+
+src_configure() {
+	local udisks
+
+	if use hddtemp && use dbus; then
+		udisks="--enable-udisks2"
+	else
+		udisks="--disable-udisks2"
+	fi
+
+	mate_src_configure \
+		--disable-netbsd \
+		--disable-static \
+		--without-aticonfig \
+		$(use_enable libnotify) \
+		$(use_with lm_sensors libsensors) \
+		$(use_with video_cards_nvidia nvidia) \
+		${udisks}
+}
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 493252ca73b5..b78f7b774cd3 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST mate-system-monitor-1.18.1.tar.xz 2159100 BLAKE2B babac7ad0dc3a3bccf5c6d4567bee0c95aad1f5fffdb1d6d566316f4712a345e7083c8032c19b6615a9f9d06fbbe8b89357407b897206f3131294b7d2305b45d SHA512 47dd2ba46cd6fbd1beef2e6f0a93332c7142f701d18f6894b4986134c557f63f3e2bed382af17cc5bf45693b556a91ccab36fde940126fdceb5834d4cea08356
 DIST mate-system-monitor-1.22.0.tar.xz 2190688 BLAKE2B 83ab7dfbc0033f094896c663790c1200e71a498d3a813a82c94593e6c6434942b2afd0fa1c3067452a46e0e1829a9239f1c145a315b9de2c2853c9f4f50618ef SHA512 6f97f934626b49320ea0dbb4e14743c4f33b12a85671b69465f689765f3003f00e51685b616e34a482c3ec0ca09ca4e13cbdb2e3eb4719c0d1fc7b25b24436a7
 EBUILD mate-system-monitor-1.18.1.ebuild 1016 BLAKE2B 1bbe2ee50460b8c3db678d658df3228e999fdf10bd887365a72ab8a8b26207db3df6a5b70a93b0e562203c766f3f6e84c46e18ee234ca78374ff8fd1b418cad9 SHA512 1d773cd89876cbbf9c0b3e7a16561b797d1272c5b412e860f7c0e9f5586ef8e4924e810f5629c8ea32cfeb38275a7ea3a21ffda6002e910f262be472d2eabd1c
-EBUILD mate-system-monitor-1.22.0.ebuild 881 BLAKE2B 8ac8388e3e6291534328a317cffab7c847723a7f1a0339023da73015e725183416d84e9181390614392f8dd1e003bc865703ab2510fc1df57f4c038b8cd83625 SHA512 25f998324182133b3ee1e9ddf3481f110a929ca2e22621f46193b9903f6423944c95d426f38a28e132ee6d9eeb670e0854838caccd3b8aa49711e27ca48bfb0d
+EBUILD mate-system-monitor-1.22.0.ebuild 1251 BLAKE2B fe910aabbc2bb3f3c72dc6b7941303dfbea244d9c4caa9d7a465e8600233281c48c0ad92b23ca372436346115318a2a1d7965fad20dd49c8df36040d326aa660 SHA512 167bcb0a93b58eea3032002a30d4523d15d6a09c176c0ea8364f0804b845d90fd313f8d1e825c3ea3e7f53f48c2933de49837e269299bcfa0cabab5c4774fdc7
 MISC metadata.xml 348 BLAKE2B fe7ff06b7a0366617fb30e7a98fa7054c32469bf49691855183ee7b9991c1aebd5f431081e5d7efe07ab3a2b2424630bea621c2b3369338f6bb5348d1ba70de7 SHA512 4cb1bd5f11887274393c957be697ce784af74a39258ead2e9ccb586ac8d4bcab06a6aa2a76e8f96a85d2d818092250eede243775b61222493739440c59cc9c9b
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
index 58b518131b09..2df1fb376d25 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
@@ -10,10 +10,12 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="The MATE System Monitor"
+
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="elogind systemd"
 
-IUSE="systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
 	>=dev-cpp/glibmm-2.26:2
@@ -28,6 +30,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.22:3
 	>=x11-libs/libwnck-3.0:3
 	virtual/libintl
+	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )"
 
 RDEPEND="${COMMON_DEPEND}
@@ -41,6 +44,19 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig:*"
 
 src_configure() {
-	mate_src_configure \
-		$(use_enable systemd)
+	local myconf=()
+
+	if use elogind || use systemd; then
+		myconf+=( --enable-systemd )
+		if use elogind; then
+			myconf+=(
+				SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+				SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+			)
+		fi
+	else
+		myconf+=( --disable-systemd )
+	fi
+
+	mate_src_configure "${myconf[@]}"
 }