-> clean up ebuild

Package-Manager: portage-2.0.51.22-r2

3 files changed, 29 insertions, 45 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index adfeefcaedd1..69a820e9f039 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,10 +1,13 @@
 # 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.46 2005/09/05 14:54:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.47 2005/09/05 20:03:09 cardoe Exp $
 
   05 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> hal-0.4.8.ebuild:
   Keyworded ~sparc for the experimental profile
 
+  05 Sep 2005; Doug Goldstein <cardoe@gentoo.org> hal-0.5.4.ebuild:
+  ${D} -> ${ROOT} clean up ebuild
+
 *hal-0.5.4 (27 Aug 2005)
 
   27 Aug 2005; Doug Goldstein <cardoe@gentoo.org> -files/hal-udev-63.patch,
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index bc61cdc08d90..cd3b2c1bf634 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,33 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455
-MD5 83a27ea966965b0a8f5c2339adbdda60 hal-0.5.4.ebuild 4069
+MD5 5a70309e742f7459479a60cb974a8463 ChangeLog 6763
 MD5 c152c92d999551dc07eb64d9aabfc9f7 hal-0.4.8.ebuild 3385
+MD5 2ce20a59c6e5f914b941013f26a41df3 hal-0.5.4.ebuild 3366
 MD5 2cf5b3c9219c87b1d9aee01f4f5f19bb hal-0.4.5-r2.ebuild 3118
-MD5 ee60239284d3d30346bc6ad688614492 ChangeLog 6662
+MD5 1a146b79d18a689bbc8a96b81f74c7f6 hal-0.4.7-r2.ebuild 3455
 MD5 a60767d83157413d549c69b98fac962c metadata.xml 303
-MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
-MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.patch 691
-MD5 442da36fd75002bb8300b0fcb65a1371 files/hal-0.4.5-vat_ntfs_labels.patch 2874
-MD5 c1624c9456f164c1b611e3ab22fb105d files/hal-0.4.7-device_info_leak.patch 2203
-MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
-MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
-MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
-MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670
+MD5 40a7b45f127bfdcacaa142660ad8b5f9 files/0.5-hald.rc 537
 MD5 2bbbb519c89110dfec96cf63cf541afc files/digest-hal-0.4.8 62
-MD5 27cab5d91e93d8b692246d0ce4110122 files/digest-hal-0.5.4 62
 MD5 e3ecbfe57c0833d32f0ea57a0de58aee files/hal-0.4.8-fix_dvdram.patch 465
 MD5 25cb64ec27a48a80126b6de5ff6c3340 files/hal-0.5.1-old_storage_policy.patch 856
+MD5 27cab5d91e93d8b692246d0ce4110122 files/digest-hal-0.5.4 62
+MD5 ada3b2801b82813b4f10fd6f6caf9d6f files/digest-hal-0.4.5-r2 62
+MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
+MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7-r2 62
+MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
 MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817
-MD5 40a7b45f127bfdcacaa142660ad8b5f9 files/0.5-hald.rc 537
 MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429
+MD5 442da36fd75002bb8300b0fcb65a1371 files/hal-0.4.5-vat_ntfs_labels.patch 2874
+MD5 c1624c9456f164c1b611e3ab22fb105d files/hal-0.4.7-device_info_leak.patch 2203
+MD5 64253ef1f2dcf68b2d82429026280085 files/hal-0.4.7-dont_add_device_twice-r1.patch 691
 MD5 58ed07e2de5e898a1e4eeedf595ddb06 files/hal-0.4.7-sys_floppy_detection.patch 568
-MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216
+MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670
+MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHFwpKRy60XGEcJIRAhNgAJkBo1nMbKFBJIq3YD/vkP3rw/i+qQCgiGFe
-F3WSV7aGgS+xzMLLCKKX/YQ=
-=gBPC
+iD8DBQFDHKSdBtvusYtCZMsRAl2MAJwMIc78P9ra5b04+qgO27Gp75NgywCeJzRb
+e/dndPMp8vknsmGE1NKnrr8=
+=+0Of
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.4.ebuild b/sys-apps/hal/hal-0.5.4.ebuild
index d4d99e575a3b..d95a5fd9be12 100644
--- a/sys-apps/hal/hal-0.5.4.ebuild
+++ b/sys-apps/hal/hal-0.5.4.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.4.ebuild,v 1.1 2005/08/27 04:09:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.4.ebuild,v 1.2 2005/09/05 20:03:09 cardoe Exp $
 
-inherit eutils linux-info versionator flag-o-matic
+inherit eutils linux-info
 
 DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
@@ -13,10 +13,6 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
 IUSE="debug pcmcia doc pam_console"
 
-
-### We don't technically "need" pam, but without pam_console, stuff 
-### doesn't work (particularly NetworkManager).
-### dep on a specific util-linux version for managed mount patches #70873
 RDEPEND=">=dev-libs/glib-2.6
 	>=sys-apps/dbus-0.33
 	dev-libs/expat
@@ -35,8 +31,6 @@ DEPEND="${RDEPEND}
 ## HAL Daemon drops privledges so we need group access to read disks
 HALDAEMON_GROUPS="haldaemon,disk,cdrom,cdrw,floppy"
 
-# We need to run at least a 2.6.10 kernel, this is a
-# way to ensure that to some extent
 pkg_setup() {
 
 	linux-info_pkg_setup
@@ -49,7 +43,7 @@ pkg_setup() {
 			die "pam without pam_console detected"
 	fi
 
-	if [ -d ${D}/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."
@@ -67,27 +61,20 @@ src_unpack() {
 }
 
 src_compile() {
-
-	local myconf
-
-	# NOTE: fstab-sync dies at an assert() and is deprecated upstream.
-	# As such, no need to support it.  
 	econf \
-		`use_enable debug verbose-mode` \
-		`use_enable pcmcia pcmcia-support` \
+		$(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` \
+		$(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
@@ -101,15 +88,9 @@ src_install() {
 	# Script to unmount devices if they are yanked out (from upstream)
 	exeinto /etc/dev.d/default
 	doexe ${FILESDIR}/hal-unmount.dev
-
-
 }
 
 pkg_postinst() {
-	##
-	## The old hal ran as root.  This was *very* bad because of all the user IO that HAL does.
-	## The new hal runs as 'haldaemon', but haldaemon needs to be in the appropriate groups to work.
-	## Below is a hack to make this transition (upgrade from previous versions) smooth.
 	## We need to add the user/groups *after* package compilation/installation, so that we
 	## don't change the user without the package being installed.
 	##