Back out the last commit

Package-Manager: portage-2.1.2.3

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 9abe7c02e26166a3a54012975c26334ae727bb08..b6bfcf32327317d3148c3a78371ab633dd9a5cb0 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # 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.139 2007/04/01 19:43:49 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.140 2007/04/01 20:00:59 steev Exp $
+
+  01 Apr 2007; Steev Klimaszewski <steev@gentoo.org>
+  -files/hal-0.5.9-button_capabilities.patch, hal-0.5.9_rc3.ebuild:
+  Back out the last commit.
 
   01 Apr 2007; Steev Klimaszewski <steev@gentoo.org>
   +files/hal-0.5.9-button_capabilities.patch, hal-0.5.9_rc3.ebuild:

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 2869d573dd94649886242881558f879912d62cb7..1845df4eb41fc6f9578be6e5a2b55902dd836a3f 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -98,10 +98,6 @@ AUX hal-0.5.7.1-sr-driver.patch 654 RMD160 86a98b6ceb98f797badd3e1c653f181d49813
 MD5 a6cfdd91f94b01684e1c3063dd07cbd8 files/hal-0.5.7.1-sr-driver.patch 654
 RMD160 86a98b6ceb98f797badd3e1c653f181d498138b1 files/hal-0.5.7.1-sr-driver.patch 654
 SHA256 52191c2230af31f0bf18f39a5f0e6d24728da5c7e0de627be55046561318ca55 files/hal-0.5.7.1-sr-driver.patch 654
-AUX hal-0.5.9-button_capabilities.patch 844 RMD160 e203b11c66e498c263dee83f76c2ac4201e10619 SHA1 a9a7382505d710bd9327cab8c416241c8d87e371 SHA256 129daf9417a9a74b48f93057386ebe7e92845cf9e91e0d3f747296f02897df80
-MD5 77d04f1a5f10eff9862a6012fdccc8e2 files/hal-0.5.9-button_capabilities.patch 844
-RMD160 e203b11c66e498c263dee83f76c2ac4201e10619 files/hal-0.5.9-button_capabilities.patch 844
-SHA256 129daf9417a9a74b48f93057386ebe7e92845cf9e91e0d3f747296f02897df80 files/hal-0.5.9-button_capabilities.patch 844
 AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 31169a28448fb1eb1dfee5d1699de9a02449a6b7 SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b
 MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 files/hal-unmount.dev 397
@@ -125,14 +121,14 @@ EBUILD hal-0.5.9_rc2.ebuild 5246 RMD160 0e9aa04e4894e452d002cec7532fda31d024085e
 MD5 9fcd878332741eccc43d7595e91f6923 hal-0.5.9_rc2.ebuild 5246
 RMD160 0e9aa04e4894e452d002cec7532fda31d024085e hal-0.5.9_rc2.ebuild 5246
 SHA256 453768e5bcb268b3913850dc4901795d78358c7d986bedd17f331da5b1ae15da hal-0.5.9_rc2.ebuild 5246
