Handle no kernel sources with eerror instead of die, thanks to Chris Gianelloni <wolf31o2@gentoo.org> in bug 129811

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 12 insertions, 222 deletions

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index a3a6b2119a8c..f9a15593f815 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,6 +1,3 @@
------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
@@ -64,22 +61,18 @@ EBUILD hal-0.5.5.1-r3.ebuild 3766 RMD160 0341accd029d9028f92f18b6b8aa65e395bbf6a
 MD5 af33a479d90c3f8814e6d370b1033a1a hal-0.5.5.1-r3.ebuild 3766
 RMD160 0341accd029d9028f92f18b6b8aa65e395bbf6ab hal-0.5.5.1-r3.ebuild 3766
 SHA256 ca56f995710840061ca42e6428427e56782fcda126db7ad83dbf3c71d6d791f7 hal-0.5.5.1-r3.ebuild 3766
-EBUILD hal-0.5.7-r3.ebuild 5662 RMD160 a8a7312be795164627614bb33d6a08798e4e66c8 SHA1 14aa06d8c4a2a5d91b3f437ab38671c86bcb0324 SHA256 f765c3eca17d13dd0bb0b4656f699db0f40bba68f31583f89ee84fa1940f2041
-MD5 635af581c44b2622b66029f34cfda7b4 hal-0.5.7-r3.ebuild 5662
-RMD160 a8a7312be795164627614bb33d6a08798e4e66c8 hal-0.5.7-r3.ebuild 5662
-SHA256 f765c3eca17d13dd0bb0b4656f699db0f40bba68f31583f89ee84fa1940f2041 hal-0.5.7-r3.ebuild 5662
-EBUILD hal-0.5.7.1-r1.ebuild 5860 RMD160 2bb8b6f0540da01b2777f71d4979ddadaf78e4d9 SHA1 26c1c96e07362a26218b9851df357b20932fa9fc SHA256 f49fd11ff09661c0c42a03119a3902849735e30bcefb173ab54d42feb16fed74
-MD5 2a944381721ea614da820c8de328c255 hal-0.5.7.1-r1.ebuild 5860
-RMD160 2bb8b6f0540da01b2777f71d4979ddadaf78e4d9 hal-0.5.7.1-r1.ebuild 5860
-SHA256 f49fd11ff09661c0c42a03119a3902849735e30bcefb173ab54d42feb16fed74 hal-0.5.7.1-r1.ebuild 5860
-EBUILD hal-0.5.7.1.ebuild 5764 RMD160 21640eca5bad9ad1ea690830c64e37aec185a8a7 SHA1 cf1361a7793e61825fad82959659b8d712d47c5e SHA256 6ae3ea70d464bd3bb6be9f16dbc66fc3cb89ae8060344ccce86680bb36d97e0b
-MD5 1c906e388735aa037f85bf0b90d7476f hal-0.5.7.1.ebuild 5764
-RMD160 21640eca5bad9ad1ea690830c64e37aec185a8a7 hal-0.5.7.1.ebuild 5764
-SHA256 6ae3ea70d464bd3bb6be9f16dbc66fc3cb89ae8060344ccce86680bb36d97e0b hal-0.5.7.1.ebuild 5764
-MISC ChangeLog 15821 RMD160 d6a4fe15dc44b630b5820e8431e96f2fab4eaffd SHA1 83a3d4d0214f7db5872de8d977dc2253041d87b5 SHA256 3f3eee6c7b34e01b95046797e99b04f76dae5ccf350db9b556b376164409ed92
-MD5 c1f0b85945cfec9758a131681bc92d47 ChangeLog 15821
-RMD160 d6a4fe15dc44b630b5820e8431e96f2fab4eaffd ChangeLog 15821
-SHA256 3f3eee6c7b34e01b95046797e99b04f76dae5ccf350db9b556b376164409ed92 ChangeLog 15821
+EBUILD hal-0.5.7-r3.ebuild 5710 RMD160 fb3a919ec3b7e96368d3d14cb7ac70d7f49ef800 SHA1 57f7a18a24ca37c95e3b593981364d7fd6cc4062 SHA256 4432f060e4a1ed8b5d46275be96d227e090b6b30e1c26b8804dfb497f3610d7b
+MD5 fea9d4c3cce16c9ec4586385e6ca3e67 hal-0.5.7-r3.ebuild 5710
+RMD160 fb3a919ec3b7e96368d3d14cb7ac70d7f49ef800 hal-0.5.7-r3.ebuild 5710
+SHA256 4432f060e4a1ed8b5d46275be96d227e090b6b30e1c26b8804dfb497f3610d7b hal-0.5.7-r3.ebuild 5710
+EBUILD hal-0.5.7.1-r1.ebuild 5905 RMD160 cf1963739884fceada57d8064ce32c33337736fe SHA1 7358d294f731856e74f19f65613f293f186eb939 SHA256 007339efc63697a1bb3211cbf9d7f67cc6b030b1fd73d9065cb4c657e98da763
+MD5 93a2ffa74943bc533caca2cdb60b6c85 hal-0.5.7.1-r1.ebuild 5905
+RMD160 cf1963739884fceada57d8064ce32c33337736fe hal-0.5.7.1-r1.ebuild 5905
+SHA256 007339efc63697a1bb3211cbf9d7f67cc6b030b1fd73d9065cb4c657e98da763 hal-0.5.7.1-r1.ebuild 5905
+MISC ChangeLog 16063 RMD160 1e5a3e81bacd498381fed5d9ce8fcc6100a3bf57 SHA1 801b59920c454c2dd9630c9e63795082431d75fb SHA256 47397eef2be5ea077321a6ee6a8607fb99e929a61493087596ac6cb87b5fbba4
+MD5 78248b7c6232463f8e45f3fca77fba0e ChangeLog 16063
+RMD160 1e5a3e81bacd498381fed5d9ce8fcc6100a3bf57 ChangeLog 16063
+SHA256 47397eef2be5ea077321a6ee6a8607fb99e929a61493087596ac6cb87b5fbba4 ChangeLog 16063
 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d
 MD5 885e3073744523eaf2450514a311758b metadata.xml 223
 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
