Revision bump, use cpupower instead of cpufrequtils; fixes bug #510034, reported by Pacho Ramos.

Package-Manager: portage-HEAD/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 114 insertions, 22 deletions

diff --git a/mate-base/mate-applets/ChangeLog b/mate-base/mate-applets/ChangeLog
index 33de2043caae..9d0b08ee36af 100644
--- a/mate-base/mate-applets/ChangeLog
+++ b/mate-base/mate-applets/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mate-base/mate-applets
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.4 2014/05/04 14:53:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.5 2014/05/16 15:14:24 tomwij Exp $
+
+*mate-applets-1.8.0-r1 (16 May 2014)
+*mate-applets-1.6.2-r1 (16 May 2014)
+
+  16 May 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch,
+  +mate-applets-1.6.2-r1.ebuild, +mate-applets-1.8.0-r1.ebuild,
+  -mate-applets-1.6.2.ebuild, -mate-applets-1.8.0.ebuild:
+  Revision bump, use cpupower instead of cpufrequtils; fixes bug #510034,
+  reported by Pacho Ramos.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-applets-1.6.2.ebuild:
   Stable for amd64, wrt bug #509268
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index a366baf7815a..9393b535d4d2 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch 3196 SHA256 2a0e69b60f0a2777190eba9b4d2bf7cfabb7912c302e992ca5b6e49971a58eba SHA512 6506e1346a972384916e54bc675db7457f9f93ade8617db291214cf9842049f3653e00d7a02bc158c19ab902b21fe276282f4f118d097d576608536899dc8ae3 WHIRLPOOL c7e5aaf8546e9879b79abe4ddf4e71afc3e9e44adaa637673844e4dcec0525416902abee6fb0eabbc88ab0095795a0da3753ef9431c4cad7cabff633845b5ffa
 DIST mate-applets-1.6.2.tar.xz 7102728 SHA256 a5607bf5f5bbd7bc75fcdc5d6eb9d2a4e45d0eb5c3b0e73ee6bb9d711c970cb1 SHA512 fb60e4c0e96d103f75720e17c7e6e847a603ecc7b639330fa845abc3b742147503d686ffb7a4d825c0f0fe78c9fe95514d911ee166d6bcd3d37445653b7fe353 WHIRLPOOL 3990f722538edb394a0aed4f9089f25b8d569fd90e1304b1828f9cb0fc3b9c726405d55a562eb3ae4eb1159f942ede2196b40c9d86acc9a92def0e42267dd01d
 DIST mate-applets-1.8.0.tar.xz 6911348 SHA256 e1798784cf2828803e8bae4660a7bcd4c5a44b510217a50c650cfcaacadf71c1 SHA512 d5d211377df4e7bb0135babee7f49fb1fdc894d3fee3a4a485efe0b47d392d0534a1aa978743730e927420f9607efb761b4d3e6814a76aa393aa892788055e35 WHIRLPOOL 69bc6167b2907463660e75fa9a69a97ee9f4d106c8ace983492c78631f603198f93396ed5d58abd87ffd123188503ddee222527aac28a998aa738b4aa76ad288
