Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sys-apps
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2007-12-25 05:00:50 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2007-12-25 05:00:50 +0000
commit41fcdc8fddf1e63fb0c4c01944d726371608ba89 (patch)
tree19ccf4d0fbcf5945fe7765d32c20f31e110059c2 /sys-apps
parentversion bump per bug #152988 (diff)
downloadhistorical-41fcdc8fddf1e63fb0c4c01944d726371608ba89.tar.gz
historical-41fcdc8fddf1e63fb0c4c01944d726371608ba89.tar.bz2
historical-41fcdc8fddf1e63fb0c4c01944d726371608ba89.zip
add cardoe's patches
Package-Manager: portage-2.1.4_rc11
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/hal/ChangeLog6
-rw-r--r--sys-apps/hal/Manifest37
-rw-r--r--sys-apps/hal/files/96_plugdev_allow_send.patch42
-rw-r--r--sys-apps/hal/files/digest-hal-0.5.103
-rw-r--r--sys-apps/hal/hal-0.5.10.ebuild18
5 files changed, 80 insertions, 26 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 027f32b8de2c..51a5e8cee576 100644
--- 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.219 2007/12/06 22:29:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.220 2007/12/25 05:00:50 compnerd Exp $
+
+ 25 Dec 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+ +files/96_plugdev_allow_send.patch, hal-0.5.10.ebuild:
+ Pull in cardoe's patches
06 Dec 2007; Doug Klima <cardoe@gentoo.org> metadata.xml:
removed myself as a maintainer of HAL.
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 70029ee72c46..3e4f33a89d72 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
@@ -141,6 +138,10 @@ AUX 0.5.9/series 938 RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b SHA1 9d998a
MD5 e717cf92a61ad9ccd74e2e5500e0c0a3 files/0.5.9/series 938
RMD160 6b6d5ab5357129e6588db78d251407193ef5fc7b files/0.5.9/series 938
SHA256 12281e626fc5b9ee3f3b29d1233d698ad0d16e0cb7e134a89a7c3a536afaaabb files/0.5.9/series 938
+AUX 96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 SHA1 ad04ac23936ac8f1915b2d25cbc366d6db24cdc9 SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a
+MD5 38976c1da85ba17ba6a46f56cd1de3bf files/96_plugdev_allow_send.patch 1781
+RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 files/96_plugdev_allow_send.patch 1781
+SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a files/96_plugdev_allow_send.patch 1781
AUX hal-0.5.7-hald-scripts.patch 8636 RMD160 339765377e3573b382df987903f301860601668f SHA1 c2ffb779f423e07b38f12a852d942928394abc63 SHA256 d0b713f84c7bc782ba7b13f439630a995588097db2141f4a97c110036f64001a
MD5 521a06ba0845bd3246d6ed4b589f110f files/hal-0.5.7-hald-scripts.patch 8636
RMD160 339765377e3573b382df987903f301860601668f files/hal-0.5.7-hald-scripts.patch 8636
@@ -233,15 +234,16 @@ AUX hal-unmount.dev 397 RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 SHA1 311
MD5 7ee3fd5b5ee117f14633350e5b335c2f files/hal-unmount.dev 397
RMD160 78286dd9527bbb421082e73b0d08e06cd514d275 files/hal-unmount.dev 397
SHA256 747a4c483f8a558f2c75666e9547e539475f112363f1dbfc6ea19ca393c8e89b files/hal-unmount.dev 397
+DIST hal-0.5.10-p1.tar.bz2 22728 RMD160 8580065498c7af6605509d03d69e5dbf01f9e350 SHA1 3661b404291feb427737198a14f2b8a0392aa312 SHA256 ae708f8e75e457672e0b62b04700afdb29b62edc4306ebf78aa7f964f44b2422
DIST hal-0.5.10.tar.gz 1591146 RMD160 fafd90e671dbe95a8dd55a4ad257586a0289ef67 SHA1 8d67499df61590c11fd3203004d69e8a45abb8fa SHA256 5a71a18c40af2bac64f40f0b8add2b6789924b98d7f1cb79a0faf83cb77acb4c
DIST hal-0.5.7.1.tar.gz 1503156 RMD160 2861818b29546bd3628b1bda3d41238cf644c644 SHA1 233b67e724e68f41ec3f53adcfb7d139328c5813 SHA256 f15320c1ec3e5c89307fc0a6fbf75b6619de12c15ce8cc1a689e7bc3f2c0831b
DIST hal-0.5.9.1-r2.tar.bz2 4246 RMD160 2b1646289c23db868bd969f7ae851e6c2d317bad SHA1 32db287e0eff7f4754b89633909daf0f6e957009 SHA256 f28ed6e02df926ef485fff79587856eb0155c747e311d83d1b6b5e3a25b924c2
DIST hal-0.5.9.1.tar.gz 1596347 RMD160 4f1f8b9513d4e168d4d043970c062cc9084f554f SHA1 fc29322a0beba73c2eab3e0a44f9b820a5fbccdd SHA256 5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b
DIST hal-0.5.9.tar.gz 1587364 RMD160 bc97bf63e35d36bdb5731c3447036425dc7adeb9 SHA1 5832d97bcaf3dabb9aeb919226e3c38d366057ac SHA256 65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
-EBUILD hal-0.5.10.ebuild 8399 RMD160 076264ace497aa93099a0c787715879776ece8b5 SHA1 b1ebdc69a03eaa307c8c1b2c483601aed9d18acf SHA256 7a4845509728b074407849aa58933241cb8608f4ea6a4b2c73b9ac2f980643bb
-MD5 cfcb4699bf955bbcab8fe54f2ca47158 hal-0.5.10.ebuild 8399
-RMD160 076264ace497aa93099a0c787715879776ece8b5 hal-0.5.10.ebuild 8399
-SHA256 7a4845509728b074407849aa58933241cb8608f4ea6a4b2c73b9ac2f980643bb hal-0.5.10.ebuild 8399
+EBUILD hal-0.5.10.ebuild 8722 RMD160 17f0b8e2360150fd66b9abfecb3b465ad9ee9d92 SHA1 611f68ab119b61dcc194750a3c0597640e80199b SHA256 a28b6c5e380100756ea78ebfb24b94f2ff8729705f5fca227cf60c618fdd9085
+MD5 73bbaae9f308a91ac08e8d0f69d01c39 hal-0.5.10.ebuild 8722
+RMD160 17f0b8e2360150fd66b9abfecb3b465ad9ee9d92 hal-0.5.10.ebuild 8722
+SHA256 a28b6c5e380100756ea78ebfb24b94f2ff8729705f5fca227cf60c618fdd9085 hal-0.5.10.ebuild 8722
EBUILD hal-0.5.7.1-r5.ebuild 6460 RMD160 4cbe3eda7a34735516dd5c53ab1037e7eab1817d SHA1 8518e69c6787353ab0944d25c07fb5f4f0ed705b SHA256 0bb6785cf30dc03385ed79232628a8668dee9a585ee4284078437e773041d594
MD5 889b54d77685b4b32a89ad8a7fa9438e hal-0.5.7.1-r5.ebuild 6460
RMD160 4cbe3eda7a34735516dd5c53ab1037e7eab1817d hal-0.5.7.1-r5.ebuild 6460
@@ -262,17 +264,17 @@ EBUILD hal-0.5.9.1-r3.ebuild 7111 RMD160 20dee0c64395c72f7e4b5d82df32dfcf4e758c4
MD5 b1cbfab2a4fb7caa3cf5dc715f690e33 hal-0.5.9.1-r3.ebuild 7111
RMD160 20dee0c64395c72f7e4b5d82df32dfcf4e758c40 hal-0.5.9.1-r3.ebuild 7111
SHA256 623c58e7e00a8eb257a66b5ff18bd431fce1b340ea83bec0cdff8a633019ff85 hal-0.5.9.1-r3.ebuild 7111
-MISC ChangeLog 35656 RMD160 aa5e1660721d82c571031a00a261358b611b4074 SHA1 624ee8783175055dddec2d684582e21d09f5cd95 SHA256 506270458641e200859ca8ee0061c66a57f32eeae53011c0dd9b452ef2403124
-MD5 715c0f9cd49dac9b8bd833b544d8ea76 ChangeLog 35656
-RMD160 aa5e1660721d82c571031a00a261358b611b4074 ChangeLog 35656
-SHA256 506270458641e200859ca8ee0061c66a57f32eeae53011c0dd9b452ef2403124 ChangeLog 35656
+MISC ChangeLog 35799 RMD160 468be5dea3dee2cd57486d07326f6681bcb38541 SHA1 cf94722c14c4e472fd60c24dfe59130a52f5c87a SHA256 5cc30008c5db54a42edc43c75bba86b7c3b5a1b7e9b65153565abd04fa605c9b
+MD5 bdf836adf6cf7c3d07f26f1284286b09 ChangeLog 35799
+RMD160 468be5dea3dee2cd57486d07326f6681bcb38541 ChangeLog 35799
+SHA256 5cc30008c5db54a42edc43c75bba86b7c3b5a1b7e9b65153565abd04fa605c9b ChangeLog 35799
MISC metadata.xml 1936 RMD160 c9a2cc56d91ca9a12850cbbe68dd36079da0ccae SHA1 a0ccb91c8a4288cc6021ccc0c4c939bd2dad9570 SHA256 e73a89f3e8c110c5bd93a4bcc16c89e97067dfda97b4a4d6dc27330d9b5e51ee
MD5 5059b92c7f8dca2dc2da2b8b6d0b8c4e metadata.xml 1936
RMD160 c9a2cc56d91ca9a12850cbbe68dd36079da0ccae metadata.xml 1936
SHA256 e73a89f3e8c110c5bd93a4bcc16c89e97067dfda97b4a4d6dc27330d9b5e51ee metadata.xml 1936
-MD5 43cd24254ae54c38a2f1e77487b37dc9 files/digest-hal-0.5.10 235
-RMD160 612420e1b90198b31704758db8df0d8feaedcfea files/digest-hal-0.5.10 235
-SHA256 3469c8fbc0a0bc5300f8bbee2b2de66d86d7150fc31538f2d6a1cec8d9aafa57 files/digest-hal-0.5.10 235
+MD5 d55fef6c11675a3cad224e0ef5413f1e files/digest-hal-0.5.10 476
+RMD160 9fc4f843a6b8d069fef1424a8806d2bca5f11605 files/digest-hal-0.5.10 476
+SHA256 5b3b45bc0d4cd8e23cb02a333c47a4fa2cd7942d0494131998b43b44e6dfaff7 files/digest-hal-0.5.10 476
MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r5 238
RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r5 238
SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r5 238
@@ -288,10 +290,3 @@ SHA256 90221d17a323f1c27f4e74a889f81c1eebd7c71f750098546da62881e75614fb files/di
MD5 240fe515b5d5d293ce0178f107726b53 files/digest-hal-0.5.9.1-r3 479
RMD160 d13900166e485e79d2f0bf8d0dbc77fbf3620d6b files/digest-hal-0.5.9.1-r3 479
SHA256 90221d17a323f1c27f4e74a889f81c1eebd7c71f750098546da62881e75614fb files/digest-hal-0.5.9.1-r3 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHXuw2p/wUKkr7RBoRAt2sAJ4hQL1pZ+lRUVOwZe3zBN+3wa/3cwCguZWc
-aC4zVShUa4qfaXb7vx5rVWY=
-=fdTk
------END PGP SIGNATURE-----
diff --git a/sys-apps/hal/files/96_plugdev_allow_send.patch b/sys-apps/hal/files/96_plugdev_allow_send.patch
new file mode 100644
index 000000000000..ea462785f229
--- /dev/null
+++ b/sys-apps/hal/files/96_plugdev_allow_send.patch
@@ -0,0 +1,42 @@
+Index: b/hal.conf
+===================================================================
+--- a/hal.conf 2007-04-03 00:41:24.000000000 -0400
++++ b/hal.conf 2007-04-06 20:36:53.000000000 -0400
+@@ -63,5 +63,16 @@
+ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+ </policy>
+
++ <!-- Gentoo specific rules to allow 'plugdev' group to access Volumes and Power Management -->
++ <!-- We possibly will use 'powerdev' for Power Management or work on encapsulating everything in ConsoleKit -->
++ <policy group="plugdev">
++ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++ </policy>
++ <policy group="plugdev">
++ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
++ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++ </policy>
++
+ </busconfig>
+
+Index: b/hal.conf.in
+===================================================================
+--- a/hal.conf.in 2007-03-07 16:52:19.000000000 -0500
++++ b/hal.conf.in 2007-04-06 20:37:59.000000000 -0400
+@@ -63,5 +63,16 @@
+ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+ </policy>
+
++ <!-- Gentoo specific rules to allow 'plugdev' group to access Volumes and Power Management -->
++ <!-- We possibly will use 'powerdev' for Power Management or work on encapsulating everything in ConsoleKit -->
++ <policy group="plugdev">
++ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++ </policy>
++ <policy group="plugdev">
++ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
++ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++ </policy>
++
+ </busconfig>
+
diff --git a/sys-apps/hal/files/digest-hal-0.5.10 b/sys-apps/hal/files/digest-hal-0.5.10
index 0559695c8a34..6688949a7f1a 100644
--- a/sys-apps/hal/files/digest-hal-0.5.10
+++ b/sys-apps/hal/files/digest-hal-0.5.10
@@ -1,3 +1,6 @@
+MD5 0c73dc24ac72b9a5b66f3c807396c635 hal-0.5.10-p1.tar.bz2 22728
+RMD160 8580065498c7af6605509d03d69e5dbf01f9e350 hal-0.5.10-p1.tar.bz2 22728
+SHA256 ae708f8e75e457672e0b62b04700afdb29b62edc4306ebf78aa7f964f44b2422 hal-0.5.10-p1.tar.bz2 22728
MD5 fce852c428e7cda0b937087c79eec63f hal-0.5.10.tar.gz 1591146
RMD160 fafd90e671dbe95a8dd55a4ad257586a0289ef67 hal-0.5.10.tar.gz 1591146
SHA256 5a71a18c40af2bac64f40f0b8add2b6789924b98d7f1cb79a0faf83cb77acb4c hal-0.5.10.tar.gz 1591146
diff --git a/sys-apps/hal/hal-0.5.10.ebuild b/sys-apps/hal/hal-0.5.10.ebuild
index 17e7eb76b4da..e0eb4826843a 100644
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ b/sys-apps/hal/hal-0.5.10.ebuild
@@ -1,16 +1,19 @@
# 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.10.ebuild,v 1.2 2007/11/23 09:30:39 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.3 2007/12/25 05:00:50 compnerd Exp $
inherit eutils linux-info autotools flag-o-matic
+PATCH_VER="p1"
+
DESCRIPTION="Hardware Abstraction Layer"
HOMEPAGE="http://www.freedesktop.org/Software/hal"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz
+ http://dev.gentoo.org/~cardoe/files/${PN}/${P}-${PATCH_VER}.tar.bz2"
LICENSE="|| ( GPL-2 AFL-2.0 )"
SLOT="0"
-KEYWORDS="~amd64 -mips -ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
KERNEL_IUSE="kernel_linux kernel_FreeBSD"
IUSE="acpi apm crypt debug dell disk-partition doc selinux ${KERNEL_IUSE}"
@@ -152,11 +155,18 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ # patchset from http://dev.gentoo.org/~cardoe/repos/hal.git
+ EPATCH_MULTI_MSG="Applying http://dev.gentoo.org/~cardoe/repos/hal.git patchset ..." \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_SOURCE="${WORKDIR}/hal-0.5.10-patches/" \
+ EPATCH_FORCE="yes" \
+ epatch
+
# Hide recovery partitions
epatch "${FILESDIR}/hal-0.5.9-hide-recovery-partitions.patch"
# Enable plugdev support
- epatch "${FILESDIR}/0.5.9/96_plugdev_allow_send.patch"
+ epatch "${FILESDIR}/96_plugdev_allow_send.patch"
}
src_compile() {