Fix up access violations with the sed

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 55650bb7c4580dd9809b33e51c0b58cfc72f90b6..3de9423a759ae04662e266b884a3b9bf525c4304 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.153 2007/04/09 21:42:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.154 2007/04/10 05:32:51 cardoe Exp $
+
+  10 Apr 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.9.ebuild:
+  Fix up access violations with the sed
 
   09 Apr 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.9.ebuild:
   Gentoo/FreeBSD dep on libvolume_id. udev is only Linux as well

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index f2927ddbf6edad4e0bcc43345b273b67ce80f794..a1e24e5d46fc8c5ba3795baa714b4949c3c2daa4 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -151,14 +151,14 @@ EBUILD hal-0.5.7.1-r5.ebuild 6426 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498
 MD5 709ca20b11819f2e13e381be47e19535 hal-0.5.7.1-r5.ebuild 6426
 RMD160 ba28bce7126639c77de28ac2fc8d233475bb498e hal-0.5.7.1-r5.ebuild 6426
 SHA256 6e020d3a29d82b993984f58ab8ef3659d837c11bce25f3ad25df6f4748e11207 hal-0.5.7.1-r5.ebuild 6426
-EBUILD hal-0.5.9.ebuild 6254 RMD160 766b5842212f2ca89bf479a62bbd2b797912ef5e SHA1 af2bd1d9a1063ae0b6fa42e893157ad55635a343 SHA256 a813e12fb36ada25e214c5c3dc29305ed26071b2cf8b36f8b07bef0e8433f30a
-MD5 6b23c6bcc664110102d6ac65bbb8dbdf hal-0.5.9.ebuild 6254
-RMD160 766b5842212f2ca89bf479a62bbd2b797912ef5e hal-0.5.9.ebuild 6254
-SHA256 a813e12fb36ada25e214c5c3dc29305ed26071b2cf8b36f8b07bef0e8433f30a hal-0.5.9.ebuild 6254
-MISC ChangeLog 24402 RMD160 2ed788dbccba2265efbb94b2c9f245c72d57ec24 SHA1 aba2928bff497596039f7c26a35543da48f1a785 SHA256 dab5fe8c4ec746350f1e4b49716ec91ae2704c6eef5a79e60ddd55afe7ae0b85
-MD5 51afc512100321ffd2046539a552bb3e ChangeLog 24402
-RMD160 2ed788dbccba2265efbb94b2c9f245c72d57ec24 ChangeLog 24402
-SHA256 dab5fe8c4ec746350f1e4b49716ec91ae2704c6eef5a79e60ddd55afe7ae0b85 ChangeLog 24402
+EBUILD hal-0.5.9.ebuild 6325 RMD160 6119b8fa872c3d0f7f9051bc38bdf7d5d9ddb8ea SHA1 5c1df19a758a32fdde7a4c59506f27f7334d1b05 SHA256 af3d74f5098d48f66a4b3eea09e3bf33bba8720cd651b5773e2f87d0ef64509e
+MD5 8aa4bb23bb495810a4760280ce1d9de8 hal-0.5.9.ebuild 6325
+RMD160 6119b8fa872c3d0f7f9051bc38bdf7d5d9ddb8ea hal-0.5.9.ebuild 6325
+SHA256 af3d74f5098d48f66a4b3eea09e3bf33bba8720cd651b5773e2f87d0ef64509e hal-0.5.9.ebuild 6325
+MISC ChangeLog 24511 RMD160 c5710e88fd881a1e1aad1c1cb7f8f61740d1e9bb SHA1 3d5a926819166f3b597b0a190c101ef9d1f7003d SHA256 c493ea0a1462b4fec1e1e05af4ac424490faebddb9f11557a59957c6610a2a8e
+MD5 5a0e4ee2123d161661fdf821c83be7fd ChangeLog 24511
+RMD160 c5710e88fd881a1e1aad1c1cb7f8f61740d1e9bb ChangeLog 24511
+SHA256 c493ea0a1462b4fec1e1e05af4ac424490faebddb9f11557a59957c6610a2a8e ChangeLog 24511
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345
@@ -175,7 +175,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGGtx4oeSe8B0zEfwRAtdpAJ9/qYNVxnrejsnuND9Yc/UiN557uQCePOS9
-vqlqh8KCZPLkkspNMwxrPho=
-=MUrG
+iD8DBQFGGyF/oeSe8B0zEfwRAp8LAKCCOPWvxv2uy/272kdamypyHk5gWgCfeu87
+2dIkgeIv04P+Gcg9Sa8XUg0=
+=VUKr
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild
index ac306c51c46fa9808e6c31d11882ffb32ad8d90d..657950bcf634baaa7c56529a6edaaa582f5db8ae 100644 (file)
--- a/sys-apps/hal/hal-0.5.9.ebuild
+++ b/sys-apps/hal/hal-0.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.13 2007/04/10 00:38:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.14 2007/04/10 05:32:51 cardoe Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -161,12 +161,13 @@ src_install() {
 
        # initscript
        newinitd "${FILESDIR}"/0.5.9-hald.rc hald
-       newconfd "${FILESDIR}"/0.5.9-hald.conf hald
+       cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/
        if use pam; then
-               sed -e 's:RC_NEED:RC_NEED="consolekit":' -i /etc/conf.d/hald
+               sed -e 's:RC_NEED:RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf
        else
-               sed -e 's:RC_NEED:RC_NEED="":' -i /etc/conf.d/hald
+               sed -e 's:RC_NEED:RC_NEED="":' -i "${WORKDIR}"/0.5.9-hald.conf
        fi
+       newconfd "${WORKDIR}"/0.5.9-hald.conf hald
 
        # We now create and keep /media here as both gnome-mount and pmount
        # use these directories, to avoid collision.