new release

5 files changed, 135 insertions, 1 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 93955bce05ce..60dcfef51a25 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.8 2004/10/28 22:22:37 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.9 2004/11/02 22:57:49 foser Exp $
+
+*hal-0.4.1 (02 Nov 2004)
+
+  02 Nov 2004; foser <foser@gentoo.org> hal-0.4.1.ebuild :
+  New release
+  Add patch for device manager
 
 *hal-0.4.0 (29 Oct 2004)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 4bee3adec715..c4b9cd47aa13 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,3 +1,4 @@
+MD5 e1bae5d6efeb5660609ec94230e62d8c hal-0.4.1.ebuild 2485
 MD5 61261554ddcd26a4720cd42600670f45 hal-0.2.98-r1.ebuild 2066
 MD5 5f372bd476e29ee45409cacd8774748f hal-0.4.0.ebuild 2478
 MD5 d08b6349e7c971dd17da7aa8547b053f ChangeLog 1485
@@ -7,6 +8,7 @@ MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 7
 MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
 MD5 14380bf35823146ebc30fb47bfcad39c files/hal-0.4.0-storage-policy-never-use-uuid.patch 1405
 MD5 467820e480b84fd75a783dbcbb282c2a files/digest-hal-0.4.0 62
+MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1 62
 MD5 fa38b59d0ab9bdf0ff3363cd756d902a files/hal-0.4.0-old_storage_policy.patch 1217
 MD5 3eb5f234297bb915e58f5e7b1dc39e7e files/hal-0.4.0-fix-fstab-sync-crasher.patch 2422
 MD5 90ea63d4a4b9885b7a6eab147dcb428b files/hal-0.4.0-clean-on-startup.patch 2653
diff --git a/sys-apps/hal/files/digest-hal-0.4.1 b/sys-apps/hal/files/digest-hal-0.4.1
new file mode 100644
index 000000000000..c130690c7dfa
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.4.1
@@ -0,0 +1 @@
+MD5 8c06c46ff1925c521cd4196d8b61d8ae hal-0.4.1.tar.gz 1333684
diff --git a/sys-apps/hal/files/hal-0.4.1-dm_devices_tab.patch b/sys-apps/hal/files/hal-0.4.1-dm_devices_tab.patch
new file mode 100644
index 000000000000..9164a3d5444e
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.1-dm_devices_tab.patch
@@ -0,0 +1,26 @@
+Index: DeviceManager.py
+===================================================================
+RCS file: /cvs/hal/hal/tools/device-manager/DeviceManager.py,v
+retrieving revision 1.15
+diff -u -b -B -r1.15 DeviceManager.py
+--- DeviceManager.py    1 Sep 2004 17:38:59 -0000       1.15
++++ DeviceManager.py    1 Nov 2004 23:22:48 -0000
+@@ -355,8 +355,15 @@
+             product.set_label("Unknown")
+             vendor.set_label("Unknown")
+ 
+-        # clear category, capabilities
++        # set category, capabilities
++        if device.properties.has_key("info.category"):
++            category.set_label("%s"%device.properties["info.category"])
++        else:
+-        category.set_label("Unknown")
++            category.set_label("Unknown")
++
++        if device.properties.has_key("info.capabilities"):
++            capabilities.set_label("%s"%device.properties["info.capabilities"])
++        else:
+-        capabilities.set_label("Unknown")
++            capabilities.set_label("Unknown")
+ 
+     def update_tab_usb(self, device):
diff --git a/sys-apps/hal/hal-0.4.1.ebuild b/sys-apps/hal/hal-0.4.1.ebuild
new file mode 100644
index 000000000000..c558bade6da9
--- /dev/null
+++ b/sys-apps/hal/hal-0.4.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.1.ebuild,v 1.1 2004/11/02 22:57:49 foser Exp $
+
+inherit eutils debug python
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+
+SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.2.2
+	>=sys-apps/dbus-0.22-r1
+	dev-libs/expat
+	sys-fs/udev
+	sys-apps/hotplug
+	sys-libs/libcap
+	sys-kernel/linux26-headers"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove RH only stuff
+	epatch ${FILESDIR}/${PN}-0.4.0-old_storage_policy.patch
+	# fix floppy drives be shown
+	epatch ${FILESDIR}/${PN}-0.4.0-allow-floppy-drives.patch
+	# smallish device manaager fix
+	cd ${S}/tools/device-manager
+	epatch ${FILESDIR}/${P}-dm_devices_tab.patch
+
+}
+
+src_compile() {
+
+	# FIXME : docs
+	econf \
+		--enable-fstab-sync \
+		--enable-hotplug-map \
+		--disable-doxygen-docs \
+		--disable-docbook-docs \
+		--with-pid-file=/var/run/hald/hald.pid \
+		|| die
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# We install this in a seperate package to avoid gnome-python dep
+	rm ${D}/usr/bin/hal-device-manager
+
+	# initscript
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/hald
+
+	# place our pid file
+	keepdir /var/run/hald
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+}
+
+pkg_preinst() {
+
+	enewgroup haldaemon || die "Problem adding haldaemon group"
+	enewuser haldaemon -1 /bin/false /dev/null haldaemon || die "Problem adding haldaemon user"
+
+}
+
+pkg_postinst() {
+
+	# make sure the permissions on the pid dir are alright & after preinst
+	chown haldaemon:haldaemon /var/run/hald
+
+	ewarn "Enabled in this ebuild by default is the usage of fstab-sync"
+	ewarn "that will create mount rules for non-existing devices in"
+	ewarn "fstab if needed, mount points will be created in /media."
+	ewarn "This functionality alters /etc/fstab runtime on the filesystem"
+	ewarn "and might have unforseen side-effects."
+	echo
+	einfo "The HAL daemon needs to be running for certain applications to"
+	einfo "work. Suggested is to add the init script to your start-up"
+	einfo "scripts, this should be done like this :"
+	einfo "\`rc-update add hald default\`"
+
+}