Bugfix, now also apply xbox-patch when xbox-driver was autoselected by PROFILE_ARCH.

Package-Manager: portage-2.1.1_pre3-r5

3 files changed, 28 insertions, 18 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index cf55f70ec6be..3673db5fad4f 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.102 2006/07/27 17:33:24 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.103 2006/07/27 18:00:27 zzam Exp $
+
+  27 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.0-r4.ebuild:
+  Bugfix, now also apply xbox-patch when xbox-driver was autoselected by
+  PROFILE_ARCH.
 
   27 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
   files/lirc-0.8.0-kernel-2.6.17.diff:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index e18b939c8dcb..c00fb712182e 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -17,10 +17,10 @@ AUX lirc-0.8.0-kernel-2.6.18.diff 2329 RMD160 1e04e9bfd7b527a3cd77da85a87a801248
 MD5 ec19e62729e5200025c611b86520d2eb files/lirc-0.8.0-kernel-2.6.18.diff 2329
 RMD160 1e04e9bfd7b527a3cd77da85a87a801248bc4bcb files/lirc-0.8.0-kernel-2.6.18.diff 2329
 SHA256 f98e1bffde2e3ff117474157db801e2cd50fc510572e2dbb747d029659cba06b files/lirc-0.8.0-kernel-2.6.18.diff 2329
-AUX lirc-0.8.0pre4-xbox-remote.diff 7632 RMD160 5eb2095df76136270e827c686671c94304d4820d SHA1 6c158eb3b95c7237e657726dbe3db2fc19a87b88 SHA256 0cd73451b1310ca6abd377d4098e7bb6f18555d176cf11aab992766f6e3fc0ec
-MD5 2a27a2540f0a87847d932f1651cd2e86 files/lirc-0.8.0pre4-xbox-remote.diff 7632
-RMD160 5eb2095df76136270e827c686671c94304d4820d files/lirc-0.8.0pre4-xbox-remote.diff 7632
-SHA256 0cd73451b1310ca6abd377d4098e7bb6f18555d176cf11aab992766f6e3fc0ec files/lirc-0.8.0pre4-xbox-remote.diff 7632
+AUX lirc-0.8.0pre4-xbox-remote.diff 7615 RMD160 400e3a965cc4164a6cd63c8a05f36df558d8eac7 SHA1 091b9cfc3443164cedf7e9a9ec4090686caa2652 SHA256 db84d35610fe2429f9e27bc4bb24dabe1210b63afa48d76bd460d94e405904ca
+MD5 9dc55ee44bfdff1a3e82c2e04fbb01a4 files/lirc-0.8.0pre4-xbox-remote.diff 7615
+RMD160 400e3a965cc4164a6cd63c8a05f36df558d8eac7 files/lirc-0.8.0pre4-xbox-remote.diff 7615
+SHA256 db84d35610fe2429f9e27bc4bb24dabe1210b63afa48d76bd460d94e405904ca files/lirc-0.8.0pre4-xbox-remote.diff 7615
 AUX lirc-udev-094.diff 192 RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 SHA1 682ffa82b7f40df87cee3c5309f6efaa94d5cd3a SHA256 05c24a907934efdd90c1f1c8bfaaa1d5b156958451355b9cefdde21fc8977120
 MD5 76ea374cc5507eead20404620aa42caf files/lirc-udev-094.diff 192
 RMD160 dd7063bba9993b652d6252e861cf8eb2309610e0 files/lirc-udev-094.diff 192
@@ -66,18 +66,18 @@ EBUILD lirc-0.8.0-r3.ebuild 7000 RMD160 8fee5231b80ec3d8bd6239efec1b39d999d265bb
 MD5 46736c999da20f4069131ab9b3ab042b lirc-0.8.0-r3.ebuild 7000
 RMD160 8fee5231b80ec3d8bd6239efec1b39d999d265bb lirc-0.8.0-r3.ebuild 7000
 SHA256 5b6bfc06eb78c0bb6367ade5d256bffc35c3c39d2bc0d56f0434db72a180cfa3 lirc-0.8.0-r3.ebuild 7000
-EBUILD lirc-0.8.0-r4.ebuild 7413 RMD160 1e45bb5b01c47ebfaa58b0c59b50a0d8054dfb6c SHA1 767d7bf2fff2dbe4784abbf868bcb9750d3c817d SHA256 3caf2226743240d03b36058d79f076f916b9ccf4845ea3646a97ee1fa7564087
-MD5 3d09f5850e7843e5dbc7dbd296631ea0 lirc-0.8.0-r4.ebuild 7413
-RMD160 1e45bb5b01c47ebfaa58b0c59b50a0d8054dfb6c lirc-0.8.0-r4.ebuild 7413
-SHA256 3caf2226743240d03b36058d79f076f916b9ccf4845ea3646a97ee1fa7564087 lirc-0.8.0-r4.ebuild 7413
+EBUILD lirc-0.8.0-r4.ebuild 7608 RMD160 e65bb4d4f4e5cee515252176f3c4f09bf6dd6612 SHA1 b100fb3d84417177c88b815b9c913d9ee4c91b31 SHA256 f0140b5b8a421473e0805f4b828b5ba64b7f910323f37a2c91daf55ea3c89f24
+MD5 ac149c668894b50b0469070f3bdb2168 lirc-0.8.0-r4.ebuild 7608
+RMD160 e65bb4d4f4e5cee515252176f3c4f09bf6dd6612 lirc-0.8.0-r4.ebuild 7608
+SHA256 f0140b5b8a421473e0805f4b828b5ba64b7f910323f37a2c91daf55ea3c89f24 lirc-0.8.0-r4.ebuild 7608
 EBUILD lirc-0.8.0.ebuild 4639 RMD160 45459bad24c39b109d3c50639be6f5196ceeaedc SHA1 f0fbe4800286039e52c5f4f2f6f1a0331472e543 SHA256 87e95b818aa03c3b15547a43c5c1c44f2b691a70323304b62f0625ba7394ab04
 MD5 c731e1674b70379dfd7e1357b919180d lirc-0.8.0.ebuild 4639
 RMD160 45459bad24c39b109d3c50639be6f5196ceeaedc lirc-0.8.0.ebuild 4639
 SHA256 87e95b818aa03c3b15547a43c5c1c44f2b691a70323304b62f0625ba7394ab04 lirc-0.8.0.ebuild 4639
