version bump

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

4 files changed, 80 insertions, 7 deletions

diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 100eeac6e17d..6cd695096a0f 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/joystick
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.25 2014/07/16 01:19:15 mr_bones_ Exp $
+
+*joystick-1.4.7 (16 Jul 2014)
+
+  16 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/joystick-1.4.7-build.patch, +joystick-1.4.7.ebuild,
+  files/joystick-1.4.4-build.patch:
+  version bump
 
   16 Jul 2014; Michael Sterrett <mr_bones_@gentoo.org>
   -files/joystick-1.4.2-build.patch, -files/joystick-20060731-asneeded.patch,
diff --git a/games-util/joystick/files/joystick-1.4.4-build.patch b/games-util/joystick/files/joystick-1.4.4-build.patch
index 8a74e82a4dba..f888ccd18812 100644
--- a/games-util/joystick/files/joystick-1.4.4-build.patch
+++ b/games-util/joystick/files/joystick-1.4.4-build.patch
@@ -1,6 +1,5 @@
-diff -ru linuxconsoletools-1.4.4.orig/docs/Makefile linuxconsoletools-1.4.4/docs/Makefile
---- linuxconsoletools-1.4.4.orig/docs/Makefile	2011-12-15 10:49:01.000000000 -0500
-+++ linuxconsoletools-1.4.4/docs/Makefile	2013-01-23 01:09:34.963691526 -0500
+--- linuxconsoletools-1.4.4.orig/docs/Makefile
++++ linuxconsoletools-1.4.4/docs/Makefile
 @@ -20,13 +20,17 @@
  # 02110-1301 USA.
  
@@ -21,9 +20,8 @@ diff -ru linuxconsoletools-1.4.4.orig/docs/Makefile linuxconsoletools-1.4.4/docs
 +	install -m 644 $(MANPAGES) $(DESTDIR)$(PREFIX)/share/man/man1
  
  .PHONY: install
-diff -ru linuxconsoletools-1.4.4.orig/utils/Makefile linuxconsoletools-1.4.4/utils/Makefile
---- linuxconsoletools-1.4.4.orig/utils/Makefile	2012-09-05 02:34:53.000000000 -0400
-+++ linuxconsoletools-1.4.4/utils/Makefile	2013-01-23 01:11:02.112760453 -0500
+--- linuxconsoletools-1.4.4.orig/utils/Makefile
++++ linuxconsoletools-1.4.4/utils/Makefile
 @@ -27,9 +27,13 @@
  
  CFLAGS		?= -g -O2 -Wall
diff --git a/games-util/joystick/files/joystick-1.4.7-build.patch b/games-util/joystick/files/joystick-1.4.7-build.patch
new file mode 100644
index 000000000000..f888ccd18812
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.4.7-build.patch
@@ -0,0 +1,39 @@
+--- linuxconsoletools-1.4.4.orig/docs/Makefile
++++ linuxconsoletools-1.4.4/docs/Makefile
+@@ -20,13 +20,17 @@
+ # 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
+--- linuxconsoletools-1.4.4.orig/utils/Makefile
++++ linuxconsoletools-1.4.4/utils/Makefile
+@@ -27,9 +27,13 @@
+ 
+ CFLAGS		?= -g -O2 -Wall
+ 
+-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
+ 
+ compile: $(PROGRAMS)
diff --git a/games-util/joystick/joystick-1.4.7.ebuild b/games-util/joystick/joystick-1.4.7.ebuild
new file mode 100644
index 000000000000..0e13afc4745a
--- /dev/null
+++ b/games-util/joystick/joystick-1.4.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.7.ebuild,v 1.1 2014/07/16 01:19:15 mr_bones_ Exp $
+
+EAPI=5
+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:0[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)
+}