From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PV59W-0006FZ-Cd for garchives@archives.gentoo.org; Tue, 21 Dec 2010 16:33:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 360A2E049A; Tue, 21 Dec 2010 16:33:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DB2A2E049A for ; Tue, 21 Dec 2010 16:33:22 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BCF11B40B8 for ; Tue, 21 Dec 2010 16:33:22 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 953) id B9F9420054; Tue, 21 Dec 2010 16:33:20 +0000 (UTC) From: "Daniel Gryniewicz (dang)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dang@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/hal: ChangeLog hal-0.5.14-r4.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog hal-0.5.14-r4.ebuild X-VCS-Directories: sys-apps/hal X-VCS-Committer: dang X-VCS-Committer-Name: Daniel Gryniewicz Content-Type: text/plain; charset=utf8 Message-Id: <20101221163320.B9F9420054@flycatcher.gentoo.org> Date: Tue, 21 Dec 2010 16:33:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3e12c656-0d02-4dc2-9d71-fcfac7854e23 X-Archives-Hash: 82c2a6b03c9d312fd87af4bb71ca498f dang 10/12/21 16:33:20 Modified: ChangeLog Added: hal-0.5.14-r4.ebuild Log: bug #340337 =20 (Portage version: 2.2.0_alpha8/cvs/Linux x86_64) Revision Changes Path 1.329 sys-apps/hal/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/Chang= eLog?rev=3D1.329&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/Chang= eLog?rev=3D1.329&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/Chang= eLog?r1=3D1.328&r2=3D1.329 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- ChangeLog 5 Dec 2010 21:14:21 -0000 1.328 +++ ChangeLog 21 Dec 2010 16:33:20 -0000 1.329 @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.328 2010/1= 2/05 21:14:21 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.329 2010/1= 2/21 16:33:20 dang Exp $ + +*hal-0.5.14-r4 (20 Dec 2010) + + 20 Dec 2010; Daniel Gryniewicz +hal-0.5.14-r4.ebuild= : + Remove support for obsolete policykit/consolekit; bug #340337 + =20 05 Dec 2010; Daniel Gryniewicz hal-0.5.14-r3.ebuild: Add dtd dep for bug #346237 1.1 sys-apps/hal/hal-0.5.14-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0= .5.14-r4.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0= .5.14-r4.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: hal-0.5.14-r4.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.14-r4.ebuild,v 1.= 1 2010/12/21 16:33:20 dang Exp $ EAPI=3D"2" inherit eutils linux-info autotools flag-o-matic multilib PATCH_VERSION=3D"4" MY_P=3D${P/_/} S=3D${WORKDIR}/${MY_P} PATCHNAME=3D"${MY_P}-gentoo-patches-${PATCH_VERSION}" DESCRIPTION=3D"Hardware Abstraction Layer" HOMEPAGE=3D"http://www.freedesktop.org/wiki/Software/hal" SRC_URI=3D"http://hal.freedesktop.org/releases/${MY_P}.tar.bz2 http://dev.gentoo.org/~dang/files/${PATCHNAME}.tar.bz2" LICENSE=3D"|| ( GPL-2 AFL-2.0 )" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~= x86 ~x86-fbsd" KERNEL_IUSE=3D"kernel_linux kernel_FreeBSD" IUSE=3D"X acpi apm crypt debug dell disk-partition doc laptop selinux ${K= ERNEL_IUSE}" RDEPEND=3D">=3Ddev-libs/dbus-glib-0.61 >=3Ddev-libs/glib-2.14 >=3Ddev-libs/expat-1.95.8 =3Dvirtual/libusb-0* >=3Dsys-apps/pciutils-2.2.7-r1 sys-apps/usbutils virtual/eject amd64? ( >=3Dsys-apps/dmidecode-2.7 ) dell? ( >=3Dsys-libs/libsmbios-0.13.4 ) disk-partition? ( >=3Dsys-block/parted-1.8.0 ) ia64? ( >=3Dsys-apps/dmidecode-2.7 ) kernel_linux? ( >=3Dsys-fs/udev-125 >=3Dsys-apps/util-linux-2.16 >=3Dsys-kernel/linux-headers-2.6.22 crypt? ( >=3Dsys-fs/cryptsetup-1.0.5 ) ) kernel_FreeBSD? ( >=3Ddev-libs/libvolume_id-0.77 ) x86? ( >=3Dsys-apps/dmidecode-2.7 ) selinux? ( sys-libs/libselinux sec-policy/selinux-hal )" DEPEND=3D"${RDEPEND} dev-util/pkgconfig >=3Ddev-util/gperf-3.0.3 >=3Ddev-util/intltool-0.35 doc? ( app-text/xmlto dev-libs/libxml2 dev-util/gtk-doc app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.1.2 )" PDEPEND=3D">=3Dapp-misc/hal-info-20081219 !gnome-extra/hal-device-manager laptop? ( >=3Dsys-power/pm-utils-0.99.3 )" ## HAL Daemon drops privledges so we need group access to read disks HALDAEMON_GROUPS_LINUX=3D"haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb" HALDAEMON_GROUPS_FREEBSD=3D"haldaemon,plugdev,operator" function check_hotplug_net() { local CONFIG_CHECK=3D"~HOTPLUG ~NET" local WARNING_HOTPLUG=3D"CONFIG_HOTPLUG:\tis not set (required for HAL)\= n" local WARNING_NET=3D"CONFIG_NET:\tis not set (required for HAL)\n" check_extra_config } function check_inotify() { local CONFIG_CHECK=3D"~INOTIFY_USER" local WARNING_INOTIFY_USER=3D"CONFIG_INOTIFY_USER:\tis not set (required= for HAL)\n" check_extra_config } function check_acpi_proc() { local CONFIG_CHECK=3D"~ACPI_PROCFS ~ACPI_PROC_EVENT" local WARNING_ACPI_PROCFS=3D"CONFIG_ACPI_PROCFS:\tis not set (required f= or HAL)\n" local WARNING_ACPI_PROC_EVENT=3D"CONFIG_ACPI_PROC_EVENT:\tis not set (re= quired 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=3D191605 # Create groups for hotplugging and HAL enewgroup haldaemon enewgroup plugdev # HAL drops priviledges by default now ... # ... so we must make sure it can read disk/cdrom info (ie. be in ${HALD= AEMON_GROUPS} groups) if use kernel_linux; then enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} elif use kernel_FreeBSD; then enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} 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} =3D=3D / ]] ; 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 } src_prepare() { EPATCH_MULTI_MSG=3D"Applying Gentoo Patchset ..." \ EPATCH_SUFFIX=3D"patch" \ EPATCH_SOURCE=3D"${WORKDIR}/${PATCHNAME}/patches/" \ EPATCH_FORCE=3D"yes" \ epatch eautoreconf } src_configure() { local acpi=3D"$(use_enable acpi)" local backend=3D local hardware=3D append-flags -rdynamic if use kernel_linux ; then backend=3D"linux" elif use kernel_FreeBSD ; then backend=3D"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 th= is # was merged into the Linux Kernel 2.6.22 if kernel_is lt 2 6 22 ; then acpi=3D"$acpi --enable-acpi-ibm --enable-acpi-toshiba" else acpi=3D"$acpi --disable-acpi-ibm --disable-acpi-toshiba" fi acpi=3D"$acpi --enable-acpi-proc --enable-acpi-acpid" else acpi=3D"$acpi --disable-acpi-ibm --disable-acpi-toshiba" acpi=3D"$acpi --disable-acpi-proc --disable-acpi-acpid" fi hardware=3D"--with-cpufreq --with-usb-csr --with-keymaps" use arm && hardware=3D"$hardware --with-omap --enable-pmu" use ppc && hardware=3D"$hardware --enable-pmu" if use x86 || use amd64; then hardware=3D"$hardware --with-macbook --with-macbookpro" fi if use dell ; then hardware=3D"$hardware --with-dell-backlight" else hardware=3D"$hardware --without-dell-backlight" fi hardware=3D"$hardware --enable-sonypic" else hardware=3D"--without-cpufreq --without-usb-csr --without-keymaps" hardware=3D"$hardware --without-omap" hardware=3D"$hardware --without-dell-backlight" hardware=3D"$hardware --enable-acpi-ibm --enable-acpi-toshiba" hardware=3D"$hardware --disable-sonypic" fi econf --with-backend=3D${backend} \ --with-os-type=3Dgentoo \ --with-pid-file=3D/var/run/hald.pid \ --with-hwdata=3D/usr/share/misc \ --with-socket-dir=3D/var/run/hald \ --with-udev-prefix=3D/etc \ --enable-umount-helper \ --enable-man-pages \ --disable-acl-management \ --enable-pci \ --disable-policy-kit \ --disable-console-kit \ $(use_enable apm) \ $(use_enable debug verbose-mode) \ $(use_enable disk-partition parted) \ $(use_enable doc docbook-docs) \ $(use_enable doc gtk-doc) \ --docdir=3D/usr/share/doc/${PF} \ --localstatedir=3D/var \ ${acpi} ${hardware} \ || die "configure failed" } src_install() { emake DESTDIR=3D"${D}" install || die dodoc AUTHORS ChangeLog NEWS README || die "docs failed" # hal umount for unclean unmounts exeinto /$(get_libdir)/udev/ newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper fai= led" # initscript cp "${FILESDIR}/0.5.14-hald.rc.1" "${WORKDIR}/" || \ die "failed to copy hald.rc.1" newinitd "${WORKDIR}/0.5.14-hald.rc.1" hald || die "init script failed" # configuration cp "${FILESDIR}/0.5.14-hald.conf" "${WORKDIR}/" || \ die "failed to copy hald.conf" if use debug; then sed -e 's:HALD_VERBOSE=3D"no":HALD_VERBOSE=3D"yes":' \ -i "${WORKDIR}/0.5.14-hald.conf" || die "failed to change verbose" fi newconfd "${WORKDIR}/0.5.14-hald.conf" hald || \ die "failed to install hald.conf" if use X ; then # New Configuration Snippets dodoc "${WORKDIR}/${PATCHNAME}/config-examples/"*.fdi || \ die "dodoc X examples failed" 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/cache/hald keepdir /var/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 "Access to hal is now protected by either at_console or the plugdev= group." elog "If you have problems discovering/configuring hardware, try adding" elog "yourself to plugdev, or ensuring consolekit is started" echo elog "IF you have additional applications which consume ACPI events, you= " elog "should consider installing acpid to allow applications to share AC= PI" 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 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 lapto= p" elog "useflag which will install pm-utils." if use X ; then echo elog "X Input Hotplugging (if you build xorg-server with the HAL usefla= g)" elog "reads user specific configuration from /etc/hal/fdi/policy/." echo 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 }