[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/

2021-05-25 Thread Joonas Niilola 
commit: b997f04bbfa099e21e321431278ceaf61eea38a6
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed May 26 05:17:47 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed May 26 05:21:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b997f04b

app-laptop/i8kutils: update maintainer's e-mail

Bug: https://bugs.gentoo.org/775977
Signed-off-by: Joonas Niilola  gentoo.org>

 app-laptop/i8kutils/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index ee006acde1a..9c7120fa189 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   octiabr...@myrvogna.net
+   myrvo...@electrosphe.re
Octiabrina Terrien-Puig

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/files/, app-laptop/i8kutils/

2021-04-14 Thread Joonas Niilola 
commit: a5196ab5d5621c7d12c2f9308dba1c176313d8f7
Author: Octiabrina Terrien–Puig  myrvogna  net>
AuthorDate: Sun Apr 11 17:06:53 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 14 05:58:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5196ab5

app-laptop/i8kutils: drop old

Closes: https://bugs.gentoo.org/722366
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Octiabrina Terrien-Puig  myrvogna.net>
Closes: https://github.com/gentoo/gentoo/pull/20338
Signed-off-by: Joonas Niilola  gentoo.org>

 app-laptop/i8kutils/Manifest   |  1 -
 app-laptop/i8kutils/files/i8k.conf | 31 -
 app-laptop/i8kutils/files/i8k.init-r1  | 50 -
 .../i8kutils/files/i8kutils-1.42-Makefile.patch| 34 --
 app-laptop/i8kutils/files/i8kutils-gcc5.patch  | 28 
 app-laptop/i8kutils/i8kutils-1.42.ebuild   | 52 --
 6 files changed, 196 deletions(-)

diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index c3f10b40ae1..ed59d0a0981 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1,2 +1 @@
 DIST i8kutils-1.43.tar.xz 29184 BLAKE2B 
3489de1993267eb8aaca1dc00e6c19f68be14b5351715828eee9d4e6abbedbcd3faa58aba5e764de4bbf6cfa41e0a64d011d1d5ea904b261fa3f9842a4501bab
 SHA512 
eed2db9e5864b0dc24e22302ce2abaa54415520a920cfa0be08068b8316a3c2c04b3565cc84164e36fb7ae5bb8b77be55ae179255e03ecd86ea664d85cece456
-DIST i8kutils_1.42.tar.xz 37544 BLAKE2B 
ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984
 SHA512 
148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b

diff --git a/app-laptop/i8kutils/files/i8k.conf 
b/app-laptop/i8kutils/files/i8k.conf
deleted file mode 100644
index c5bd389b294..000
--- a/app-laptop/i8kutils/files/i8k.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Config file for /etc/init.d/i8k
-
-# Parameters:
-#
-# i8kbuttons Parameters
-# =
-# VOLUME_UP : command for i8kbuttons to run on volume up key
-# VOLUME_DOWN : command for i8kbuttons to run on volume down key
-# VOLUME_MUTE : command for i8kbuttons to run on mute key
-# BUTTON_REPEAT : repeat rate, in milliseconds, for i8kbuttons keypresses
-#
-# If VOLUME_* commands are not defined, i8kbuttons will not be started
-#
-# i8kmon Parameters
-# =
-# NOMON : if set, i8kmon will not be started
-# NOAUTO : if set, i8kmon will not control the fans
-# TIMEOUT : timeout, in seconds, at which i8kmon will check/update status
-#  (default is 2)
-
-# for ALSA
-MIXER="/usr/bin/amixer -q set Master"
-VOLUME_UP="$MIXER 1+" 
-VOLUME_DOWN="$MIXER 1-" 
-VOLUME_MUTE="$MIXER toggle" 
-
-# for aumix (no mute support)
-#VOLUME_UP="aumix -v +4"
-#VOLUME_DOWN="aumix -v -4"
-
-BUTTON_REPEAT=100

diff --git a/app-laptop/i8kutils/files/i8k.init-r1 
b/app-laptop/i8kutils/files/i8k.init-r1
deleted file mode 100644
index 1e1cb7ca0c9..000
--- a/app-laptop/i8kutils/files/i8k.init-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-   after alsasound
-   after modules
-}
-
-checkconfig() {
-   if [ ! -e /proc/i8k ] ; then
-   eerror "The i8k driver is not installed"
-   return 1
-   fi
-}
-
-start() {
-   checkconfig || return 1
-   if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
-   ebegin "Starting i8kbuttons"
-   start-stop-daemon --start --quiet --pidfile 
/var/run/i8kbuttons.pid \
-   --make-pidfile --exec /usr/bin/i8kbuttons --background \
-   -- ${VOLUME_UP:+-u "${VOLUME_UP}"} \
-  ${VOLUME_DOWN:+-d "$VOLUME_DOWN"} \
-  ${VOLUME_MUTE:+-m "$VOLUME_MUTE"} \
-  ${BUTTON_REPEAT:+-r "$BUTTON_REPEAT"}
-   eend $?
-   fi
-   if [ ! -n "$NOMON" ]; then
-   ebegin "Starting i8kmon"
-   start-stop-daemon --start -b --quiet  \
-   --pidfile /var/run/i8kmon.pid \
-   --make-pidfile \
-   --exec /usr/bin/i8kmon --background \
-   --name "tclsh /usr/bin/i8kmon" \
-   -- -d ${NOAUTO:+-na} ${TIMEOUT:+-t $TIMEOUT}
-   eend $?
-   fi
-}
-
-stop() {
-   if [ -n "$VOLUME_UP$VOLUME_DOWN$VOLUME_MUTE" ] ; then
-   ebegin "Stopping i8kbuttons"
-   start-stop-daemon --stop --quiet --pidfile 
/var/run/i8kbuttons.pid
-   eend $?
-   fi
-   if [ ! -n "$NOMON" ]; then
-   ebegin "Stopping i8kmon"
-   start-stop-daemon --stop --quiet --pidfile /var/run/i8kmon.pid
-   eend $?
-   fi
-}

