fix bug 276518 (with sping) and some RDEPEND/DEPEND issues

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 24 insertions, 16 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index ae78233e013f..d862268c5873 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.206 2009/09/25 10:20:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.207 2009/10/03 22:46:15 fauli Exp $
+
+  03 Oct 2009; Christian Faulhammer <fauli@gentoo.org> lirc-0.8.5.ebuild:
+  Rework dependencies:
+  * Add dev-embedded/libftdi for some drivers, bug 276518 (with help
+  from sping)
+  * Correct assignment of RDEPEND and DEPEND
 
   25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> lirc-0.8.4.ebuild,
   -files/lirc-0.8.4-imon-pad2keys.patch, lirc-0.8.4a.ebuild:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 86b156abca29..55281c1067a2 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -29,14 +29,14 @@ EBUILD lirc-0.8.3-r2.ebuild 9021 RMD160 6ddd9235fb94f9ccfebe0aec33d164555836ef2f
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.4.ebuild 8942 RMD160 19d3fea9b5dedb272a640c30ee10d4a22dbf8b58 SHA1 f473243a365096732971a49ea8f20fde3fac913b SHA256 429ce5f9fd73a743676afa665f335e9dec0b8a73d528d45cc83a0d1d736fa2d6
 EBUILD lirc-0.8.4a.ebuild 9136 RMD160 cbf9c0b69fadb9fd113d4be6fe766a1a52810939 SHA1 2a82ebe8e8c02f73b7fc49789cf6c2fd7a77ca17 SHA256 d5ff273afd5ebdc7eba7091dbd18846abfe658352189fd49df803237705934b7
-EBUILD lirc-0.8.5.ebuild 9406 RMD160 7f63aaeedd994369091d90b04f1efebc226108b2 SHA1 47586078bc105876991d6bbccaea36c7a66b0d7c SHA256 7069d9f4a671c44dc24f3e6dcd56abdabe6fdb6a1874f0b2f59fdb544e81f9f6
+EBUILD lirc-0.8.5.ebuild 9466 RMD160 3a4d52bd5fea2f46153d4ad1d57bbe6d2b962a5a SHA1 6496868407f1a21c54deb5fd6f36f2413f5dec71 SHA256 0c81602f91506d8f7eb93e6f15875cae2b1903f7bbcf7b8fe407e4ed2ca7f275
 EBUILD lirc-0.8.6.ebuild 9408 RMD160 290201d2471ba2b5e4b3dd5e19024694736db2c1 SHA1 946732f5c7b8a61c6e076fb4bdfb8be9b9ad6a7c SHA256 68bf99ef10a117b4a8eb410ef91d07155c0fe9cf3ac888143b77714bf2ce404d
-MISC ChangeLog 32888 RMD160 f69fca3b6682fe4cd9736eb04cba2b3ab19b157f SHA1 7a4ac63a1b0b3343c82c6d4ed4f7b58a2015fdbe SHA256 e94aa5c914d7098e9bfc1a16e1cf9544cb5b5138d0de9b802c859da8b34c60c1
+MISC ChangeLog 33110 RMD160 66c149ef69df3439c519cbd9aa6ba205b2402d26 SHA1 8b39e8fa5152fe7e425a8a03e608f9ccb5cf7f3e SHA256 5d29b5531a611dcd542b295def9aa261e0e607ebcd8001d58ea56d4d5e4670d1
 MISC metadata.xml 376 RMD160 7b854dad1999c38592eabe928aab80615ba1f1e5 SHA1 17dc9c9591c77aa4ec2d98b9bc1f34ff68da31ad SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq8mW8ACgkQAiZjviIA2XhshACg79qO/LhlZNzyu7OzSornmvYT
-4TIAn1UxGSX7m6blH9il6W73jldAGuQR
-=9u/i
+iEYEARECAAYFAkrH1D8ACgkQNQqtfCuFneN+OgCgj25So6d8h31yQqLBIIv3KzXQ
+iA4AoIqf2HpHff2XNUbivnVfBi8YIENy
+=uR31
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-0.8.5.ebuild b/app-misc/lirc/lirc-0.8.5.ebuild
index f425c04ec087..dc6bef6d9c0b 100644
--- a/app-misc/lirc/lirc-0.8.5.ebuild
+++ b/app-misc/lirc/lirc-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.5 2009/08/29 18:09:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.5.ebuild,v 1.6 2009/10/03 22:46:15 fauli Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -17,7 +17,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc X hardware-carrier transmitter"
 
 S="${WORKDIR}/${MY_P}"
@@ -73,25 +73,27 @@ IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}"
 LIBUSB_USED_BY_DEV="
 	all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad
 	imon_rsc streamzap mceusb mceusb2 xboxusb irlink commandir"
+LIBFTDI_USED_BY_DEV="
+	ftdi usbirboy userspace"
 
 for dev in ${LIBUSB_USED_BY_DEV}; do
-	RDEPEND="${RDEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
+	DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-libs/libusb )"
+done
+
+for dev in ${LIBFTDI_USED_BY_DEV}; do
+	DEPEND="${DEPEND} lirc_devices_${dev}? ( dev-embedded/libftdi )"
 done
 
 RDEPEND="${RDEPEND}
-	lirc_devices_ftdi? ( dev-embedded/libftdi )"
+	lirc_devices_usbirboy? ( app-misc/usbirboy )
+	lirc_devices_inputlirc? ( app-misc/inputlircd )
+	lirc_devices_iguana? ( app-misc/iguanaIR )"
 
 # adding only compile-time depends
 DEPEND="${RDEPEND}
 	virtual/linux-sources
 	lirc_devices_all? ( dev-embedded/libftdi )"
 
-# adding only run-time depends
-RDEPEND="${RDEPEND}
-	lirc_devices_usbirboy? ( app-misc/usbirboy )
-	lirc_devices_inputlirc? ( app-misc/inputlircd )
-	lirc_devices_iguana? ( app-misc/iguanaIR )"
-
 # add all devices to IUSE
 for dev in ${IUSE_LIRC_DEVICES}; do
 	IUSE="${IUSE} lirc_devices_${dev}"