revbump for more udev fixes

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc3-git3 i686

3 files changed, 307 insertions, 12 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index c15b1f3344b2..0474a3b49dbf 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.250 2008/09/05 06:29:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.251 2008/09/11 04:32:46 compnerd Exp $
+
+*hal-0.5.11-r3 (11 Sep 2008)
+
+  11 Sep 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +hal-0.5.11-r3.ebuild:
+  Revbump with another patch for udev interface change fallouts
 
   05 Sep 2008; Alexis Ballier <aballier@gentoo.org> hal-0.5.11-r2.ebuild:
   bump libvolume_id requirement for freebsd
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 38157a48e2fc..c1c6e58cb4cf 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
 AUX 0.5.10-hald.conf 119 RMD160 06e205ba7fa8acfb6f68e84a247845a3ad028351 SHA1 c8a62a808c7f632154dda1686fe344a4a136e28f SHA256 b19e6df9c78b6f813405a7cbff20e049714db1a000e6b71ab2eca02d372d58af
 AUX 0.5.10-hald.rc 1111 RMD160 e4b6aaf254a8b909781006151d40060990681412 SHA1 3ab3c81517ee286a6407ff7e068b1ab0e2695fe5 SHA256 6c36fb7d9c2e3f29e9f35332a7ea97ba85d977de4cdd6b355e3a7d6c2b82aca7
@@ -66,6 +63,7 @@ DIST hal-0.5.10.tar.gz 1591146 RMD160 fafd90e671dbe95a8dd55a4ad257586a0289ef67 S
 DIST hal-0.5.11-gentoo-patches-0.tar.bz2 3041 RMD160 2d0141b0dbb0add8e97a8102d0b7e29c43a79d06 SHA1 8dafcbb7a16d13d6e35d65b6686db73f42ef1ee3 SHA256 1e5c93688981b45d912d4332d39d7a6cf87be2b5e5c96231a9c178ee62769220
 DIST hal-0.5.11-gentoo-patches-1.tar.bz2 3941 RMD160 a33c088dbb9dac955870959238fa8292d6dba460 SHA1 c279a44301841a15d9ebef740953e11184f46d99 SHA256 23498d492e2b14749606d94865c70798a3caa47e3385d5aca02ed2f39422a375
 DIST hal-0.5.11-gentoo-patches-2.tar.bz2 5116 RMD160 7d397f9e2a0bc7d707e3788097468e577f0de9f6 SHA1 436b0d610f3945f019e8b826a3e298968eae8c83 SHA256 e824feec0c4482266f1f3b41f298ab7b345ed090e8af6345d1f79a47a4830830
+DIST hal-0.5.11-gentoo-patches-3.tar.bz2 5393 RMD160 651604cfee7664036e9fd96491e4ca4e73e78b4a SHA1 52d4c4157ceacec3f90aef602b2d227f5a5281c1 SHA256 db1ba0031baeaa0330fb876776a069fefd267bbbf61b9434a0fba2cc3e2e9453
 DIST hal-0.5.11.tar.bz2 1281251 RMD160 741cfe82f0bc2d67106b24cfe526a754ab36e45f SHA1 1ddb7895d2ddc2464b553ad11f7ba38860478ae9 SHA256 78a2621209b2db4d71f25fe3a7df7b7dd4b5e866e9c699454b78e611def065cf
 DIST hal-0.5.11.tar.gz 1672992 RMD160 b937e8bec11e0e856d2a8efff58c36f87f9ba9d0 SHA1 f51366229e5dd6d5d72d60114fdef76bf5feba26 SHA256 730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
 DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644 SHA1 233b67e724e68f41ec3f53adcfb7d139328c5813 SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b