-EBUILD mate-applets-1.6.2.ebuild 2435 SHA256 71ae1d1180961b30cb37dcc973b06968d44e1890871968e9ef9d4ce24b73ac18 SHA512 ff81fa66452cc1e3629eda6837116eee9c79e34b41020ec50bbbb2ddb733d1a028b9408438d4dc2974d39535d7612612ff3031526a753d180d61462517e772c5 WHIRLPOOL b5c64f7bacc7805c7fd2634c53227e72376f7273eea0440c3ce978a2a36507372b9daffd00fef480524afed469a059bb22a8fb81db2e682659ea911f9e599d9a
-EBUILD mate-applets-1.8.0.ebuild 2382 SHA256 21d72b6eaace9bbb030420e92bd8e76d3faa2904ad3f7f152af9711d97d96a58 SHA512 a371b793e3c3a4cf0b92fa3428da3b722c6b611e6f39220a378c063690f1c917ca5a9e42faf62a9253356690dfead08ccd8f7c78698844eeef9655e6eba19890 WHIRLPOOL 433aee45f189bdb54292aeaf1609ca7985ac80aaff3cb8bec85d24f21a38f4ba34b64e6737e08d71110ca39bc9b03a2d49327db4524f4547f61a33e92e988b70
-MISC ChangeLog 859 SHA256 bb1d0d72771ebd4cf4f93453446773eb1caffecfb2c8790dc4ccc5b1d560718d SHA512 83763fe4c69fcf2d0d12bf6c034adefb84b95d6aab6fb5e03cffde93c217db3952691a20ecd736af730ef4fa624fdbaf321270a68d13a0dfd4e5b1c34646b4ea WHIRLPOOL fae563ae1953124f7ffc61bfae85d084f3e82f34989adb66f5ff6d05faed78f829c037d391ec281a42fa4112e01e7819bf7dd7adb7b3de42057c812a159f5783
+EBUILD mate-applets-1.6.2-r1.ebuild 2525 SHA256 711e8f9a85bf4468d44372a88fc4511e4040aa41722f331162beab783e476241 SHA512 c787945f3293047a96714a18592b5f8c5c8aabaf6e99f95afff08433fbd44c1d63bffda5437ecf279c06ef97bd92004fdac62722be96688a297e8a743d96df07 WHIRLPOOL 47c7a4bd1195610f7473b95b119e99c3cd9a5744790b93d74b69ac6be84283e1abe3ff520cb56db1d63a1bf9dde27c2e26d5721791467f227f12682cd709e50b
+EBUILD mate-applets-1.8.0-r1.ebuild 2471 SHA256 a8c6902c6ada03a610c1408b78f6a3d05b3786bfd6f51a91efcb665ad09c614c SHA512 d641e9aef9d91eee0c9ca102fc5dce4dfedce41e629b7bd0d048b9d938d34d0a7256206d8647fa70fa0523734ecc50f082c93c6eb6bd2d4f92d08eaaa0dbd705 WHIRLPOOL 9bec8c8803826b1dcaa34c131e4b75fc3a03d7e5e3fda2d644b6ae771d7b022c68297daf7696fc37c7a8f41503ff1fe0d23d72d282a3d600689075b86134c07a
+MISC ChangeLog 1274 SHA256 7e8b1bf80514c41a29ce931af3ad946d59d239622de17b5c22c0b4c9326ec23f SHA512 e10379ea5dee4a1b97c1b81f05c43613b3a58523aab1b3a110d8a1d9b20479101be24f32fd307c197289d2587343e6b0f2324cb2b68e9c4c252b50728b321e66 WHIRLPOOL 1be743710bcedda46eac7ab8e97c6520a4932a8b6a758a4f034171f36c81e3d6d5e5ab2e1c8f224d77f07f4eb978480bcf4675e9b7deddeacedb128125228cc9
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTZlRwAAoJELp701BxlEWfQdYP/0aO9SHlGk1MZw7MEvY6FVWV
-YWSQIg4vR1ym8ZVS6+I61i/HmKLXsbNWkaQo33V7Cg4IVAR9ytFH1Oia9amrkyOX
-wwpTVQHxuNXRPern0P+SM1aN8OMhbGh+un7WmZP9zg2DwWIzdg4dhFevkn7PbRYD
-vcG4f4O06asykJVxb9RD3dbuhF5hUx02BVK5D+/tQBN6ep+hAFakm/q+1MoKH3zW
-CiOhXAb57iks1vpU0CmKk/3GavYUzBgQtTz51VET5StbNH1yrcXEnZ5Q6+Oewkq7
-5ZYenJdgqJnchU2cEUg4n2x7qb0oKYZoEV9OQfqJg0Xa4wV7jGBbCucPp9agwDwT
-ceGQqon0iGUGG4Rq+Ia+p0+zXlUj3vh2WDV/mnVX+saW/x3KcbqYGpATn6JRNUxH
-h4xgnhxUaEMiBtJmjYnk8+5lDwgUqq0YrV71HZy3GSMVitnpbm/dCy7cNoeAxOzX
-/EVT+/LHzWH77S/OH7gRLY//nd4/jVtaUdtyPMAMtV17u6kZE+25x+qq4790+qUv
-6OBaRc4tEMOB7n7RDNs+JvQYFB8GbhjKE9i9x2DMwtyRO6wOwo8bPR1r0BlsvidM
-rStZoI4LislKCRdg79iKruYL3G2o/a2ok7Nm5DS/c2EgDI1wNYnQd9N8NBTnoVMu
-dATlucIBgb46yIoottPr
-=sc8Y
+iQEcBAEBCAAGBQJTditDAAoJEJWyH81tNOV9rJ8H/3bjST/0J440YiTgqnHG2HdS
+m565wI49EHuVG0Z0aVL7coJeRYsGnPzIUHVGj0eK5lq+x0BcERaupEwPyAsDtEYc
+LYdeq5OneoIQefg3azTqiFiv3zuJRIdkyHO+mDbFCZ1gBtCoH0NfNG8CLNJQgSvy
+CN8KSfYYf9G1q+fcgBFxGWDfoZLatXF5CpMDujh6U/47Ekm0/KhVSMg54qJzVf2d
+pwccslf+BMsh0GOCihSWIaWZp9IrJxp7WlfkPpwQ3o9YuoJ5a0WXpfrPBNr2cWmG
++tU7xoU288NnttRo+dKq3SG/wB1S3peWsSoJkGFyJ0DdmjrpIh9Kd/6HxIXXMdk=
+=W2mh
 -----END PGP SIGNATURE-----
