gentoo resync : 28.04.2021

7 files changed, 2 insertions, 203 deletions

diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 5ce6675d9c9b..6905ab19fd86 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1,11 +1,5 @@
-AUX i8k.conf 891 BLAKE2B 734a958f641396e103b6a018d983638d91c540267325b8057f23091e614b88e5eb45b9cf154e32a8aa00f219904227eaed3887f87c379e18d6475a945a065f19 SHA512 bc262f0014237abfc87efc60dabbb37e86c459077831b68c07ea13608d1174bd32cb695e74ca4597839f7b128cfc1b4860874cce0c6f511972569e5f0948526d
-AUX i8k.init-r1 1216 BLAKE2B b8e2dbb0cb343b751deaacda9a7f57646c27fc501669980e20e3b42302e87fb89001b48dcecb3d5866a06dd5cf538044ab3ff356c9dba18a7b57ebd3dc408fc1 SHA512 39282605172dac48c12819e5adeb080d3c73257d775fb8e53d2bdcf26e0510dd10055d8a51e17043f2a5d49da3ffb73f28a767fbfb44c0bb77feb621e25867cb
 AUX i8kmon.init 397 BLAKE2B 54d12165aa4d8cee50e4e73392d39f0064669f55e57e999dce4db98992e1ac762a87235a25d07822d143baf40d32bc4ab93ad5f53b2d719a54299069e9b7feb9 SHA512 e31b6aacea515735c96375094521a9c825660d7a19e40386f0afe93084fc51ba767afd5549101ca8dca217589dd75b0034952d20be9a15bec5a2a6e9e0012b38
 AUX i8kmon.service 158 BLAKE2B e567398b719557fffc6b4a244e4528d6147e8406db59d4cca39d531e88a04be5e4154971f15ed9db24d7f8ebfef103ea78cdaa4aeae356823045f7012782cf39 SHA512 77cbed13d4c1982a491faafe7e45da7a4fc06ea94e6b126405211f54a4bb5b4c794d94f6ca56d6d16ad0e0e62d8311bf90e0e6c60c74147ea12963c530c69529
-AUX i8kutils-1.42-Makefile.patch 1296 BLAKE2B cbcc827c1c93ebb4a597c642ed14110c92de701b7b094228924442c75806ecf2e35b43a65c7a39f412e9d10d24ea97c726c76cd9653ea090a0215a795ac47905 SHA512 3dd548cff896d3b14df0e55059f842cf3e04c0a9057f2c16eea7fb160882ceab4dc91782012d2243a4a78f9271c2effdb09109ffe889c27149a65940b69785d9
-AUX i8kutils-gcc5.patch 1161 BLAKE2B 12705e687c801a2863f2b8908473b1268bb3af474004ec1b317d03cb9ffb100dc4c4b2b5afeaeea76d047037b5ba5586a8629a1bbf5313b99e76dd7728679e1b SHA512 c789ef70244c59041308c5ff692c2bec6cf4fa5e673deeea9ec59cd1b6036e60f6ca4036dea04eaaa1b8172e3388b2f5e02227311e032c9c552e04ac50276616
 DIST i8kutils-1.43.tar.xz 29184 BLAKE2B 3489de1993267eb8aaca1dc00e6c19f68be14b5351715828eee9d4e6abbedbcd3faa58aba5e764de4bbf6cfa41e0a64d011d1d5ea904b261fa3f9842a4501bab SHA512 eed2db9e5864b0dc24e22302ce2abaa54415520a920cfa0be08068b8316a3c2c04b3565cc84164e36fb7ae5bb8b77be55ae179255e03ecd86ea664d85cece456
-DIST i8kutils_1.42.tar.xz 37544 BLAKE2B ca8ec63252f43b269ba2a5565fce275aaa6542ebe6f4824d12b194cb0ae8b09dbe354c743ad78af8bcb897e411f1739df464e6c5603d470842de4b59be753984 SHA512 148e8788c50cbaa22f1dd3b72867839f5bc2d91cda70aee74f7c9a3d8542386a44652c5eb8dd9eba0e30400fc6bb72855d3cc7f2dc4284c2529b9cba2eac485b
-EBUILD i8kutils-1.42.ebuild 1022 BLAKE2B 4248f6b20e56f8298a4fdfcfb28fb03e76c5d3da611a42dee4a0a1ad49678bcda1b547d6e4c3c0da47a1c1771b59cd7e7fdd3dc367e84e94f8560c3bcb1fd64b SHA512 a8d386ec9e17804dbf5dac188e7a6af2f943d40f6166972482a3fe970c42300a9cd137697b8b21018a23af8ce080db1c24f6b1b3b4011224559e1df749fedd1c
-EBUILD i8kutils-1.43.ebuild 1152 BLAKE2B 3e42ed12051ff979a009234c477bcd5b4b682584333aa1f39ea1be5f69e077e6725700764e3de03c05afa51e21dd369424508ee999623afabbf7624dfcda0b9d SHA512 b3f207556ff004ecee5d61ba68abc93a5c195d1eaf0323a1ccac0f868a0ff1072053ad0b2268e68bd6f7b0cb5f76b09cc04f3e252f69ecc82865e9a35c1ee55c
+EBUILD i8kutils-1.43.ebuild 1150 BLAKE2B a4fc7832095a20bab0267bfb2b95a4b2298eae3e272b115eee00cd1610016a2f6c0d7b2cf5d4a1da6314a773c2862d5578a25b36f74de12b49285b0261ba556e SHA512 c0bd9abc87d2b01253edc2af86c2f9ed5d91aed35c7f7a87d667c813498554996748b4cdffcab705e46dd0cd2f4b1bc25a356654405a84938332413171511e78
 MISC metadata.xml 485 BLAKE2B 75c334131b955002752321192acb3e3ae092e325e8d868477742a3a0c63d616cef83145d0abefce2a6b0c326295609a16700fdaa18bcebbff06e13e4fd6c0f3d SHA512 54f23399c9913a0cedc0d1f7db5a974b9f05827c30dd9ad95385b52807dfbbc75d72110659fa91613ee8a42893061f964675f53ed5a1e0415ad70fdbad45f48f
diff --git a/app-laptop/i8kutils/files/i8k.conf b/app-laptop/i8kutils/files/i8k.conf
deleted file mode 100644
index c5bd389b294a..000000000000
--- 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 1e1cb7ca0c94..000000000000
--- 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 a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch b/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
deleted file mode 100644
index 7dc56d91aa3e..000000000000
--- a/app-laptop/i8kutils/files/i8kutils-1.42-Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 258b95f595f6..000000000000
--- a/app-laptop/i8kutils/files/i8kutils-gcc5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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, &tmst);
- 	t = tmst.tv_nsec;
diff --git a/app-laptop/i8kutils/i8kutils-1.42.ebuild b/app-laptop/i8kutils/i8kutils-1.42.ebuild
deleted file mode 100644
index a18ef111995f..000000000000
--- a/app-laptop/i8kutils/i8kutils-1.42.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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="tk"
-
-DEPEND="tk? ( dev-lang/tk:0 )"
-RDEPEND="${DEPEND}
-	sys-power/acpi"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( README.i8kutils )
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gcc5.patch"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	tc-export CC
-}
-
-src_install() {
-	dobin i8kctl i8kfan
-	doman i8kctl.1
-	dodoc README.i8kutils
-
-	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
-}
diff --git a/app-laptop/i8kutils/i8kutils-1.43.ebuild b/app-laptop/i8kutils/i8kutils-1.43.ebuild
index d406bfcc3a0f..82620db160af 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