gentoo resync : 15.02.2018

4 files changed, 4 insertions, 103 deletions

diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 15d0eb30d60a..0608f16aa399 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 147e5526774f..5356f0804a20 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -5,7 +5,6 @@ AUX mate-applets-1.16.0-cpupower-4.7.patch 1142 BLAKE2B 1222947dd918825d3905aa4c
 DIST mate-applets-1.12.1.tar.xz 6816716 BLAKE2B 3268a6a4dd1ee1a238a9573315f9450dea4636b40a98f27857dff3cfd9379e5adefa9f2f7f0522837d3bc4fa1c54055d4e65b47165f42cc44400775ed8890b14 SHA512 c9acac98df31386b4016d42d3d1fe0e9ddd5e8fccc291269cff73e2a4c0853fabb85a649ee14f4aef3200c0f731c1d95f48aefdb3d8baaf014ad8776c1e94234
 DIST mate-applets-1.14.1.tar.xz 7151156 BLAKE2B 9b3540ea04c4473f8d9ee081a87d399ebfe74d77d96b96f4c5bf11d954dd53a1e764981eefe593d75480aadf3028626917fd21cdd1b45a5b8f14e4381fcd48ae SHA512 f7657a4dbeed5ff161dae33bd915bf868c95626d661b3d7e4eea9b86776f75449c4060c647d9a040ccf8a01556979b62a9b21c988b33e0cd8d5d90fd663a331d
 DIST mate-applets-1.16.0.tar.xz 7150340 BLAKE2B 0b5554b3e5f250dbc38ec3ecff795dca3d503045fda7f31ea8cb190c8c30a35b5576b990d5005f11b44035b26d6df2ce91e36edd369e983d893bfa2db5e4c00c SHA512 606fd39b95083e7cff2ce95e75b4acb0ec1f3d66621a15fa726891c6d6319f7757b92c8c26efd3ee05da9da3dc315b16a3a9089fd4bb8d420816d4728f8545af
-DIST mate-applets-1.18.1.tar.xz 7158716 BLAKE2B 9f3698a61cfdcabbe5734d4f1f2c57a4ee11e4072e5bb87fe8f44e0dc6bdf7bb99e7c455ca221c573f0cef5557d4e89a53b7679915f635aa6ab6d257ca478bd6 SHA512 3186af69f3b8b54a7f31d3c00a39ed439717200181a1e64d97b28eaf2e75b19ac79fdda44c40401687e9cece06feb1e29f52948cd73afadeb0099f64e672c036
 DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
 EBUILD mate-applets-1.12.1-r4.ebuild 2264 BLAKE2B dec3daf4cb9c1d53b9a317457e4e40eced00956679fec63a9093efc6092b147c170b839208a70fccf62e016036201deb5fa99ec40304d01d03daf5571d01dcb4 SHA512 81b027473726418d372e07896dbfce908e5224c59dd044fcf2fd630c5b799ca02015270ba62751652c7e4deead7686432ddb6f625ae76b73056a78f1bfe6bf37
 EBUILD mate-applets-1.12.1-r5.ebuild 2302 BLAKE2B a8ae9a7e19e6521f99ed9f7c38fb7c9d26899460013e41182c29f862e6b69c754bf548241333dd98ddfc00c33b77e0e2249bc69c5882878b9723f43c71962464 SHA512 2bf780ce08385d2ad2f4266d3f05363bc10289627a4c79623813017633e2da41d6190a754aa11579245727c515ebbc7bd53eacf1022ee6b82c4daffa1c587d93
@@ -13,6 +12,5 @@ EBUILD mate-applets-1.14.1-r1.ebuild 2453 BLAKE2B 879d76df7c9a12e7a2eb8ea3878ce3
 EBUILD mate-applets-1.14.1-r2.ebuild 2410 BLAKE2B 862befae14e867cbf2cbe59e3cf2fa5961da8e54863dd4bbb701e984ffd5fc605209d57584ed8789f159e2592e8cdd12018cac14bc221f1510f469735f3b3b40 SHA512 c1a96efd69969b4cb5be6e9342ab365ca9bee4dd3133a56f2bfcaeb243d178ace5bf40dc77c0c603b11bcf5a5b7aa9990e29055c8e0b33ff82b36238c8865046
 EBUILD mate-applets-1.16.0-r1.ebuild 2370 BLAKE2B e973bb109010f615a6652e55487aaad98456b318829a20f8e8ecab9d2d2a880daedc6a796fb79a6da1ee36e85f83908fd60af6054b8de3205e650c15645f2e0e SHA512 cf8eb10cbd2300402a7309561bc3b179710995adfdfa7f70134aaf4aef2ceedd374ceea653905f4645532d8530faaa1a677fff7fc071eb2081c27b223d438ca2
 EBUILD mate-applets-1.16.0.ebuild 2413 BLAKE2B 1635d43378d5f761f840d0a433f188f04d59f69bb9bf9fd49a7471dbd2d21797d22f7d90c3624fb2509ce173fd124507e2d81768596cb9409bbe571a2b862dd3 SHA512 d447fac31a5492be65c6a8dfd1724b6956e1f0c657c1750e175d7476fa75b75411a140706c36c5cb54f8e54c7338da9f94a26a70edb1351f66f2c5f5805464fe