@@ -75,18 +73,12 @@ DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SH
 EBUILD hal-0.5.10.ebuild 8248 RMD160 c56d241e26b5482852dd5aed247ba7ac1b41c583 SHA1 4c923eefc4bbc0198b6f9f70b2270a9cfdb71ab7 SHA256 92d43d08a805e5dc2471aaa50b56f353061d49bcd220e29fb5f62d44d18d8e22
 EBUILD hal-0.5.11-r1.ebuild 9159 RMD160 63fe25020dc3330d3b883280c65f1e86d89f225e SHA1 92e8f894d5e7ffa59d9405da5fd08756e6308ec9 SHA256 de17a7078483c35af09e10115a5536c892e34c20dfaaba0834b8f1a1d7c155da
 EBUILD hal-0.5.11-r2.ebuild 9338 RMD160 a2f3187d10bdf1fac7d7b61d0ce4f321be26ab2e SHA1 c921765e05a54d5c792cf0e478b78386e44fd4b4 SHA256 386cc7c7f99894d9ce1665b394464f9557def7e197670821924618ec2a10a98e
+EBUILD hal-0.5.11-r3.ebuild 9338 RMD160 a6d06201cd9456666cbca8f7f186645be22c6120 SHA1 f1261f8d21473b8c514f12e9e595065d5684d180 SHA256 0c89cbc0dcbcf5aeed64c7eacab2f00a119858eb6a3cde502eb0dee4a4a8ca82
 EBUILD hal-0.5.11.ebuild 9067 RMD160 1cbcf4a96e0e60ca93076650cdad77fe1319e351 SHA1 9bcafee905a2e46659275d997bb100e790546c77 SHA256 0a45c5fc921ab371fe98739fd8dbd39d67a8d79aa475348bc479aebf7876880c
 EBUILD hal-0.5.7.1-r5.ebuild 6071 RMD160 60716b2c7ee1a8975437ce7202693d6afe4f4827 SHA1 a5ff8967f35cd274f0332d31375c40a2dc7b0365 SHA256 2d0ad70486b0daea4427e7fe175d2efe83c6b26eb7a65118383c5b612c4276cf
 EBUILD hal-0.5.9-r1.ebuild 8126 RMD160 5fa699350af9035dc46ce28ae47fbbbf1372d73f SHA1 fbb47635761675592f1dab9366d17aca9078bd42 SHA256 0eed38206886b8b27ec7021c5e098e204c6dcb610b5d38cc46928fc94cc8be1d
 EBUILD hal-0.5.9.1-r1.ebuild 7200 RMD160 825b2e12573f0e164fc95c747f883a4ff8fe407d SHA1 c411dd412d4bea656d36b8b5f337d7153c789e23 SHA256 acb2a201f38e6479155270fbbb2bf1866cc5729b0bac0e0ce1e776e5776959e5
 EBUILD hal-0.5.9.1-r2.ebuild 6876 RMD160 44e9c3c9dec8212f35b1b2bc2c29e0379ccfa2e6 SHA1 985e45b257741dcd5906a9af30cab854fc65fbd7 SHA256 9eda880949eb2ffb864102ec240b594be465cf5a5f26180c393bc3ffb0a89fd2
 EBUILD hal-0.5.9.1-r3.ebuild 6866 RMD160 74d77db8e6d4909a01ce886238ff3ea1c38790cb SHA1 830da9dbe53cadeccf4cf53766e39f19fc9f3801 SHA256 0bf9e0b12000ffab6bf9541c140eabfbd22942652bcf1dbf50edcfdd7ff703dc
