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