diff options
-rw-r--r-- | sys-libs/gpm/Manifest | 2 | ||||
-rw-r--r-- | sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch | 33 | ||||
-rw-r--r-- | sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch | 16 | ||||
-rw-r--r-- | sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch | 30 | ||||
-rw-r--r-- | sys-libs/gpm/files/gpm.conf.d | 23 | ||||
-rw-r--r-- | sys-libs/gpm/files/gpm.rc6-2 | 29 | ||||
-rw-r--r-- | sys-libs/gpm/files/gpm.service | 12 | ||||
-rw-r--r-- | sys-libs/gpm/gpm-1.20.7-r2.ebuild | 95 | ||||
-rw-r--r-- | sys-libs/gpm/metadata.xml | 8 |
9 files changed, 0 insertions, 248 deletions
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest deleted file mode 100644 index b637cdcc..00000000 --- a/sys-libs/gpm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST gpm-1.20.7-docs.patch.xz 41668 SHA256 a1b73e8916d1ae5e336a6c366c2be51b668176d743bb137a53c623f5a634faf6 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4 WHIRLPOOL f6832979bc5b3ca1c61f150ab8795f744dc3d44fa404038dd5de97c4fd939e2e1fb4b40bcb27daf5cb81846a0841954dbfa5b8d6e37e341b834d9dce6382dcf1 -DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a diff --git a/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch b/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch deleted file mode 100644 index c981658e..00000000 --- a/sys-libs/gpm/files/gpm-1.20.7-musl-missing-headers.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur gpm-1.20.7.orig/src/daemon/open_console.c gpm-1.20.7/src/daemon/open_console.c ---- gpm-1.20.7.orig/src/daemon/open_console.c 2012-10-26 21:21:38.000000000 +0000 -+++ gpm-1.20.7/src/daemon/open_console.c 2015-07-20 19:31:22.225131984 +0000 -@@ -22,6 +22,7 @@ - #include <fcntl.h> /* open and co. */ - #include <sys/stat.h> /* stat() */ - #include <sys/ioctl.h> /* ioctl */ -+#include <sys/sysmacros.h> /* major */ - - /* Linux specific (to be outsourced in gpm2 */ - #include <linux/serial.h> /* for serial console check */ -diff -Naur gpm-1.20.7.orig/src/prog/display-buttons.c gpm-1.20.7/src/prog/display-buttons.c ---- gpm-1.20.7.orig/src/prog/display-buttons.c 2012-10-26 21:21:38.000000000 +0000 -+++ gpm-1.20.7/src/prog/display-buttons.c 2015-07-20 19:27:48.489140025 +0000 -@@ -36,6 +36,7 @@ - #include <stdio.h> /* printf() */ - #include <time.h> /* time() */ - #include <errno.h> /* errno */ -+#include <sys/select.h> /* fd_set, select, FD_* */ - #include <gpm.h> /* gpm information */ - - /* display resulting data */ -diff -Naur gpm-1.20.7.orig/src/prog/display-coords.c gpm-1.20.7/src/prog/display-coords.c ---- gpm-1.20.7.orig/src/prog/display-coords.c 2012-10-26 21:21:38.000000000 +0000 -+++ gpm-1.20.7/src/prog/display-coords.c 2015-07-20 19:28:45.829137867 +0000 -@@ -37,6 +37,7 @@ - #include <stdio.h> /* printf() */ - #include <time.h> /* time() */ - #include <errno.h> /* errno */ -+#include <sys/select.h> /* fd_set, select, FD_* */ - #include <gpm.h> /* gpm information */ - - /* display resulting data */ diff --git a/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch b/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch deleted file mode 100644 index 270109ee..00000000 --- a/sys-libs/gpm/files/gpm-1.20.7-musl-portable-sigaction.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur gpm-1.20.7.orig/src/prog/gpm-root.y gpm-1.20.7/src/prog/gpm-root.y ---- gpm-1.20.7.orig/src/prog/gpm-root.y 2012-10-26 21:21:38.000000000 +0000 -+++ gpm-1.20.7/src/prog/gpm-root.y 2015-07-20 19:37:50.489117377 +0000 -@@ -1199,8 +1199,11 @@ - #if defined(__GLIBC__) - __sigemptyset(&childaction.sa_mask); - #else /* __GLIBC__ */ -- childaction.sa_mask=0; -+ sigemptyset(&childaction.sa_mask); - #endif /* __GLIBC__ */ -+#ifndef SA_INTERRUPT -+# define SA_INTERRUPT 0x20000000 /* from GLIBC's <bits/sigaction.h> */ -+#endif - childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */ - sigaction(SIGCHLD,&childaction,NULL); - diff --git a/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch b/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch deleted file mode 100644 index d8ab2d19..00000000 --- a/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 14 Mar 2016 15:39:54 -0400 -Subject: [PATCH] fix building w/newer glibc - -Linux C libraries are looking to disentangle sysmacros.h from the -sys/types.h include, so make sure we pull in the header when it is -found. ---- - src/daemon/open_console.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c -index 4d6c0af..6dd43e6 100644 ---- a/src/daemon/open_console.c -+++ b/src/daemon/open_console.c -@@ -24,6 +24,10 @@ - #include <sys/types.h> /* major() */ - #include <sys/ioctl.h> /* ioctl */ - -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> /* major() w/newer glibc */ -+#endif -+ - /* Linux specific (to be outsourced in gpm2 */ - #include <linux/serial.h> /* for serial console check */ - #include <asm/ioctls.h> /* for serial console check */ --- -2.6.2 - diff --git a/sys-libs/gpm/files/gpm.conf.d b/sys-libs/gpm/files/gpm.conf.d deleted file mode 100644 index f21c2575..00000000 --- a/sys-libs/gpm/files/gpm.conf.d +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/init.d/gpm - -# Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry - -MOUSE=ps2 -#MOUSE=imps2 -#MOUSEDEV=/dev/psaux -MOUSEDEV=/dev/input/mice - -# Extra settings - -#RESPONSIVENESS= -#REPEAT_TYPE=raw - -# Please uncomment this line if you want gpm to understand charsets used -# in URLs and names with ~ or : in them, etc. This is a good idea to turn on! - -#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\"" - -# Various other options, see gpm(8) manpage for more. - -#APPEND="-g 1 -A60" -#APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60" diff --git a/sys-libs/gpm/files/gpm.rc6-2 b/sys-libs/gpm/files/gpm.rc6-2 deleted file mode 100644 index 7f735278..00000000 --- a/sys-libs/gpm/files/gpm.rc6-2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -#NB: Config is in /etc/conf.d/gpm - -command=/usr/sbin/gpm -command_args=" - -m ${MOUSEDEV} - -t ${MOUSE} - ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}} - ${REPEAT_TYPE:+ -R${REPEAT_TYPE}} - ${APPEND} -" - -pidfile=/var/run/gpm.pid - -depend() { - need localmount - use hotplug logger -} - -start_pre() { - if [ -z "${MOUSEDEV}" ] || [ -z "${MOUSE}" ] ; then - eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first" - return 1 - fi -} diff --git a/sys-libs/gpm/files/gpm.service b/sys-libs/gpm/files/gpm.service deleted file mode 100644 index 966ad800..00000000 --- a/sys-libs/gpm/files/gpm.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Console Mouse manager -After=syslog.target - -[Service] -ExecStart=/usr/sbin/gpm -m /dev/input/mice -t exps2 -StandardOutput=syslog -Type=forking -PIDFile=/var/run/gpm.pid - -[Install] -WantedBy=multi-user.target diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild deleted file mode 100644 index 157250c8..00000000 --- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# emacs support disabled due to #99533 #335900 - -EAPI=5 - -inherit eutils systemd toolchain-funcs autotools multilib-minimal usr-ldscript - -DESCRIPTION="Console-based mouse driver" -HOMEPAGE="http://www.nico.schottelius.org/software/gpm/" -SRC_URI="http://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma - mirror://gentoo/${P}-docs.patch.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips ppc x86" -IUSE="selinux static-libs" - -RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] - selinux? ( sec-policy/selinux-gpm )" -DEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] - app-arch/xz-utils - sys-apps/texinfo - virtual/yacc" - -src_prepare() { - epatch "${FILESDIR}"/${P}-sysmacros.patch - - # Hack up the docs until we get this sorted upstream. - # https://github.com/telmich/gpm/issues/8 - epatch "${WORKDIR}"/${P}-docs.patch - touch -r . doc/* || die - - # fix ABI values - sed -i \ - -e '/^abi_lev=/s:=.*:=1:' \ - -e '/^abi_age=/s:=.*:=20:' \ - configure.ac.footer || die - # Rebuild autotools since release doesn't include them. - # Should be fixed with the next release though. - # https://github.com/telmich/gpm/pull/15 - sed -i -e '/ACLOCAL/,$d' autogen.sh || die - - epatch "${FILESDIR}"/${P}-musl-missing-headers.patch - epatch "${FILESDIR}"/${P}-musl-portable-sigaction.patch - - ./autogen.sh - eautoreconf - - # Out-of-tree builds are broken. - # https://github.com/telmich/gpm/issues/16 - multilib_copy_sources -} - -multilib_src_configure() { - econf \ - --sysconfdir=/etc/gpm \ - $(use_enable static-libs static) \ - emacs=/bin/false -} - -_emake() { - emake \ - EMACS=: ELISP="" \ - $(multilib_is_native_abi || echo "PROG= ") \ - "$@" -} - -multilib_src_compile() { - _emake -} - -multilib_src_test() { - _emake check -} - -multilib_src_install() { - _emake DESTDIR="${D}" install - - dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so - gen_usr_ldscript -a gpm -} - -multilib_src_install_all() { - insinto /etc/gpm - doins conf/gpm-*.conf - - dodoc README TODO - dodoc doc/Announce doc/FAQ doc/README* - - newinitd "${FILESDIR}"/gpm.rc6-2 gpm - newconfd "${FILESDIR}"/gpm.conf.d gpm - systemd_dounit "${FILESDIR}"/gpm.service -} diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml deleted file mode 100644 index 56c12441..00000000 --- a/sys-libs/gpm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -</pkgmetadata> |