-MISC ChangeLog 15573 RMD160 91aebfc4a8636c9e2b4ccb3e0c39a9b7fb1866e0 SHA1 4904758970340e913d2fb8b019053b4140d9be82 SHA256 f928543806d21afc8b6272842d75b77c5d2cadcf4ee5e48f577f5119a13ea075
-MD5 dc4ee841215ed89fc5271006a6d20d15 ChangeLog 15573
-RMD160 91aebfc4a8636c9e2b4ccb3e0c39a9b7fb1866e0 ChangeLog 15573
-SHA256 f928543806d21afc8b6272842d75b77c5d2cadcf4ee5e48f577f5119a13ea075 ChangeLog 15573
+MISC ChangeLog 15738 RMD160 c676f92f1345144e37da327878e59f1160858e3d SHA1 22b7f4566d18ad11600b9b482b3bb25a06f1939b SHA256 f127d50c9b0b60d8138d655e8df6206f280eff7a0c1e3de75451252317d7aed0
+MD5 eb4cc124965da6477248f6d614c9ee8c ChangeLog 15738
+RMD160 c676f92f1345144e37da327878e59f1160858e3d ChangeLog 15738
+SHA256 f127d50c9b0b60d8138d655e8df6206f280eff7a0c1e3de75451252317d7aed0 ChangeLog 15738
 MISC metadata.xml 252 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 SHA1 9fdd5da8466c39d7ff3b40412c4dfa77dd2446b7 SHA256 4e8b5c34b3e50b781a18c9be9e6199442f1b0299e00d66ba35024f8b743b9c32
 MD5 abf8a9c4b96bc3bb50f04a48349dae34 metadata.xml 252
 RMD160 e1c170c221f61fa9787a04feac90fab777639d88 metadata.xml 252
@@ -103,7 +103,7 @@ SHA256 e24d5fc3d5ed85823419cd88ebc5dfa9fd7fc924e746daf282885564aa84e8cc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEyPjtt2vP6XvVdOcRAl3HAKCbB6ZkrU7QN7zT6qP+agrRT0haKQCfZ6ks
-eOO1VGTTwXaX7W25wVKm1xM=
-=oOds
+iD8DBQFEyP9Ct2vP6XvVdOcRAtXlAKCqMcY266XauBZB1tUPSEkhUwd4iACeJnJ8
+mEcx6uu9uBHOBW7Vr6nguK8=
+=d6NR
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-0.8.0-r4.ebuild b/app-misc/lirc/lirc-0.8.0-r4.ebuild
index 257a1ff04a2c..caec0d52f2d3 100644
--- a/app-misc/lirc/lirc-0.8.0-r4.ebuild
+++ b/app-misc/lirc/lirc-0.8.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r4.ebuild,v 1.1 2006/07/25 14:29:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r4.ebuild,v 1.2 2006/07/27 18:00:27 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -142,6 +142,7 @@ pkg_setup() {
 
 		if use lirc_devices_xboxusb; then
 			add_device atiusb "device xboxusb"
+			NEED_XBOX_PATCH=1
 		fi
 
 		if use lirc_devices_usbirboy; then
@@ -153,6 +154,7 @@ pkg_setup() {
 			if [[ "${PROFILE_ARCH}" == "xbox" ]]; then
 				# on xbox: use special driver
 				add_device atiusb "device xboxusb"
+				NEED_XBOX_PATCH=1
 			else
 				# no driver requested
 				einfo
@@ -224,13 +226,16 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# Apply kernel compatibility patches
 	epatch ${FILESDIR}/${P}-kernel-2.6.16.diff
 	epatch ${FILESDIR}/${P}-kernel-2.6.17.diff
 	epatch ${FILESDIR}/${P}-kernel-2.6.18.diff
 
+	# Work with udev-094 and greater
 	epatch ${FILESDIR}/${PN}-udev-094.diff
 
-	use lirc_devices_xboxusb && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff
+	# Apply patches needed for some special device-types
+	[[ ${NEED_XBOX_PATCH:-0} == 1 ]] && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff
 	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch
 
 	# remove parallel driver on SMP systems
@@ -238,6 +243,7 @@ src_unpack() {
 		sed -i -e "s:lirc_parallel::" drivers/Makefile.in
 	fi
 
+	# respect CFLAGS
 	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.in
 
 	# setting default device-node