version bump 1.6.1

(Portage version: 2.0.51.22-r2)

5 files changed, 83 insertions, 3 deletions

diff --git a/app-misc/joy2key/ChangeLog b/app-misc/joy2key/ChangeLog
index d70def419f13..353462c98fa4 100644
--- a/app-misc/joy2key/ChangeLog
+++ b/app-misc/joy2key/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/joy2key
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/ChangeLog,v 1.10 2005/04/21 19:26:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/ChangeLog,v 1.11 2005/07/31 04:40:56 vanquirius Exp $
+
+*joy2key-1.6.1 (31 Jul 2005)
+
+  31 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/1.6.1-fix-configure.diff, +joy2key-1.6.1.ebuild:
+  Version bump. Now patching configure.ac instead of configure.in. May or may
+  not fix bug 100834.
 
   21 Apr 2005; Simon Stelling <blubb@gentoo.org> joy2key-1.6.ebuild:
   stable on amd64
diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
index db4ef4db44fa..638988a2c51f 100644
--- a/app-misc/joy2key/Manifest
+++ b/app-misc/joy2key/Manifest
@@ -1,4 +1,7 @@
-MD5 923f316f9c2776f6e3411339b2c987e4 ChangeLog 1087
 MD5 d720bfc7671fb9804d528717bf1f4fcd joy2key-1.6.ebuild 991
-MD5 bcacfecb034a3c6f8df6113978d45906 files/digest-joy2key-1.6 62
+MD5 0a86f6ed9101364c05a8eae4a9ac5aa5 joy2key-1.6.1.ebuild 951
+MD5 923f316f9c2776f6e3411339b2c987e4 ChangeLog 1087
+MD5 abf880207ca06145aacbb4e650b78834 files/digest-joy2key-1.6.1 64
 MD5 86397ad9fe231a1baa8fbde88136645f files/fix-configure.in.diff 908
+MD5 bcacfecb034a3c6f8df6113978d45906 files/digest-joy2key-1.6 62
+MD5 e04ece922600614ceb1c6b93ef5d12cf files/1.6.1-fix-configure.diff 908
diff --git a/app-misc/joy2key/files/1.6.1-fix-configure.diff b/app-misc/joy2key/files/1.6.1-fix-configure.diff
new file mode 100644
index 000000000000..2f46050a25e5
--- /dev/null
+++ b/app-misc/joy2key/files/1.6.1-fix-configure.diff
@@ -0,0 +1,27 @@
+--- configure.ac	2001-04-10 11:36:09.000000000 -0600
++++ configure.ac	2005-03-19 08:40:56.377832328 -0700
+@@ -20,8 +20,22 @@
+               AC_DEFINE(ENABLE_CONSOLE))
+ 
+ AC_ARG_ENABLE(X, [  --disable-X             do not compile in X features],
+-              if test $enableval != no; then AC_DEFINE(ENABLE_X) export xstuff="-L$x_libraries -lX11"; fi,
+-              AC_DEFINE(ENABLE_X) export X_Stuff="-L$x_libraries -lX11")
++              if test $enableval != no; then AC_DEFINE(ENABLE_X) 
++	        if test -n "$x_libraries";
++	        then
++	         export xstuff="-L$x_libraries -lX11"
++	        else
++	         export xstuff="-lX11"
++	        fi
++	       fi
++	       ,
++              AC_DEFINE(ENABLE_X) 
++	      if test -n "$x_libraries";
++	      then
++	       export X_Stuff="-L$x_libraries -lX11"
++	      else
++	       export X_Stuff="-lX11"
++	      fi)
+ 
+ AC_SUBST(X_Stuff)
+ AC_SUBST(x_headers)
diff --git a/app-misc/joy2key/files/digest-joy2key-1.6.1 b/app-misc/joy2key/files/digest-joy2key-1.6.1
new file mode 100644
index 000000000000..37953c317a2b
--- /dev/null
+++ b/app-misc/joy2key/files/digest-joy2key-1.6.1
@@ -0,0 +1 @@
+MD5 9b0888140fde5d89eff754ff50645c10 joy2key-1.6.1.tar.gz 76708
diff --git a/app-misc/joy2key/joy2key-1.6.1.ebuild b/app-misc/joy2key/joy2key-1.6.1.ebuild
new file mode 100644
index 000000000000..f3b7249f0981
--- /dev/null
+++ b/app-misc/joy2key/joy2key-1.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.1.ebuild,v 1.1 2005/07/31 04:40:56 vanquirius Exp $
+
+inherit eutils
+
+DESCRIPTION="An application that translates joystick events to keyboard events"
+HOMEPAGE="http://interreality.org/~tetron/technology/joy2key/"
+SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="X"
+
+DEPEND="X? ( virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# fix-configure.in.diff fix issue with blank -L blocking -lX11
+	# Thanks to Joshua Baergen in bug #82685
+
+	epatch ${FILESDIR}/${PV}-fix-configure.diff
+}
+
+src_compile() {
+	autoreconf --force
+
+	local myconf
+	use X || myconf="--disable-X"
+
+	CFLAGS=${CFLAGS/-O?/}
+	econf ${myconf} || die "econf failed"
+	make || die
+}
+
+src_install() {
+	dobin joy2key
+	doman joy2key.1
+	dodoc README joy2keyrc.sample AUTHORS NEWS TODO
+}