@@ -90,16 +83,6 @@ SHA256 51107ff7d6a8b82a6be18a1707160591f325fa1a16d47aa8cc5c0045a1addb14 files/di
 MD5 2cab9d9e3415f54f6368f796cf3df8ff files/digest-hal-0.5.7-r3 232
 RMD160 a3f08885fb362e481bd884a8f2192d3dc995fbee files/digest-hal-0.5.7-r3 232
 SHA256 1d79783e98c3e4f937148d5fb93916927d2484d85501a1f9a53b75c2080c15c2 files/digest-hal-0.5.7-r3 232
-MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1 238
-RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1 238
-SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1 238
 MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r1 238
 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r1 238
 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFEyzpoeSe8B0zEfwRAlTnAJwMcg135L+rM/wG9WJXWQFSkN1TSQCeNVEH
-k8fb4lHny0py3PtK59Eld6g=
-=je6M
------END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/digest-hal-0.5.7.1 b/sys-apps/hal/files/digest-hal-0.5.7.1
deleted file mode 100644
index 3042516ecf0a..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.7.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz 1503156
-RMD160 2861818b29546bd3628b1bda3d41238cf644c644 hal-0.5.7.1.tar.gz 1503156
-SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b hal-0.5.7.1.tar.gz 1503156
diff --git a/sys-apps/hal/hal-0.5.7.1.ebuild b/sys-apps/hal/hal-0.5.7.1.ebuild
deleted file mode 100644
index e22de65a19e7..000000000000
--- a/sys-apps/hal/hal-0.5.7.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1.ebuild,v 1.1 2006/08/16 03:36:55 steev Exp $
-
-inherit eutils linux-info debug
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="acpi crypt debug doc dmi pcmcia selinux"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=sys-apps/dbus-0.60
-	>=sys-fs/udev-078
-	>=sys-apps/util-linux-2.12r
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	dev-libs/expat
-	sys-libs/libcap
-	sys-apps/pciutils
-	dev-libs/libusb
-	sys-apps/hotplug
-	dmi? ( >=sys-apps/dmidecode-2.7 )
-	crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 )
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( app-doc/doxygen app-text/docbook-sgml-utils )"
-
-## HAL Daemon drops privledges so we need group access to read disks
-HALDAEMON_GROUPS="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb"
-
-function notify_uevent() {
-	eerror
-	eerror "You must enable Kernel Userspace Events in your kernel."
-	eerror "This can be set under 'General Setup'.  It is marked as"
-	eerror "CONFIG_KOBJECT_UEVENT in the config file."
-	eerror
-	ebeep 5
-}
-
-function notify_uevent_2_6_16() {
-	eerror
-	eerror "You must enable Kernel Userspace Events in your kernel."
-	eerror "For this you need to enable 'Hotplug' under 'General Setup' and"
-	eerror "basic networking.  They are marked CONFIG_HOTPLUG and CONFIG_NET"
-	eerror "in the config file."
-	eerror
-	ebeep 5
-}
-
-function notify_procfs() {
-	eerror
-	eerror "You must enable the proc filesystem in your kernel."
-	eerror "For this you need to enable '/proc file system support' under"
-	eerror "'Pseudo filesystems' in 'File systems'.  It is marked"
-	eerror "CONFIG_PROC_FS in the config file."
-	eerror
-	ebeep 5
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	kernel_is ge 2 6 15 || die "HAL requires a kernel version 2.6.15 or newer"
-
-	if kernel_is lt 2 6 16 ; then
-		linux_chkconfig_present KOBJECT_UEVENT || notify_uevent
-	else
-		(linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET) \
-			|| notify_uevent_2_6_16
-	fi
-
-	if use acpi ; then
-		linux_chkconfig_present PROC_FS || notify_procfs
-	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}"
-
-	# sony screen brightness patch
-#	epatch "${FILESDIR}"/${PN}-0.5.7-sony-brightness.patch
-
-	# handle ignored volumes properly
-	epatch "${FILESDIR}"/${PN}-0.5.7-ignored-volumes.patch
-
-	# Fix bash in hald scripts
-	epatch "${FILESDIR}"/${PN}-0.5.7-hald-scripts.patch
-
-	# probe partition table
-	epatch "${FILESDIR}"/${PN}-0.5.7-part-table.patch
-
-	# fix pmu support crash
-	epatch "${FILESDIR}"/${PN}-0.5.7-pmu-fix.patch
-
-	# unclean unmount 
-	epatch "${FILESDIR}"/${PN}-0.5.7-unclean-unmount-r1.patch
-
-	# allow plugdev group people to mount
-	epatch "${FILESDIR}"/${PN}-0.5.7-plugdev-allow-send.patch
-
-	# rescan devices on resume
-	epatch "${FILESDIR}"/${PN}-0.5.7-rescan-on-resume.patch
-
-	# detect hibernate-ram script as well
-	epatch "${FILESDIR}"/${PN}-0.5.7-hibernate.patch
-
-	# dbus deprecated dbus_connection_disconnect
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-dbus-close.patch
-}
-
-src_compile() {
-	econf \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-os-type=gentoo \
-		--with-pid-file=/var/run/hald.pid \
-		--enable-hotplug-map \
-		$(use_enable debug verbose-mode) \
-		$(use_enable pcmcia pcmcia-support) \
-		$(use_enable acpi acpi-proc) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable selinux) \
-		|| die "configure failed"
-
-	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-hald.rc hald
-
-	# Script to unmount devices if they are yanked out (from upstream)
-	exeinto /etc/dev.d/default
-	doexe "${FILESDIR}"/hal-unmount.dev
-
-	# We now create and keep /media here as both gnome-mount and pmount
-	# use these directories, to avoid collision.
-	dodir /media
-	keepdir /media
-}
-
-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)
-	enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS} || die "Problem adding haldaemon user"
-
-	# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS}
-	# If users have a problem with this, let them file a bug
-	usermod -G ${HALDAEMON_GROUPS} haldaemon
-
-	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"
-}