diff --git a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
new file mode 100644
index 000000000000..880afc75b76b
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
@@ -0,0 +1,79 @@
+Obtained from: http://pkgs.fedoraproject.org/cgit/mate-applets.git/plain/cpufreq.patch
+
+diff -upr mate-applets-1.5.0-orig/configure.ac mate-applets-1.5.0/configure.ac
+--- mate-applets-1.5.0-orig/configure.ac	2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/configure.ac	2013-01-14 18:04:15.726598991 +0100
+@@ -506,13 +506,13 @@ if test "x$HAVE_POLKIT" = "xyes"; then
+ fi
+ 
+ AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no)
+-LIBCPUFREQ_LIBS=
+-if test "x$have_libcpufreq" = "xyes"; then
+-   AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+-   LIBCPUFREQ_LIBS=-lcpufreq
++LIBCPUPOWER_LIBS=
++if test "x$have_libcpupower" = "xyes"; then
++   AC_DEFINE([HAVE_LIBCPUPOWER], [1], [Have libcpupower.])
++   LIBCPUPOWER_LIBS=-lcpupower
+ fi
+-AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+-AC_SUBST(LIBCPUFREQ_LIBS)
++AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
++AC_SUBST(LIBCPUPOWER_LIBS)
+ 
+ build_cpufreq_applet=no
+ 
+diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c
+--- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2013-01-14 19:15:28.432366287 +0100
+@@ -24,7 +24,7 @@
+ #include "cpufreq-selector-factory.h"
+ #include "cpufreq-selector-sysfs.h"
+ #include "cpufreq-selector-procfs.h"
+-#ifdef HAVE_LIBCPUFREQ
++#ifdef HAVE_LIBCPUPOWER
+ #include "cpufreq-selector-libcpufreq.h"
+ #endif
+ 
+@@ -33,7 +33,7 @@ cpufreq_selector_factory_create_selector
+ {
+ 	CPUFreqSelector *selector = NULL;
+ 	
+-#ifdef HAVE_LIBCPUFREQ
++#ifdef HAVE_LIBCPUPOWER
+ 	selector = cpufreq_selector_libcpufreq_new (cpu);
+ #else
+ 	if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
+@@ -41,7 +41,7 @@ cpufreq_selector_factory_create_selector
+ 	} else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
+ 		selector = cpufreq_selector_procfs_new (cpu);
+ 	}
+-#endif /* HAVE_LIBCPUFREQ */
++#endif /* HAVE_LIBCPUPOWER */
+ 
+ 	return selector;
+ }
+diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am
+--- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am	2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am	2013-01-14 19:13:27.223180712 +0100
+@@ -16,7 +16,7 @@ if CPUFREQ_SELECTOR_SUID
+ endif
+ 
+ 
+-if HAVE_LIBCPUFREQ
++if HAVE_LIBCPUPOWER
+ cpufreq_files=cpufreq-selector-libcpufreq.c        cpufreq-selector-libcpufreq.h
+ endif
+ 
+diff -upr mate-applets-1.5.0-orig/cpufreq/src/Makefile.am mate-applets-1.5.0/cpufreq/src/Makefile.am
+--- mate-applets-1.5.0-orig/cpufreq/src/Makefile.am	2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/cpufreq/src/Makefile.am	2013-01-14 19:14:01.647517888 +0100
+@@ -12,7 +12,7 @@ INCLUDES = \
+ 
+ libexec_PROGRAMS = mate-cpufreq-applet
+ 
+-if HAVE_LIBCPUFREQ
++if HAVE_LIBCPUPOWER
+ cpufreq_files=cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
+ endif
+ 
diff --git a/mate-base/mate-applets/mate-applets-1.6.2.ebuild b/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild
index 41869fa056d0..3ace42659f72 100644
--- a/mate-base/mate-applets/mate-applets-1.6.2.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2.ebuild,v 1.3 2014/05/04 14:53:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.6.2-r1.ebuild,v 1.1 2014/05/16 15:14:24 tomwij Exp $
 
 EAPI="5"
 
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit gnome2 python-single-r1 versionator
+inherit eutils gnome2 python-single-r1 versionator
 
 MATE_BRANCH="$(get_version_component_range 1-2)"
 
@@ -35,7 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-settings-daemon-1.6:0
 	>=mate-extra/mate-character-map-1.6:0
 	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpufrequtils:0
+	sys-power/cpupower:0
 	>=sys-power/upower-0.9.4:0
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.20:2
@@ -59,6 +59,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-replace-cpufreq-by-cpupower.patch
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--libexecdir=/usr/libexec/mate-applets \
diff --git a/mate-base/mate-applets/mate-applets-1.8.0.ebuild b/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild
index a126af2dd1ef..e779f5700816 100644
--- a/mate-base/mate-applets/mate-applets-1.8.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0.ebuild,v 1.1 2014/04/17 15:45:48 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.0-r1.ebuild,v 1.1 2014/05/16 15:14:24 tomwij Exp $
 
 EAPI="5"
 
@@ -34,7 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=mate-base/mate-panel-1.8:0
 	>=mate-base/mate-settings-daemon-1.6:0
 	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpufrequtils:0
+	sys-power/cpupower:0
 	>=sys-power/upower-0.9.4:0
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.24:2
@@ -58,6 +58,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext:*
 	virtual/pkgconfig:*"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.6.2-r1-replace-cpufreq-by-cpupower.patch
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--libexecdir=/usr/libexec/mate-applets \