From 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Mar 2018 16:55:35 +0000 Subject: gentoo resync : 13.03.2018 --- sys-power/Manifest.gz | Bin 5540 -> 5386 bytes sys-power/acpid/Manifest | 2 +- sys-power/acpid/metadata.xml | 4 + sys-power/phctool/Manifest | 8 -- .../phctool-0.5.2.2_all_paths_tool_no_sudo.patch | 17 ----- .../phctool-0.5.2.2_all_paths_tool_sudo.patch | 18 ----- .../files/phctool-0.5.2.2_all_paths_tray.patch | 32 -------- .../files/phctool-0.5.2.2_gui_kernel_2.6.38.patch | 21 ------ .../files/phctool-0.5.2.2_kernel_2.6.36.patch | 79 ------------------- sys-power/phctool/metadata.xml | 11 --- sys-power/phctool/phctool-0.5.2.2-r3.ebuild | 84 --------------------- 11 files changed, 5 insertions(+), 271 deletions(-) delete mode 100644 sys-power/phctool/Manifest delete mode 100644 sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_no_sudo.patch delete mode 100644 sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_sudo.patch delete mode 100644 sys-power/phctool/files/phctool-0.5.2.2_all_paths_tray.patch delete mode 100644 sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch delete mode 100644 sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch delete mode 100644 sys-power/phctool/metadata.xml delete mode 100644 sys-power/phctool/phctool-0.5.2.2-r3.ebuild (limited to 'sys-power') diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz index 04950d5bd682..24148f9304ab 100644 Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest index ec3dab4b7f7b..41f52f4375e0 100644 --- a/sys-power/acpid/Manifest +++ b/sys-power/acpid/Manifest @@ -9,4 +9,4 @@ AUX systemd/acpid.service 155 BLAKE2B 763b5f0ad5d03e91098ec9e71a17c5d0a52c90f193 AUX systemd/acpid.socket 119 BLAKE2B a0f22e8579c48d7258c81f7fb97a9566f1dd4722da9d2f68c1b960ee88ca432ab17890b556df913a44aaba9b91c309de073afa1710eea71528a3c85988533ad9 SHA512 9a8293166b3818255d39d972dd354e675d23e4d59fb4ce3a8b5dedbf33e809f808ae3020f308426ba8d9d1317396727edc5be5bf51a7a30bc40c809442c96c0a DIST acpid-2.0.28.tar.xz 156036 BLAKE2B a6a78f82f7f4ecbd0d883d175c921195970e157a919fefc9cf48a94db534b496a8570c031fda5b08df3fb1775e26a50b5942bac7717aa582d590605930e3af78 SHA512 effe9c3b30b4a6ea20eca4b36a06d4b3da9b262d100685958faec4b38f89377a87dcaecee7a69b87aaddfa47688bcc46fc47a38391ac4bd2019cb3b48ab18fcb EBUILD acpid-2.0.28.ebuild 1848 BLAKE2B 3690edafa00601a5a56856917b584709083cbd1162e8834d1bf666ab95f8d7ffaf4ca621e7b0d53319a2b9a2d17a8f397b024d24effc31005ea441c0ad9b097a SHA512 bf95f7a34b85e83b22c934bfcbb353a17041f0f93c11dd2eabe21c59dadf01ce02a7fdca9cf3ceb43e6ea6e6e057874b4a0c09cfb998c026785f2c80b9082da2 -MISC metadata.xml 215 BLAKE2B d627a31790daf5ddca7ce1b22201506f2bff379675177dc44a126aafafb2c363ba4a7817bc126ada7312a4c054f8bc38d776d025001699ba1fae7539e5a815fe SHA512 1352957113ebdcf17666fb4d5f6db855657ba12e1e62346dbfd6a48861afa4936aa0fb2a0f417ce8f527846aea3a63baf6e22c43607c52a039c3e0274e5ab0f3 +MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a diff --git a/sys-power/acpid/metadata.xml b/sys-power/acpid/metadata.xml index 9f5b0250f67d..ab0b82310d0f 100644 --- a/sys-power/acpid/metadata.xml +++ b/sys-power/acpid/metadata.xml @@ -1,6 +1,10 @@ + + andrey_utkin@gentoo.org + Andrey Utkin + acpid2 diff --git a/sys-power/phctool/Manifest b/sys-power/phctool/Manifest deleted file mode 100644 index 0f41317bf6bf..000000000000 --- a/sys-power/phctool/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX phctool-0.5.2.2_all_paths_tool_no_sudo.patch 534 BLAKE2B e0fdd206dcc1880025e1afec6d935d7fbca844f1547a1b32f0f3010a3f1702c575b4730cef52f78e399f32173ee7462bbc7bc41c1b1caf2936d7d631bf166246 SHA512 344da8cf2f6533650e731e2297ec15bba09c859de342f920300be82fbac4d82ad9786c28dbc3504ab36a6909c2588eacdffb41c86dd2c0462ad8c44d5bca6a5d -AUX phctool-0.5.2.2_all_paths_tool_sudo.patch 547 BLAKE2B a8a5d6b48d2b92647ff817916b76bc79756106659f95b469e689b4c766d27e9ee31471a24470f0295247ce2ec98545f7868f6f3b41a4f5d35f6d166a1534bbb3 SHA512 ab21747a1ef55bff373871ec33b8edd98bd565f9a81b8d2e32248c0ccbeea9f454236f691714e06409e9524b5108c636112460d8839e1aee3879eca6430189f4 -AUX phctool-0.5.2.2_all_paths_tray.patch 1043 BLAKE2B c93e3e3e80244bcc54a447ea195b956849d25cce73abbd9bd4d9ccd02ea037bc77faf9433efde317b2b631c95a8d68f467e201bce37263056fee1009745594f8 SHA512 92585e64d70e3a8daf8dfa7f950edc2dfd50b50e39169ea68e0eea53a17779855e9f912452f6d82965add041a6d35d746a13d17749010aa8671b55c386e86aa2 -AUX phctool-0.5.2.2_gui_kernel_2.6.38.patch 879 BLAKE2B 00d2334b5f950ff1be1aa3f37689346bfbfc5a1f57d5ab433c75ad7a0551ed95902b13faa5c332b4daf79aa44aa51769090f2a13076318ca64f800de886af6d6 SHA512 9a45ee7a506e5520fa155336915fed2e149d5c7f033024d13391bf750424e47ed43c6a7820e599b45aaed5b5fbf466409fdeff505857087c124f0862259c22a1 -AUX phctool-0.5.2.2_kernel_2.6.36.patch 3527 BLAKE2B 28dc168d278996da14ca91649ea1f37bf82953414e60d65acb4cb47f9ea8e806e596c48917058e61d2151841b7065d2371386ae7c53c9b6b1c6b30de927e1f24 SHA512 61407bb85f8d552ee6aa448e473e627a55a23b882fdaf5c99808b8ba6f71418f0d9e9142d5e3931d184994ff983a6d222843d5b6590d9eee8965a8bfefe5a930 -DIST phctool-0.5.2.2.tar.gz 941587 BLAKE2B d5844aecbefcaf9ec3525a47a9ce5bac8faa1a063ea833d6d69a9b8079f3c6a26ccc1d96685ee0408efe5c6279834ac309d92e22c70d2d907de622242f330e36 SHA512 50beafb8d96b070563f4fcef93f1a07285b4347a05df70aee06aeac9b7c80642d8f967321b499d733c1734d36c7ebda6379094f5eb9a5bee648d7aa1f6c23053 -EBUILD phctool-0.5.2.2-r3.ebuild 2094 BLAKE2B 19fd7924c99056157b22d47a7fc5c5a3983fb853ffffea6cdd0d1aa1f1f333ffbd878ce72db41c026a6c937763fc3662a5e9f84cc745c56787245668cbf2b9be SHA512 68dab3a399da8023536ef56267ab7c384671d4be41d791d9e766aa6a8da5e8ea5797fc8e42e055bb57ace9c1279eefd0e525fcb30c8681546a47f1c8b9545fa5 -MISC metadata.xml 331 BLAKE2B 227a5ddf3973614e79a51040167aff6fef3d91d912377d6e7e773f289f856466c973ef5145ed4662ba1d4dd6c88a9ba4bb28509fbf1123c4efcfed9253ac1224 SHA512 29e807bda7452cd13c7f6ed65d0f6fa7ed467fe7ba3408d8fb394909e02e7b68507e3122dcddbd54d715843d63741c16ed3fce5562610aa17d41cb98efc8cdba diff --git a/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_no_sudo.patch b/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_no_sudo.patch deleted file mode 100644 index 316e538abe0d..000000000000 --- a/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_no_sudo.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/phctool.sh 2007-10-27 22:32:35.000000000 +0200 -+++ b/phctool.sh 2009-09-05 23:20:18.000000000 +0200 -@@ -1,10 +1,7 @@ - #!/bin/sh --#this shellscript is just a wrapper to subphctool.sh --#but necessary to run phctool with sudo even from the tray icon --PROGPATH=`dirname "$0"` --cd $PROGPATH --if test -e /usr/bin/gksu -- then gksu ./subphctool.sh $1 -- else sudo ./subphctool.sh $1 --fi -+#this shellscript is just a wrapper to phctool.py -+#but necessary to run phctool from another directory -+ -+cd /usr/share/phctool -+./phctool.py $1 diff --git a/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_sudo.patch b/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_sudo.patch deleted file mode 100644 index 11b64c3bab07..000000000000 --- a/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tool_sudo.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/phctool.sh 2007-10-27 22:32:35.000000000 +0200 -+++ b/phctool.sh 2009-09-05 23:20:18.000000000 +0200 -@@ -1,10 +1,7 @@ - #!/bin/sh --#this shellscript is just a wrapper to subphctool.sh --#but necessary to run phctool with sudo even from the tray icon --PROGPATH=`dirname "$0"` --cd $PROGPATH --if test -e /usr/bin/gksu -- then gksu ./subphctool.sh $1 -- else sudo ./subphctool.sh $1 --fi -+#this shellscript is just a wrapper to subphctool.py -+#but necessary to run phctool from another directory -+ -+cd /usr/share/phctool -+sudo ./subphctool.sh $1 - diff --git a/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tray.patch b/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tray.patch deleted file mode 100644 index 1d2053a9c4b7..000000000000 --- a/sys-power/phctool/files/phctool-0.5.2.2_all_paths_tray.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/phctray.sh 2007-09-08 08:29:31.000000000 +0200 -+++ b/phctray.sh 2009-09-05 23:16:54.000000000 +0200 -@@ -2,6 +2,5 @@ - #this shellscript is just a wrapper to phctray.py - #but necessary to run phctray from another directory - --PROGPATH=`dirname "$0"` --cd $PROGPATH -+cd /usr/share/phctool - ./phctray.py ---- a/phctray.py 2009-09-08 12:17:11.000000000 +0200 -+++ b/phctray.py 2009-09-08 12:17:33.000000000 +0200 -@@ -61,7 +61,7 @@ - t.show_all() - - ##call phctool without GUI to set stored values --cmd=[sys.path[0]+"/phctool.sh","background"] ##command -+cmd=["/usr/bin/phctool","background"] ##command - subprocess.Popen(cmd, shell=False) ##call the affinated programm - - gtk.main() ---- a/phctray.py 2009-09-08 12:22:28.000000000 +0200 -+++ b/phctray.py 2009-09-08 12:23:44.000000000 +0200 -@@ -11,7 +11,7 @@ - return; - - def run_phctool( *args ): -- cmd=[sys.path[0]+"/phctool.sh"] ##command -+ cmd=["/usr/bin/phctool"] ##command - subprocess.Popen(cmd, shell=False) ##call the affinated programm - - def applet_face_click( window, event, *data ): diff --git a/sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch b/sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch deleted file mode 100644 index db33396e3d17..000000000000 --- a/sys-power/phctool/files/phctool-0.5.2.2_gui_kernel_2.6.38.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- phctool/inc/libs/cpuinfo.py -+++ phctool/inc/libs/cpuinfo.py -@@ -1,6 +1,7 @@ - #cpuinfo.py - #This is a function library to get - #informations about CPUs and its PHC data -+#Modified by Fabio Veronese fveronese85*at*gmail.com 22 Mar 2011 - - - import os, string -@@ -30,6 +31,10 @@ - if os.path.exists('/proc/acpi/processor/CPU'+cpunr): - ##remember ACPI Pathname - self.data[cpunr]['acpi']['acpiname']='/proc/acpi/processor/CPU'+cpunr -+ elif os.path.exists('/sys/devices/system/cpu/cpu'+cpunr+'/thermal_throttle'): -+ ##here some throttling infos for 2.6.38 and maybe laters -+ #self.data[cpunr]['acpi']['acpiname']='/sys/devices/system/cpu/cpu'+cpunr+'/thermal_throttle' -+ self.data[cpunr]['acpi']['acpiname']='' - else: - self.data[cpunr]['acpi']['exist']=False - # For some reason we have to fallback on the old function... diff --git a/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch b/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch deleted file mode 100644 index c3a2432aea2d..000000000000 --- a/sys-power/phctool/files/phctool-0.5.2.2_kernel_2.6.36.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- phctool/inc/libs/cpuinfo.py -+++ phctool/inc/libs/cpuinfo.py -@@ -14,33 +14,49 @@ - - - def _get_acpi_cpus(self): -- ##count number of CPUs on this system using acpi proc interface -- ##since we need acpi this i a good way to count CPUs -- ##we also will remember the Directory-Name because on single CPU -- ##systems the Dir may be named CPU while on Multicores they are indexed (CPU0, CPU1) .. -- directory="/proc/acpi/processor/" -- for f in os.listdir(directory): ##iterate the directory -- pathname = os.path.join(directory, f) ## -- if os.path.isdir(pathname): ##is the object we found really a (sub-)directory? -- ##We open the info-file to get the ID to this CPU, -- ##i don't know if this really could happen but the ID may differ from -- ##from the Path iterator (maybe one CPU is supported and another isn't) -- if os.path.exists(pathname+'/info'): -- file = open(pathname+'/info', 'r'); -- for line in file: -- if string.find(line,":"): -- content = line.split(":"); -- if len(content)>1: -- info_ident=content[0].strip(); -- info_value=content[1].strip(); -- if info_ident == "processor id": -- cpunr=info_value -- self.data[cpunr]={} -- self.data[cpunr]['acpi']={} -- self.data[cpunr]['acpi']['exist']=True -- self.data[cpunr]['acpi']['acpiname']=f ##remember ACPI Pathname -- else: -- self.data[cpunr]['acpi']['exist']=False -+ # We need to ignore /proc/acpi/processor as it's becoming deprecated -+ # A good solution might be a look in online cpus, but it doesn't mean they are surely ACPI-supported -+ if os.path.exists('/sys/devices/system/cpu/online'): -+ file = open('/sys/devices/system/cpu/online', 'r'); -+ for line in file: -+ if string.find(line,"-"): -+ content = line.split("-"); -+ for val in content: -+ cpunr=val.strip(); -+ self.data[cpunr]={} -+ self.data[cpunr]['acpi']={} -+ self.data[cpunr]['acpi']['exist']=True -+ # This sounds useful just for throttling, which is managed better by other stuff... I'll keep just for compatibility -+ if os.path.exists('/proc/acpi/processor/CPU'+cpunr): -+ ##remember ACPI Pathname -+ self.data[cpunr]['acpi']['acpiname']='/proc/acpi/processor/CPU'+cpunr -+ else: -+ self.data[cpunr]['acpi']['exist']=False -+ # For some reason we have to fallback on the old function... -+ else: -+ directory="/proc/acpi/processor/" -+ for f in os.listdir(directory): ##iterate the directory -+ pathname = os.path.join(directory, f) ## -+ if os.path.isdir(pathname): ##is the object we found really a (sub-)directory? -+ ##We open the info-file to get the ID to this CPU, -+ ##i don't know if this really could happen but the ID may differ from -+ ##from the Path iterator (maybe one CPU is supported and another isn't) -+ if os.path.exists(pathname+'/info'): -+ file = open(pathname+'/info', 'r'); -+ for line in file: -+ if string.find(line,":"): -+ content = line.split(":"); -+ if len(content)>1: -+ info_ident=content[0].strip(); -+ info_value=content[1].strip(); -+ if info_ident == "processor id": -+ cpunr=info_value -+ self.data[cpunr]={} -+ self.data[cpunr]['acpi']={} -+ self.data[cpunr]['acpi']['exist']=True -+ self.data[cpunr]['acpi']['acpiname']=f ##remember ACPI Pathname -+ else: -+ self.data[cpunr]['acpi']['exist']=False - - - def _get_cpuinfos(self): diff --git a/sys-power/phctool/metadata.xml b/sys-power/phctool/metadata.xml deleted file mode 100644 index 9148655f78bf..000000000000 --- a/sys-power/phctool/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -xmw@gentoo.org -Michael Weber - - - Enable support for sudo to run gui from non-root user - - diff --git a/sys-power/phctool/phctool-0.5.2.2-r3.ebuild b/sys-power/phctool/phctool-0.5.2.2-r3.ebuild deleted file mode 100644 index c33953a060fe..000000000000 --- a/sys-power/phctool/phctool-0.5.2.2-r3.ebuild +++ /dev/null @@ -1,84 +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 python-single-r1 user - -DESCRIPTION="Processor Hardware Control userland configuration tool" -HOMEPAGE="http://www.linux-phc.org/" -SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=50 -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc sudo" - -DEPEND="${PYTHON_DEPS} - dev-python/egg-python[${PYTHON_USEDEP}] - dev-python/pygtk:2[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - sudo? ( app-admin/sudo )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -S="${WORKDIR}/${PV%.*}-${PV##*.}/${PN}" - -pkg_setup() { - MY_PROGDIR="/usr/share/${PN}" - if use sudo ; then - MY_GROUPNAME="phcusers" - enewgroup ${MY_GROUPNAME} - fi - python-single-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/${P}_all_paths_tray.patch - if use sudo ; then - eapply "${FILESDIR}"/${P}_all_paths_tool_sudo.patch - else - eapply "${FILESDIR}"/${P}_all_paths_tool_no_sudo.patch - fi - eapply "${FILESDIR}"/${P}_kernel_2.6.36.patch - eapply "${FILESDIR}"/${P}_gui_kernel_2.6.38.patch - eapply_user - find . -name "*.pyc" -delete || die - python_fix_shebang . -} - -src_install() { - newbin phctool.sh phctool - newbin phctray.sh phctray - - exeinto ${MY_PROGDIR} - doexe phc{tool,tray}.py subphctool.sh - python_moduleinto ${MY_PROGDIR} - python_domodule inc - - if use sudo ; then - fowners -R ":${MY_GROUPNAME}" "${MY_PROGDIR}" - fperms g+rX "${MY_PROGDIR}" - dodir /etc/sudoers.d - echo "#%${MY_GROUPNAME} ALL=(root) NOPASSWD:${MY_PROGDIR}/subphctool.sh" \ - > "${ED}"/etc/sudoers.d/${PN} || die - fperms a-w,o-r /etc/sudoers.d/${PN} - fi - - dodoc CHANGELOG - if use doc; then - docinto html - dodoc -r doc/docfiles doc/index.htm - fi -} - -pkg_postinst() { - if use sudo; then - einfo "You have to add a line to /etc/sudoers to get access to" - einfo "/sys/devices/system/cpu/cpu1/cpufreq/phc_controls from the phctool/phctray" - einfo "Please check and uncomment the content of /etc/sudoers.d/${PN}" - else - einfo "Group not automatically added. Please run phctool as root." - fi -} -- cgit v1.2.3