diff options
| -rw-r--r-- | sys-libs/gpm/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-libs/gpm/Manifest | 10 | ||||
| -rw-r--r-- | sys-libs/gpm/files/digest-gpm-1.20.1-r1 | 2 | ||||
| -rw-r--r-- | sys-libs/gpm/files/gpm-run | 7 | ||||
| -rw-r--r-- | sys-libs/gpm/files/gpm.rc5 | 30 | ||||
| -rw-r--r-- | sys-libs/gpm/files/gpmInt.h | 170 | ||||
| -rw-r--r-- | sys-libs/gpm/files/svc-gpm | 30 | ||||
| -rw-r--r-- | sys-libs/gpm/gpm-1.20.1-r1.ebuild | 46 | ||||
| -rw-r--r-- | sys-libs/gpm/gpm-1.20.1.ebuild | 7 |
9 files changed, 63 insertions, 249 deletions
diff --git a/sys-libs/gpm/ChangeLog b/sys-libs/gpm/ChangeLog index 273ead760e8f..be1555f849e2 100644 --- a/sys-libs/gpm/ChangeLog +++ b/sys-libs/gpm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/gpm -# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.31 2004/10/31 17:30:29 tgall Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/ChangeLog,v 1.32 2005/01/30 11:43:39 vapier Exp $ + +*gpm-1.20.1-r1 (30 Jan 2005) + + 30 Jan 2005; Mike Frysinger <vapier@gentoo.org> +gpm-1.20.1-r1.ebuild: + Clean up ebuild and the source code so that we can do fun things like not + require autoconf and build in parallel ! Whoo ! 31 Oct 2004; Tom Gall <tgall@gentoo.org> gpm-1.20.1.ebuild, +files/gpm-linux26-headers.patch: diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest index d676a34b6c19..a188c2d8773b 100644 --- a/sys-libs/gpm/Manifest +++ b/sys-libs/gpm/Manifest @@ -1,11 +1,9 @@ MD5 f40007a511afe5cc0675a41d1e675064 ChangeLog 4521 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 89970db4c5e1e5556175f2dae7ad12ef gpm-1.20.1-r1.ebuild 1161 MD5 a98d03916a3f575760a003243fbad3d3 gpm-1.20.1.ebuild 1661 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 ea7ad06dda6e39fd68b7ff1fd97e9ef6 files/digest-gpm-1.20.1-r1 136 +MD5 1e2ab7c222263d460e9e881f7a1558c7 files/gpm-linux26-headers.patch 423 MD5 97f0853f825f506bf47be3b8ce6f9ce9 files/digest-gpm-1.20.1 136 -MD5 a681ee7098ec613c1d2341d1cbbfca25 files/gpm-run 134 MD5 d562712814b13d09904823bd3eb31269 files/gpm.conf.d 570 -MD5 146798e9d5d83b73a15b3ea40dfe6f7f files/gpm.rc5 588 MD5 b1364fd3bf27cda742dbcfc87497cc18 files/gpm.rc6 951 -MD5 e24675823ef2f451c7f3f55c2c561b5b files/gpmInt.h 5090 -MD5 006069406dca2f0b2611fdc50878b83d files/svc-gpm 448 -MD5 1e2ab7c222263d460e9e881f7a1558c7 files/gpm-linux26-headers.patch 423 diff --git a/sys-libs/gpm/files/digest-gpm-1.20.1-r1 b/sys-libs/gpm/files/digest-gpm-1.20.1-r1 new file mode 100644 index 000000000000..68685aa4213d --- /dev/null +++ b/sys-libs/gpm/files/digest-gpm-1.20.1-r1 @@ -0,0 +1,2 @@ +MD5 2c63e827d755527950d9d13fe3d87692 gpm-1.20.1.tar.bz2 565014 +MD5 bd99acbf8d09f8dbcca521e8e6489dcf gpm-1.20.1-patches-1.1.tar.bz2 7696 diff --git a/sys-libs/gpm/files/gpm-run b/sys-libs/gpm/files/gpm-run deleted file mode 100644 index ca5e87e11dac..000000000000 --- a/sys-libs/gpm/files/gpm-run +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -if [ ! -e /var/run/gpm.pid ] -then - /usr/sbin/gpm - sleep 2 -fi -exec envuidgid daemon /usr/bin/watchpid `cat /var/run/gpm.pid` diff --git a/sys-libs/gpm/files/gpm.rc5 b/sys-libs/gpm/files/gpm.rc5 deleted file mode 100644 index d70040518a64..000000000000 --- a/sys-libs/gpm/files/gpm.rc5 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -#RCUPDATE:2 3 4:80:This line is required for script management - -. /etc/rc.d/config/functions -. /etc/rc.d/config/basic - -SERVICE="GPM" -opts="start stop restart" - -PIDFILE=/var/run/gpm.pid -EXE=/usr/sbin/gpm - -start() { - ebegin "Starting $SERVICE" - start-stop-daemon --start --quiet --exec $EXE -- -t $MOUSE - eend $? "Started $SERVICE." "Error starting $SERVICE." -} - -stop() { - ebegin "Stopping $SERVICE" - start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXE - eend $? "Stopped $SERVICE." "Error stopping $SERVICE." -} - -restart() { - stop - start -} - -doservice ${@} diff --git a/sys-libs/gpm/files/gpmInt.h b/sys-libs/gpm/files/gpmInt.h deleted file mode 100644 index 43d4a845839b..000000000000 --- a/sys-libs/gpm/files/gpmInt.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * gpmInt.h - server-only stuff for gpm-Linux - * - * Copyright (C) 1994-1999 Alessandro Rubini <rubini@linux.it> - * Copyright (C) 1998 Ian Zimmerman <itz@rahul.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. - ********/ - -#ifndef _GPMINT_INCLUDED -#define _GPMINT_INCLUDED - -/* $Id: gpmInt.h,v 1.1 2000/11/12 21:35:07 achim Exp $ */ - -#include <sys/types.h> /* time_t */ - -#include "gpmCfg.h" -#include "gpm.h" - -#if !defined(__GNUC__) -# define inline -#endif - -#ifdef DEBUG -# define inline -#endif - -#ifndef OPEN_MAX -#define OPEN_MAX 256 -#endif - -#include "wd.h" /* when debugging macros */ - -/*....................................... Strange requests (iff conn->pid==0)*/ - -#define GPM_REQ_SNAPSHOT 0 -#define GPM_REQ_BUTTONS 1 -#define GPM_REQ_CONFIG 2 -#define GPM_REQ_NOPASTE 3 - -/*....................................... Structures */ - - -/* - * and this is the entry in the mouse-type table - */ -typedef struct Gpm_Type { - char *name; - char *desc; /* a descriptive line */ - char *synonyms; /* extra names (the XFree name etc) as a list */ - int (*fun)(Gpm_Event *state, unsigned char *data); - struct Gpm_Type *(*init)(int fd, unsigned short flags, - struct Gpm_Type *type, int argc, char **argv); - unsigned short flags; - unsigned char proto[4]; - int packetlen; - int howmany; /* howmany bytes to read at a time */ - int getextra; /* does it get an extra byte? (only mouseman) */ - int absolute; /* flag indicating absolute pointing device */ - - int (*repeat_fun)(Gpm_Event *state, int fd); /* repeat this event into fd */ - /* itz Mon Jan 11 23:27:54 PST 1999 */ -} Gpm_Type; - -#define GPM_EXTRA_MAGIC_1 0xAA -#define GPM_EXTRA_MAGIC_2 0x55 - -typedef struct Gpm_Cinfo { - Gpm_Connect data; - int fd; - struct Gpm_Cinfo *next; -} Gpm_Cinfo; - - -/*....................................... Global variables */ - -/* this structure is used to hide the dual-mouse stuff */ - -struct mouse_features { - char *opt_type, *opt_dev, *opt_sequence; - int opt_baud,opt_sample,opt_delta, opt_accel, opt_scale, opt_scaley; - int opt_time, opt_cluster, opt_three, opt_glidepoint_tap; - char *opt_options; /* extra textual configuration */ - Gpm_Type *m_type; - int fd; -}; - -extern struct mouse_features mouse_table[3], *which_mouse; /*the current one*/ - -typedef struct Opt_struct_type {int a,B,d,i,p,r,V,A;} Opt_struct_type; - -/* this is not very clean, actually, but it works fine */ -#define opt_type (which_mouse->opt_type) -#define opt_dev (which_mouse->opt_dev) -#define opt_sequence (which_mouse->opt_sequence) -#define opt_baud (which_mouse->opt_baud) -#define opt_sample (which_mouse->opt_sample) -#define opt_delta (which_mouse->opt_delta) -#define opt_accel (which_mouse->opt_accel) -#define opt_scale (which_mouse->opt_scale) -#define opt_scaley (which_mouse->opt_scaley) -#define opt_time (which_mouse->opt_time) -#define opt_cluster (which_mouse->opt_cluster) -#define opt_three (which_mouse->opt_three) -#define opt_glidepoint_tap (which_mouse->opt_glidepoint_tap) -#define opt_options (which_mouse->opt_options) - -#define m_type (which_mouse->m_type) - -/* the other variables */ - -extern char *prgname; -extern char *opt_lut; -extern int opt_test, opt_ptrdrag; -extern int opt_kill; -extern int opt_repeater, opt_double; -extern char* opt_repeater_type; -extern int opt_kernel, opt_explicittype; -extern int opt_aged; -extern time_t opt_age_limit; -extern char *opt_special; -extern int opt_rawrep; -extern int fifofd; -extern char *consolename; /* the selected one */ - -extern Gpm_Type *repeated_type; -extern Gpm_Type mice[]; -extern struct winsize win; -extern int maxx, maxy; -extern Gpm_Cinfo *cinfo[MAX_VC+1]; - -/*....................................... Prototypes */ - /* gpm.c */ -int main(int argc, char **argv); - - /* gpn.c */ -#define oops(s) gpm_oops(__FILE__, __LINE__,(s)) -int cmdline(int argc, char **argv); -int giveInfo(int request, int fd); - /* mice.c */ -extern int M_listTypes(void); - /* special.c */ -int processSpecial(Gpm_Event *event); -int twiddler_key(unsigned long message); -int twiddler_key_init(void); - -/*....................................... Dirty hacks */ - -#undef GPM_USE_MAGIC /* magic token foreach message? */ - - -#ifdef GPM_USE_MAGIC -#define MAGIC_P(code) code -#else -#define MAGIC_P(code) -#endif - -#endif /* _GPMINT_INCLUDED */ diff --git a/sys-libs/gpm/files/svc-gpm b/sys-libs/gpm/files/svc-gpm deleted file mode 100644 index 5918c37469f9..000000000000 --- a/sys-libs/gpm/files/svc-gpm +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -#RCUPDATE:2 3 4:80:This line is required for script management - -. /etc/rc.d/config/functions - -SERVICE="gpm" -opts="start stop" - -start() { - ebegin "Starting $SERVICE" - ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE} - eend $? -} - -stop() { - ebegin "Stopping $SERVICE" - if [ -e ${SVCDIR}/control/${SERVICE} ] - then - /usr/bin/svc -dx ${SVCDIR}/control/${SERVICE} - rm ${SVCDIR}/control/${SERVICE} - fi - eend $? -} - -doservice ${@} - - - - - diff --git a/sys-libs/gpm/gpm-1.20.1-r1.ebuild b/sys-libs/gpm/gpm-1.20.1-r1.ebuild new file mode 100644 index 000000000000..ec463f74ab30 --- /dev/null +++ b/sys-libs/gpm/gpm-1.20.1-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1-r1.ebuild,v 1.1 2005/01/30 11:43:39 vapier Exp $ + +inherit eutils toolchain-funcs + +PATCH_VER="1.1" +DESCRIPTION="Console-based mouse driver" +HOMEPAGE="ftp://arcana.linux.it/pub/gpm/" +SRC_URI="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2 + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux" + +DEPEND=">=sys-libs/ncurses-5.2" +RDEPEND="selinux? ( sec-policy/selinux-gpm )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/patch +} + +src_compile() { + econf --sysconfdir=/etc/gpm || die "econf failed" + emake \ + CC=$(tc-getCC) \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) \ + || die "emake failed" +} + +src_install() { + make install DESTDIR="${D}" || die "make install failed" + insinto /etc/gpm + doins conf/gpm-*.conf + + dodoc BUGS ChangeLog Changes README TODO + dodoc doc/Announce doc/FAQ doc/README* + + newinitd "${FILESDIR}"/gpm.rc6 gpm + newconfd "${FILESDIR}"/gpm.conf.d gpm +} diff --git a/sys-libs/gpm/gpm-1.20.1.ebuild b/sys-libs/gpm/gpm-1.20.1.ebuild index 3c646394c8f6..a17ccccde201 100644 --- a/sys-libs/gpm/gpm-1.20.1.ebuild +++ b/sys-libs/gpm/gpm-1.20.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1.ebuild,v 1.22 2005/01/30 10:12:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/gpm-1.20.1.ebuild,v 1.23 2005/01/30 11:43:39 vapier Exp $ inherit eutils @@ -12,11 +12,10 @@ SRC_URI="ftp://arcana.linux.it/pub/gpm/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" IUSE="selinux" -DEPEND=">=sys-libs/ncurses-5.2 - sys-devel/autoconf" +DEPEND=">=sys-libs/ncurses-5.2" RDEPEND="selinux? ( sec-policy/selinux-gpm )" PATCHDIR=${WORKDIR}/patches |