| 1 |
cardoe 08/12/24 15:39:11 |
| 2 |
|
| 3 |
Modified: hal-0.5.11-r1.ebuild ChangeLog hal-0.5.11-r4.ebuild |
| 4 |
Log: |
| 5 |
fixes to ensure we die on failure of some files. fix paths to migration script |
| 6 |
(Portage version: 2.1.6.1/cvs/Linux 2.6.27-gentoo-r7 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.14 sys-apps/hal/hal-0.5.11-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild?rev=1.14&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild?rev=1.14&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild?r1=1.13&r2=1.14 |
| 14 |
|
| 15 |
Index: hal-0.5.11-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v |
| 18 |
retrieving revision 1.13 |
| 19 |
retrieving revision 1.14 |
| 20 |
diff -u -r1.13 -r1.14 |
| 21 |
--- hal-0.5.11-r1.ebuild 23 Dec 2008 20:43:00 -0000 1.13 |
| 22 |
+++ hal-0.5.11-r1.ebuild 24 Dec 2008 15:39:11 -0000 1.14 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.13 2008/12/23 20:43:00 cardoe Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r1.ebuild,v 1.14 2008/12/24 15:39:11 cardoe Exp $ |
| 28 |
|
| 29 |
inherit eutils linux-info autotools flag-o-matic |
| 30 |
|
| 31 |
@@ -207,7 +207,7 @@ |
| 32 |
} |
| 33 |
|
| 34 |
src_install() { |
| 35 |
- emake DESTDIR="${D}" install || die |
| 36 |
+ emake DESTDIR="${D}" install || die "emake failed" |
| 37 |
dodoc AUTHORS ChangeLog NEWS README || die "docs failed" |
| 38 |
|
| 39 |
# hal umount for unclean unmounts |
| 40 |
@@ -225,16 +225,21 @@ |
| 41 |
sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ |
| 42 |
-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose" |
| 43 |
fi |
| 44 |
- newconfd "${WORKDIR}/0.5.10-hald.conf" hald |
| 45 |
+ newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \ |
| 46 |
+ die "failed to install hald.conf" |
| 47 |
|
| 48 |
if use X ; then |
| 49 |
# New Configuration Snippets |
| 50 |
- dodoc "${WORKDIR}/${P}-extras/"*.fdi |
| 51 |
- dobin "${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py" |
| 52 |
+ dodoc "${WORKDIR}/${P}-config-examples/"*.fdi || \ |
| 53 |
+ die "dodoc X examples failed" |
| 54 |
+ dobin "${WORKDIR}/${P}-config-examples/migrate-xorg-to-fdi.py" || \ |
| 55 |
+ die "dodoc X migration script failed" |
| 56 |
|
| 57 |
# Automagic conversion! |
| 58 |
- elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..." |
| 59 |
- "${WORKDIR}/${P}-extras/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" |
| 60 |
+ elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file" |
| 61 |
+ "${WORKDIR}/${P}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \ |
| 62 |
+ > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \ |
| 63 |
+ ewarn "Failed to migrate your keyboard configuration." |
| 64 |
fi |
| 65 |
|
| 66 |
# We now create and keep /media here as both gnome-mount and pmount |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.259 sys-apps/hal/ChangeLog |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.259&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?rev=1.259&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/ChangeLog?r1=1.258&r2=1.259 |
| 75 |
|
| 76 |
Index: ChangeLog |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v |
| 79 |
retrieving revision 1.258 |
| 80 |
retrieving revision 1.259 |
| 81 |
diff -u -r1.258 -r1.259 |
| 82 |
--- ChangeLog 23 Dec 2008 21:04:59 -0000 1.258 |
| 83 |
+++ ChangeLog 24 Dec 2008 15:39:11 -0000 1.259 |
| 84 |
@@ -1,6 +1,11 @@ |
| 85 |
# ChangeLog for sys-apps/hal |
| 86 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.258 2008/12/23 21:04:59 cardoe Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.259 2008/12/24 15:39:11 cardoe Exp $ |
| 89 |
+ |
| 90 |
+ 24 Dec 2008; Doug Goldstein <cardoe@g.o> hal-0.5.11-r1.ebuild, |
| 91 |
+ hal-0.5.11-r4.ebuild: |
| 92 |
+ fixes to ensure we die on failure of some files. fix paths to migration |
| 93 |
+ script |
| 94 |
|
| 95 |
23 Dec 2008; Doug Goldstein <cardoe@g.o> -hal-0.5.7.1-r5.ebuild, |
| 96 |
-hal-0.5.9-r1.ebuild, -hal-0.5.9.1-r1.ebuild, -hal-0.5.9.1-r2.ebuild, |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.5 sys-apps/hal/hal-0.5.11-r4.ebuild |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild?rev=1.5&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild?rev=1.5&content-type=text/plain |
| 104 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild?r1=1.4&r2=1.5 |
| 105 |
|
| 106 |
Index: hal-0.5.11-r4.ebuild |
| 107 |
=================================================================== |
| 108 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v |
| 109 |
retrieving revision 1.4 |
| 110 |
retrieving revision 1.5 |
| 111 |
diff -u -r1.4 -r1.5 |
| 112 |
--- hal-0.5.11-r4.ebuild 23 Dec 2008 20:43:00 -0000 1.4 |
| 113 |
+++ hal-0.5.11-r4.ebuild 24 Dec 2008 15:39:11 -0000 1.5 |
| 114 |
@@ -1,6 +1,6 @@ |
| 115 |
# Copyright 1999-2008 Gentoo Foundation |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.4 2008/12/23 20:43:00 cardoe Exp $ |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r4.ebuild,v 1.5 2008/12/24 15:39:11 cardoe Exp $ |
| 119 |
|
| 120 |
inherit eutils linux-info autotools flag-o-matic |
| 121 |
|
| 122 |
@@ -227,16 +227,20 @@ |
| 123 |
sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ |
| 124 |
-i "${WORKDIR}/0.5.10-hald.conf" || die "failed to change verbose" |
| 125 |
fi |
| 126 |
- newconfd "${WORKDIR}/0.5.10-hald.conf" hald |
| 127 |
+ newconfd "${WORKDIR}/0.5.10-hald.conf" hald || \ |
| 128 |
+ die "failed to install hald.conf" |
| 129 |
|
| 130 |
if use X ; then |
| 131 |
# New Configuration Snippets |
| 132 |
- dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || die |
| 133 |
- dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || die |
| 134 |
+ dodoc "${WORKDIR}/${PN}-config-examples/"*.fdi || \ |
| 135 |
+ die "dodoc X examples failed" |
| 136 |
+ dobin "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" || \ |
| 137 |
+ die "dodoc X migration script failed" |
| 138 |
|
| 139 |
# Automagic conversion! |
| 140 |
- elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file..." |
| 141 |
- "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \ |
| 142 |
+ elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file" |
| 143 |
+ "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \ |
| 144 |
+ > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \ |
| 145 |
ewarn "Failed to migrate your keyboard configuration." |
| 146 |
fi |
Archives