Fix autotools handling, and use filter-flag. Close bug #152132, thanks to Patrick Lauer for reporting.

Package-Manager: portage-2.1.2_pre3-r6

6 files changed, 62 insertions, 32 deletions

diff --git a/app-misc/joy2key/ChangeLog b/app-misc/joy2key/ChangeLog
index e10ba7b4269f..0a82dae810f6 100644
--- a/app-misc/joy2key/ChangeLog
+++ b/app-misc/joy2key/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/joy2key
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/ChangeLog,v 1.13 2006/03/15 16:01:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/ChangeLog,v 1.14 2006/10/22 21:18:37 flameeyes Exp $
+
+  22 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> joy2key-1.6.ebuild,
+  joy2key-1.6.1.ebuild:
+  Fix autotools handling, and use filter-flag. Close bug #152132, thanks to
+  Patrick Lauer for reporting.
 
   15 Mar 2006; Caleb Tennis <caleb@gentoo.org> joy2key-1.6.ebuild,
   joy2key-1.6.1.ebuild:
diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
index b90dfb2f3ebe..aa028a8cc29d 100644
--- a/app-misc/joy2key/Manifest
+++ b/app-misc/joy2key/Manifest
@@ -1,21 +1,38 @@
-MD5 96bf9c0b99dff1692a285de7272e7b8e ChangeLog 1528
-RMD160 58a47f5aa5af8f5e4f95ed5d4dad13b42b5316b8 ChangeLog 1528
-SHA256 ecd9a0f0edc6d98c8395b34a15698b3c0f787cda4b3331dd4f23330cd0402b52 ChangeLog 1528
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 1.6.1-fix-configure.diff 908 RMD160 c01edad27811247adc7823aac3d9ae52dc94dda6 SHA1 32da2604b75671466d1f623552630930ca325fd5 SHA256 5a8ab8acdc2d41e78082757dc4c5838a5436f0dfb6de6861a583cdbcbcdef33a
 MD5 e04ece922600614ceb1c6b93ef5d12cf files/1.6.1-fix-configure.diff 908
 RMD160 c01edad27811247adc7823aac3d9ae52dc94dda6 files/1.6.1-fix-configure.diff 908
 SHA256 5a8ab8acdc2d41e78082757dc4c5838a5436f0dfb6de6861a583cdbcbcdef33a files/1.6.1-fix-configure.diff 908
-MD5 bcacfecb034a3c6f8df6113978d45906 files/digest-joy2key-1.6 62
-RMD160 da74ef8ef0e3cd30fa131cbc1732a63a96a08cc5 files/digest-joy2key-1.6 62
-SHA256 7a69c310940c8e4c63373fdf91177f9e52097193ac923f1356d141ee85bffe5d files/digest-joy2key-1.6 62
-MD5 abf880207ca06145aacbb4e650b78834 files/digest-joy2key-1.6.1 64
-RMD160 62205aec0aa0c33be16216a9e2dcfa53a9604611 files/digest-joy2key-1.6.1 64
-SHA256 262d018f2687ef70e5526c199c5de889ffb8445eb550a7c504356ca96a1ddc40 files/digest-joy2key-1.6.1 64
+AUX fix-configure.in.diff 908 RMD160 90d1259d6b1b0cc822dba467161fb1416de16939 SHA1 f1159ff2abbc4544e4d4a8e739fb17af7d878afc SHA256 a3ef519a86bab934c84e64040b38c73e51ceee354047523fe5d7688ee9edf20e
 MD5 86397ad9fe231a1baa8fbde88136645f files/fix-configure.in.diff 908
 RMD160 90d1259d6b1b0cc822dba467161fb1416de16939 files/fix-configure.in.diff 908
 SHA256 a3ef519a86bab934c84e64040b38c73e51ceee354047523fe5d7688ee9edf20e files/fix-configure.in.diff 908
