diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2007-08-01 13:40:16 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2007-08-01 13:40:16 +0000 |
commit | 890220afacae0aab18e1e760b927e0a8b2e32c70 (patch) | |
tree | 3b4f72cdc00335331d4352c93df900484971aa6f /sys-apps/hal | |
parent | Marking 7.1.042 ppc and ppc64 stable for bug 185677 (diff) | |
download | gentoo-2-890220afacae0aab18e1e760b927e0a8b2e32c70.tar.gz gentoo-2-890220afacae0aab18e1e760b927e0a8b2e32c70.tar.bz2 gentoo-2-890220afacae0aab18e1e760b927e0a8b2e32c70.zip |
ingore sun disklabel partition. remove old versions
(Portage version: 2.1.3_rc9)
Diffstat (limited to 'sys-apps/hal')
-rw-r--r-- | sys-apps/hal/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch | 22 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.5.7.1-r3 | 3 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.5.9 | 3 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.5.9.1 | 3 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.5.7.1-r3.ebuild | 203 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.5.9.1-r1.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.5.9.1.ebuild | 241 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.5.9.ebuild | 235 |
9 files changed, 30 insertions, 690 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index c83c569bd232..9a37975aec70 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.198 2007/07/26 19:27:09 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.199 2007/08/01 13:40:16 cardoe Exp $ + + 01 Aug 2007; Doug Goldstein <cardoe@gentoo.org> + +files/0.5.9/99_sun_disklabel_ignore.patch, -hal-0.5.7.1-r3.ebuild, + -hal-0.5.9.ebuild, -hal-0.5.9.1.ebuild, hal-0.5.9.1-r1.ebuild: + ingore sun disklabel partition. remove old versions *hal-0.5.9.1-r1 (26 Jul 2007) diff --git a/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch b/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch new file mode 100644 index 000000000000..451ab4fb0abf --- /dev/null +++ b/sys-apps/hal/files/0.5.9/99_sun_disklabel_ignore.patch @@ -0,0 +1,22 @@ +Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi +=================================================================== +--- a/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi 2007-07-27 12:26:05.000000000 -0400 ++++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi 2007-07-27 12:26:22.000000000 -0400 +@@ -16,4 +16,17 @@ + </match> + </match> + </device> ++ ++ <!-- sun disklabel --> ++ <device> ++ <match key="volume.fsusage" string="filesystem"> ++ <match key="volume.partition.number" int="3"> ++ <match key="volume.partition.start" uint64="0"> ++ <match key="@block.storage_device:storage.size" uint64="@volume.size"> ++ <merge key="volume.ignore" type="bool">true</merge> ++ </match> ++ </match> ++ </match> ++ </match> ++ </device> + </deviceinfo> diff --git a/sys-apps/hal/files/digest-hal-0.5.7.1-r3 b/sys-apps/hal/files/digest-hal-0.5.7.1-r3 deleted file mode 100644 index 3042516ecf0a..000000000000 --- a/sys-apps/hal/files/digest-hal-0.5.7.1-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d7a7741808ba130f8aff3f5d3b5689e4 hal-0.5.7.1.tar.gz 1503156 -RMD160 2861818b29546bd3628b1bda3d41238cf644c644 hal-0.5.7.1.tar.gz 1503156 -SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b hal-0.5.7.1.tar.gz 1503156 diff --git a/sys-apps/hal/files/digest-hal-0.5.9 b/sys-apps/hal/files/digest-hal-0.5.9 deleted file mode 100644 index bf095eb8f645..000000000000 --- a/sys-apps/hal/files/digest-hal-0.5.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a6f532770cf9286e1de38d6570cbc6bc hal-0.5.9.tar.gz 1587364 -RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 hal-0.5.9.tar.gz 1587364 -SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d hal-0.5.9.tar.gz 1587364 diff --git a/sys-apps/hal/files/digest-hal-0.5.9.1 b/sys-apps/hal/files/digest-hal-0.5.9.1 deleted file mode 100644 index 1964bb97ee92..000000000000 --- a/sys-apps/hal/files/digest-hal-0.5.9.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6a40f49f964e64358e53652038f3059f hal-0.5.9.1.tar.gz 1596347 -RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f hal-0.5.9.1.tar.gz 1596347 -SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b hal-0.5.9.1.tar.gz 1596347 diff --git a/sys-apps/hal/hal-0.5.7.1-r3.ebuild b/sys-apps/hal/hal-0.5.7.1-r3.ebuild deleted file mode 100644 index 3b300dc3a925..000000000000 --- a/sys-apps/hal/hal-0.5.7.1-r3.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r3.ebuild,v 1.14 2007/07/08 05:58:39 mr_bones_ 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="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" -IUSE="acpi crypt debug doc dmi pcmcia selinux" - -RDEPEND=">=dev-libs/glib-2.6 - || ( >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-0.60 ) - >=sys-fs/udev-083 - >=sys-apps/util-linux-2.12r - || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 ) - dev-libs/expat - sys-libs/libcap - sys-apps/pciutils - dev-libs/libusb - virtual/eject - dmi? ( >=sys-apps/dmidecode-2.7 ) - crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) - selinux? ( sys-libs/libselinux )" - -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,plugdev,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 -} - -function notify_uevent_2_6_16() { - eerror - eerror "You must enable Kernel Userspace Events in your kernel." - eerror "For this you need to enable 'Hotplug' under 'General Setup' and" - eerror "basic networking. They are marked CONFIG_HOTPLUG and CONFIG_NET" - eerror "in the config file." - eerror - ebeep 5 -} - -function notify_procfs() { - eerror - eerror "You must enable the proc filesystem in your kernel." - eerror "For this you need to enable '/proc file system support' under" - eerror "'Pseudo filesystems' in 'File systems'. It is marked" - eerror "CONFIG_PROC_FS in the config file." - eerror - ebeep 5 -} - -pkg_setup() { - get_version || eerror "Unable to calculate Linux Kernel version" - - kernel_is ge 2 6 15 || eerror "HAL requires a kernel version 2.6.15 or newer" - - if kernel_is lt 2 6 16 ; then - linux_chkconfig_present KOBJECT_UEVENT || notify_uevent - else - (linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET) \ - || notify_uevent_2_6_16 - fi - - if use acpi ; then - linux_chkconfig_present PROC_FS || notify_procfs - 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}" - - # handle ignored volumes properly - epatch "${FILESDIR}"/${PN}-0.5.7.1-ignored-volumes.patch - - # Fix bash in hald scripts - epatch "${FILESDIR}"/${PN}-0.5.7-hald-scripts.patch - - # probe partition table - epatch "${FILESDIR}"/${PN}-0.5.7-part-table.patch - - # fix pmu support crash - epatch "${FILESDIR}"/${PN}-0.5.7-pmu-fix.patch - - # unclean unmount - epatch "${FILESDIR}"/${PN}-0.5.7-unclean-unmount-r1.patch - - # allow plugdev group people to mount - epatch "${FILESDIR}"/${PN}-0.5.7-plugdev-allow-send.patch - - # rescan devices on resume - epatch "${FILESDIR}"/${PN}-0.5.7-rescan-on-resume.patch - - # detect hibernate-ram script as well - epatch "${FILESDIR}"/${PN}-0.5.7-hibernate.patch - - # dbus deprecated dbus_connection_disconnect - epatch "${FILESDIR}"/${PN}-0.5.7.1-dbus-close.patch - - # sr driver fix - epatch "${FILESDIR}"/${PN}-0.5.7.1-sr-driver.patch - - # hibernate sequence fix - epatch "${FILESDIR}"/${PN}-0.5.7.1-hibernate-fix.patch -} - -src_compile() { - if [ -r "${ROOT}/usr/share/misc/pci.ids.gz" ] ; then - hwdata="${ROOT}/usr/share/misc/pci.ids.gz" - elif [ -r "${ROOT}/usr/share/misc/pci.ids" ] ; then - hwdata="${ROOT}/usr/share/misc/pci.ids" - else - die "pci.ids file not found. please file a bug @ bugs.gentoo.org" - fi - - econf \ - --with-doc-dir=/usr/share/doc/${PF} \ - --with-os-type=gentoo \ - --with-pid-file=/var/run/hald.pid \ - --with-hwdata=${hwdata} \ - --enable-hotplug-map \ - $(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) \ - $(use_enable selinux) \ - || die "configure failed" - - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README - - # remove dep on gnome-python - mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/ - - # hal umount for unclean unmounts - exeinto /lib/udev/ - newexe "${FILESDIR}"/hal-unmount.dev hal_unmount - - # initscript - newinitd "${FILESDIR}"/0.5-hald.rc hald - - # Script to unmount devices if they are yanked out (from upstream) - exeinto /etc/dev.d/default - doexe "${FILESDIR}"/hal-unmount.dev - - # We now create and keep /media here as both gnome-mount and pmount - # use these directories, to avoid collision. - dodir /media - keepdir /media -} - -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/ - - # 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) - 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 - - 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" -} diff --git a/sys-apps/hal/hal-0.5.9.1-r1.ebuild b/sys-apps/hal/hal-0.5.9.1-r1.ebuild index 13a3d2033fba..fa715424ed03 100644 --- a/sys-apps/hal/hal-0.5.9.1-r1.ebuild +++ b/sys-apps/hal/hal-0.5.9.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.1 2007/07/26 19:27:09 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1-r1.ebuild,v 1.2 2007/08/01 13:40:16 cardoe Exp $ inherit eutils linux-info autotools flag-o-matic @@ -119,6 +119,7 @@ src_unpack() { epatch ${FILESDIR}/0.5.9/96_plugdev_allow_send.patch epatch ${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch epatch ${FILESDIR}/0.5.9/98_hald_cache_test_path.patch + epatch ${FILESDIR}/0.5.9/99_sun_disklabel_ignore.patch eautoreconf } diff --git a/sys-apps/hal/hal-0.5.9.1.ebuild b/sys-apps/hal/hal-0.5.9.1.ebuild deleted file mode 100644 index b7b01565ca1d..000000000000 --- a/sys-apps/hal/hal-0.5.9.1.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.1.ebuild,v 1.5 2007/07/10 12:52:55 armin76 Exp $ - -inherit eutils linux-info autotools flag-o-matic - -DESCRIPTION="Hardware Abstraction Layer" -HOMEPAGE="http://www.freedesktop.org/Software/hal" -SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz" - -LICENSE="|| ( GPL-2 AFL-2.0 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -KERNEL_IUSE="kernel_linux kernel_FreeBSD" -IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}" - -RDEPEND=">=dev-libs/glib-2.6 - >=dev-libs/dbus-glib-0.61 - kernel_linux? ( >=sys-fs/udev-104 ) - kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 ) - kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 ) - kernel_FreeBSD? ( dev-libs/libvolume_id ) - >=dev-libs/expat-1.95.8 - >=sys-apps/pciutils-2.2.3 - >=dev-libs/libusb-0.1.10a - sys-apps/usbutils - virtual/eject - amd64? ( >=sys-apps/dmidecode-2.7 ) - x86? ( >=sys-apps/dmidecode-2.7 ) - ia64? ( >=sys-apps/dmidecode-2.7 ) - dell? ( >=sys-libs/libsmbios-0.13.4 ) - disk-partition? ( >=sys-apps/parted-1.7.1 ) - kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) ) - selinux? ( sys-libs/libselinux - sec-policy/selinux-hal )" -# pam? ( sys-auth/consolekit )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35 - doc? ( app-doc/doxygen - app-text/docbook-sgml-utils - app-text/xmlto )" - -PDEPEND="app-misc/hal-info" - -## 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 notify_uevent() { - ewarn - ewarn "You must enable Kernel Userspace Events in your kernel." - ewarn "For this you need to enable 'Hotplug' under 'General Setup' and" - ewarn "basic networking. They are marked CONFIG_HOTPLUG and CONFIG_NET" - ewarn "in the config file." - ewarn - ebeep 5 -} - -function notify_procfs() { - ewarn - ewarn "You must enable the proc filesystem in your kernel." - ewarn "For this you need to enable '/proc file system support' under" - ewarn "'Pseudo filesystems' in 'File systems'. It is marked" - ewarn "CONFIG_PROC_FS in the config file." - ewarn - ebeep 5 -} - -function notify_inotify() { - ewarn - ewarn "You must enable the Inotify system in your kernel." - ewarn "For this you need to enable 'Inotify support for userspace'" - ewarn "in 'File systems'. It is marked CONFIG_INOTIFY_USER in the config file." - ewarn - ebeep 5 -} - -pkg_setup() { - if built_with_use --missing false sys-apps/pciutils zlib ; then - eerror "You MUST build sys-apps/pciutils without the zlib USE flag" - die "You MUST build sys-apps/pciutils without the zlib USE flag" - fi - - if use kernel_linux; then - kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer" - - if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET ) - then - notify_uevent - fi - - linux_chkconfig_present INOTIFY_USER || notify_inotify - - if use acpi ; then - linux_chkconfig_present PROC_FS || notify_procfs - fi - 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} - - # Gentoo patchset - epatch ${FILESDIR}/0.5.9/07_malloc_h_for_stdlib_h.patch - #epatch ${FILESDIR}/0.5.9/95_gentoo_man_page.patch - epatch ${FILESDIR}/0.5.9/96_plugdev_allow_send.patch - epatch ${FILESDIR}/0.5.9/97_ignore_fixed_drives.patch - epatch ${FILESDIR}/0.5.9/98_hald_cache_test_path.patch - - eautoreconf -} - -src_compile() { - local backend="" - local acpi="" - - # TODO :: policykit should have a pam useflag - append-flags -rdynamic - - if use kernel_linux ; then - backend="linux" - use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm" - elif use kernel_FreeBSD ; then - backend="freebsd" - else - eerror "Invalid backend" - fi - - if ! use acpi ; then - acpi="--disable-acpi-proc --disable-acpi-acpid" - fi - - econf --disable-policy-kit \ - --docdir=/usr/share/doc/${PF} \ - --with-os-type=gentoo \ - --with-pid-file=/var/run/hald.pid \ - --with-socket-dir=/var/run/hald \ - --with-hwdata=/usr/share/misc \ - --enable-hotplug-map \ - --enable-man-pages \ - --with-backend=${backend} \ - $(use_enable debug verbose-mode) \ - $(use_with dell dell-backlight) \ - $(use_enable disk-partition parted) \ - $(use_enable pcmcia pcmcia-support) \ - $(use_enable doc docbook-docs) \ - $(use_enable doc doxygen-docs) \ - $(use_enable selinux) \ - --disable-console-kit \ - ${acpi} \ - || die "configure failed" -#$(use_enable pam console-kit) - - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README - - # remove dep on gnome-python - mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/ - - # hal umount for unclean unmounts - exeinto /lib/udev/ - newexe "${FILESDIR}"/hal-unmount.dev hal_unmount - - # initscript - newinitd "${FILESDIR}"/0.5.9-hald.rc hald - cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/ -# if use pam; then -# sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf -# fi - if use debug; then - sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ - -i "${WORKDIR}"/0.5.9-hald.conf - fi - newconfd "${WORKDIR}"/0.5.9-hald.conf hald - - # 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 -} - -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/ - - # 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 - - 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" -} diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild deleted file mode 100644 index dc42ca4fadc4..000000000000 --- a/sys-apps/hal/hal-0.5.9.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.28 2007/06/28 23:19:25 vapier Exp $ - -inherit eutils linux-info autotools flag-o-matic - -DESCRIPTION="Hardware Abstraction Layer" -HOMEPAGE="http://www.freedesktop.org/Software/hal" -SRC_URI="http://people.freedesktop.org/~david/dist/${P}.tar.gz" - -LICENSE="|| ( GPL-2 AFL-2.0 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 -mips ~ppc -ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -KERNEL_IUSE="kernel_linux kernel_FreeBSD" -IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}" - -RDEPEND=">=dev-libs/glib-2.6 - >=dev-libs/dbus-glib-0.61 - kernel_linux? ( >=sys-fs/udev-104 ) - kernel_linux? ( >=sys-apps/util-linux-2.12r-r1 ) - kernel_linux? ( >=sys-kernel/linux-headers-2.6.17 ) - kernel_FreeBSD? ( dev-libs/libvolume_id ) - >=dev-libs/expat-1.95.8 - >=sys-apps/pciutils-2.2.3 - >=dev-libs/libusb-0.1.10a - sys-apps/usbutils - virtual/eject - amd64? ( >=sys-apps/dmidecode-2.7 ) - x86? ( >=sys-apps/dmidecode-2.7 ) - ia64? ( >=sys-apps/dmidecode-2.7 ) - dell? ( >=sys-libs/libsmbios-0.13.4 ) - disk-partition? ( >=sys-apps/parted-1.7.1 ) - kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) ) - selinux? ( sys-libs/libselinux - sec-policy/selinux-hal )" -# pam? ( sys-auth/consolekit )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35 - doc? ( app-doc/doxygen app-text/docbook-sgml-utils )" - -PDEPEND="app-misc/hal-info" - -## 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 notify_uevent() { - ewarn - ewarn "You must enable Kernel Userspace Events in your kernel." - ewarn "For this you need to enable 'Hotplug' under 'General Setup' and" - ewarn "basic networking. They are marked CONFIG_HOTPLUG and CONFIG_NET" - ewarn "in the config file." - ewarn - ebeep 5 -} - -function notify_procfs() { - ewarn - ewarn "You must enable the proc filesystem in your kernel." - ewarn "For this you need to enable '/proc file system support' under" - ewarn "'Pseudo filesystems' in 'File systems'. It is marked" - ewarn "CONFIG_PROC_FS in the config file." - ewarn - ebeep 5 -} - -function notify_inotify() { - ewarn - ewarn "You must enable the Inotify system in your kernel." - ewarn "For this you need to enable 'Inotify support for userspace'" - ewarn "in 'File systems'. It is marked CONFIG_INOTIFY_USER in the config file." - ewarn - ebeep 5 -} - -pkg_setup() { - if built_with_use --missing false sys-apps/pciutils zlib ; then - eerror "You MUST build sys-apps/pciutils without the zlib USE flag" - die "You MUST build sys-apps/pciutils without the zlib USE flag" - fi - - if use kernel_linux; then - kernel_is ge 2 6 17 || ewarn "HAL requires a kernel version 2.6.17 or newer" - - if ! ( linux_chkconfig_present HOTPLUG && linux_chkconfig_present NET ) - then - notify_uevent - fi - - linux_chkconfig_present INOTIFY_USER || notify_inotify - - if use acpi ; then - linux_chkconfig_present PROC_FS || notify_procfs - fi - 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} - - # Gentoo Patch Set - EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${FILESDIR}/${PV} - - eautoreconf -} - -src_compile() { - local backend="" - local acpi="" - - # TODO :: policykit should have a pam useflag - append-flags -rdynamic - - if use kernel_linux ; then - backend="linux" - use acpi && acpi="--enable-acpi-toshiba --enable-acpi-ibm" - elif use kernel_FreeBSD ; then - backend="freebsd" - else - eerror "Invalid backend" - fi - - if ! use acpi ; then - acpi="--disable-acpi-proc --disable-acpi-acpid" - fi - - econf --disable-policy-kit \ - --with-doc-dir=/usr/share/doc/${PF} \ - --with-os-type=gentoo \ - --with-pid-file=/var/run/hald.pid \ - --with-socket-dir=/var/run/hald \ - --with-hwdata=/usr/share/misc \ - --enable-hotplug-map \ - --enable-man-pages \ - --with-backend=${backend} \ - $(use_enable debug verbose-mode) \ - $(use_with dell dell-backlight) \ - $(use_enable disk-partition parted) \ - $(use_enable pcmcia pcmcia-support) \ - $(use_enable doc docbook-docs) \ - $(use_enable doc doxygen-docs) \ - $(use_enable selinux) \ - --disable-console-kit \ - ${acpi} \ - || die "configure failed" -#$(use_enable pam console-kit) - - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README - - # remove dep on gnome-python - mv "${D}"/usr/bin/hal-device-manager "${D}"/usr/share/hal/device-manager/ - - # hal umount for unclean unmounts - exeinto /lib/udev/ - newexe "${FILESDIR}"/hal-unmount.dev hal_unmount - - # initscript - newinitd "${FILESDIR}"/0.5.9-hald.rc hald - cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/ -# if use pam; then -# sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf -# fi - if use debug; then - sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ - -i "${WORKDIR}"/0.5.9-hald.conf - fi - newconfd "${WORKDIR}"/0.5.9-hald.conf hald - - # 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 -} - -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/ - - # 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 - - 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" -} |