| 1 |
compnerd 08/09/04 22:29:09 |
| 2 |
|
| 3 |
Modified: ChangeLog hal-0.5.11-r2.ebuild |
| 4 |
Log: |
| 5 |
fix deps, build, and install |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc3-git3 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.249 sys-apps/hal/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.249&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.249&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?r1=1.248&r2=1.249 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v |
| 18 |
retrieving revision 1.248 |
| 19 |
retrieving revision 1.249 |
| 20 |
diff -u -r1.248 -r1.249 |
| 21 |
--- ChangeLog 4 Sep 2008 06:07:54 -0000 1.248 |
| 22 |
+++ ChangeLog 4 Sep 2008 22:29:09 -0000 1.249 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for sys-apps/hal |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.248 2008/09/04 06:07:54 compnerd Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.249 2008/09/04 22:29:09 compnerd Exp $ |
| 28 |
+ |
| 29 |
+ 04 Sep 2008; Saleem Abdulrasool <compnerd@g.o> |
| 30 |
+ hal-0.5.11-r2.ebuild: |
| 31 |
+ Fix deps for udev (thanks to zzam for pointing out that it had been left |
| 32 |
+ unchanged accidentally). sonypic support requires linux, move it inside |
| 33 |
+ the kernel_linux check. |
| 34 |
|
| 35 |
*hal-0.5.11-r2 (04 Sep 2008) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 sys-apps/hal/hal-0.5.11-r2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: hal-0.5.11-r2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- hal-0.5.11-r2.ebuild 4 Sep 2008 06:07:54 -0000 1.1 |
| 53 |
+++ hal-0.5.11-r2.ebuild 4 Sep 2008 22:29:09 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2008 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.1 2008/09/04 06:07:54 compnerd Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r2.ebuild,v 1.2 2008/09/04 22:29:09 compnerd Exp $ |
| 59 |
|
| 60 |
inherit eutils linux-info autotools flag-o-matic |
| 61 |
|
| 62 |
@@ -31,7 +31,7 @@ |
| 63 |
disk-partition? ( >=sys-apps/parted-1.8.0 ) |
| 64 |
ia64? ( >=sys-apps/dmidecode-2.7 ) |
| 65 |
kernel_linux? ( |
| 66 |
- >=sys-fs/udev-111 |
| 67 |
+ >=sys-fs/udev-117 |
| 68 |
>=sys-apps/util-linux-2.13 |
| 69 |
>=sys-kernel/linux-headers-2.6.19 |
| 70 |
crypt? ( >=sys-fs/cryptsetup-1.0.5 ) |
| 71 |
@@ -171,11 +171,14 @@ |
| 72 |
else |
| 73 |
hardware="$hardware --without-dell-backlight" |
| 74 |
fi |
| 75 |
+ |
| 76 |
+ hardware="$hardware --enable-sonypic" |
| 77 |
else |
| 78 |
hardware="--without-cpufreq --without-usb-csr --without-keymaps" |
| 79 |
hardware="$hardware --without-omap" |
| 80 |
hardware="$hardware --without-dell-backlight" |
| 81 |
hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba" |
| 82 |
+ hardware="$hardware --disable-sonypic" |
| 83 |
fi |
| 84 |
|
| 85 |
econf --with-backend=${backend} \ |
| 86 |
@@ -189,7 +192,6 @@ |
| 87 |
--disable-console-kit \ |
| 88 |
--disable-acl-management \ |
| 89 |
--enable-pci \ |
| 90 |
- --enable-sonypic \ |
| 91 |
$(use_enable apm) \ |
| 92 |
$(use_enable arm pmu) \ |
| 93 |
$(use_enable debug verbose-mode) \ |
| 94 |
@@ -231,7 +233,8 @@ |
| 95 |
|
| 96 |
# Automagic conversion! |
| 97 |
elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..." |
| 98 |
- "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || die |
| 99 |
+ "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \ |
| 100 |
+ ewarn "Failed to migrate your keyboard configuration." |
| 101 |
fi |
| 102 |
|
| 103 |
# We now create and keep /media here as both gnome-mount and pmount |
Archives