version bump from upstream

Package-Manager: portage-2.1.4_rc14

7 files changed, 127 insertions, 6 deletions

diff --git a/app-misc/hal-info/ChangeLog b/app-misc/hal-info/ChangeLog
index d751802eaf7d..8b63881bb183 100644
--- a/app-misc/hal-info/ChangeLog
+++ b/app-misc/hal-info/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/hal-info
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hal-info/ChangeLog,v 1.24 2007/11/23 06:21:43 compnerd Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hal-info/ChangeLog,v 1.25 2008/01/06 06:44:41 compnerd Exp $
+
+*hal-info-20071030 (06 Jan 2008)
+
+  06 Jan 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/01_dell_cdrom_nopoll.patch,
+  +files/02_hardware_brightness_fixups.patch,
+  +files/03_feiya_memory_bar.patch, +hal-info-20071030.ebuild:
+  Version bump from upstream
 
 *hal-info-20071011 (23 Nov 2007)
 
diff --git a/app-misc/hal-info/Manifest b/app-misc/hal-info/Manifest
index bb7d653138e9..e9c28ca1538e 100644
--- a/app-misc/hal-info/Manifest
+++ b/app-misc/hal-info/Manifest
@@ -1,7 +1,20 @@
+AUX 01_dell_cdrom_nopoll.patch 1014 RMD160 42436b161a7d1edd17103b7a2e0fab23aedec59e SHA1 689c6c7319202a582e7ad350c5a964236d0d9598 SHA256 e243f1af9f87f43c8c2358516c8aee73f449e8ddd70059e7209d10027bf97111
+MD5 e4aaeb967d7f31bebb8cedbb67cbc9af files/01_dell_cdrom_nopoll.patch 1014
+RMD160 42436b161a7d1edd17103b7a2e0fab23aedec59e files/01_dell_cdrom_nopoll.patch 1014
+SHA256 e243f1af9f87f43c8c2358516c8aee73f449e8ddd70059e7209d10027bf97111 files/01_dell_cdrom_nopoll.patch 1014
+AUX 02_hardware_brightness_fixups.patch 1021 RMD160 e0428972bc20b2218484f4efc0ec8cc717056446 SHA1 8a288ea79dd1df83709bfd261e4c7f49484a8c60 SHA256 fa538c448162e78a3a0088251ecdd7accca87ad93abf75dde6e0246392130e4a
+MD5 98f9e3cd2762fc973f111df632a2d63b files/02_hardware_brightness_fixups.patch 1021
+RMD160 e0428972bc20b2218484f4efc0ec8cc717056446 files/02_hardware_brightness_fixups.patch 1021
+SHA256 fa538c448162e78a3a0088251ecdd7accca87ad93abf75dde6e0246392130e4a files/02_hardware_brightness_fixups.patch 1021
+AUX 03_feiya_memory_bar.patch 1002 RMD160 56f39919ed51d368aa0ab079b9ee9fb2a57f428c SHA1 196315b6735f84a03ab5332d1d126a5afaa9695d SHA256 8a55225bf216ade7785ff80d879e4df32d8924127872e7cfb9fa4d676e793e36
+MD5 0a3040883651fb9c029de62c1cb448f8 files/03_feiya_memory_bar.patch 1002
+RMD160 56f39919ed51d368aa0ab079b9ee9fb2a57f428c files/03_feiya_memory_bar.patch 1002
+SHA256 8a55225bf216ade7785ff80d879e4df32d8924127872e7cfb9fa4d676e793e36 files/03_feiya_memory_bar.patch 1002
 DIST hal-info-20070425.tar.gz 108493 RMD160 9af0838dd72d645a7a07fad10dc2511472f0f09b SHA1 085c3b59294284a7f6c4cb26f5bbc4319c756e0e SHA256 e3ccc59730b692ad80a1ed2151d67f9f9f30f0356c3adc596525e2443dbee556
 DIST hal-info-20070516.tar.gz 110925 RMD160 0847953c0e1f8fd40b10abbf85ad86578b0db1e0 SHA1 d7f741b3c6d550f173d8c31773cafb39eeaf4e0a SHA256 9e7b2afcf84f454bb83aadcc2545eec4f5b99bb73edea780e8fd33b4807263e5
 DIST hal-info-20070618.tar.gz 118985 RMD160 cbd8db973663f755397d128beddb0a0b2ccebf21 SHA1 0b586373cdf425180c9fe803b576fd7ca86c07c4 SHA256 bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
 DIST hal-info-20071011.tar.gz 148823 RMD160 b74d44de18ab8593c41217ec08eb00537f9e26b0 SHA1 218553c25978106b8701ae8cf35bda2df4fc8ed5 SHA256 f43aa62a69f07c76a0851f7e76dbeccba89e831c402f23a3d530fb2f9311a7c3
+DIST hal-info-20071030.tar.gz 152587 RMD160 354b43db32a5be13deb820330e823944b41485a5 SHA1 844f599b300162b0f43ddb08606a7ab36caa6399 SHA256 d08b61b0bb941ed3f58b60d4b2f9d8be2e43dc184812e74957d540b21661d7da
 EBUILD hal-info-20070425.ebuild 713 RMD160 f759f27f065c067ad99a8bad80161d4faa588c2f SHA1 f3848fe777dd5a64592c0d082d09b9b9697677ea SHA256 9976eb0bf96eda7595fd553cfe9ef9dfc85c3d1ba2a270f771cdc71c1a886822
 MD5 d8d4c9b842dc14681d28fe988131fe05 hal-info-20070425.ebuild 713
 RMD160 f759f27f065c067ad99a8bad80161d4faa588c2f hal-info-20070425.ebuild 713
@@ -18,10 +31,14 @@ EBUILD hal-info-20071011.ebuild 661 RMD160 dc59c95323fba36d943c121f0f8c0c11c9223
 MD5 6328fc0fbe7260bbc45397b990cfdb1b hal-info-20071011.ebuild 661
 RMD160 dc59c95323fba36d943c121f0f8c0c11c9223d85 hal-info-20071011.ebuild 661
 SHA256 ca512937409faa8c411c01adab6e1d0ebce1fa39c8df9f3cf1b8b8f8bb1e1d09 hal-info-20071011.ebuild 661
-MISC ChangeLog 3501 RMD160 185eb35b9e6439e3838358a51fc421b6d6b1aa55 SHA1 88efd71953e781c214d10195a7a5dca4b0e2da27 SHA256 2e2ae9f74b73dca1bf266f1bf74b68611ed3044ce77b998b699f93ff755f7a29
-MD5 dfd44c5a582b038701f1484b48e1c2d7 ChangeLog 3501
-RMD160 185eb35b9e6439e3838358a51fc421b6d6b1aa55 ChangeLog 3501
-SHA256 2e2ae9f74b73dca1bf266f1bf74b68611ed3044ce77b998b699f93ff755f7a29 ChangeLog 3501
+EBUILD hal-info-20071030.ebuild 847 RMD160 de0d440f6afe8c076930ef87cec5f3f7ee36a396 SHA1 3c43d9b4eed4d3a64a2c204fe2611ff14f17e3db SHA256 9fd01c9343f21c7da9673b731ff27eb1559566fa4a0df30e49372cdccacd044e
+MD5 cc7cf64beed25b95baa9b0a86638363b hal-info-20071030.ebuild 847
+RMD160 de0d440f6afe8c076930ef87cec5f3f7ee36a396 hal-info-20071030.ebuild 847
+SHA256 9fd01c9343f21c7da9673b731ff27eb1559566fa4a0df30e49372cdccacd044e hal-info-20071030.ebuild 847
+MISC ChangeLog 3767 RMD160 fad410d8db4a278bd1dbc4f808bc7bbaa09f9f4a SHA1 9a8135dcc2f4da4eb97f0bfa20716c0f9a6976f7 SHA256 8601280918c6a8baf237961aa4d40e128f8eebe24b01d2c2bc39322fd05027fb
+MD5 e1a414184b80cc46aaffb2c4d805832e ChangeLog 3767
+RMD160 fad410d8db4a278bd1dbc4f808bc7bbaa09f9f4a ChangeLog 3767
+SHA256 8601280918c6a8baf237961aa4d40e128f8eebe24b01d2c2bc39322fd05027fb ChangeLog 3767
 MISC metadata.xml 222 RMD160 ef6286925330a9e740813a3d578b94633551a865 SHA1 2b6190af74b0097c61a7fc15832ef7f982bc4183 SHA256 aa81864aebd2d7c8c9a75e1773ae4fd85feef42339e86f3198c6bf9df356b7ea
 MD5 df087ae002e9366783b6a0ebfebdd19e metadata.xml 222
 RMD160 ef6286925330a9e740813a3d578b94633551a865 metadata.xml 222
@@ -38,3 +55,6 @@ SHA256 8923eb09edb4b6166c463a9f084edf7a921725d435f4d3d12a769857d1874704 files/di
 MD5 211d40ed620f3007f8597416ce71f310 files/digest-hal-info-20071011 253
 RMD160 b0efd67d9fbf5b97be8798d0599e4bd62855e2eb files/digest-hal-info-20071011 253
 SHA256 b5c3d99cfc45a84a2ea86cebefe7d33cea82b13c51f620359dba7461cb0aa609 files/digest-hal-info-20071011 253
+MD5 77bb5e0957c16856463757358cb034ce files/digest-hal-info-20071030 253
+RMD160 128fe035b788902eb171e8d42f9773415888c245 files/digest-hal-info-20071030 253
+SHA256 2dd69a5aeddbad8c3dfec632c60427b9af4e607b26d577504d5e55fab6fb1b6f files/digest-hal-info-20071030 253
diff --git a/app-misc/hal-info/files/01_dell_cdrom_nopoll.patch b/app-misc/hal-info/files/01_dell_cdrom_nopoll.patch
new file mode 100644
index 000000000000..e53fe42866c4
--- /dev/null
+++ b/app-misc/hal-info/files/01_dell_cdrom_nopoll.patch
@@ -0,0 +1,22 @@
+--- hal-info-20070618/fdi/preprobe/10osvendor/10-ide-drives.fdi	2007-03-01 03:32:53.000000000 +0100
++++ hal-info-20070618.new/fdi/preprobe/10osvendor/10-ide-drives.fdi	2007-08-06 08:28:54.000000000 +0200
+@@ -3,6 +3,19 @@
+ <deviceinfo version="0.2">
+ 
+   <device>
++    <!-- Handle weird Dell Laptops that slow down the system if the optical 
++        drive is polled (RH Bug #138148) -->
++    <match key="storage.bus" string="ide">
++      <match key="storage.model" string="HL-DT-STCD-RW/DVD-ROM GCC-4240N">
++       <match key="block.device" string="/dev/hdb">
++          <merge key="storage.media_check_enabled" type="bool">false</merge>
++       </match>
++       <match key="block.device" string="/dev/hdd">
++          <merge key="storage.media_check_enabled" type="bool">false</merge>
++       </match>
++      </match>
++    </match>
++
+     <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
+     <match key="storage.bus" string="ide">
+       <match key="storage.drive_type" string="disk">
diff --git a/app-misc/hal-info/files/02_hardware_brightness_fixups.patch b/app-misc/hal-info/files/02_hardware_brightness_fixups.patch
new file mode 100644
index 000000000000..b0370c4a5572
--- /dev/null
+++ b/app-misc/hal-info/files/02_hardware_brightness_fixups.patch
@@ -0,0 +1,15 @@
+--- hal-info-20071030/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi	2007-08-31 23:15:26.000000000 +0200
++++ hal-info-20071030.new/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi	2007-11-14 18:52:24.000000000 +0100
+@@ -8,11 +8,7 @@
+   <device>
+     <match key="info.category" string="laptop_panel">
+       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell">
+-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Latitude">
+-	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="D420">
+-	    <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+-	  </match>
+-	</match>
++	<merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+       </match>
+       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA">
+         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE M100">
diff --git a/app-misc/hal-info/files/03_feiya_memory_bar.patch b/app-misc/hal-info/files/03_feiya_memory_bar.patch
new file mode 100644
index 000000000000..b8b46037880a
--- /dev/null
+++ b/app-misc/hal-info/files/03_feiya_memory_bar.patch
@@ -0,0 +1,18 @@
+--- hal-info-20070618/fdi/information/10freedesktop/10-usb-music-players.fdi	2007-06-14 20:16:15.000000000 +0200
++++ hal-info-20070618.new/fdi/information/10freedesktop/10-usb-music-players.fdi	2007-10-01 22:37:34.000000000 +0200
+@@ -434,15 +434,6 @@
+           </match>
+ 	</match>
+ 
+-        <!-- Feiya Technology Corp Memory Bar -->
+-        <match key="@storage.originating_device:usb.vendor_id" int="0x090c">
+-          <match key="@storage.originating_device:usb.product_id" int="0x1000">
+-            <merge key="portable_audio_player.type" type="string">generic</merge>
+-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+-          </match>
+-        </match>
+-
+ 	<!-- Peak Digital Audio Player -->
+         <match key="@storage.originating_device:usb.vendor_id" int="0xd7d">
+           <match key="@storage.originating_device:usb.product_id" int="0x1651">
diff --git a/app-misc/hal-info/files/digest-hal-info-20071030 b/app-misc/hal-info/files/digest-hal-info-20071030
new file mode 100644
index 000000000000..da721fee256a
--- /dev/null
+++ b/app-misc/hal-info/files/digest-hal-info-20071030
@@ -0,0 +1,3 @@
+MD5 d0bc671a56477bac28a18b8bcf80c2be hal-info-20071030.tar.gz 152587
+RMD160 354b43db32a5be13deb820330e823944b41485a5 hal-info-20071030.tar.gz 152587
+SHA256 d08b61b0bb941ed3f58b60d4b2f9d8be2e43dc184812e74957d540b21661d7da hal-info-20071030.tar.gz 152587
diff --git a/app-misc/hal-info/hal-info-20071030.ebuild b/app-misc/hal-info/hal-info-20071030.ebuild
new file mode 100644
index 000000000000..f2096555ce77
--- /dev/null
+++ b/app-misc/hal-info/hal-info-20071030.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hal-info/hal-info-20071030.ebuild,v 1.1 2008/01/06 06:44:41 compnerd Exp $
+
+inherit eutils
+
+DESCRIPTION="The fdi scripts that HAL uses"
+HOMEPAGE="http://hal.freedesktop.org/"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-apps/hal-0.5.10"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/01_dell_cdrom_nopoll.patch"
+	epatch "${FILESDIR}/02_hardware_brightness_fixups.patch"
+	epatch "${FILESDIR}/03_feiya_memory_bar.patch"
+}
+
+src_compile() {
+	econf || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "install failed."
+}