summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Harmon <russ@eatnumber1.com>2009-12-26 13:52:11 -0500
committerRussell Harmon <russ@eatnumber1.com>2009-12-26 13:52:11 -0500
commitb5372beace6c42daee2d331fc61792c4add73e71 (patch)
tree517485f475517bd1850d7a5aa251d3f1e0eee437 /x11-misc
parentFix idea-community ebuild (diff)
downloadeatnumber1-b5372beace6c42daee2d331fc61792c4add73e71.tar.gz
eatnumber1-b5372beace6c42daee2d331fc61792c4add73e71.tar.bz2
eatnumber1-b5372beace6c42daee2d331fc61792c4add73e71.zip
Removed keynav since it's in sunrise.
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/keynav/files/keynav-20091108_etc-config.patch57
-rw-r--r--x11-misc/keynav/files/keynav-20091108_fix-makefile.patch46
-rw-r--r--x11-misc/keynav/keynav-20091108.ebuild35
3 files changed, 0 insertions, 138 deletions
diff --git a/x11-misc/keynav/files/keynav-20091108_etc-config.patch b/x11-misc/keynav/files/keynav-20091108_etc-config.patch
deleted file mode 100644
index c1a2af8..0000000
--- a/x11-misc/keynav/files/keynav-20091108_etc-config.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/keynav-20091108/keynav.c 2009-11-08 16:03:15.000000000 -0500
-+++ b/keynav-20091108/keynav.c 2009-11-26 10:31:41.813671575 -0500
-@@ -285,22 +285,11 @@
- }
- }
-
--void parse_config() {
-- char *homedir;
--
-- keybindings = malloc(keybindings_size * sizeof(struct keybinding));
--
-- defaults();
--
-- homedir = getenv("HOME");
--
-- if (homedir != NULL) {
-- char *rcfile = NULL;
-+void parse_config_file(const char* file) {
- FILE *fp = NULL;
- #define LINEBUF_SIZE 512
- char line[LINEBUF_SIZE];
-- asprintf(&rcfile, "%s/.keynavrc", homedir);
-- fp = fopen(rcfile, "r");
-+ fp = fopen(file, "r");
- if (fp != NULL) {
- /* fopen succeeded */
- while (fgets(line, LINEBUF_SIZE, fp) != NULL) {
-@@ -308,11 +297,27 @@
- *(line + strlen(line) - 1) = '\0';
- parse_config_line(line);
- }
-- free(rcfile);
-+ fclose(fp);
- return;
- }
-+}
-+
-+void parse_config() {
-+ char *homedir;
-+
-+ keybindings = malloc(keybindings_size * sizeof(struct keybinding));
-+
-+ defaults();
-+
-+ parse_config_file("/etc/keynavrc");
-+ homedir = getenv("HOME");
-+
-+ if (homedir != NULL) {
-+ char *rcfile = NULL;
-+ asprintf(&rcfile, "%s/.keynavrc", homedir);
-+ parse_config_file(rcfile);
-+ free(rcfile);
- }
-- fprintf(stderr, "No ~/.keynavrc found.\n");
- }
-
- void defaults() {
diff --git a/x11-misc/keynav/files/keynav-20091108_fix-makefile.patch b/x11-misc/keynav/files/keynav-20091108_fix-makefile.patch
deleted file mode 100644
index 55e9b38..0000000
--- a/x11-misc/keynav/files/keynav-20091108_fix-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/keynav-20091108/Makefile 2009-11-08 16:04:23.000000000 -0500
-+++ b/keynav-20091108/Makefile 2009-11-26 11:44:05.336699998 -0500
-@@ -1,5 +1,5 @@
--CFLAGS=`pkg-config --cflags xcb-shape xinerama x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
--LDFLAGS=`pkg-config --libs xcb-shape xinerama x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama`
-+CFLAGS+= $(shell pkg-config --cflags xcb-shape xinerama x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include)
-+LDFLAGS+= $(shell pkg-config --libs xcb-shape xinerama x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama)
-
- #CFLAGS+=-g
- OTHERFILES=README CHANGELIST COPYRIGHT \
-@@ -7,17 +7,19 @@
-
- #MICROVERSION?=00
-
-+.PHONY: all
-+
- all: keynav
-
- clean:
- rm *.o || true;
-- make -C xdotool clean || true
-+ $(MAKE) -C xdotool clean || true
-
- keynav: xdo.o keynav.o
-- gcc $(LDFLAGS) xdo.o keynav.o -o $@
-+ $(CC) $(CFLAGS) xdo.o keynav.o -o $@ $(LDFLAGS)
-
- xdo.o:
-- make -C xdotool xdo.o
-+ $(MAKE) -C xdotool xdo.o
- cp xdotool/xdo.o .
-
- #NAME=keynav-`date +%Y%m%d`.$(MICROVERSION);
---- a/keynav-20091108/xdotool/Makefile 2009-11-08 16:01:30.000000000 -0500
-+++ b/keynav-20091108/xdotool/Makefile 2009-11-26 11:37:19.769691350 -0500
-@@ -13,8 +13,8 @@
- DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst
- DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
-
--LIBS=`pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)"`
--INC=`pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)"`
-+LIBS=$(shell pkg-config --libs x11 xtst 2> /dev/null || echo "$(DEFAULT_LIBS)")
-+INC=$(shell pkg-config --cflags x11 xtst 2> /dev/null || echo "$(DEFAULT_INC)")
-
- CFLAGS+=$(INC)
- LDFLAGS+=$(LIBS)
diff --git a/x11-misc/keynav/keynav-20091108.ebuild b/x11-misc/keynav/keynav-20091108.ebuild
deleted file mode 100644
index c38e24f..0000000
--- a/x11-misc/keynav/keynav-20091108.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit eutils
-
-DESCRIPTION="Make pointer-driven interfaces easier and faster for users to operate."
-HOMEPAGE="http://www.semicomplete.com/projects/keynav/"
-SRC_URI="http://semicomplete.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- x11-proto/xproto"
-DEPEND="${RDEPEND}
- x11-libs/libX11
- x11-libs/libXinerama
- x11-libs/libXext
- x11-libs/libXtst"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}_etc-config.patch"
- epatch "${FILESDIR}/${P}_fix-makefile.patch"
-}
-
-src_install() {
- dodoc README CHANGELIST
- dobin keynav
- insinto /etc
- doins keynavrc
-}