-EBUILD mate-applets-1.18.1-r1.ebuild 2174 BLAKE2B 39757b57a816a02471b449b268751b7aea43631ea4490b393512e2a493b9cceba279be2e2eb75695d113a44be7e3b8cfe9d3effa45c8b074611f99999d44dfa3 SHA512 766e9b6432440f050f3c7d9faa477b8046b1ab21724f6359622609d0191af71b8cda85ef72828e780335cf13a4be60b88b151c7ef6e2b42ce0aff90a224b1b4c
-EBUILD mate-applets-1.18.2.ebuild 2217 BLAKE2B 4e8b946dc9a07fce71f8c3283e9d86f51a10c138657789e17c82e73523bc282dfd39111947403d239ae84bacc72fe01ef423fa01fa61ae70dd71c4c06f30160e SHA512 951a01311247bd47cdd1477e12eb4578a8af2487231b1e96c8e5676797fb19def4e2ce983b896f141361fb0e24d42cb0d2b7d384f765c05982c19d351b758185
+EBUILD mate-applets-1.18.2.ebuild 2174 BLAKE2B c467c9c9805deb6afac96baad1409a819d8ffd535f8d6e104408dc123a398ae78095cd85673c3e4de2eabdb3f582883c252dc2bd7e7a67f4b263c9fb113fbdaa SHA512 664aaa372eb7a67aac9c95c2c860438bf89a9dc8aca4f8979a4c5737ab2e631c4c58378676d00af5e516a419793fc2716a46bcac21bea7bab087645b3f465fcf
 MISC metadata.xml 417 BLAKE2B 415a8520ed9bb5dc3fb80e935e607c999254785ce733ada8ac88529876916c6beb0012addeeeacb37df02bc35ea42c1748b6fabc563c40bf4cba2dbb77ccc73e SHA512 8df2d630bab80c248991cb2d57c928b24bfdc92d72d9ecabd06bc362882bb0bc0f3dc376ba54deb77213676eda4fdb8c2a4362c634bdd58f8d2b3060a184309d
diff --git a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild b/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
deleted file mode 100644
index 5f55633bb791..000000000000
--- a/mate-base/mate-applets/mate-applets-1.18.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.17.0
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.12.0:2=
-	>=gnome-extra/gucharmap-3.0:2.90
-	>=mate-base/mate-panel-1.17.0
-	>=net-wireless/wireless-tools-28_pre9:0
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/gtksourceview:3.0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libwnck-3.0:3
-	x11-libs/pango:0
-	virtual/libintl:0
-	policykit? ( >=sys-auth/polkit-0.97:0 )
-	upower? (
-		|| (
-			>=sys-power/upower-0.9.23
-			>=sys-power/upower-pm-utils-0.9.23
-		)
-	)
-	!!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	dev-libs/libxslt:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--with-cpufreq-lib=cpupower \
-		$(use_with X x) \
-		$(use_with upower) \
-		$(use_enable ipv6) \
-		$(use_enable policykit polkit)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
-
-src_install() {
-	python_fix_shebang invest-applet
-	mate_src_install
-
-	local APPLETS="accessx-status battstat charpick command cpufreq drivemount
-			geyes invest-applet mateweather multiload netspeed stickynotes
-			timerapplet trashapplet"
-
-	for applet in ${APPLETS}; do
-		docinto ${applet}
-
-		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
-			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
-		done
-	done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild b/mate-base/mate-applets/mate-applets-1.18.2.ebuild
index de826c083737..f0e4d037e94c 100644
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,6 @@ SLOT="0"
 IUSE="X ipv6 policykit +upower"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-#cpupower #593470
 COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/atk:0
 	>=dev-libs/dbus-glib-0.74:0
@@ -31,7 +30,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-panel-1.17.0
 	>=net-wireless/wireless-tools-28_pre9:0
 	>=sys-apps/dbus-1.1.2:0
-	<sys-power/cpupower-4.7
+	sys-power/cpupower
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.14:3
 	x11-libs/gtksourceview:3.0
@@ -62,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
-PATCHES=( "${FILESDIR}/${PN}-1.14.1-revert-upstream-cpupower-4.7-fix.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
 
 src_configure() {
 	mate_src_configure \