gentoo resync : 14.07.2018

5 files changed, 144 insertions, 0 deletions

diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
new file mode 100644
index 000000000000..438275836543
--- /dev/null
+++ b/games-util/joystick/Manifest
@@ -0,0 +1,5 @@
+AUX joystick-1.4.8-udev.patch 1724 BLAKE2B 63fd913ee85bbcdb00ccf8150dcccca4f2f6c36ef274b04dffd78aaaf9906048368495855edaa8809f371b7f63320ad89b3c40f94242b8d1f4316ab04a4eece6 SHA512 8a00825c9fb293e174eace79b1ce08af9eb2c6e18450daa62ae67b7c6a49ebe6b2490de4ccc7c1177edb300ed361a0920773b14d90c1aae4a34062ca16ad76de
+AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064
+DIST linuxconsoletools-1.6.0.tar.bz2 50563 BLAKE2B 26f68f4a9a4af5b875bc7efcc70edd80978a560f62c415b4957ee851260a2f6e6227c5a3001fb009777eac7e19d0449a8335486290ae0aaa9467ad8e1e9a89fb SHA512 35ca923cceca729bcbab95dff18682abd0d87a297e70aa8707fbabccde018fef0775a99195af4bf9111ba33210a14c10d1a766f83112cd535930a1ae430c7c75
+EBUILD joystick-1.6.0.ebuild 887 BLAKE2B 4884fd349de63ed785b16f5f094463619560a4bfeb59ad5b9b9a4b24fd3d47eb00dd285ec2b4957e544828e846a953b5c5b77a8dad1a65564ad38a84a10e0982 SHA512 53c67ffa860135221e573741ca2352fefed4b8284022b906383bf63775ea62b751792218c3f9dd36448c20346683d6ee657d9a91dc7f748506c2827b2db0c3f5
+MISC metadata.xml 335 BLAKE2B e83ffecd1afda0861555f62d9bad50f99c8e1bebb296f303bbdb8624ea283eb04d30d76a74d9970f519e303e851991ae33b232f74c9d2fdacce16b59fccdf9f5 SHA512 6440a6652a98c7439b22df51f22089ddd867be3e07e6c04001aa15b1fc01fd84dc8d3244f106abe4ae89caf7561aa45fe2526f2f9e8e8844a5e44f9f8a51df41
diff --git a/games-util/joystick/files/joystick-1.4.8-udev.patch b/games-util/joystick/files/joystick-1.4.8-udev.patch
new file mode 100644
index 000000000000..c0032493ebf7
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.4.8-udev.patch
@@ -0,0 +1,52 @@
+diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1.4.8/utils/jscal-restore.in
+--- linuxconsoletools-1.4.8.orig/utils/jscal-restore.in	2011-12-15 10:49:01.000000000 -0500
++++ linuxconsoletools-1.4.8/utils/jscal-restore.in	2015-05-16 01:54:00.799168225 -0400
+@@ -6,8 +6,13 @@
+     exit 1
+ fi
+ 
+-if [ ! -x /sbin/udevadm ]; then
+-    echo Restoring joystick configuration requires udev! >&2
++for f in /sbin/udevadm /bin/udevadm ;
++do
++    [ -x $f ] && UDEVADM=$f
++done
++
++if [ -z "$UDEVADM" ] ; then
++    echo Storing joystick configuration requires udev! >&2
+     exit 1
+ fi
+ 
+@@ -30,7 +35,7 @@
+ # in the NAME value
+ IFS=$'\x0A'
+ 
+-for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
++for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
+     ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
+     VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
+     case $ID in
+diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-store.in linuxconsoletools-1.4.8/utils/jscal-store.in
+--- linuxconsoletools-1.4.8.orig/utils/jscal-store.in	2011-12-15 10:49:01.000000000 -0500
++++ linuxconsoletools-1.4.8/utils/jscal-store.in	2015-05-16 01:53:18.725607838 -0400
+@@ -11,14 +11,18 @@
+     echo "Stores the device's calibration for future use."
+     exit 1
+ fi
++for f in /sbin/udevadm /bin/udevadm ;
++do
++    [ -x $f ] && UDEVADM=$f
++done
+ 
+-if [ ! -x /sbin/udevadm ]; then
++if [ -z "$UDEVADM" ] ; then
+     echo Storing joystick configuration requires udev! >&2
+     exit 1
+ fi
+ 
+ ident=$(mktemp)
+-/sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
++${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
+ . $ident
+ rm $ident
+ 
diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch
new file mode 100644
index 000000000000..fa60ec719917
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.6.0-build.patch
@@ -0,0 +1,34 @@
+--- linuxconsoletools-1.6.0/docs/Makefile
++++ linuxconsoletools-1.6.0/docs/Makefile
+@@ -20,9 +20,13 @@
+ # 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 evdev-joystick.1
+ 
++ifneq ($(USE_SDL),no)
++MANPAGES += ffmvforce.1
++endif
++
+ PREFIX          ?= /usr/local
+ 
+ install:
+--- linuxconsoletools-1.6.0/utils/Makefile
++++ linuxconsoletools-1.6.0/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 evdev-joystick
+ 
++ifneq ($(USE_SDL),no)
++PROGRAMS += ffmvforce
++endif
++
+ PREFIX          ?= /usr/local
+ 
+ compile: $(PROGRAMS)
diff --git a/games-util/joystick/joystick-1.6.0.ebuild b/games-util/joystick/joystick-1.6.0.ebuild
new file mode 100644
index 000000000000..ce8acc0a4ad6
--- /dev/null
+++ b/games-util/joystick/joystick-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+MY_P="linuxconsoletools-${PV}"
+DESCRIPTION="joystick testing utilities"
+HOMEPAGE="https://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 ~x86"
+IUSE="sdl udev"
+
+DEPEND="sdl? ( media-libs/libsdl:0[video] )
+	!<x11-libs/tslib-1.0-r2"
+RDEPEND="${DEPEND}
+	udev? ( virtual/udev )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-build.patch
+	"${FILESDIR}"/${PN}-1.4.8-udev.patch
+)
+
+src_prepare() {
+	default
+
+	export PREFIX=/usr
+	tc-export CC PKG_CONFIG
+	export USE_SDL=$(usex sdl)
+}
+
+src_install() {
+	default
+	if use !udev ; then
+		rm "${D}"/usr/bin/jscal-{re,}store || die
+	fi
+}
diff --git a/games-util/joystick/metadata.xml b/games-util/joystick/metadata.xml
new file mode 100644
index 000000000000..677407539cc4
--- /dev/null
+++ b/games-util/joystick/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">linuxconsole</remote-id>
+	</upstream>
+</pkgmetadata>