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