commit: a5196ab5d5621c7d12c2f9308dba1c176313d8f7 Author: Octiabrina Terrien–Puig <octiabrina <AT> myrvogna <DOT> net> AuthorDate: Sun Apr 11 17:06:53 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Apr 14 05:58:26 2021 +0000 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 <octiabrina <AT> myrvogna.net> Closes: https://github.com/gentoo/gentoo/pull/20338 Signed-off-by: Joonas Niilola <juippis <AT> 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..00000000000 --- 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..00000000000 --- 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 7dc56d91aa3..00000000000 --- 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 258b95f595f..00000000000 --- 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 a18ef111995..00000000000 --- 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 -}
