old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 8 insertions, 260 deletions

diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 4168d5bbda92..100eeac6e17d 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-util/joystick
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.23 2013/06/30 21:09:53 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.24 2014/07/16 00:45:41 mr_bones_ Exp $
+
+  16 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/joystick-1.4.2-build.patch, -files/joystick-20060731-asneeded.patch,
+  -files/joystick-MCS-defines.patch, -files/joystick-jstest-segv.patch,
+  -joystick-0_pre20060731.ebuild, -joystick-1.4.2.ebuild:
+  old
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> joystick-1.4.4.ebuild:
   Stable for ppc, wrt bug #475238
diff --git a/games-util/joystick/files/joystick-1.4.2-build.patch b/games-util/joystick/files/joystick-1.4.2-build.patch
deleted file mode 100644
index 6e3d5774e5e4..000000000000
--- a/games-util/joystick/files/joystick-1.4.2-build.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -20,13 +20,16 @@
- # 02110-1301 USA.
- 
- MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
--		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+		  ffset.1 ffcfstress.1 jscal-store.1 \
- 		  jscal-restore.1
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
- 
- PREFIX          ?= /usr/local
- 
- install:
- 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
--	install $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
-+	install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
- 
- .PHONY: install
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -25,11 +25,19 @@
- # Edit the options below to suit your needs
- #
- 
--CC		= gcc
--CFLAGS		= -g -O2 -Wall -I../linux/include
-+CC ?= gcc
-+PKG_CONFIG ?= pkg-config
-+CFLAGS ?= -g -O2
-+CFLAGS += -Wall
-+CPPFLAGS += -I../linux/include
-+SDL_CFLAGS = $(shell $(PKG_CONFIG) --cflags sdl)
-+SDL_LIBS = $(shell $(PKG_CONFIG) --libs sdl)
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS	= inputattach jstest jscal fftest ffset \
- 		  ffcfstress jscal-restore jscal-store
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
- 
- PREFIX          ?= /usr/local
- 
-@@ -40,27 +48,27 @@
- 	$(RM) *.o *.swp $(PROGRAMS) *.orig *.rej map *~
- 
- ffcfstress: ffcfstress.c
--	$(CC) -O2 -funsigned-char ffcfstress.c -lm -o ffcfstress
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -funsigned-char ffcfstress.c -lm -o ffcfstress
- 
- ffmvforce.o: ffmvforce.c
--	$(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ `sdl-config --cflags`
-+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $^ -o $@
- 
- ffmvforce: ffmvforce.o
--	$(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl-config --libs`
-+	$(CC) $^ -o $@ $(CFLAGS) $(LDFLAGS) -lm $(SDL_LIBS)
- 
- axbtnmap.o: axbtnmap.c axbtnmap.h
- 
- jscal.o: jscal.c axbtnmap.h
- 
- jscal: jscal.o axbtnmap.o
--	$(CC) $(CFLAGS) $(CPPFLAGS) $^ -lm -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -lm -o $@
- 
- jstest.o: jstest.c axbtnmap.h
- 
- jstest: jstest.o axbtnmap.o
- 
- gencodes: gencodes.c scancodes.h
--	$(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) gencodes.c -o gencodes
- 
- jscal-restore: jscal-restore.in
- 	sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
diff --git a/games-util/joystick/files/joystick-20060731-asneeded.patch b/games-util/joystick/files/joystick-20060731-asneeded.patch
deleted file mode 100644
index d9bbc07240ae..000000000000
--- a/games-util/joystick/files/joystick-20060731-asneeded.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- utils.orig/Makefile	2006-07-31 06:50:01.000000000 +0200
-+++ utils/Makefile	2009-12-09 20:11:17.962976029 +0100
-@@ -46,7 +45,7 @@
- 
- ffcfstress: ffcfstress.c
- 	$(CC) $(CFLAGS) -funsigned-char \
--	 -lm ffcfstress.c -o ffcfstress
-+	 ffcfstress.c -o ffcfstress $(LDFLAGS) -lm
- 
- ffmvforce.o: ffmvforce.c
- 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ `sdl-config --cflags`
-@@ -55,13 +54,13 @@
- 	$(CC) $^ -o $@ $(LDFLAGS) $(CFLAGS) -lm `sdl-config --libs`
- 
- jscal: jscal.o
--	$(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@ -lm
- 
- gencodes: gencodes.c scancodes.h
- 	$(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
- 
- acceltest: acceltest.c
--	$(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $^ -o $@ -lm
- 
- dist:
- 	tar jcf ../joystick-`date +%Y%m%d`.tar.bz2 -C .. utils
diff --git a/games-util/joystick/files/joystick-MCS-defines.patch b/games-util/joystick/files/joystick-MCS-defines.patch
deleted file mode 100644
index 9fa8aad16880..000000000000
--- a/games-util/joystick/files/joystick-MCS-defines.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://bugs.gentoo.org/103270
-
---- evtest.c
-+++ evtest.c
-@@ -254,6 +254,22 @@
- 	[ABS_VOLUME] = "Volume",	[ABS_MISC] = "Misc",
- };
- 
-+/* many of these MSC defines are only in newer linux headers */
-+#ifndef MSC_SERIAL
-+# define MSC_SERIAL
-+#endif 0x00
-+#ifndef MSC_PULSELED
-+# define MSC_PULSELED 0x01
-+#endif
-+#ifndef MSC_GESTURE
-+# define MSC_GESTURE 0x02
-+#endif
-+#ifndef MSC_RAW
-+# define MSC_RAW 0x03
-+#endif
-+#ifndef MSC_SCAN
-+# define MSC_SCAN 0x04
-+#endif
- char *misc[MSC_MAX + 1] = {
- 	[ 0 ... MSC_MAX] = NULL,
- 	[MSC_SERIAL] = "Serial",	[MSC_PULSELED] = "Pulseled",
diff --git a/games-util/joystick/files/joystick-jstest-segv.patch b/games-util/joystick/files/joystick-jstest-segv.patch
deleted file mode 100644
index fa1e4cdd6cbd..000000000000
--- a/games-util/joystick/files/joystick-jstest-segv.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-fix segfault when JSIOCGAXMAP/JSIOCGBTNMAP dont work
-
-http://bugs.gentoo.org/132607
-
-patch by Matt Anderson
-
---- utils/jstest.c
-+++ utils/jstest.c
-@@ -76,6 +76,7 @@ int main (int argc, char **argv)
- 	char name[NAME_LENGTH] = "Unknown";
- 	uint16_t btnmap[KEY_MAX - BTN_MISC + 1];
- 	uint8_t axmap[ABS_MAX + 1];
-+	int btnmap_ok, axismap_ok;
- 
- 	if (argc < 2 || argc > 3 || !strcmp("--help", argv[1])) {
- 		puts("");
-@@ -99,21 +100,29 @@ int main (int argc, char **argv)
- 	ioctl(fd, JSIOCGAXES, &axes);
- 	ioctl(fd, JSIOCGBUTTONS, &buttons);
- 	ioctl(fd, JSIOCGNAME(NAME_LENGTH), name);
--	ioctl(fd, JSIOCGAXMAP, axmap);
--	ioctl(fd, JSIOCGBTNMAP, btnmap);
-+	axismap_ok = ioctl(fd, JSIOCGAXMAP, axmap);
-+	btnmap_ok = ioctl(fd, JSIOCGBTNMAP, btnmap);
- 
- 
- 	printf("Driver version is %d.%d.%d.\n",
- 		version >> 16, (version >> 8) & 0xff, version & 0xff);
- 
- 	printf("Joystick (%s) has %d axes (", name, axes);
--	for (i = 0; i < axes; i++)
--		printf("%s%s", i > 0 ? ", " : "", axis_names[axmap[i]]);
-+	if (!axismap_ok) {
-+		for (i = 0; i < axes; i++)
-+			printf("%s%s", i > 0 ? ", " : "", axis_names[axmap[i]]);
-+	} else {
-+		printf(" axismap never defined ");
-+	}
- 	puts(")");
- 
- 	printf("and %d buttons (", buttons);
--	for (i = 0; i < buttons; i++)
--		printf("%s%s", i > 0 ? ", " : "", button_names[btnmap[i] - BTN_MISC]);
-+	if (!btnmap_ok) {
-+		for (i = 0; i < buttons; i++)
-+			printf("%s%s", i > 0 ? ", " : "", button_names[btnmap[i] - BTN_MISC]);
-+	} else {
-+		printf(" buttonmap never defined ");
-+	}
- 	puts(").");
- 
- 	printf("Testing ... (interrupt to exit)\n");
diff --git a/games-util/joystick/joystick-0_pre20060731.ebuild b/games-util/joystick/joystick-0_pre20060731.ebuild
deleted file mode 100644
index 54092da1fd69..000000000000
--- a/games-util/joystick/joystick-0_pre20060731.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-0_pre20060731.ebuild,v 1.3 2012/06/14 14:45:16 xmw Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://gentoo/${P/0_pre}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="sdl"
-
-DEPEND="sdl? ( media-libs/libsdl[video] )
-	!x11-libs/tslib"
-
-S=${WORKDIR}/utils
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/joystick-MCS-defines.patch \
-		"${FILESDIR}"/joystick-jstest-segv.patch \
-		"${FILESDIR}"/${P/0_pre}-asneeded.patch
-	sed -i \
-		-e '/^CC/d' \
-		Makefile \
-		|| die 'sed failed'
-}
-
-src_compile() {
-	local SDL
-	tc-export CC
-	use sdl && SDL=1 || SDL=0
-	emake SDL=${SDL} || die "emake failed"
-	emake inputattach || die "inputattach failed"
-}
-
-src_install() {
-	dobin $(find . -type f -a -perm +1) || die "dobin"
-	dodoc README
-}
diff --git a/games-util/joystick/joystick-1.4.2.ebuild b/games-util/joystick/joystick-1.4.2.ebuild
deleted file mode 100644
index 2279cc606e0d..000000000000
--- a/games-util/joystick/joystick-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.2.ebuild,v 1.6 2012/06/13 06:43:27 mr_bones_ Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-MY_P="linuxconsoletools-${PV}"
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="sdl"
-
-DEPEND="sdl? ( media-libs/libsdl[video] )
-	!<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	export PREFIX=/usr
-	tc-export CC PKG_CONFIG
-	export USE_SDL=$(usex sdl)
-}