1 |
dang 09/04/30 19:20:44 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: hal-0.5.12_rc1-r1.ebuild |
5 |
Log: |
6 |
Bump to hal-0.5.12_rc1-r1 |
7 |
- I'm taking primary maintainership from chainsaw, with his permission |
8 |
- Add policykit and consolekit flags. Since pk support depends on ck support, |
9 |
the policykit flag will enable consolekit support, even if the consolekit |
10 |
flag is not set. This allows proper USE-depend from other packages. |
11 |
- Add CPUFreq to the dbus allow lists |
12 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
13 |
|
14 |
Revision Changes Path |
15 |
1.13 sys-apps/hal/metadata.xml |
16 |
|
17 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/metadata.xml?rev=1.13&view=markup |
18 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/metadata.xml?rev=1.13&content-type=text/plain |
19 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/metadata.xml?r1=1.12&r2=1.13 |
20 |
|
21 |
Index: metadata.xml |
22 |
=================================================================== |
23 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/metadata.xml,v |
24 |
retrieving revision 1.12 |
25 |
retrieving revision 1.13 |
26 |
diff -u -r1.12 -r1.13 |
27 |
--- metadata.xml 4 Feb 2009 12:47:14 -0000 1.12 |
28 |
+++ metadata.xml 30 Apr 2009 19:20:44 -0000 1.13 |
29 |
@@ -3,7 +3,7 @@ |
30 |
<pkgmetadata> |
31 |
<herd>freedesktop</herd> |
32 |
<maintainer> |
33 |
- <email>chainsaw@g.o</email> |
34 |
+ <email>dang@g.o</email> |
35 |
</maintainer> |
36 |
<use> |
37 |
<flag name='acpi'>Enables HAL to attempt to read from /proc/acpi/event, if |
38 |
@@ -12,6 +12,9 @@ |
39 |
runlevel (rc-update add acpid default) along with HAL. This will also |
40 |
enable HAL to read Toshiba and IBM acpi events which do not get sent |
41 |
via /proc/acpi/event</flag> |
42 |
+ <flag name='consolekit'>Enables HAL to interact with consolekit for |
43 |
+ determining whether a given process is running on behalf of the person |
44 |
+ setting at the console.</flag> |
45 |
<flag name='crypt'>Allows HAL to mount volumes that are encrypted using |
46 |
LUKS. <pkg>sys-fs/cryptsetup-luks</pkg> which has recently been renamed |
47 |
to <pkg>sys-fs/cryptsetup</pkg> allows you to create such encrypted |
48 |
|
49 |
|
50 |
|
51 |
1.280 sys-apps/hal/ChangeLog |
52 |
|
53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.280&view=markup |
54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.280&content-type=text/plain |
55 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?r1=1.279&r2=1.280 |
56 |
|
57 |
Index: ChangeLog |
58 |
=================================================================== |
59 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v |
60 |
retrieving revision 1.279 |
61 |
retrieving revision 1.280 |
62 |
diff -u -r1.279 -r1.280 |
63 |
--- ChangeLog 29 Apr 2009 22:33:54 -0000 1.279 |
64 |
+++ ChangeLog 30 Apr 2009 19:20:44 -0000 1.280 |
65 |
@@ -1,6 +1,23 @@ |
66 |
# ChangeLog for sys-apps/hal |
67 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
68 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.279 2009/04/29 22:33:54 vapier Exp $ |
69 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.280 2009/04/30 19:20:44 dang Exp $ |
70 |
+ |
71 |
+*hal-0.5.12_rc1-r1 (30 Apr 2009) |
72 |
+ |
73 |
+ 30 Apr 2009; Daniel Gryniewicz <dang@g.o> |
74 |
+ +hal-0.5.12_rc1-r1.ebuild, metadata.xml: |
75 |
+ Bump to hal-0.5.12_rc1-r1 |
76 |
+ |
77 |
+ - I'm taking primary maintainership from chainsaw, with his permission |
78 |
+ |
79 |
+ - Add policykit and consolekit flags. Since pk support depends on ck |
80 |
+ support, |
81 |
+ |
82 |
+ the policykit flag will enable consolekit support, even if the consolekit |
83 |
+ |
84 |
+ flag is not set. This allows proper USE-depend from other packages. |
85 |
+ |
86 |
+ - Add CPUFreq to the dbus allow lists |
87 |
|
88 |
29 Apr 2009; Mike Frysinger <vapier@g.o> hal-0.5.12_rc1: |
89 |
Drop useless ||() construct since there is only one atom in it. |
90 |
|
91 |
|
92 |
|
93 |
1.1 sys-apps/hal/hal-0.5.12_rc1-r1.ebuild |
94 |
|
95 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild?rev=1.1&view=markup |
96 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild?rev=1.1&content-type=text/plain |
97 |
|
98 |
Index: hal-0.5.12_rc1-r1.ebuild |
99 |
=================================================================== |
100 |
# Copyright 1999-2009 Gentoo Foundation |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.12_rc1-r1.ebuild,v 1.1 2009/04/30 19:20:44 dang Exp $ |
103 |
|
104 |
EAPI="2" |
105 |
|
106 |
inherit eutils linux-info autotools flag-o-matic |
107 |
|
108 |
PATCH_VERSION="2" |
109 |
|
110 |
MY_P=${P/_/} |
111 |
S=${WORKDIR}/${MY_P} |
112 |
DESCRIPTION="Hardware Abstraction Layer" |
113 |
HOMEPAGE="http://www.freedesktop.org/wiki/Software/hal" |
114 |
SRC_URI="http://hal.freedesktop.org/releases/${MY_P}.tar.bz2 |
115 |
http://dev.gentoo.org/~dang/files/${MY_P}-gentoo-patches-${PATCH_VERSION}.tar.bz2" |
116 |
|
117 |
LICENSE="|| ( GPL-2 AFL-2.0 )" |
118 |
SLOT="0" |
119 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
120 |
|
121 |
KERNEL_IUSE="kernel_linux kernel_FreeBSD" |
122 |
IUSE="X acpi apm crypt consolekit debug dell disk-partition doc laptop policykit selinux ${KERNEL_IUSE}" |
123 |
|
124 |
RDEPEND=">=dev-libs/dbus-glib-0.61 |
125 |
>=dev-libs/glib-2.14 |
126 |
>=dev-libs/expat-1.95.8 |
127 |
>=dev-libs/libusb-0.1.10a |
128 |
>=sys-apps/pciutils-2.2.7-r1 |
129 |
>=dev-util/gperf-3.0.3 |
130 |
sys-apps/usbutils |
131 |
virtual/eject |
132 |
amd64? ( >=sys-apps/dmidecode-2.7 ) |
133 |
dell? ( >=sys-libs/libsmbios-0.13.4 ) |
134 |
disk-partition? ( >=sys-apps/parted-1.8.0 ) |
135 |
ia64? ( >=sys-apps/dmidecode-2.7 ) |
136 |
kernel_linux? ( |
137 |
>=sys-fs/udev-117 |
138 |
>=sys-apps/util-linux-2.13 |
139 |
>=sys-kernel/linux-headers-2.6.19 |
140 |
crypt? ( >=sys-fs/cryptsetup-1.0.5 ) |
141 |
) |
142 |
kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) |
143 |
x86? ( >=sys-apps/dmidecode-2.7 ) |
144 |
selinux? ( sys-libs/libselinux sec-policy/selinux-hal ) |
145 |
consolekit? ( |
146 |
sys-auth/consolekit[policykit=] |
147 |
) |
148 |
policykit? ( |
149 |
sys-auth/consolekit[policykit] |
150 |
sys-auth/policykit[pam] |
151 |
)" |
152 |
DEPEND="${RDEPEND} |
153 |
dev-util/pkgconfig |
154 |
>=dev-util/intltool-0.35 |
155 |
doc? ( |
156 |
app-text/xmlto |
157 |
dev-libs/libxml2 |
158 |
dev-util/gtk-doc |
159 |
app-text/docbook-sgml-utils |
160 |
)" |
161 |
PDEPEND=">=app-misc/hal-info-20081219 |
162 |
!gnome-extra/hal-device-manager |
163 |
laptop? ( >=sys-power/pm-utils-0.99.3 )" |
164 |
|
165 |
## HAL Daemon drops privledges so we need group access to read disks |
166 |
HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb" |
167 |
HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator" |
168 |
|
169 |
function check_hotplug_net() { |
170 |
local CONFIG_CHECK="~HOTPLUG ~NET" |
171 |
local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n" |
172 |
local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n" |
173 |
check_extra_config |
174 |
} |
175 |
|
176 |
function check_inotify() { |
177 |
local CONFIG_CHECK="~INOTIFY_USER" |
178 |
local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n" |
179 |
check_extra_config |
180 |
} |
181 |
|
182 |
function check_acpi_proc() { |
183 |
local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT" |
184 |
local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n" |
185 |
local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n" |
186 |
check_extra_config |
187 |
} |
188 |
|
189 |
pkg_setup() { |
190 |
if use kernel_linux ; then |
191 |
if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then |
192 |
kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer" |
193 |
|
194 |
if kernel_is lt 2 6 23 && use acpi ; then |
195 |
check_acpi_proc |
196 |
fi |
197 |
fi |
198 |
|
199 |
check_hotplug_net |
200 |
check_inotify |
201 |
fi |
202 |
|
203 |
# http://devmanual.gentoo.org/ebuild-writing/functions/ |
204 |
# http://bugs.gentoo.org/show_bug.cgi?id=191605 |
205 |
|
206 |
# Create groups for hotplugging and HAL |
207 |
enewgroup haldaemon |
208 |
enewgroup plugdev |
209 |
|
210 |
# HAL drops priviledges by default now ... |
211 |
# ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups) |
212 |
if use kernel_linux; then |
213 |
enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} |
214 |
elif use kernel_FreeBSD; then |
215 |
enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} |
216 |
fi |
217 |
|
218 |
# Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS} |
219 |
# If users have a problem with this, let them file a bug |
220 |
if [[ ${ROOT} == / ]] ; then |
221 |
if use kernel_linux; then |
222 |
usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon |
223 |
elif use kernel_FreeBSD; then |
224 |
pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD} |
225 |
fi |
226 |
fi |
227 |
} |
228 |
|
229 |
src_prepare() { |
230 |
EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \ |
231 |
EPATCH_SUFFIX="patch" \ |
232 |
EPATCH_SOURCE="${WORKDIR}/${P}-patches/" \ |
233 |
EPATCH_FORCE="yes" \ |
234 |
epatch |
235 |
|
236 |
eautoreconf |
237 |
} |
238 |
|
239 |
src_configure() { |
240 |
local acpi="$(use_enable acpi)" |
241 |
local backend= |
242 |
local hardware= |
243 |
|
244 |
append-flags -rdynamic |
245 |
|
246 |
if use kernel_linux ; then |
247 |
backend="linux" |
248 |
elif use kernel_FreeBSD ; then |
249 |
backend="freebsd" |
250 |
else |
251 |
eerror "Invalid backend" |
252 |
fi |
253 |
|
254 |
if use kernel_linux ; then |
255 |
if use acpi ; then |
256 |
# Using IBM ACPI and Toshiba ACPI results in double notification as this |
257 |
# was merged into the Linux Kernel 2.6.22 |
258 |
if kernel_is lt 2 6 22 ; then |
259 |
acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba" |
260 |
else |
261 |
acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba" |
262 |
fi |
263 |
|
264 |
acpi="$acpi --enable-acpi-proc --enable-acpi-acpid" |
265 |
else |
266 |
acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba" |
267 |
acpi="$acpi --disable-acpi-proc --disable-acpi-acpid" |
268 |
fi |
269 |
|
270 |
hardware="--with-cpufreq --with-usb-csr --with-keymaps" |
271 |
use arm && hardware="$hardware --with-omap --enable-pmu" |
272 |
use ppc && hardware="$hardware --enable-pmu" |
273 |
if use x86 || use amd64; then |
274 |
hardware="$hardware --with-macbook --with-macbookpro" |
275 |
fi |
276 |
|
277 |
if use dell ; then |
278 |
hardware="$hardware --with-dell-backlight" |
279 |
else |
280 |
hardware="$hardware --without-dell-backlight" |
281 |
fi |
282 |
|
283 |
hardware="$hardware --enable-sonypic" |
284 |
else |
285 |
hardware="--without-cpufreq --without-usb-csr --without-keymaps" |
286 |
hardware="$hardware --without-omap" |
287 |
hardware="$hardware --without-dell-backlight" |
288 |
hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba" |
289 |
hardware="$hardware --disable-sonypic" |
290 |
fi |
291 |
|
292 |
# Policykit support depends on consolekit support. Therefore, force on |
293 |
# consolekit, even if it's USE flag is off, if policykit support is on. |
294 |
# This enables packages to USE-depend on hal[policykit?] |
295 |
econf --with-backend=${backend} \ |
296 |
--with-os-type=gentoo \ |
297 |
--with-pid-file=/var/run/hald.pid \ |
298 |
--with-hwdata=/usr/share/misc \ |
299 |
--with-socket-dir=/var/run/hald \ |
300 |
--enable-umount-helper \ |
301 |
--enable-man-pages \ |
302 |
--disable-acl-management \ |
303 |
--enable-pci \ |
304 |
$(use_enable apm) \ |
305 |
$(use_enable debug verbose-mode) \ |
306 |
$(use_enable disk-partition parted) \ |
307 |
$(use_enable doc docbook-docs) \ |
308 |
$(use_enable doc gtk-doc) \ |
309 |
$(use_enable consolekit console-kit) \ |
310 |
$(use_enable policykit console-kit) \ |
311 |
$(use_enable policykit policy-kit) \ |
312 |
--docdir=/usr/share/doc/${PF} \ |
313 |
--localstatedir=/var \ |
314 |
${acpi} ${hardware} \ |
315 |
|| die "configure failed" |
316 |
} |
317 |
|
318 |
src_install() { |
319 |
emake DESTDIR="${D}" install || die |
320 |
dodoc AUTHORS ChangeLog NEWS README || die "docs failed" |
321 |
|
322 |
# hal umount for unclean unmounts |
323 |
exeinto /lib/udev/ |
324 |
newexe "${FILESDIR}/hal-unmount.dev" hal_unmount || die "udev helper failed" |
325 |
|
326 |
# initscript |
327 |
newinitd "${FILESDIR}/0.5.10-hald.rc" hald || die "init script failed" |
328 |
|
329 |
# configuration |
330 |
cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" || \ |
331 |
die "failed to copy hald.conf" |
332 |
|
333 |
if use debug; then |
334 |
sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ |
335 |
-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose" |
336 |
fi |
337 |
newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \ |
338 |
die "failed to install hald.conf" |
339 |
|
340 |
if use X ; then |
341 |
# New Configuration Snippets |
342 |
dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \ |
343 |
die "dodoc X examples failed" |
344 |
fi |
345 |
|
346 |
# We now create and keep /media here as both gnome-mount and pmount |
347 |
# use these directories, to avoid collision. |
348 |
keepdir /media |
349 |
|
350 |
# We also need to create and keep /etc/fdi/{information,policy,preprobe} |
351 |
# or else hal bombs. |
352 |
keepdir /etc/hal/fdi/{information,policy,preprobe} |
353 |
|
354 |
# HAL stores it's fdi cache in /var/lib/cache/hald |
355 |
keepdir /var/lib/cache/hald |
356 |
|
357 |
# HAL keeps its unix socket here |
358 |
keepdir /var/run/hald |
359 |
keepdir /var/lib/hal |
360 |
} |
361 |
|
362 |
pkg_postinst() { |
363 |
# Despite what people keep changing this location. Either one works.. it doesn't matter |
364 |
# http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/ |
365 |
|
366 |
elog "The HAL daemon needs to be running for certain applications to" |
367 |
elog "work. Suggested is to add the init script to your start-up" |
368 |
elog "scripts, this should be done like this :" |
369 |
elog "\`rc-update add hald default\`" |
370 |
echo |
371 |
elog "Looking for automounting support? Add yourself to the plugdev group" |
372 |
echo |
373 |
elog "IF you have additional applications which consume ACPI events, you" |
374 |
elog "should consider installing acpid to allow applications to share ACPI" |
375 |
elog "events." |
376 |
if use X ; then |
377 |
echo |
378 |
elog "If you wish to use a non US layout, you may do so by executing:" |
379 |
elog "setxkbmap <layout> or by utilizing your Desktop Environment's" |
380 |
elog "Keyboard Layout Settings mechanism." |
381 |
elog "Under GNOME, this is gnome-keyboard-properties, and under KDE" |
382 |
elog "it is kxkb." |
383 |
fi |
384 |
echo |
385 |
elog "In order have suspend/hibernate function with HAL or apps that use HAL" |
386 |
elog "(such as gnome-power-manager), you should build HAL with the laptop" |
387 |
elog "useflag which will install pm-utils." |
388 |
if use X ; then |
389 |
echo |
390 |
elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)" |
391 |
elog "reads user specific configuration from /etc/hal/fdi/policy/." |
392 |
echo |
393 |
elog "You should remove the Input sections from your xorg.conf once you have" |
394 |
elog "migrated the rules to a HAL fdi file." |
395 |
fi |
396 |
|
397 |
ebeep 5 |
398 |
epause 5 |
399 |
} |