-EBUILD hal-0.5.9_rc3.ebuild 5301 RMD160 60a9e7c3b10a57adceab5d3a8d5d14fb822f165f SHA1 84ff57bcdc88e8e285f35042f0a265461236f1cd SHA256 fd0047302b469353d27afb9801a2187df5fe1fdfaceebe5425dc790bf4ec39da
-MD5 a135d199e08ced9b981ec58c7cb4fa25 hal-0.5.9_rc3.ebuild 5301
-RMD160 60a9e7c3b10a57adceab5d3a8d5d14fb822f165f hal-0.5.9_rc3.ebuild 5301
-SHA256 fd0047302b469353d27afb9801a2187df5fe1fdfaceebe5425dc790bf4ec39da hal-0.5.9_rc3.ebuild 5301
-MISC ChangeLog 21361 RMD160 ec005471ef86bd98f0ee97a09a0fe4f866f05bbc SHA1 bbb9adf2e63d0e51156be6cb4242087fac86db44 SHA256 33c5cf918b16b807d689855b8edef7e90efe81101ee67c3e641109c3fccb3b09
-MD5 bc9293a72b73aa3914fac2c98bb67640 ChangeLog 21361
-RMD160 ec005471ef86bd98f0ee97a09a0fe4f866f05bbc ChangeLog 21361
-SHA256 33c5cf918b16b807d689855b8edef7e90efe81101ee67c3e641109c3fccb3b09 ChangeLog 21361
+EBUILD hal-0.5.9_rc3.ebuild 5195 RMD160 e617c2a38f3923697e892be4fb556a624aeffb5f SHA1 4c7894f59ef7b82a6f044fbae04263f5a131e2b5 SHA256 51c6840dbfc972d787975cc0ca7f9e1acd03564a95f0b60b7688737f6cd82b61
+MD5 f5224e354a5f7ae84fcc9587d3203cda hal-0.5.9_rc3.ebuild 5195
+RMD160 e617c2a38f3923697e892be4fb556a624aeffb5f hal-0.5.9_rc3.ebuild 5195
+SHA256 51c6840dbfc972d787975cc0ca7f9e1acd03564a95f0b60b7688737f6cd82b61 hal-0.5.9_rc3.ebuild 5195
+MISC ChangeLog 21511 RMD160 fcac710f19f2726eeee2d6c4c6262566d67450b8 SHA1 b50e1aa4e13f3db19b9729391132150b9e3dd556 SHA256 e26216fe267957bdb79840edc016366064306cb5ce513f689efc56cf686bd4c6
+MD5 5e6db8b4232edc2fa91e8126436d623d ChangeLog 21511
+RMD160 fcac710f19f2726eeee2d6c4c6262566d67450b8 ChangeLog 21511
+SHA256 e26216fe267957bdb79840edc016366064306cb5ce513f689efc56cf686bd4c6 ChangeLog 21511
 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d
 MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345
 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345

diff --git a/sys-apps/hal/files/hal-0.5.9-button_capabilities.patch b/sys-apps/hal/files/hal-0.5.9-button_capabilities.patch
deleted file mode 100644 (file)
index 64a828b..0000000
--- a/sys-apps/hal/files/hal-0.5.9-button_capabilities.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: David Zeuthen <davidz@redhat.com>
-Date: Sun, 1 Apr 2007 08:48:35 +0000 (-0400)
-Subject: give back the "button" capability to keyboards
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=e0d3327b68fc043e6ac8a1b0bdf97249476a3968
-
-give back the "button" capability to keyboards
-
-Without this, gnome-power-manager will not react to buttons on some
-keyboards.
----
-
---- a/fdi/policy/10osvendor/10-keyboard-policy.fdi
-+++ b/fdi/policy/10osvendor/10-keyboard-policy.fdi
-@@ -9,6 +9,9 @@
-       </match>
-       <match key="info.capabilities" contains="input.keyboard">
-       <append key="info.addons" type="strlist">hald-addon-keyboard</append>
-+        <match key="info.capabilities" contains_not="button">
-+        <append key="info.capabilities" type="strlist">button</append>
-+        </match>
-       </match>
-     </match>
-   </device>

diff --git a/sys-apps/hal/hal-0.5.9_rc3.ebuild b/sys-apps/hal/hal-0.5.9_rc3.ebuild
index 66fc0e396479f5578efa5cb19f9287de116b551d..7e17952a38c8703260aaa93e020db6893128310a 100644 (file)
--- a/sys-apps/hal/hal-0.5.9_rc3.ebuild
+++ b/sys-apps/hal/hal-0.5.9_rc3.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_rc3.ebuild,v 1.2 2007/04/01 19:43:49 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9_rc3.ebuild,v 1.3 2007/04/01 20:00:59 steev Exp $
 
 inherit eutils linux-info autotools flag-o-matic
 
@@ -89,8 +89,6 @@ src_unpack() {
        unpack ${A}
        cd ${S}
        epatch ${FILESDIR}/${PN}-0.5.7-plugdev-allow-send.patch
-       # Some keyboards don't work without this patch.
-       epatch ${FILESDIR}/${PN}-0.5.9-button_capabilites.patch
 }
 
 src_compile() {