From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 games-util/joystick/Manifest                       |  5 +--
 .../joystick/files/joystick-1.4.8-udev.patch       | 52 ----------------------
 games-util/joystick/joystick-1.6.0.ebuild          | 42 -----------------
 games-util/joystick/joystick-1.7.0.ebuild          | 41 +++++++++++++++++
 4 files changed, 43 insertions(+), 97 deletions(-)
 delete mode 100644 games-util/joystick/files/joystick-1.4.8-udev.patch
 delete mode 100644 games-util/joystick/joystick-1.6.0.ebuild
 create mode 100644 games-util/joystick/joystick-1.7.0.ebuild

(limited to 'games-util/joystick')

diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 7824607915cd..d8e6fe806329 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,7 +1,6 @@
-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
 DIST linuxconsoletools-1.6.1.tar.bz2 50854 BLAKE2B 0614e72226c575499ae5976011a0fca146a1981e2d355f7554f105b184bdd4f1090bf5374377e89f3881c5476e3c3a362b70f86cfd83440264066ea50a8c6a4b SHA512 b520c0a2d55986204619e3a5a00fb8b1e26453ac6df4f51c8c87495661a68bb6fe5a1947a3e079a53a537bf06d23c73c404a4d7e4d4dd18c0f7f69c1985a77be
-EBUILD joystick-1.6.0.ebuild 887 BLAKE2B 4884fd349de63ed785b16f5f094463619560a4bfeb59ad5b9b9a4b24fd3d47eb00dd285ec2b4957e544828e846a953b5c5b77a8dad1a65564ad38a84a10e0982 SHA512 53c67ffa860135221e573741ca2352fefed4b8284022b906383bf63775ea62b751792218c3f9dd36448c20346683d6ee657d9a91dc7f748506c2827b2db0c3f5
+DIST linuxconsoletools-1.7.0.tar.bz2 52960 BLAKE2B 438e69e7aa220ea3fc92a9a72bda081c7877663c451f3101bc30e344a7a0f0f20b1c2f4ecd78c0db501b6442e2cd20e9f288c9c331118e8c666a61c3ac4b6851 SHA512 260667e167281dd6f4de0904c2852a5bf3d9d0fe9d603135d4849c5a6610997306c9b476f64e4015d17a4dc8e4a8d36e96e01b9b63664fc7b493201fe12b4f56
 EBUILD joystick-1.6.1.ebuild 841 BLAKE2B 88add5fc4038140e9af4fcceeac0efd19119285d467bc335dc89ed24e35a57c0b87f1af14989a8dd297654971b639a0ca076096c32ba4d137b22a1b9504d577b SHA512 a0ac620ef668b62951e2c317c59c615f5234b727ecf3fbffa3c47c02055f6d185b37649bdd8a2c992cf8abfc8f5cea72194cf9ad2211b4f12586234283ddc627
+EBUILD joystick-1.7.0.ebuild 844 BLAKE2B 90f27f297b1ceebece8e845819988c7aff6c24d36d1d87c221844d4550c1caff777157514f02c40c82e89430fc067ca33b34faa5d6b3d25dc4f6ed558efb258b SHA512 43d97ac907c5a47c5c5b9b3731c53ca4935c26b08513056397f8338758172337bd55b8974c209762feb9949ed304bf162c2323d826fee508a6d6a6a5f4345591
 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
deleted file mode 100644
index c0032493ebf7..000000000000
--- a/games-util/joystick/files/joystick-1.4.8-udev.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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/joystick-1.6.0.ebuild b/games-util/joystick/joystick-1.6.0.ebuild
deleted file mode 100644
index ce8acc0a4ad6..000000000000
--- a/games-util/joystick/joystick-1.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/joystick-1.7.0.ebuild b/games-util/joystick/joystick-1.7.0.ebuild
new file mode 100644
index 000000000000..a4389f20bcfb
--- /dev/null
+++ b/games-util/joystick/joystick-1.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit 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/libsdl2: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
+)
+
+src_prepare() {
+	default
+
+	export PREFIX=/usr
+	tc-export CC PKG_CONFIG
+	export USE_SDL=$(usex sdl)
+}
+
+src_install() {
+	default
+	if ! use udev ; then
+		rm "${ED}"/usr/bin/jscal-{re,}store || die
+	fi
+}
-- 
cgit v1.2.3