--- hal-0.5.10.ebuild	2007-11-23 07:29:51.000000000 +0100
+++ hal-0.5.10.ebuild	2007-11-23 09:51:02.000000000 +0100
@@ -13,7 +13,7 @@
 KEYWORDS="~amd64 -mips -ppc64 ~x86"
 
 KERNEL_IUSE="kernel_linux kernel_FreeBSD"
-IUSE="acpi apm crypt debug dell disk-partition doc selinux ${KERNEL_IUSE}"
+IUSE="acl acpi apm crypt debug dell disk-partition doc selinux ${KERNEL_IUSE}"
 
 RDEPEND=">=dev-libs/glib-2.6
 		 >=dev-libs/dbus-glib-0.61
@@ -21,8 +21,8 @@
 		 >=sys-apps/pciutils-2.2.7-r1
 		 >=dev-libs/libusb-0.1.10a
 		 >=dev-util/gperf-3.0.3
-		 >=sys-auth/consolekit-0.2
-		 >=sys-auth/policykit-0.6
+		 acl? ( >=sys-auth/consolekit-0.2
+			>=sys-auth/policykit-0.6 )
 		   sys-apps/usbutils
 		   virtual/eject
 		 amd64? ( >=sys-apps/dmidecode-2.7 )
@@ -212,11 +212,11 @@
 		  --with-socket-dir=/var/run/hald \
 		  --enable-umount-helper \
 		  --enable-man-pages \
-		  --enable-policy-kit \
-		  --enable-console-kit \
-		  --enable-acl-management \
 		  --enable-pci \
 		  --enable-sonypic \
+		  $(use_enable acl policy-kit) \
+		  $(use_enable acl console-kit) \
+		  $(use_enable acl acl-management) \
 		  $(use_enable apm) \
 		  $(use_enable arm pmu) \
 		  $(use_enable arm omap) \
@@ -245,6 +245,7 @@
 
 	# initscript
 	newinitd "${FILESDIR}"/0.5.10-hald.rc hald
+	use acl || sed -i -e "s:consolekit::" "${D}"/etc/init.d/hald
 
 	# configuration
 	cp "${FILESDIR}"/0.5.10-hald.conf "${WORKDIR}"/