* [gentoo-commits] gentoo-x86 commit in sys-apps/hal: ChangeLog hal-0.5.14-r3.ebuild
@ 2010-09-28 6:20 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-09-28 6:20 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/09/28 06:20:47
Modified: ChangeLog
Added: hal-0.5.14-r3.ebuild
Log:
Remove now unnecessary workaround for PATH and 512 bytes limit in init script wrt #267928.
(Portage version: 2.2_rc87/cvs/Linux x86_64)
Revision Changes Path
1.327 sys-apps/hal/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.327&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.327&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/ChangeLog?r1=1.326&r2=1.327
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- ChangeLog 28 Sep 2010 04:47:53 -0000 1.326
+++ ChangeLog 28 Sep 2010 06:20:47 -0000 1.327
@@ -1,6 +1,13 @@
# 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.326 2010/09/28 04:47:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.327 2010/09/28 06:20:47 ssuominen Exp $
+
+*hal-0.5.14-r3 (28 Sep 2010)
+
+ 28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +files/0.5.14-hald.rc.1, +hal-0.5.14-r3.ebuild:
+ Remove now unnecessary workaround for PATH and 512 bytes limit in init
+ script wrt #267928.
28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> hal-0.5.14-r2.ebuild:
Remove old sys-auth/consolekit from dependencies.
1.1 sys-apps/hal/hal-0.5.14-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild?rev=1.1&content-type=text/plain
Index: hal-0.5.14-r3.ebuild
===================================================================
# 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-r3.ebuild,v 1.1 2010/09/28 06:20:47 ssuominen Exp $
EAPI="2"
inherit eutils linux-info autotools flag-o-matic multilib
PATCH_VERSION="3"
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}
PATCHNAME="${MY_P}-gentoo-patches-${PATCH_VERSION}"
DESCRIPTION="Hardware Abstraction Layer"
HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal"
SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2
http://dev.gentoo.org/~dang/files/${PATCHNAME}.tar.bz2"
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="X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux ${KERNEL_IUSE}"
RDEPEND=">=dev-libs/dbus-glib-0.61
>=dev-libs/glib-2.14
>=dev-libs/expat-1.95.8
=virtual/libusb-0*
>=sys-apps/pciutils-2.2.7-r1
sys-apps/usbutils
virtual/eject
amd64? ( >=sys-apps/dmidecode-2.7 )
dell? ( >=sys-libs/libsmbios-0.13.4 )
disk-partition? ( >=sys-block/parted-1.8.0 )
ia64? ( >=sys-apps/dmidecode-2.7 )
kernel_linux? (
>=sys-fs/udev-125
>=sys-apps/util-linux-2.16
>=sys-kernel/linux-headers-2.6.22
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 )
consolekit? ( >=sys-auth/consolekit-0.4 )
policykit? (
sys-auth/consolekit[policykit]
sys-auth/policykit[pam]
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
>=dev-util/gperf-3.0.3
>=dev-util/intltool-0.35
doc? (
app-text/xmlto
dev-libs/libxml2
dev-util/gtk-doc
app-text/docbook-sgml-utils
)"
PDEPEND=">=app-misc/hal-info-20081219
!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
enewgroup plugdev
# 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}
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} == / ]] ; 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() {
# Patch for fbsd, Bug #309263. MOVE INTO PATCHSET FOR NEXT BUMP!
epatch "${FILESDIR}"/${P}-r2-fbsd.patch
# Only apply one of the policy patches. Bug #267042
if use policykit ; then
rm "${WORKDIR}/${PATCHNAME}/patches/0001-plugdev-dbus-policy.patch"
else
rm "${WORKDIR}/${PATCHNAME}/patches/0002-policykit-dbus-policy.patch"
fi
EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \
EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}/patches/" \
EPATCH_FORCE="yes" \
epatch
eautoreconf
}
src_configure() {
local acpi="$(use_enable acpi)"
local backend=
local hardware=
local consolekit="$(use_enable consolekit console-kit)"
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 --enable-pmu"
use ppc && hardware="$hardware --enable-pmu"
if use x86 || use amd64; then
hardware="$hardware --with-macbook --with-macbookpro"
fi
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
# Policykit support depends on consolekit support. Therefore, force on
# consolekit, even if it's USE flag is off, if policykit support is on.
# This enables packages to USE-depend on hal[policykit?]
if use policykit ; then
consolekit="--enable-console-kit"
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 \
--with-udev-prefix=/etc \
--enable-umount-helper \
--enable-man-pages \
--disable-acl-management \
--enable-pci \
$(use_enable apm) \
$(use_enable debug verbose-mode) \
$(use_enable disk-partition parted) \
$(use_enable doc docbook-docs) \
$(use_enable doc gtk-doc) \
$(use_enable policykit policy-kit) \
${consolekit} \
--docdir=/usr/share/doc/${PF} \
--localstatedir=/var \
${acpi} ${hardware} \
|| die "configure failed"
}
src_install() {
emake DESTDIR="${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 failed"
# initscript
cp "${FILESDIR}/0.5.14-hald.rc.1" "${WORKDIR}/" || \
die "failed to copy hald.rc.1"
if use consolekit || use policykit; then
sed -e 's:need dbus:need dbus consolekit:' \
-i "${WORKDIR}/0.5.14-hald.rc.1" || die "failed to change verbose"
fi
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="no":HALD_VERBOSE="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 policykit 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 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/."
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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/hal: ChangeLog hal-0.5.14-r3.ebuild
@ 2010-12-05 21:14 Daniel Gryniewicz (dang)
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Gryniewicz (dang) @ 2010-12-05 21:14 UTC (permalink / raw
To: gentoo-commits
dang 10/12/05 21:14:22
Modified: ChangeLog hal-0.5.14-r3.ebuild
Log:
Add dtd dep for bug #346237
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)
Revision Changes Path
1.328 sys-apps/hal/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.328&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.328&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/ChangeLog?r1=1.327&r2=1.328
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- ChangeLog 28 Sep 2010 06:20:47 -0000 1.327
+++ ChangeLog 5 Dec 2010 21:14:21 -0000 1.328
@@ -1,6 +1,9 @@
# 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.327 2010/09/28 06:20:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.328 2010/12/05 21:14:21 dang Exp $
+
+ 05 Dec 2010; Daniel Gryniewicz <dang@gentoo.org> hal-0.5.14-r3.ebuild:
+ Add dtd dep for bug #346237
*hal-0.5.14-r3 (28 Sep 2010)
1.2 sys-apps/hal/hal-0.5.14-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild?r1=1.1&r2=1.2
Index: hal-0.5.14-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hal-0.5.14-r3.ebuild 28 Sep 2010 06:20:47 -0000 1.1
+++ hal-0.5.14-r3.ebuild 5 Dec 2010 21:14:21 -0000 1.2
@@ -1,6 +1,6 @@
# 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-r3.ebuild,v 1.1 2010/09/28 06:20:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.14-r3.ebuild,v 1.2 2010/12/05 21:14:21 dang Exp $
EAPI="2"
@@ -57,6 +57,7 @@
dev-libs/libxml2
dev-util/gtk-doc
app-text/docbook-sgml-utils
+ app-text/docbook-xml-dtd:4.1.2
)"
PDEPEND=">=app-misc/hal-info-20081219
!gnome-extra/hal-device-manager
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-05 21:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-28 6:20 [gentoo-commits] gentoo-x86 commit in sys-apps/hal: ChangeLog hal-0.5.14-r3.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2010-12-05 21:14 Daniel Gryniewicz (dang)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox