version bump from upstream

(Portage version: 2.1.4_rc14)

6 files changed, 103 insertions, 2 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/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."
+}