x11-misc/keynav: Remove keynav-20091108

svn path=/sunrise/; revision=9806

5 files changed, 5 insertions, 143 deletions

diff --git a/x11-misc/keynav/ChangeLog b/x11-misc/keynav/ChangeLog
index a01459bf2..9cdae9592 100644
--- a/x11-misc/keynav/ChangeLog
+++ b/x11-misc/keynav/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   04 Jan 2010; Russell Harmon (eatnumber1) <russ@eatnumber1.com>
+  -keynav-20091108.ebuild:
+  Remove keynav-20091108
+
+  04 Jan 2010; Russell Harmon (eatnumber1) <russ@eatnumber1.com>
   +keynav-20091231.04.ebuild:
   Version bump keynav to 20091231.04. Thanks to Russell Harmon
 
diff --git a/x11-misc/keynav/Manifest b/x11-misc/keynav/Manifest
index 2c439ebd9..89a8b63f7 100644
--- a/x11-misc/keynav/Manifest
+++ b/x11-misc/keynav/Manifest
@@ -1,8 +1,4 @@
-AUX keynav-20091108_etc-config.patch 1325 RMD160 c16161b407e8a3111fecbd4fe186cc6bc3e9aad3 SHA1 68914140c6fe00ea5258c8cd09f89a1dfd6cb6c3 SHA256 97f49a518367195d9dada6780e3555af80f3fc5231cdab1e7648375da9dde574
-AUX keynav-20091108_fix-makefile.patch 1780 RMD160 030c44a90d7f394e52bd80920928ab00e1224156 SHA1 66b53648079c11d768e14f0f6752dfbde7e82933 SHA256 281686ee09d5a9a25fc1356ee979b621ef2b4fa1b30e925fb366f00443b64541
-DIST keynav-20091108.tar.gz 34953 RMD160 c72cf86a82ad0a8491ff8018805af81857b8aff1 SHA1 812f74158456ca726f5b67c16e2582a0f30c99fc SHA256 553fb6cefe1011fe250b6c869bff4ccb4019e13f692b2f9d28663fcf38349a5c
 DIST keynav-20091231.04.tar.gz 37958 RMD160 b2103bb8b23740e07cab513f0c52d8e1fdd71955 SHA1 922d01c822796fd421d6ee8566e40349789fb448 SHA256 4ddf3587d86db3b4424f8c182c12526b05c40c3c91bb227359272e8ef94ed9a9
-EBUILD keynav-20091108.ebuild 841 RMD160 935c69c7c9edd9bfe399ca9d2c41be43b2b6c98e SHA1 7b7841da1bda35da247b0a415afa0393091dfb70 SHA256 8894ab6db10b16850fd781fc6b314ff09e356ec53478aa11130073926d554116
 EBUILD keynav-20091231.04.ebuild 806 RMD160 e3f749254dcd7f872b6ecb9bb736d8c7f6eaced2 SHA1 eb7625140309f1aae2fad777de6b9f5e01bc5d34 SHA256 f2b6a093c3fca3b7130e3c794e74371b311d59a595e55ba5d78a8431c0ad7655
-MISC ChangeLog 513 RMD160 06723ee756750a83029375a09815bb2ed04179a4 SHA1 8580ec9f8acbf7241a7ed006580b8bce32130fbc SHA256 ac22602b6cc874529a7c31f0330da02f4cbcbffe3a6f8252f2b678dac23696a8
+MISC ChangeLog 631 RMD160 d7935b0372251b9711d0ee885174aa542a7ad6a4 SHA1 fae16045c8add9972044dba4939b86cdadf8139c SHA256 a2523a27d00c8b90c41c171069791bf411692bba6cccaed6c32a686bd7576695
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
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 c1a2af8d8..000000000
--- 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 55e9b381f..000000000
--- 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 f3c700eee..000000000
--- 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-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libXext
-	x11-libs/libXtst"
-DEPEND="x11-proto/xproto
-	${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_etc-config.patch" \
-		"${FILESDIR}/${P}_fix-makefile.patch"
-}
-
-src_install() {
-	dodoc README CHANGELIST || die "Unable to install documentation"
-	dobin keynav || die "Unable to install keynav binary"
-	insinto /etc
-	doins keynavrc || die "Unable to install keynavrc"
-}