diff --git

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/

2021-04-11 Thread Sam James 
commit: 31738ee5af398bd5f3996258c49cd0c42946331e
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 11 11:04:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 11 11:04:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31738ee5

app-laptop/i8kutils: Stabilize 1.43 x86, #780891

Signed-off-by: Sam James  gentoo.org>

 app-laptop/i8kutils/i8kutils-1.43.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-laptop/i8kutils/i8kutils-1.43.ebuild 
b/app-laptop/i8kutils/i8kutils-1.43.ebuild
index d406bfcc3a0..f4aff273d9f 100644
--- a/app-laptop/i8kutils/i8kutils-1.43.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.43.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz ->
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
dev-lang/tcl

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/files/, app-laptop/i8kutils/

2021-03-06 Thread Joonas Niilola 
commit: a2e43367d043c5c9773fda30630303ebad28bd2e
Author: Octiabrina Terrien–Puig  myrvogna  net>
AuthorDate: Tue Mar  2 01:10:47 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar  6 15:12:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e43367

app-laptop/i8kutils: update to 1.43 and adoption

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Octiabrina Terrien-Puig  myrvogna.net>
Closes: https://github.com/gentoo/gentoo/pull/19729
Signed-off-by: Joonas Niilola  gentoo.org>

 app-laptop/i8kutils/Manifest |  1 +
 app-laptop/i8kutils/files/i8kmon.init| 19 +
 app-laptop/i8kutils/i8kutils-1.43.ebuild | 49 
 app-laptop/i8kutils/metadata.xml |  9 +-
 4 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index aa67d983e3c..c3f10b40ae1 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1 +1,2 @@