-MISC ChangeLog 40106 RMD160 9ccdafac3a4456d5aa7b46df262cc7efed8c666e SHA1 11724863d323cb0a8fda601ad11140a977f92810 SHA256 946302f2dc8ec3a6a84bf5ddb3e090ed1d3ea7810e7b5d817058d6407687818c
+MISC ChangeLog 40282 RMD160 c5cf43a19566dec6b16a12c6f62625723175fbb1 SHA1 914b65378ef142adc31b26809012258bef775b22 SHA256 a3f489f0483600bc74b53a0e73c7af3b0715c22a386682b87338fe076b47f55b
 MISC metadata.xml 2117 RMD160 b71094e3b086495c13fb59821096e055dab9ea57 SHA1 9c00ef716aaaa6db8dd389c58cc1631b9c68a199 SHA256 d70d7e6244bd2c73d835612df8b21b22990ca79cf83c2cbf5df8ec2abcb27855
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjA0cQACgkQvFcC4BYPU0rlaACeKhxatqip7XgpgkKokvh3I67B
-oR4AniVyGGxLB/86e0h7eNHZzg38wEX+
-=RckV
------END PGP SIGNATURE-----
diff --git a/sys-apps/hal/hal-0.5.11-r3.ebuild b/sys-apps/hal/hal-0.5.11-r3.ebuild
new file mode 100644
index 000000000000..44f8e82553ea
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.11-r3.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r3.ebuild,v 1.1 2008/09/11 04:32:46 compnerd Exp $
+
+inherit eutils linux-info autotools flag-o-matic
+
+PATCH_VERSION="3"
+
+DESCRIPTION="Hardware Abstraction Layer"
+HOMEPAGE="http://www.freedesktop.org/Software/hal"
+SRC_URI="http://hal.freedesktop.org/releases/${P/_/}.tar.bz2
+		 http://dev.gentoo.org/~compnerd/files/${PN}/${P}-gentoo-patches-${PATCH_VERSION}.tar.bz2"
+
+LICENSE="|| ( GPL-2 AFL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
+
+KERNEL_IUSE="kernel_linux kernel_FreeBSD"
+IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
+
+RDEPEND=">=dev-libs/dbus-glib-0.61
+		 >=dev-libs/glib-2.14
+		 >=dev-libs/expat-1.95.8
+		 >=dev-libs/libusb-0.1.10a
+		 >=sys-apps/pciutils-2.2.7-r1
+		 >=dev-util/gperf-3.0.3
+		   sys-apps/usbutils
+		   virtual/eject
+		 amd64? ( >=sys-apps/dmidecode-2.7 )
+		 dell? ( >=sys-libs/libsmbios-0.13.4 )
+		 disk-partition? ( >=sys-apps/parted-1.8.0 )
+		 ia64? ( >=sys-apps/dmidecode-2.7 )
+		 kernel_linux?	(
+							>=sys-fs/udev-117
+							>=sys-apps/util-linux-2.13
+							>=sys-kernel/linux-headers-2.6.19
+							crypt?	( >=sys-fs/cryptsetup-1.0.5 )
+						)
+		 kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 )
+		 x86? ( >=sys-apps/dmidecode-2.7 )
+		 selinux? ( sys-libs/libselinux sec-policy/selinux-hal )"
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		>=dev-util/intltool-0.35
+		X? ( >=dev-python/pyxf86config-0.3.34-r1 )
+		doc?	(
+					app-text/xmlto
+					dev-libs/libxml2
+					dev-util/gtk-doc
+					app-text/docbook-sgml-utils
+				)"
+PDEPEND="|| ( =app-misc/hal-info-20080310 =app-misc/hal-info-20080508 )
+		 !gnome-extra/hal-device-manager
+		 laptop? ( >=sys-power/pm-utils-0.99.3 )"
+
+## 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 check_hotplug_net() {
+	local CONFIG_CHECK="~HOTPLUG ~NET"
+	local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n"
+	local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_inotify() {
+	local CONFIG_CHECK="~INOTIFY_USER"
+	local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+function check_acpi_proc() {
+	local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT"
+	local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n"
+	local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n"
+	check_extra_config
+}
+
+pkg_setup() {
+	if use kernel_linux ; then
+		if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then
+			kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer"
+
+			if kernel_is lt 2 6 23 && use acpi ; then
+				check_acpi_proc
+			fi
+		fi
+
+		check_hotplug_net
+		check_inotify
+	fi
+
+	# http://devmanual.gentoo.org/ebuild-writing/functions/
+	# http://bugs.gentoo.org/show_bug.cgi?id=191605
+
+	# 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
+}
+
+S="${WORKDIR}/${PF/-r*/}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	eautoreconf
+}
+
+src_compile() {
+	local acpi="$(use_enable acpi)"
+	local backend=
+	local hardware=
+
+	append-flags -rdynamic
+
+	if use kernel_linux ; then
+		backend="linux"
+	elif use kernel_FreeBSD ; then
+		backend="freebsd"
+	else
+		eerror "Invalid backend"
+	fi
+
+	if use kernel_linux ; then
+		if use acpi ; then
+			# Using IBM ACPI and Toshiba ACPI results in double notification as this
+			# was merged into the Linux Kernel 2.6.22
+			if kernel_is lt 2 6 22 ; then
+				acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba"
+			else
+				acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			fi
+
+			acpi="$acpi --enable-acpi-proc --enable-acpi-acpid"
+		else
+			acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba"
+			acpi="$acpi --disable-acpi-proc --disable-acpi-acpid"
+		fi
+
+		hardware="--with-cpufreq --with-usb-csr --with-keymaps"
+		use arm && hardware="$hardware --with-omap"
+
+		if use dell ; then
+			hardware="$hardware --with-dell-backlight"
+		else
+			hardware="$hardware --without-dell-backlight"
+		fi
+
+		hardware="$hardware --enable-sonypic"
+	else
+		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
+		hardware="$hardware --without-omap"
+		hardware="$hardware --without-dell-backlight"
+		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
+		hardware="$hardware --disable-sonypic"
+	fi
+
+	econf --with-backend=${backend} \
+		  --with-os-type=gentoo \
+		  --with-pid-file=/var/run/hald.pid \
+		  --with-hwdata=/usr/share/misc \
+		  --with-socket-dir=/var/run/hald \
+		  --enable-umount-helper \
+		  --enable-man-pages \
+		  --disable-policy-kit \
+		  --disable-console-kit \
+		  --disable-acl-management \
+		  --enable-pci \
+		  $(use_enable apm) \
+		  $(use_enable arm pmu) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc gtk-doc) \
+		  --docdir=/usr/share/doc/${PF} \
+		  --localstatedir=/var \
+		  ${acpi} ${hardware} \
+	|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	# hal umount for unclean unmounts
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/hal-unmount.dev" hal_unmount
+
+	# initscript
+	newinitd "${FILESDIR}/0.5.10-hald.rc" hald
+
+	# configuration
+	cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/"
+
+	if use debug; then
+		sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \
+			-i "${WORKDIR}/0.5.10-hald.conf"
+	fi
+	newconfd "${WORKDIR}/0.5.10-hald.conf" hald
+
+	if use X ; then
+		# New Configuration Snippets
+		dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || die
+		dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || die
+
+		# Automagic conversion!
+		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..."
+		"${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \
+			ewarn "Failed to migrate your keyboard configuration."
+	fi
+
+	# 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
+	keepdir /var/lib/hal
+}
+
+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/
+
+	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"
+	echo
+	elog "IF you have additional applications which consume ACPI events, you"
+	elog "should consider installing acpid to allow applications to share ACPI"
+	elog "events."
+	if use X ; then
+		echo
+		elog "If you wish to use a non US layout, you may do so by executing:"
+		elog "setxkbmap <layout> or by utilizing your Desktop Environment's"
+		elog "Keyboard Layout Settings mechanism."
+		elog "Under GNOME, this is gnome-keyboard-properties, and under KDE"
+		elog "it is kxkb."
+	fi
+	echo
+	elog "In order have suspend/hibernate function with HAL or apps that use HAL"
+	elog "(such as gnome-power-manager), you should build HAL with the laptop"
+	elog "useflag which will install pm-utils."
+	if use X ; then
+		echo
+		elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)"
+		elog "reads user specific configuration from /etc/hal/fdi/policy/."
+		if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]]
+		then
+			elog "We have converted your existing xorg.conf rules and the FDI is stored"
+			elog "at /etc/hal/fdi/policy/10-x11-input.fdi"
+		fi
+		elog "You should remove the Input sections from your xorg.conf once you have"
+		elog "migrated the rules to a HAL fdi file."
+	fi
+
+	ebeep 5
+	epause 5
+}