ebuild clean ups

(Portage version: 2.1_pre1)

9 files changed, 26 insertions, 410 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index c5f67d9d3e11..0bb2ce634072 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.58 2005/12/16 15:57:32 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.59 2005/12/21 09:41:19 cardoe Exp $
+
+  21 Dec 2005; Doug Goldstein <cardoe@gentoo.org> files/0.5-hald.rc,
+  -hal-0.4.5-r2.ebuild, -hal-0.5.4.ebuild, -hal-0.5.5.1.ebuild,
+  hal-0.5.5.1-r1.ebuild:
+  ebuild clean ups
 
 *hal-0.5.5.1-r1 (16 Dec 2005)
 
diff --git a/sys-apps/hal/files/0.5-hald.rc b/sys-apps/hal/files/0.5-hald.rc
index 7a3ca0ba5242..38a182c6c236 100755
--- a/sys-apps/hal/files/0.5-hald.rc
+++ b/sys-apps/hal/files/0.5-hald.rc
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5-hald.rc,v 1.1 2005/08/18 07:19:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5-hald.rc,v 1.2 2005/12/21 09:41:20 cardoe Exp $
 
 depend() {
-	need dbus hotplug
+	need dbus
 }
 
 start() {
diff --git a/sys-apps/hal/files/digest-hal-0.4.5-r2 b/sys-apps/hal/files/digest-hal-0.4.5-r2
deleted file mode 100644
index c4ca2b2c74d4..000000000000
--- a/sys-apps/hal/files/digest-hal-0.4.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 780d0bf4849c83ea4f8ab9b4102229c2 hal-0.4.5.tar.gz 1343158
diff --git a/sys-apps/hal/files/digest-hal-0.5.4 b/sys-apps/hal/files/digest-hal-0.5.4
deleted file mode 100644
index f7981d006cfc..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f84ddbc22bc35baa9388e7794d1fa31 hal-0.5.4.tar.gz 1476396
diff --git a/sys-apps/hal/files/digest-hal-0.5.5.1 b/sys-apps/hal/files/digest-hal-0.5.5.1
deleted file mode 100644
index 9dfb57f4441c..000000000000
--- a/sys-apps/hal/files/digest-hal-0.5.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2abd81ed3f5a37789f4fbda2f6a61270 hal-0.5.5.1.tar.gz 1517882
diff --git a/sys-apps/hal/hal-0.4.5-r2.ebuild b/sys-apps/hal/hal-0.4.5-r2.ebuild
deleted file mode 100644
index 2a0252c834a1..000000000000
--- a/sys-apps/hal/hal-0.4.5-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.5-r2.ebuild,v 1.12 2005/06/07 19:33:11 beu Exp $
-
-inherit eutils python linux-info versionator flag-o-matic
-
-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="amd64 ia64 ppc ppc64 x86"
-IUSE="debug pcmcia doc livecd"
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=sys-apps/dbus-0.22-r1
-	dev-libs/expat
-	sys-fs/udev
-	sys-apps/hotplug
-	sys-libs/libcap
-	dev-libs/popt
-	>=sys-apps/util-linux-2.12i
-	>=sys-kernel/linux-headers-2.6"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( app-doc/doxygen )"
-# dep on a specific util-linux version for 
-# managed mount patches #70873
-
-# We need to run at least a 2.6.10 kernel, this is a
-# way to ensure that to some extent
-pkg_setup() {
-	use livecd && return
-	linux-info_pkg_setup
-	kernel_is ge 2 6 10 \
-		|| die "You need a 2.6.10 or newer kernel to build this package"
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# remove pamconsole option
-	epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch
-	# pick up the gentoo usermap
-	epatch ${FILESDIR}/${P}-gentoo_gphoto2_usermap.patch
-	# fix issues with certain misbehaving kernel drivers (#78564)
-	cd ${S}/hald/linux
-	epatch ${FILESDIR}/${P}-net_lockup.patch
-	cd ${S}/hald/linux/volume_id
-	epatch ${FILESDIR}/${P}-vat_ntfs_labels.patch
-
-}
-
-src_compile() {
-
-	# use sysfs stuff added in 2.6.10 kernel
-	append-flags -DSYSFS_CARRIER_ENABLE
-
-	# FIXME : docs
-	econf \
-		`use_enable debug verbose-mode` \
-		`use_enable pcmcia pcmcia-support` \
-		--enable-fstab-sync \
-		--enable-hotplug-map \
-		--disable-docbook-docs \
-		`use_enable doc doxygen-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 should be considered a security risk."
-	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\`"
-
-}
diff --git a/sys-apps/hal/hal-0.5.4.ebuild b/sys-apps/hal/hal-0.5.4.ebuild
deleted file mode 100644
index b486211a0c93..000000000000
--- a/sys-apps/hal/hal-0.5.4.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.8 2005/12/14 07:04:06 cardoe Exp $
-
-inherit eutils linux-info
-
-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 ~amd64 ~ia64 ~ppc ~ppc64 ~sparc"
-IUSE="debug pcmcia doc pam_console"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=sys-apps/dbus-0.33
-	dev-libs/expat
-	>=sys-fs/udev-063
-	sys-apps/hotplug
-	>=sys-apps/util-linux-2.12i
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	dev-libs/libusb
-	pam_console? ( sys-libs/pam )"
-
-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,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
-
-	die "KOBJECT_UEVENT is not set"
-}
-
-pkg_setup() {
-
-	linux-info_pkg_setup
-	kernel_is ge 2 6 10 \
-		|| die "You need a 2.6.10 or newer kernel to run this package"
-
-	linux_chkconfig_present KOBJECT_UEVENT \
-		|| notify_uevent
-
-	if use pam_console && ! built_with_use sys-libs/pam pam_console ; then
-			eerror "You need to build pam with pam_console support"
-			eerror "Please remerge sys-libs/pam with USE=pam_console"
-			die "pam without pam_console detected"
-	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}
-	# remove pamconsole option
-	use pam_console || epatch ${FILESDIR}/${PN}-0.5.1-old_storage_policy.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug verbose-mode) \
-		$(use_enable pcmcia pcmcia-support) \
-		--enable-sysfs-carrier \
-		--enable-hotplug-map \
-		$(use_enable doc docbook-docs) \
-		$(use_enable doc doxygen-docs) \
-		--with-pid-file=/var/run/hald.pid \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-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
-	newinitd ${FILESDIR}/0.5-hald.rc hald
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-
-	# Script to unmount devices if they are yanked out (from upstream)
-	exeinto /etc/dev.d/default
-	doexe ${FILESDIR}/hal-unmount.dev
-}
-
-pkg_postinst() {
-	## We need to add the user/groups *after* package compilation/installation, so that we
-	## don't change the user without the package being installed.
-	##
-	enewgroup haldaemon || die "Problem adding haldaemon 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
-
-	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\`"
-
-	ewarn
-	ewarn "If you are upgrading from a previous version of hal you should run"
-	ewarn "revdep-rebuild to find any programs which were built against the old"
-	ewarn "version and then rebuild them.  Not doing so may result in a broken"
-	ewarn "system."
-	ewarn
-}
diff --git a/sys-apps/hal/hal-0.5.5.1-r1.ebuild b/sys-apps/hal/hal-0.5.5.1-r1.ebuild
index 0b2fd7bee5cf..d8d70d836353 100644
--- a/sys-apps/hal/hal-0.5.5.1-r1.ebuild
+++ b/sys-apps/hal/hal-0.5.5.1-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1-r1.ebuild,v 1.1 2005/12/16 15:57:32 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1-r1.ebuild,v 1.2 2005/12/21 09:41:19 cardoe Exp $
 
-inherit eutils linux-info
+inherit eutils linux-info debug
 
 DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
@@ -48,8 +48,9 @@ pkg_setup() {
 	kernel_is ge 2 6 13 \
 		|| die "You need a 2.6.13 or newer kernel to run this package"
 
-	linux_chkconfig_present KOBJECT_UEVENT \
-		|| notify_uevent
+	if [ kernel_is le 2 6 15 ]; then
+		linux_chkconfig_present KOBJECT_UEVENT || notify_uevent
+	fi
 
 	if use acpi ; then
 		linux_chkconfig_present PROC_FS \
@@ -62,7 +63,7 @@ pkg_setup() {
 			die "pam without pam_console detected"
 	fi
 
-	if [ -d ${ROOT}/etc/hal/device.d ]; then
+	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."
@@ -73,12 +74,12 @@ pkg_setup() {
 
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-RBC.patch
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-RBC.patch
 
 	# remove pamconsole option
-	use pam_console || epatch ${FILESDIR}/${PN}-0.5.1-old_storage_policy.patch
+	use pam_console || epatch "${FILESDIR}"/${PN}-0.5.1-old_storage_policy.patch
 }
 
 src_compile() {
@@ -96,34 +97,28 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	# We install this in a seperate package to avoid gnome-python dep
-	rm ${D}/usr/bin/hal-device-manager
+	rm "${D}"/usr/bin/hal-device-manager
 
 	# initscript
-	newinitd ${FILESDIR}/0.5-hald.rc hald
+	newinitd "${FILESDIR}"/0.5-hald.rc hald
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
 
 	# Script to unmount devices if they are yanked out (from upstream)
 	exeinto /etc/dev.d/default
-	doexe ${FILESDIR}/hal-unmount.dev
+	doexe "${FILESDIR}"/hal-unmount.dev
 }
 
-pkg_postinst() {
-	## We need to add the user/groups *after* package compilation/installation, so that we
-	## don't change the user without the package being installed.
-	##
+pkg_preinst() {
 	enewgroup haldaemon || die "Problem adding haldaemon 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
+	enewuser haldaemon -1 "-1" -1 ${HALDAEMON_GROUPS} || die "Problem adding haldaemon user"
 	usermod -G ${HALDAEMON_GROUPS} haldaemon
+}
 
+pkg_postinst() {
 	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 :"
diff --git a/sys-apps/hal/hal-0.5.5.1.ebuild b/sys-apps/hal/hal-0.5.5.1.ebuild
deleted file mode 100644
index d776711626bc..000000000000
--- a/sys-apps/hal/hal-0.5.5.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.5.1.ebuild,v 1.3 2005/12/14 07:04:06 cardoe Exp $
-
-inherit eutils linux-info
-
-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 ~amd64 ~ia64 ~ppc ~ppc64 ~sparc"
-IUSE="acpi debug doc pam_console pcmcia"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=sys-apps/dbus-0.50
-	>=sys-fs/udev-071
-	>=sys-apps/util-linux-2.12i
-	|| ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
-	dev-libs/expat
-	dev-libs/libusb
-	sys-apps/hotplug
-	pam_console? ( sys-libs/pam )"
-
-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,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
-
-	die "KOBJECT_UEVENT is not set"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	kernel_is ge 2 6 13 \
-		|| die "You need a 2.6.13 or newer kernel to run this package"
-
-	linux_chkconfig_present KOBJECT_UEVENT \
-		|| notify_uevent
-
-	if use acpi ; then
-		linux_chkconfig_present PROC_FS \
-			|| die "ACPI support requires PROC_FS support in kernel"
-	fi
-
-	if use pam_console && ! built_with_use sys-libs/pam pam_console ; then
-			eerror "You need to build pam with pam_console support"
-			eerror "Please remerge sys-libs/pam with USE=pam_console"
-			die "pam without pam_console detected"
-	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}
-	# remove pamconsole option
-	use pam_console || epatch ${FILESDIR}/${PN}-0.5.1-old_storage_policy.patch
-}
-
-src_compile() {
-	econf \
-		--with-os-type=gentoo \
-		--with-pid-file=/var/run/hald.pid \
-		$(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) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-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
-	newinitd ${FILESDIR}/0.5-hald.rc hald
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-
-	# Script to unmount devices if they are yanked out (from upstream)
-	exeinto /etc/dev.d/default
-	doexe ${FILESDIR}/hal-unmount.dev
-}
-
-pkg_postinst() {
-	## We need to add the user/groups *after* package compilation/installation, so that we
-	## don't change the user without the package being installed.
-	##
-	enewgroup haldaemon || die "Problem adding haldaemon 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
-
-	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\`"
-}