+DIST i8kutils-1.43.tar.xz 29184 BLAKE2B 
3489de1993267eb8aaca1dc00e6c19f68be14b5351715828eee9d4e6abbedbcd3faa58aba5e764de4bbf6cfa41e0a64d011d1d5ea904b261fa3f9842a4501bab
 SHA512 
eed2db9e5864b0dc24e22302ce2abaa54415520a920cfa0be08068b8316a3c2c04b3565cc84164e36fb7ae5bb8b77be55ae179255e03ecd86ea664d85cece456
 DIST i8kutils_1.42.tar.xz 37544 BLAKE2B 
ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984
 SHA512 
148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b

diff --git a/app-laptop/i8kutils/files/i8kmon.init 
b/app-laptop/i8kutils/files/i8kmon.init
new file mode 100644
index 000..ed41a2a0a55
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kmon.init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+   after modules
+}
+
+command="/usr/bin/i8kmon"
+command_args="--nouserconfig"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_pre() {
+   if [ ! -e /proc/i8k ]; then
+   eerror "The dell-smm-hwmon (i8k) driver is not loaded or 
installed"
+   return 1
+   fi
+}

diff --git a/app-laptop/i8kutils/i8kutils-1.43.ebuild 
b/app-laptop/i8kutils/i8kutils-1.43.ebuild
new file mode 100644
index 000..d406bfcc3a0
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.43.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="https://launchpad.net/i8kutils;
+SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz 
-> ${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+   dev-lang/tcl
+   sys-power/acpi
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_pretend() {
+   # Check for required dell-smm-hwmon (formerly i8k) driver
+   if ! linux_config_exists; then
+   eerror "Unable to check your kernel for dell-smm-hwmon (i8k) 
support"
+   else
+   CONFIG_CHECK="~I8K"
+   ERROR_I8K="You must have the dell_smm_hwmon driver compiled 
into your"
+   ERROR_I8K+=" kernel or loaded as a module to use i8kutils' 
utilities"
+   check_extra_config
+   fi
+}
+
+src_compile() {
+   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+   dobin i8k{ctl,fan,mon}
+   doman i8k{ctl,mon}.1
+   newdoc README.i8kutils README
+   insinto /etc
+   doins i8kmon.conf
+
+   newinitd "${FILESDIR}/i8kmon.init" i8kmon
+   systemd_dounit debian/i8kmon.service
+}

diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index 000429d96db..c9d971e383d 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -1,7 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   octiabr...@myrvogna.net
+   Octiabrina Terrien-Puig
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

i8kutils

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/

2020-05-21 Thread Andreas Sturmlechner 
commit: a28cf771613bcfed39785aadf26fb23fa61c0a58
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 21 08:13:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 21 08:13:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28cf771

app-laptop/i8kutils: Drop 1.33-r1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-laptop/i8kutils/Manifest|  1 -
 app-laptop/i8kutils/i8kutils-1.33-r1.ebuild | 54 -
 2 files changed, 55 deletions(-)

diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 2322a663fee..aa67d983e3c 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1,2 +1 @@
-DIST i8kutils_1.33.tar.gz 50378 BLAKE2B 
648d5dca57a407b1239b5a8d51dbe44214140368eefa71d72ef31b0cac3c0e7af2cb0ce44eb7ee429f555ef6503025ffa7543d9d17d2c42db98b67865fac0a03
 SHA512 
a7b9277b8c9bc2642a65122dda31cfa7cc0c4fa780ba980364c0a4e0e4599502c6557871464ff256c5911370d98944826d0e29d4d3621605d5e8c1c8a23e5578
 DIST i8kutils_1.42.tar.xz 37544 BLAKE2B 
ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984
 SHA512 
148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b

diff --git a/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild 
b/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
deleted file mode 100644
index cf870ed7fd3..000
--- a/app-laptop/i8kutils/i8kutils-1.33-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Dell Inspiron and Latitude utilities"
-HOMEPAGE="http://packages.debian.org/sid/i8kutils;
-SRC_URI="mirror://debian/pool/main/i/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="examples tk"
-
-DEPEND="tk? ( dev-lang/tk )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.i8kutils )
-
-src_prepare() {
-   sed \
-   -e '/^CC/d' \
-   -e '/^CFLAGS/d' \
-   -e 's: -g : $(LDFLAGS) :g' \
-   -i Makefile || die
-
-   tc-export CC
-}
-
-src_install() {
-   dobin i8kbuttons i8kctl
-   doman i8kbuttons.1 i8kctl.1
-   dosym /usr/bin/i8kctl /usr/bin/i8kfan
-
-   use examples && dodoc -r examples
-
-   newinitd "${FILESDIR}"/i8k.init-r1 i8k
-   newconfd "${FILESDIR}"/i8k.conf i8k
-
-   if use tk; then
-   dobin i8kmon
-   doman i8kmon.1
-   dodoc i8kmon.conf
-   systemd_dounit "${FILESDIR}"/i8kmon.service
-   else
-   cat >> "${ED}"/etc/conf.d/i8k <<- EOF
-   # i8kmon disabled because the package was installed without 
USE=tk
-   NOMON=1
-   EOF
-   fi
-
-}

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/

2020-05-21 Thread Agostino Sarubbo 
commit: 4e0b4e36c3dc258ba0e6165461c65acc1bb4e823
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 21 08:04:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 21 08:04:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e0b4e36

app-laptop/i8kutils: x86 stable wrt bug #724016

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-laptop/i8kutils/i8kutils-1.42.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild 
b/app-laptop/i8kutils/i8kutils-1.42.ebuild
index 1e16ace1869..a18ef111995 100644
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="tk"
 
 DEPEND="tk? ( dev-lang/tk:0 )"

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/

2020-05-21 Thread Agostino Sarubbo 
commit: af48e7826accc0c9aab3bde6829d68fdc622f797
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 21 07:50:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 21 07:50:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af48e782

app-laptop/i8kutils: amd64 stable wrt bug #724016

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-laptop/i8kutils/i8kutils-1.42.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild 
b/app-laptop/i8kutils/i8kutils-1.42.ebuild
index a02cb3a89a8..1e16ace1869 100644
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ 
SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz;
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="tk"
 
 DEPEND="tk? ( dev-lang/tk:0 )"

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/, app-laptop/i8kutils/files/

2015-11-13 Thread Ian Delaney 
commit: 4b4234a933a25f93131c443b51cc3bd5b79ce345
Author: Ioan-Adrian Ratiu  adirat  com>
AuthorDate: Wed Nov 11 18:37:47 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Thu Nov 12 10:58:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4234a9

app-laptop/i8kutils: fix gcc5 build for v1.42

Recipe enhancements requested in the bug are also included

Gentoo bug: #565466

Signed-off-by: Ioan-Adrian Ratiu  adirat.com>

 .../i8kutils/files/i8kutils-1.42-Makefile.patch| 34 ++
 app-laptop/i8kutils/files/i8kutils-gcc5.patch  | 28 ++
 app-laptop/i8kutils/i8kutils-1.42.ebuild   | 17 +--
 3 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch 
b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
new file mode 100644
index 000..7dc56d9
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
@@ -0,0 +1,34 @@
+Fix a race condition causing parallel builds to sometimes fail.
+
+Both probe_i8k_calls_time and i8kctl contain a main() function, though
+i8kctl's is omitted when built with -DLIB so they can link without a
+conflict.  i8kctl is also a standalone exe so it is built twice, with
+and without -DLIB.  When building in parallel you can get into a 
+situation where the object file created by the probe_i8k_calls_time
+target gets overwritten with the one from i8kctl and bad things happen.
+Nothing actually uses the i8kctl.o that has main() so we can just not
+build it.
+
+Also move CFLAGS, CC, LDFLAGS respect out of the ebuild.
+
+--- a/Makefile
 b/Makefile
+@@ -17,13 +17,13 @@ ccflags-y = -Wall
+ 
+ all: i8kctl probe_i8k_calls_time
+ 
+-i8kctl: i8kctl.c i8kctl.o
+-  gcc -Wall i8kctl.c -o i8kctl
++i8kctl: i8kctl.c
++  $(CC) -Wall ${CFLAGS} -o i8kctl i8kctl.c
+ 
+ probe_i8k_calls_time: probe_i8k_calls_time.c
+-  gcc -Wall -c -g -DLIB i8kctl.c
+-  gcc -Wall -c -g -DLIB probe_i8k_calls_time.c
+-  gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
++  $(CC) -Wall ${CFLAGS} -c -DLIB i8kctl.c
++  $(CC) -Wall ${CFLAGS} -c -DLIB probe_i8k_calls_time.c
++  $(CC) -Wall ${CFLAGS} ${LDFLAGS} -o probe_i8k_calls_time i8kctl.o 
probe_i8k_calls_time.o
+ 
+ i8k:
+   make -C /lib/modules/$(shell uname -r)/build M=$(PWD) modules

diff --git a/app-laptop/i8kutils/files/i8kutils-gcc5.patch 
b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
new file mode 100644
index 000..258b95f
--- /dev/null
+++ b/app-laptop/i8kutils/files/i8kutils-gcc5.patch
@@ -0,0 +1,28 @@
+Fix build with GCC 5.
+
+x86_64-pc-linux-gnu-gcc -O2 -march=native -g -pipe   -c -o i8kctl.o i8kctl.c
+gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB i8kctl.c
+gcc -Wall -c -Wl,--hash-style=gnu -Wl,-O1 -Wl,--as-needed -DLIB 
probe_i8k_calls_time.c
+gcc -o probe_i8k_calls_time i8kctl.o probe_i8k_calls_time.o
+probe_i8k_calls_time.o: In function `main':
+probe_i8k_calls_time.c:(.text+0x62): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0x82): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xa2): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xbf): undefined reference to `timestamp'
+probe_i8k_calls_time.c:(.text+0xdc): undefined reference to `timestamp'
+probe_i8k_calls_time.o:probe_i8k_calls_time.c:(.text+0xf9): more undefined 
references to `timestamp' follow
+collect2: error: ld returned 1 exit status
+Makefile:24: recipe for target 'probe_i8k_calls_time' failed
+
+
+--- a/probe_i8k_calls_time.c
 b/probe_i8k_calls_time.c
+@@ -13,7 +13,7 @@ double t;
+ 
+ struct timespec tmst;
+ 
+-inline double timestamp()
++double timestamp()
+ {
+   clock_gettime(CLOCK_REALTIME, );
+   t = tmst.tv_nsec;

diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild 
b/app-laptop/i8kutils/i8kutils-1.42.ebuild
index ae16f20..5d4cde5 100644
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit systemd toolchain-funcs
+inherit eutils systemd toolchain-funcs
 
 DESCRIPTION="Dell Inspiron and Latitude utilities"
 HOMEPAGE="https://launchpad.net/i8kutils;
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz;
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples tk"
+IUSE="tk"
 
 DEPEND="tk? ( dev-lang/tk:0 )"
 RDEPEND="${DEPEND}
@@ -24,11 +24,8 @@ S="${WORKDIR}/${PN}"
 DOCS=( README.i8kutils )
 
 src_prepare() {
-   sed \
-   -e '/^CC/d' \
-   -e '/^CFLAGS/d' \
-   -e 's: -g : $(LDFLAGS) :g' \
-   -i Makefile || die
+   epatch "${FILESDIR}/${PN}-gcc5.patch"
+   epatch "${FILESDIR}/${P}-Makefile.patch"
 
tc-export CC
 }
@@ -36,10 +33,10 @@ src_prepare() {
 src_install() {
dobin i8kctl i8kfan
doman i8kctl.1
-
-   use examples && dodoc -r examples
+

[gentoo-commits] repo/gentoo:master commit in: app-laptop/i8kutils/

2015-11-09 Thread Ian Delaney 
commit: e8fa20278328ff3ac39a2bfd89d1c3287f57a9b1
Author: Ioan-Adrian Ratiu  adirat  com>
AuthorDate: Sat Nov  7 18:51:22 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Nov  8 15:44:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fa2027

app-laptop/i8kutils: bump to v1.42

sys-power/acpi added to RDEPEND

Signed-off-by: Ioan-Adrian Ratiu  adirat.com>

 app-laptop/i8kutils/Manifest |  1 +
 app-laptop/i8kutils/i8kutils-1.42.ebuild | 56 
 app-laptop/i8kutils/metadata.xml |  6 ++--
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index cdd104c..cda3ca0 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1 +1,2 @@
 DIST i8kutils_1.33.tar.gz 50378 SHA256 
ebdd39a2be8b5742bd7b24a5dbcbef36ab3b9980330ad07eea471e68b800ecd7 SHA512 
a7b9277b8c9bc2642a65122dda31cfa7cc0c4fa780ba980364c0a4e0e4599502c6557871464ff256c5911370d98944826d0e29d4d3621605d5e8c1c8a23e5578
 WHIRLPOOL 
162cec2b48c1573a8b49d7966db312357754bc4445a9247d6fd0ca43bfabf1ccbe155bdc19c66fcc654f1dd6ff7499e82829e62a726f602a846b01b4a0189eb2
+DIST i8kutils_1.42.tar.xz 37544 SHA256 
8764ee6d78e646965fbf1ba653cbfa6e05627eb9922389c132866431d7c3d802 SHA512 
148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
 WHIRLPOOL 
da39e9312bf9c224dd2f6272e33361e6230421703170a8ba76965cc1b6994eab69423a824b505f6cead9c45b7288019bc0f663b925e8278b0ddb2b73061f5b36

diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild 
b/app-laptop/i8kutils/i8kutils-1.42.ebuild
new file mode 100644
index 000..ae16f20
--- /dev/null
+++ b/app-laptop/i8kutils/i8kutils-1.42.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Dell Inspiron and Latitude utilities"
+HOMEPAGE="https://launchpad.net/i8kutils;
+SRC_URI="https://launchpad.net/i8kutils/trunk/${PV}/+download/${P/-/_}.tar.xz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples tk"
+
+DEPEND="tk? ( dev-lang/tk:0 )"
+RDEPEND="${DEPEND}
+   sys-power/acpi"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.i8kutils )
+
+src_prepare() {
+   sed \
+   -e '/^CC/d' \
+   -e '/^CFLAGS/d' \
+   -e 's: -g : $(LDFLAGS) :g' \
+   -i Makefile || die
+
+   tc-export CC
+}
+
+src_install() {
+   dobin i8kctl i8kfan
+   doman i8kctl.1
+
+   use examples && dodoc -r examples
+
+   newinitd "${FILESDIR}"/i8k.init-r1 i8k
+
+   if use tk; then
+   dobin i8kmon
+   doman i8kmon.1
+   dodoc i8kmon.conf
+   systemd_dounit "${FILESDIR}"/i8kmon.service
+   else
+   cat >> "${ED}"/etc/conf.d/i8k <<- EOF
+   # i8kmon disabled because the package was installed without 
USE=tk
+   NOMON=1
+   EOF
+   fi
+
+}

diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index 59e2b8f..5523fac 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -1,8 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   proxy-maintainers

-   maintainer-nee...@gentoo.org
-   Default assignee for orphaned packages
+   a...@adirat.com
+   Ioan-Adrian Ratiu
+   Proxied maintainer. Assign bugs to 
him.