fix building with libtool 2.2 and without X

Package-Manager: portage-2.1.5.2

3 files changed, 311 insertions, 2 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 2f472c6b39a9..6796118e2dbd 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.237 2008/05/22 10:52:28 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.238 2008/05/29 02:26:11 compnerd Exp $
+
+*hal-0.5.11-r1 (29 May 2008)
+
+  29 May 2008; Saleem Abdulrasool <compnerd@gentoo.org>
+  +hal-0.5.11-r1.ebuild:
+  Fix building with libtool, optionalize the X dep with the X useflag.
 
   22 May 2008; Tobias Klausmann <klausman@gentoo.org> hal-0.5.11.ebuild:
   Keyworded on alpha, bug #222899
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index f893b416aad9..03675f9ac3b5 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -61,17 +61,20 @@ AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 311
 DIST hal-0.5.10-gentoo-patches-0.tar.bz2 38854 RMD160 5f3cfc320885851f0024cb4543b2a9266fb6bea5 SHA1 134183fe6850e2eebabfb46b446ac592ec147576 SHA256 60775698be0dbe1a9a3507bdc8188a454a03252e59aa68a0700c82bd6aaece66
 DIST hal-0.5.10.tar.gz 1591146 RMD160 fafd90e671dbe95a8dd55a4ad257586a0289ef67 SHA1 8d67499df61590c11fd3203004d69e8a45abb8fa SHA256 5a71a18c40af2bac64f40f0b8add2b6789924b98d7f1cb79a0faf83cb77acb4c
 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.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
 DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad SHA1 32db287e0eff7f4754b89633909daf0f6e957009 SHA256 f28ed6e02df926ef485fff79587856eb0155c747e311d83d1b6b5e3a25b924c2
 DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
 DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 EBUILD hal-0.5.10.ebuild 8245 RMD160 3d949ff211ebff05339129cf9f0d8707ef466f7b SHA1 3c419529a5507fe45e7beb974a6a7dde31959d91 SHA256 fd34e5bc301ae5877a5127db9c49a35e2937caac835cd08e6c43ef6a4697800b
+EBUILD hal-0.5.11-r1.ebuild 9255 RMD160 e381d7b50cd215868e12c578996742468b244848 SHA1 24c369eec92d3145bfaba260645d9ae1eee76eb2 SHA256 9e878b72985f03f988b368c31e9a99257e3d07431a244cf632950f10e4252180
 EBUILD hal-0.5.11.ebuild 9158 RMD160 9e63d242bc1bd50d41d13b37d5fc70f37bb85da1 SHA1 09425612f3dda7b5f383c5b5fec46c285c166c63 SHA256 6c908b6dcb8163754cbf0375a3104b350c5f32a0cb0a4eeb868d659c78fdba30
 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 38357 RMD160 431737110e7d44c0a2f7a36d288be78789e55925 SHA1 2e3b25aa138ce7c49954bc47cf5eefd6ed9b4626 SHA256 764a681c8487348c24277bb0de888fdcba18ad57aaf86e92715c3b260140bbaf
+MISC ChangeLog 38540 RMD160 8f5081298d7eebb5e987a0d4886632dc919e3a0c SHA1 75d11accd48586bebbedecb437fa6335e216a8bb SHA256 63a78cd420f4f154e694a9761fa2b65b5b6a06a21b2b6674c2ecbdaa3a406966
 MISC metadata.xml 1936 RMD160 c9a2cc56d91ca9a12850cbbe68dd36079da0ccae SHA1 a0ccb91c8a4288cc6021ccc0c4c939bd2dad9570 SHA256 e73a89f3e8c110c5bd93a4bcc16c89e97067dfda97b4a4d6dc27330d9b5e51ee
diff --git a/sys-apps/hal/hal-0.5.11-r1.ebuild b/sys-apps/hal/hal-0.5.11-r1.ebuild
new file mode 100644
index 000000000000..b500041fc756
--- /dev/null
+++ b/sys-apps/hal/hal-0.5.11-r1.ebuild
@@ -0,0 +1,300 @@
+# 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-r1.ebuild,v 1.1 2008/05/29 02:26:11 compnerd Exp $
+
+inherit eutils linux-info autotools flag-o-matic
+
+PATCH_VERSION="1"
+
+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-111
+							>=sys-apps/util-linux-2.13
+							>=sys-kernel/linux-headers-2.6.19
+							crypt?	(
+										||	(
+												>=sys-fs/cryptsetup-1.0.5
+												>=sys-fs/cryptsetup-luks-1.0.1
+											)
+									)
+						)
+		 kernel_FreeBSD? ( dev-libs/libvolume_id )
+		 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-doc/doxygen
+					app-text/docbook-sgml-utils
+					app-text/xmlto
+					dev-libs/libxml2
+				)"
+PDEPEND="=app-misc/hal-info-20080310
+		 !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 --enable-omap"
+
+		if use dell ; then
+			hardware="$hardware --with-dell-backlight"
+		else
+			hardware="$hardware --without-dell-backlight"
+		fi
+	else
+		hardware="--without-cpufreq --without-usb-csr --without-keymaps"
+		hardware="$hardware --disable-omap"
+		hardware="$hardware --without-dell-backlight"
+		hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba"
+	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 \
+		  --enable-sonypic \
+		  $(use_enable apm) \
+		  $(use_enable arm pmu) \
+		  $(use_with arm omap) \
+		  $(use_enable debug verbose-mode) \
+		  $(use_enable disk-partition parted) \
+		  $(use_enable doc docbook-docs) \
+		  $(use_enable doc doxygen-docs) \
+		  --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}/${P}-extras/"*.fdi
+		dobin "${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py"
+
+		# Automagic conversion!
+		elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..."
+		"${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi"
+	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
+}