commit: 562f581c9e62196cf2c2d9339ba9f9398aaaf480 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Mar 18 19:41:05 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Mar 18 19:41:05 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562f581c
sys-apps/input-utils: Removed old. Package-Manager: Portage-2.3.5, Repoman-2.3.2 sys-apps/input-utils/Manifest | 1 - .../input-utils-0.0.1-protocol-mismatch-fix.patch | 22 ---- .../files/input-utils-0.0.1_pre20081014.patch | 116 --------------------- .../input-utils-0.0.1_pre20081014.ebuild | 34 ------ 4 files changed, 173 deletions(-) diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest index f6d7183e22e..71b693a402f 100644 --- a/sys-apps/input-utils/Manifest +++ b/sys-apps/input-utils/Manifest @@ -1,3 +1,2 @@ DIST input-1.2.tar.gz 22809 SHA256 7934244f34d5cd5d31a67d14892d4c0d8260dc0f622e01cf21bc1eddf4b98b56 SHA512 75a5e2d5b778ae93fb2d29ed7c8b0ec564233a385d88d0fe3a9e5ecd55259f14014bf269c318b5872ddd1379110565d354a1a043eb0a4693c724d52b6ca12173 WHIRLPOOL 61f4f4ff16ddc2654d302beecbc28352d49bbb53d56538aed4e044706a339da67bf03b9df9b42df8ca84ae7bccd779a783d3250a51927a205380f0a06d546ea4 DIST input-1.3.tar.gz 23755 SHA256 9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d WHIRLPOOL a0a531796532720a3e3b3c6c21833df264f59b2a29ebdbf84f24481ea5687b9a7450d03091a751c05a1968ac6621a35861841c8f70ea26f44a2192ef3972b699 -DIST input-20081014-101501.tar.gz 33797 SHA256 185f31f5776bd81be28ae7984d6d2812420858bed8f6ebfbfeaaa7d6ca62b0e5 SHA512 24ad3b5077b0e32b0ed6d28e84c27089091468d1379645f862c66a1987f079765c5aed850542b3bcec25f6254b681991119332a5b024ff04dd3dbd72e3ae3450 WHIRLPOOL e4daac596d81d5a71c829935d6185bc857a4d1d7971d97a6fc9d3b633f9ceeaf8e269b3fe783f948e0e426c5c2a4fd669b861689dd0d2cfeee32b38aaf3012c8 diff --git a/sys-apps/input-utils/files/input-utils-0.0.1-protocol-mismatch-fix.patch b/sys-apps/input-utils/files/input-utils-0.0.1-protocol-mismatch-fix.patch deleted file mode 100644 index 007258a5330..00000000000 --- a/sys-apps/input-utils/files/input-utils-0.0.1-protocol-mismatch-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch from https://bugs.gentoo.org/attachment.cgi?id=262203&action=diff - ---- input.c.orig 2011-02-12 02:29:40.308989368 -0500 -+++ input.c 2011-02-12 02:30:21.209265625 -0500 -@@ -46,17 +46,6 @@ - if (verbose) - fprintf(stderr,"%s\n",filename); - -- if (-1 == ioctl(fd,EVIOCGVERSION,&version)) { -- perror("ioctl EVIOCGVERSION"); -- close(fd); -- return -1; -- } -- if (EV_VERSION != version) { -- fprintf(stderr, "protocol version mismatch (expected %d, got %d)\n", -- EV_VERSION, version); -- close(fd); -- return -1; -- } - return fd; - } - diff --git a/sys-apps/input-utils/files/input-utils-0.0.1_pre20081014.patch b/sys-apps/input-utils/files/input-utils-0.0.1_pre20081014.patch deleted file mode 100644 index 796b1bef62d..00000000000 --- a/sys-apps/input-utils/files/input-utils-0.0.1_pre20081014.patch +++ /dev/null @@ -1,116 +0,0 @@ -This patch is derived from input-utils_0.0.20051128-4.diff.gz - -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/GNUmakefile input-utils-0.0.20081014/GNUmakefile ---- input-utils-0.0.20081014.orig/GNUmakefile 2008-10-14 10:27:01.000000000 +0000 -+++ input-utils-0.0.20081014/GNUmakefile 2011-07-03 07:49:07.000000000 +0000 -@@ -7,7 +7,7 @@ - LDLIBS += -lm - - # build --TARGETS := lsinput input-events input-kbd input-send input-recv lircd.conf -+TARGETS := lsinput input-events input-kbd lircd.conf - HEADERS := EV.h REL.h ABS.h MSC.h LED.h SND.h REP.h KEY.h BTN.h BUS.h SW.h - - # default target -@@ -45,7 +45,7 @@ - - install: build - $(INSTALL_DIR) $(bindir) $(mandir)/man8 -- $(INSTALL_BINARY) lsinput input-events input-kbd input-send input-recv $(bindir) -+ $(INSTALL_BINARY) lsinput input-events input-kbd $(bindir) - $(INSTALL_DATA) lsinput.man $(mandir)/man8/lsinput.8 - $(INSTALL_DATA) input-kbd.man $(mandir)/man8/input-kbd.8 - $(INSTALL_DATA) input-events.man $(mandir)/man8/input-events.8 -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/input-events.man input-utils-0.0.20081014/input-events.man ---- input-utils-0.0.20081014.orig/input-events.man 2005-07-27 14:17:04.000000000 +0000 -+++ input-utils-0.0.20081014/input-events.man 2011-07-03 07:48:16.000000000 +0000 -@@ -1,7 +1,7 @@ - .TH INPUT-EVENTS 8 "July 2005" "" "" - .SH NAME - --input-events \- list input devices -+input-events \- print input events - - .SH SYNOPSIS - \fBinput\-events \fR [\fB\-t\fR\ \fIsec\fR] [\fB\-g\fR]\ \fIdevnr\fR -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/input.h input-utils-0.0.20081014/input.h ---- input-utils-0.0.20081014.orig/input.h 2008-10-14 10:27:01.000000000 +0000 -+++ input-utils-0.0.20081014/input.h 2011-07-03 07:48:16.000000000 +0000 -@@ -1,7 +1,7 @@ - #include <inttypes.h> - - #include <sys/ioctl.h> --#include "linux-input.h" -+#include <linux/input.h> - - #define ev_name(code) ((code) < EV_MAX && EV_NAME[code] ? EV_NAME[code] : "???") - #define ev_type_name(type, code) ((code) < EV_TYPE_MAX[type] && EV_TYPE_NAME[type][code] ? EV_TYPE_NAME[type][code] : "???") -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/input-kbd.c input-utils-0.0.20081014/input-kbd.c ---- input-utils-0.0.20081014.orig/input-kbd.c 2008-10-14 10:27:01.000000000 +0000 -+++ input-utils-0.0.20081014/input-kbd.c 2011-07-03 07:48:16.000000000 +0000 -@@ -36,7 +36,6 @@ - entry.keycode = KEY_RESERVED; - rc = ioctl(fd, EVIOCGKEYCODE, &entry); - if (rc < 0) { -- map->size--; - break; - } - if (map->size >= map->alloc) { -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/lirc.sh input-utils-0.0.20081014/lirc.sh ---- input-utils-0.0.20081014.orig/lirc.sh 2005-11-28 14:07:00.000000000 +0000 -+++ input-utils-0.0.20081014/lirc.sh 2011-07-03 07:48:16.000000000 +0000 -@@ -1,5 +1,5 @@ - #!/bin/sh --INPUT="linux-input.h" -+INPUT="/usr/include/linux/input.h" - cat <<EOF - begin remote - name linux-input-layer -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/lsinput.c input-utils-0.0.20081014/lsinput.c ---- input-utils-0.0.20081014.orig/lsinput.c 2004-04-21 11:55:44.000000000 +0000 -+++ input-utils-0.0.20081014/lsinput.c 2011-07-03 07:48:16.000000000 +0000 -@@ -1,5 +1,6 @@ - #include <stdio.h> - #include <stdlib.h> -+#include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> - -@@ -10,14 +11,19 @@ - static void list_devices(void) - { - int i,fd; -+ char filename[32]; -+ struct stat statbuf; - - for (i = 0; i < 32; i++) { -- /* try to open */ -- fd = device_open(i,1); -- if (-1 == fd) -- return; -- device_info(fd); -- close(fd); -+ snprintf(filename,sizeof(filename), "/dev/input/event%d",i); -+ if (stat(filename, &statbuf) == 0) { -+ /* try to open */ -+ fd = device_open(i,1); -+ if (-1 == fd) -+ return; -+ device_info(fd); -+ close(fd); -+ } - } - return; - } -diff -Nuar --exclude '*.rej' --exclude '*.orig' input-utils-0.0.20081014.orig/name.sh input-utils-0.0.20081014/name.sh ---- input-utils-0.0.20081014.orig/name.sh 2004-04-21 11:55:44.000000000 +0000 -+++ input-utils-0.0.20081014/name.sh 2011-07-03 07:48:16.000000000 +0000 -@@ -1,7 +1,7 @@ - #!/bin/sh - - TYPE="$1" --INPUT="linux-input.h" -+INPUT="/usr/include/linux/input.h" - - awk " - /EV_VERSION/ { next }; diff --git a/sys-apps/input-utils/input-utils-0.0.1_pre20081014.ebuild b/sys-apps/input-utils/input-utils-0.0.1_pre20081014.ebuild deleted file mode 100644 index 27158c58a4c..00000000000 --- a/sys-apps/input-utils/input-utils-0.0.1_pre20081014.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit eutils - -MY_P="input-${PV/0.0.1_pre/}-101501" - -DESCRIPTION="Small collection of linux input layer utils" -HOMEPAGE="http://dl.bytesex.org/cvs-snapshots/"; -SRC_URI="http://dl.bytesex.org/cvs-snapshots/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/input" - -src_prepare() { - # Ported from Debian - epatch "${FILESDIR}"/input-utils-0.0.1_pre20081014.patch - # version check stuff - epatch "${FILESDIR}"/input-utils-0.0.1-protocol-mismatch-fix.patch -} - -src_install() { - make install bindir="${D}"/usr/bin mandir="${D}"/usr/share/man STRIP="" || die "make install failed" - dodoc lircd.conf - dodoc README -}