-MD5 3b3b2e35d975f57f6fe495e206b21727 joy2key-1.6.1.ebuild 980
-RMD160 4c249e64bbbed35464ebfc53b349de2f41f265cb joy2key-1.6.1.ebuild 980
-SHA256 83166cf5f0852de1b4e0f84b4f51eb461dcb1fa474ebe7ced7f5e4039d4964a2 joy2key-1.6.1.ebuild 980
-MD5 0d067096ab395454d7ade986d2c81c6a joy2key-1.6.ebuild 1014
-RMD160 028599aadc1e1ae74ec2c67784c21b9fe8e8b0d4 joy2key-1.6.ebuild 1014
-SHA256 c62c9efb0396b8e54ea3744c1a055b05f9b6deb63533909253256905b15365d2 joy2key-1.6.ebuild 1014
+DIST joy2key-1.6.1.tar.gz 76708 RMD160 e771e67a47d73b825f75eff2aecb15359e56f03a SHA1 7149d2b4fe3e74c4fb99ce1d27a7685265cba30c SHA256 a9ea6fbff0780197b2eb4b49a6b6fa1dad87f99b81eaf9ea97e05057b3cd3d7e
+DIST joy2key-1.6.tar.gz 41007 RMD160 5471f985f65a73d073eac1d03a0f8e0e82de03e6 SHA1 3b0a4d78ebcc38818b3b9447b2bee65f32b9da5d SHA256 f4dfe9d12d123443ab5a860aeda0e0e19db2d9d1dc38fd532f59fd7b0dfe100b
+EBUILD joy2key-1.6.1.ebuild 1046 RMD160 e96f5d3a0623069829a719cca08edd097794a085 SHA1 4b3d78743575ea664819d2a6d85f4796589804a7 SHA256 7f06efe41d151f575c602040e2726b8bb8a6b1fd7e2d91e20f7d4f3028de2faf
+MD5 c0514e784128f047041c533f4a178af0 joy2key-1.6.1.ebuild 1046
+RMD160 e96f5d3a0623069829a719cca08edd097794a085 joy2key-1.6.1.ebuild 1046
+SHA256 7f06efe41d151f575c602040e2726b8bb8a6b1fd7e2d91e20f7d4f3028de2faf joy2key-1.6.1.ebuild 1046
+EBUILD joy2key-1.6.ebuild 1080 RMD160 e79650d654bf70e74f70cc4f4a0dc2103bc149fb SHA1 fdf5b1a0f2a4454ba50b260ca5ae24ec1480c2ed SHA256 3f535cd9e2ac293d6a3810712e9806b1425b393bdf4293f17459807f3395c6f8
+MD5 c38c15f689f7964034db989dbb6ad9dd joy2key-1.6.ebuild 1080
+RMD160 e79650d654bf70e74f70cc4f4a0dc2103bc149fb joy2key-1.6.ebuild 1080
+SHA256 3f535cd9e2ac293d6a3810712e9806b1425b393bdf4293f17459807f3395c6f8 joy2key-1.6.ebuild 1080
+MISC ChangeLog 1737 RMD160 c06986cdfadff339405f801236f3af4dac2f0fe5 SHA1 ca2469aa075da596e5de78872d0a50ae7f1e43ed SHA256 8bf73d8743f0340b2ea45c3566d2b42bff85784001b7b0f21b77f426dfd2026f
+MD5 31544f210a5fbb54c25080696d61f2e3 ChangeLog 1737
+RMD160 c06986cdfadff339405f801236f3af4dac2f0fe5 ChangeLog 1737
+SHA256 8bf73d8743f0340b2ea45c3566d2b42bff85784001b7b0f21b77f426dfd2026f ChangeLog 1737
+MD5 8773706d7af65ab4404fba8975a392e6 files/digest-joy2key-1.6 232
+RMD160 ffbb87f2cbac3da08d1a26994ec47e912e6ec602 files/digest-joy2key-1.6 232
+SHA256 8b7474b24f39fd74f94712535cb20dab72d6302d0f8e6cec4a78427fd2575cc1 files/digest-joy2key-1.6 232
+MD5 50635d94e6ab496f6247e406c71ddc80 files/digest-joy2key-1.6.1 238
+RMD160 797886df733912d36e4e38a3dd4fadf6c3ec9697 files/digest-joy2key-1.6.1 238
+SHA256 0d90a88d2d16ad90c95acc65352359f1afcbd5008c11b89cfa0ecedb2d15abdc files/digest-joy2key-1.6.1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFO+A1AiZjviIA2XgRAlbiAJ9hC8xNJNXR3WeM6yOCjUjjZuAKmQCeO9OY
+WygSWXU8PPqAt40OqWkmM/g=
+=DOpo
+-----END PGP SIGNATURE-----
diff --git a/app-misc/joy2key/files/digest-joy2key-1.6 b/app-misc/joy2key/files/digest-joy2key-1.6
index 6c3103268552..72661aecd0fa 100644
--- a/app-misc/joy2key/files/digest-joy2key-1.6
+++ b/app-misc/joy2key/files/digest-joy2key-1.6
@@ -1 +1,3 @@
 MD5 efe27b01dd142973ae79daea0c00cd81 joy2key-1.6.tar.gz 41007
