look in both places for old and new udev package locations of udevadm (bug #543200)

Package-Manager: portage-2.2.18/cvs/Linux x86_64

4 files changed, 102 insertions, 2 deletions

diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 5b2190d51c4d..10945caecae0 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-util/joystick
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.31 2015/04/02 20:49:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.32 2015/05/16 06:04:45 mr_bones_ Exp $
+
+*joystick-1.4.8-r1 (16 May 2015)
+
+  16 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/joystick-1.4.8-udev.patch, +joystick-1.4.8-r1.ebuild:
+  look in both places for old and new udev package locations of udevadm (bug
+  #543200)
 
   02 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -files/joystick-1.4.4-build.patch, -joystick-1.4.4.ebuild:
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 96414edaa045..78b33d5a505c 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,5 +1,7 @@
 AUX joystick-1.4.8-build.patch 998 SHA256 6674638a044d87f47d0f677658c0bf6d4818888e3d1848bde205cdb080732a95 SHA512 0ce8ad1cb863dc1a69283b48e7795beec98919ca4bfa063896531a3a5eda5b9a670ff960b993cf90478e6abadbacb6c1cda8b28b2584fad8b8f1c192ae4e9d33 WHIRLPOOL a447f8063763889e0b3d315a17fa81cbbeca9ce479120735d36f9216ee872032d4ae231528ecdfcc25e8271970708724bf8e87f999be09356f27ba2fc6bbf9cf
+AUX joystick-1.4.8-udev.patch 1713 SHA256 172facf344b3f7243c6d2e0a98c18faf5c5c52abfbbe8f43de08ddf0cdb4b43e SHA512 9ef9a73dbe3457487cc17d7e11e1ddfce8852abf066177c4c490b352d5e7afe068f1be315e24a9486b865497ec8c1495e5c7b8d7866c55269da66dcb9098a710 WHIRLPOOL ca25f672b0cb8402a8dbd08b4aa95337c687bc2d04f59c409bbfc558f020693931e7e46285720fc240f3c5ab8a1a7f494e7e27ebce31f498d8a77504e136e35f
 DIST linuxconsoletools-1.4.8.tar.bz2 43964 SHA256 23c4ac595f608e25f472d947c4193233f763f37ae0cf6b48141d33443a4cee6a SHA512 ea3a0baa3f163e10a4c76f58977a96d91d91bddb1a75cea5195b0a631c11ca55e40730aaa0d1965404837595c4a7fd8b75c3dd7785fe0e47ee2c90021341f262 WHIRLPOOL c02960d5e171efef3739f440a903ae9b14bec8b6ab4de2181ea691aa78c870f81b291ac98e313d234778fb59c4be8e53242cb46db019f3dffdbd8f26ddcbb113
+EBUILD joystick-1.4.8-r1.ebuild 993 SHA256 d68ab68d6b1818e66a0faefc7366327920e23f6bcf8229563b12652f18d907b4 SHA512 37520f1fac8ea0577a0b435755bb1905575a726780dda55d4ccf44e411c47b0e9dcaaae84c6f91c2f1765738ec094544afd71b029cc9af6713535753619bd9ea WHIRLPOOL 9512503c1688f26c343ed6c9d00c81a04a29c2388cb23bcfd8ca639bc327e7ccc44ca9c820a3d76db54275e68f257592e30844c700e27915a863dfa3a6d7010e
 EBUILD joystick-1.4.8.ebuild 817 SHA256 467d251431eef5dbd9daac5fe1296fe5e9c9c4212bbba6262ba5addd069ab1f2 SHA512 8397273970e8c738299c16018a6df3a8ec88fa64006246622d273700d300d2be9ab67e8157352a017bdb6b5903fe380d88e58c71c4b52674cf099ae008a00a54 WHIRLPOOL c859e6c0b8b362653927ea24d7c901af80134982e1db58e7e219d79fc6ee2f96e4f556a0bd01c13047f34cbae91123bf356744f3ce4230381431dbb9d46f3265
-MISC ChangeLog 4554 SHA256 d9b8ca9685f1e61fa6b829438ca45fb3d552dd3c7dda38eb3c08e7e49285975b SHA512 d4444132739f9cc1be369a69f6c29c914de3cc7be3b26e8c4b35960892d150940460200a4ef7c1f30468a38c22d73656fb26dc697798aa9bdc2eb6468daeaa31 WHIRLPOOL 7c70c743dbe6679660276d3ba740b157739bb0d2ca3be41b1e38cc1148e462ced66cd0963ade385517755bef81b94c73f26286daa0d2272bd99f517bb0255ba6
+MISC ChangeLog 4795 SHA256 2cd7eef5a28241615e56f85e69a2fd18db23c496920e4de66fb09032b653f419 SHA512 2341474d52663959772d61c8aefc760949720995d8412b11cc9cf69f64e33993e4ba4e4e6bef0d1b00368dd30089acdc5fbb959db02c7434eb2d13021b19206a WHIRLPOOL 81f413959355ff8f27048b2caa9ce8a01fa883a9604bf5edf15ae83e3a971c33212c3300bf9a98972279f812f17ebd244d62b14662f1e8e521657f8ca0c9c1bb
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
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..c8d78adaded0
--- /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 ] && UDEV=$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} -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 ] && UDEV=$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.4.8-r1.ebuild b/games-util/joystick/joystick-1.4.8-r1.ebuild
new file mode 100644
index 000000000000..36c5bab9d231
--- /dev/null
+++ b/games-util/joystick/joystick-1.4.8-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.8-r1.ebuild,v 1.1 2015/05/16 06:04:45 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 udev"
+
+DEPEND="sdl? ( media-libs/libsdl:0[video] )
+	!<x11-libs/tslib-1.0-r2"
+RDEPEND="${DEPEND}
+	udev? ( virtual/udev )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-udev.patch
+	export PREFIX=/usr
+	tc-export CC PKG_CONFIG
+	export USE_SDL=$(usex sdl)
+}
+
+src_install() {
+	default
+	if use !udev ; then
+		rm -f "${D}"/usr/bin/jscal-{re,}store || die
+	fi
+}