fixed bug #188911. switched to patch tarballs and using git so this is more of an experiment revision

Package-Manager: portage-2.1.3.7

4 files changed, 278 insertions, 5 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 574c9cfc98df..faf5ca6a479a 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.207 2007/08/28 19:40:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.208 2007/08/28 21:33:19 cardoe Exp $
+
+*hal-0.5.9.1-r2 (28 Aug 2007)
+
+  28 Aug 2007; Doug Goldstein <cardoe@gentoo.org> +hal-0.5.9.1-r2.ebuild:
+  fixed bug #188911. switched to patch tarballs and using git so this is more
+  of an experiment revision
 
   28 Aug 2007; Jeroen Roovers <jer@gentoo.org> hal-0.5.9.1-r1.ebuild:
   Stable for HPPA (bug #185823).
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 56200071b966..51acea9f647b 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
@@ -219,6 +222,7 @@ MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 files/hal-unmount.dev 397
 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b files/hal-unmount.dev 397
 DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644 SHA1 233b67e724e68f41ec3f53adcfb7d139328c5813 SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b
+DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad SHA1 32db287e0eff7f4754b89633909daf0f6e957009 SHA256 f28ed6e02df926ef485fff79587856eb0155c747e311d83d1b6b5e3a25b924c2
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 EBUILD hal-0.5.7.1-r5.ebuild 6458 RMD160 69b97cb8110f4e7c6f3b565bdd47912bf8e52d28 SHA1 44a44907d4a003ef5e10284939605265e06aae81 SHA256 47c69a87bd79397006dcd98c28d20b9a2947046c38765627f1a11ca1cd3f3e7f
@@ -233,10 +237,14 @@ EBUILD hal-0.5.9.1-r1.ebuild 7737 RMD160 f189ff98a073762f15701ad123a509030ee18aa
 MD5 bbad4ffe9b89862e90f322f3f711ff79 hal-0.5.9.1-r1.ebuild 7737
 RMD160 f189ff98a073762f15701ad123a509030ee18aac hal-0.5.9.1-r1.ebuild 7737
 SHA256 6a43a2cc940dd2c02b9350d3ebe73425f5a60ac5ddd225cc45ee6222deab381f hal-0.5.9.1-r1.ebuild 7737
-MISC ChangeLog 33927 RMD160 ceef5de42a1c6193068487008423ac33562efa78 SHA1 d136373c67d93085a7baf584bb9defbf972f1765 SHA256 1bb58b5850ee49dc13bbc2a43ed3ef834f0668fee45279fd922a701cde74d30c
-MD5 3c4cf4eaef356e21a6d660dc1139026b ChangeLog 33927
-RMD160 ceef5de42a1c6193068487008423ac33562efa78 ChangeLog 33927
-SHA256 1bb58b5850ee49dc13bbc2a43ed3ef834f0668fee45279fd922a701cde74d30c ChangeLog 33927
+EBUILD hal-0.5.9.1-r2.ebuild 7431 RMD160 6b0156346679165fde5752b052a09f7e0f2decbe SHA1 cfb8f7455474cf55b74b6a785622f05859ee2cff SHA256 4e03d029ce39e2e54a67e9d82db0d598e1d1156a7f5ddfeb8430c9ff05f1a2a6
+MD5 54d784b854b973034394c46f3d420098 hal-0.5.9.1-r2.ebuild 7431
+RMD160 6b0156346679165fde5752b052a09f7e0f2decbe hal-0.5.9.1-r2.ebuild 7431
+SHA256 4e03d029ce39e2e54a67e9d82db0d598e1d1156a7f5ddfeb8430c9ff05f1a2a6 hal-0.5.9.1-r2.ebuild 7431
+MISC ChangeLog 34142 RMD160 d7b2f2be589b9b64418cf298451269a6aaa205ab SHA1 eb1d7fe18a094ac34cb7bb295de65f00ac7f0e4f SHA256 1f7eb4afa3f15d12827ba61252369bf11207604196bd5f881f7b815233cbc858
+MD5 449d89613a6d775f9f58b6c913c53e2b ChangeLog 34142
+RMD160 d7b2f2be589b9b64418cf298451269a6aaa205ab ChangeLog 34142
+SHA256 1f7eb4afa3f15d12827ba61252369bf11207604196bd5f881f7b815233cbc858 ChangeLog 34142
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -250,3 +258,13 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 MD5 0b6b9a1ce7f87610dbda3f922db15fa9 files/digest-hal-0.5.9.1-r1 238
 RMD160 2cb1ef22b4ce904b95d1f944b9d0263a93c0f968 files/digest-hal-0.5.9.1-r1 238
 SHA256 a4b6fc77fa4c4a013240b9cb2eea17745527ec0175bd22f395733d386ae31b2b files/digest-hal-0.5.9.1-r1 238
+MD5 240fe515b5d5d293ce0178f107726b53 files/digest-hal-0.5.9.1-r2 479
+RMD160 d13900166e485e79d2f0bf8d0dbc77fbf3620d6b files/digest-hal-0.5.9.1-r2 479
+SHA256 90221d17a323f1c27f4e74a889f81c1eebd7c71f750098546da62881e75614fb files/digest-hal-0.5.9.1-r2 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG1JSpoeSe8B0zEfwRAq8+AJ9oRj2sMs8elOPr8x+7UEiBLfxCrgCfYs3u
+BDUUw9qpu46zYmHrRSkUOSI=
+=H+bw
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/digest-hal-0.5.9.1-r2 b/sys-apps/hal/files/digest-hal-0.5.9.1-r2
new file mode 100644
index 000000000000..be777ba486b6
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.5.9.1-r2
@@ -0,0 +1,6 @@
+MD5 487292f463aa98f4397beb16540f1846 hal-0.5.9.1-r2.tar.bz2 4246
+RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad hal-0.5.9.1-r2.tar.bz2 4246
+SHA256 f28ed6e02df926ef485fff79587856eb0155c747e311d83d1b6b5e3a25b924c2 hal-0.5.9.1-r2.tar.bz2 4246
+MD5 6a40f49f964e64358e53652038f3059f hal-0.5.9.1.tar.gz 1596347
+RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f hal-0.5.9.1.tar.gz 1596347
+SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b hal-0.5.9.1.tar.gz 1596347
diff --git a/sys-apps/hal/hal-0.5.9.1-r2.ebuild b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
new file mode 100644
index 000000000000..9a30b1d82d0c
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.9.1-r2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r2.ebuild,v 1.1 2007/08/28 21:33:19 cardoe Exp $
+
+inherit eutils linux-info autotools flag-o-matic
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz
+		http://dev.gentoo.org/~cardoe/files/hal/${PN}-${PVR}.tar.bz2"
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/glib-2.6
+		>=dev-libs/dbus-glib-0.61
+		kernel_linux? ( >=sys-fs/udev-104 )
+		kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 )
+		kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 )
+		kernel_FreeBSD? ( dev-libs/libvolume_id )
+		>=dev-libs/expat-1.95.8
+		>=sys-apps/pciutils-2.2.3
+		>=dev-libs/libusb-0.1.10a
+		sys-apps/usbutils
+		virtual/eject
+		amd64? ( >=sys-apps/dmidecode-2.7 )
+		x86? ( >=sys-apps/dmidecode-2.7 )
+		ia64? ( >=sys-apps/dmidecode-2.7 )
+		dell? ( >=sys-libs/libsmbios-0.13.4 )
+		disk-partition? ( >=sys-apps/parted-1.7.1
+						<=sys-apps/parted-1.8.7 )
+		kernel_linux? ( crypt? ( || ( >=sys-fs/cryptsetup-1.0.5
+						>=sys-fs/cryptsetup-luks-1.0.1 ) ) )
+		selinux? ( sys-libs/libselinux
+					sec-policy/selinux-hal )"
+#		pam? ( sys-auth/consolekit )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		doc? ( app-doc/doxygen
+				app-text/docbook-sgml-utils
+				app-text/xmlto )"
+
+PDEPEND="app-misc/hal-info"
+
+## HAL Daemon drops privledges so we need group access to read disks
+HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
+HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator"
+
+function notify_uevent() {
+	ewarn
+	ewarn "You must enable Kernel Userspace Events in your kernel."
+	ewarn "For this you need to enable 'Hotplug' under 'General Setup' and"
+	ewarn "basic networking.  They are marked CONFIG_HOTPLUG and CONFIG_NET"
+	ewarn "in the config file."
+	ewarn
+	ebeep 5
+}
+
+function notify_procfs() {
+	ewarn
+	ewarn "You must enable the proc filesystem in your kernel."
+	ewarn "For this you need to enable '/proc file system support' under"
+	ewarn "'Pseudo filesystems' in 'File systems'.  It is marked"
+	ewarn "CONFIG_PROC_FS in the config file."
+	ewarn
+	ebeep 5
+}
+
+function notify_inotify() {
+	ewarn
+	ewarn "You must enable the Inotify system in your kernel."
+	ewarn "For this you need to enable 'Inotify support for userspace'"
+	ewarn "in 'File systems'. It is marked CONFIG_INOTIFY_USER in the config file."
+	ewarn
+	ebeep 5
+}
+
+pkg_setup() {
+	if ! built_with_use --missing false sys-apps/pciutils hal ; then
+		if built_with_use --missing false sys-apps/pciutils zlib ; then
+			eerror "You MUST build sys-apps/pciutils without the zlib USE flag"
+			die "You MUST build sys-apps/pciutils without the zlib USE flag"
+		fi
+	fi
+
+	if use kernel_linux; then
+		kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer"
+
+		if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET )
+		then
+			notify_uevent
+		fi
+
+		linux_chkconfig_present INOTIFY_USER || notify_inotify
+
+		if use acpi ; then
+			linux_chkconfig_present PROC_FS || notify_procfs
+		fi
+	fi
+
+	if [[ -d ${ROOT}/etc/hal/device.d ]]; then
+		eerror "HAL 0.5.x will not run with the HAL 0.4.x series of"
+		eerror "/etc/hal/device.d/ so please remove this directory"
+		eerror "with rm -rf /etc/hal/device.d/ and then re-emerge."
+		eerror "This is due to configuration protection of /etc/"
+		die "remove /etc/hal/device.d/"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"/hal-patches
+
+	eautoreconf
+}
+
+src_compile() {
+	local backend=""
+	local acpi=""
+
+	# TODO :: policykit should have a pam useflag
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+		use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if ! use acpi ; then
+		acpi="--disable-acpi-proc --disable-acpi-acpid"
+	fi
+
+	econf --disable-policy-kit \
+		  --docdir=/usr/share/doc/${PF} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-socket-dir=/var/run/hald \
+		  --with-hwdata=/usr/share/misc \
+		  --enable-hotplug-map \
+		  --enable-man-pages \
+		  --with-backend=${backend} \
+		  $(use_enable debug verbose-mode) \
+		  $(use_with dell dell-backlight) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable pcmcia pcmcia-support) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc doxygen-docs) \
+		  $(use_enable selinux) \
+		  --disable-console-kit \
+		  ${acpi} \
+	|| die "configure failed"
+#$(use_enable pam console-kit)
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	# remove dep on gnome-python
+	mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}"/hal-unmount.dev hal_unmount
+
+	# initscript
+	newinitd "${FILESDIR}"/0.5.9-hald.rc hald
+	cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
+#	if use pam; then
+#		sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
+#	fi
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+		-i "${WORKDIR}"/0.5.9-hald.conf
+	fi
+	newconfd "${WORKDIR}"/0.5.9-hald.conf hald
+
+	# We now create and keep /media here as both gnome-mount and pmount
+	# use these directories, to avoid collision.
+	keepdir /media
+
+	# We also need to create and keep /etc/fdi/{information,policy,preprobe}
+	# or else hal bombs.
+	keepdir /etc/hal/fdi/{information,policy,preprobe}
+
+	# HAL stores it's fdi cache in /var/lib/cache/hald
+	keepdir /var/lib/cache/hald
+
+	# HAL keeps its unix socket here
+	keepdir /var/run/hald
+}
+
+pkg_postinst() {
+	# Despite what people keep changing this location. Either one works.. it doesn't matter
+	# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/
+
+	# Create groups for hotplugging and HAL
+	enewgroup haldaemon || die "Problem adding haldaemon group"
+	enewgroup plugdev || die "Problem adding plugdev group"
+
+	# HAL drops priviledges by default now ...
+	# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups)
+	if use kernel_linux; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} \
+			|| die "Problem adding haldaemon user"
+	elif use kernel_FreeBSD; then
+		enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} \
+			|| die "Problem addding haldaemon user"
+	fi
+
+	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
+	# If users have a problem with this, let them file a bug
+	if [[ ${ROOT} == / ]] ; then
+		if use kernel_linux; then
+			usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon
+		elif use kernel_FreeBSD; then
+			pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD}
+		fi
+	fi
+
+	elog "The HAL daemon needs to be running for certain applications to"
+	elog "work. Suggested is to add the init script to your start-up"
+	elog "scripts, this should be done like this :"
+	elog "\`rc-update add hald default\`"
+	echo
+	elog "Looking for automounting support? Add yourself to the plugdev group"
+}