+RMD160 5471f985f65a73d073eac1d03a0f8e0e82de03e6 joy2key-1.6.tar.gz 41007
+SHA256 f4dfe9d12d123443ab5a860aeda0e0e19db2d9d1dc38fd532f59fd7b0dfe100b joy2key-1.6.tar.gz 41007
diff --git a/app-misc/joy2key/files/digest-joy2key-1.6.1 b/app-misc/joy2key/files/digest-joy2key-1.6.1
index 37953c317a2b..4a0d8a291e57 100644
--- a/app-misc/joy2key/files/digest-joy2key-1.6.1
+++ b/app-misc/joy2key/files/digest-joy2key-1.6.1
@@ -1 +1,3 @@
 MD5 9b0888140fde5d89eff754ff50645c10 joy2key-1.6.1.tar.gz 76708
+RMD160 e771e67a47d73b825f75eff2aecb15359e56f03a joy2key-1.6.1.tar.gz 76708
+SHA256 a9ea6fbff0780197b2eb4b49a6b6fa1dad87f99b81eaf9ea97e05057b3cd3d7e 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
index 856469b6ab21..c3a79d2c2d5b 100644
--- a/app-misc/joy2key/joy2key-1.6.1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.1.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 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.3 2006/03/15 16:01:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.1.ebuild,v 1.4 2006/10/22 21:18:37 flameeyes Exp $
 
-inherit eutils
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools flag-o-matic
 
 DESCRIPTION="An application that translates joystick events to keyboard events"
 HOMEPAGE="http://interreality.org/~tetron/technology/joy2key/"
@@ -17,22 +20,21 @@ DEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
+	epatch "${FILESDIR}/${PV}-fix-configure.diff"
+	eautoreconf
 }
 
 src_compile() {
-	autoreconf --force
-
 	local myconf
 	use X || myconf="--disable-X"
 
-	CFLAGS=${CFLAGS/-O?/}
+	filter-flags -O?
 	econf ${myconf} || die "econf failed"
-	make || die
+	emake || die
 }
 
 src_install() {
diff --git a/app-misc/joy2key/joy2key-1.6.ebuild b/app-misc/joy2key/joy2key-1.6.ebuild
index bcb14cc98a52..1819ec63cd49 100644
--- a/app-misc/joy2key/joy2key-1.6.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.ebuild,v 1.21 2006/03/15 16:01:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/joy2key/joy2key-1.6.ebuild,v 1.22 2006/10/22 21:18:37 flameeyes Exp $
 
-inherit eutils
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils autotools flag-o-matic
 
 DESCRIPTION="An application that translates joystick events to keyboard events"
 SRC_URI="http://www-unix.oit.umass.edu/~tetron/technology/joy2key/${P}.tar.gz"
@@ -17,22 +20,21 @@ DEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# fix-configure.in.diff fix issue with blank -L blocking -lX11
 	# Thanks to Joshua Baergen in bug #82685
 
-	epatch ${FILESDIR}/fix-configure.in.diff
+	epatch "${FILESDIR}/fix-configure.in.diff"
+	eautoreconf
 }
 
 src_compile() {
-	autoreconf --force
-
 	local myconf
 	use X || myconf="--disable-X"
 
-	CFLAGS=${CFLAGS/-O?/}
+	filter-flags -O?
 	econf ${myconf} || die "econf failed"
-	make || die
+	emake || die
 }
 
 src_install() {