From 8d172dae2d1a1f6adeb4305c99e451d8f9f75d74 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 18 Apr 2007 14:31:07 +0000 Subject: [PATCH] Since KDE doesn't support ConsoleKit yet and the technicals have not been worked out 100%, leaving ConsoleKit out of this release. Re-added the utf8 for ntfs patch. Re-added the detect newer MacBookPro's patch. Re-added ignore fixed volumes patch. These were dropped by accident in 0.5.9. Package-Manager: portage-2.1.2.4 --- sys-apps/hal/ChangeLog | 12 +++++- sys-apps/hal/Manifest | 42 ++++++++++++------- .../0.5.9/13_detect_newer_macbooks.patch | 13 ++++++ .../hal/files/0.5.9/14_ntfs_allows_utf8.patch | 12 ++++++ .../files/0.5.9/97_ignore_fixed_drives.patch | 38 +++++++++++++++++ sys-apps/hal/files/0.5.9/series | 3 ++ sys-apps/hal/hal-0.5.9.ebuild | 17 ++++---- 7 files changed, 113 insertions(+), 24 deletions(-) create mode 100644 sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch create mode 100644 sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch create mode 100644 sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 77e33bbdddf3..45bcb04a56a8 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,16 @@ # 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.169 2007/04/17 16:26:30 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.170 2007/04/18 14:31:07 cardoe Exp $ + + 18 Apr 2007; Doug Goldstein + +files/0.5.9/13_detect_newer_macbooks.patch, + +files/0.5.9/14_ntfs_allows_utf8.patch, + +files/0.5.9/97_ignore_fixed_drives.patch, files/0.5.9/series, + hal-0.5.9.ebuild: + Since KDE doesn't support ConsoleKit yet and the technicals have not been + worked out 100%, leaving ConsoleKit out of this release. Re-added the utf8 + for ntfs patch. Re-added the detect newer MacBookPro's patch. Re-added + ignore fixed volumes patch. These were dropped by accident in 0.5.9. 17 Apr 2007; Doug Goldstein -files/hal-0.5.1-old_storage_policy.patch, -files/hal-0.5.5.1-RBC.patch, diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 3a1f3aed8725..644c6542f3e8 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -61,6 +61,14 @@ AUX 0.5.9/12_hal_fix-vol_label_probe_volume.patch 2720 RMD160 972107dbb7a325aeee MD5 26a93aff650c702597a02003e897c53b files/0.5.9/12_hal_fix-vol_label_probe_volume.patch 2720 RMD160 972107dbb7a325aeeee992454f33c860035eb755 files/0.5.9/12_hal_fix-vol_label_probe_volume.patch 2720 SHA256 5e2c186ec2e24c53ec4b16921aed5ae0dfc39f7137f791341ba3dffa56d07f1a files/0.5.9/12_hal_fix-vol_label_probe_volume.patch 2720 +AUX 0.5.9/13_detect_newer_macbooks.patch 836 RMD160 fa066ba9b1b734f34bdc6daa67e00b0e3e1e3707 SHA1 6d7a16512f503e0ba6803daeeeccc82a96f30a5c SHA256 fe68a79f893725b4492c513df47f1f3e28096b1f0b4a203aeafe32b8d0ad0974 +MD5 7f70ffb93dece74ab3b9724f8bf2c4c9 files/0.5.9/13_detect_newer_macbooks.patch 836 +RMD160 fa066ba9b1b734f34bdc6daa67e00b0e3e1e3707 files/0.5.9/13_detect_newer_macbooks.patch 836 +SHA256 fe68a79f893725b4492c513df47f1f3e28096b1f0b4a203aeafe32b8d0ad0974 files/0.5.9/13_detect_newer_macbooks.patch 836 +AUX 0.5.9/14_ntfs_allows_utf8.patch 791 RMD160 51dd2eab4d77bdc10f63500d05621650ebb58738 SHA1 cf8f08894fd33cf297d7cd7c7168a11824b534a3 SHA256 eac2b172054dc8c658428f65e2d88454cecf7a5766b359ff7b3a6744878ee65f +MD5 6f0b723829536ff43e7d9f42dcd89317 files/0.5.9/14_ntfs_allows_utf8.patch 791 +RMD160 51dd2eab4d77bdc10f63500d05621650ebb58738 files/0.5.9/14_ntfs_allows_utf8.patch 791 +SHA256 eac2b172054dc8c658428f65e2d88454cecf7a5766b359ff7b3a6744878ee65f files/0.5.9/14_ntfs_allows_utf8.patch 791 AUX 0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 SHA1 f9de30d705eada8e2f631e51b715b9923f732fb4 SHA256 59d81dcb273f3cdc9c7fc9f195331529642fef2c2150b3eeb3fd98ea555b1893 MD5 f6d115e0eb501aba476f4df965bfeb6c files/0.5.9/95_gentoo_man_page.patch 18159 RMD160 cd4bf6c16e84464b11de755323ef2d0f5c1a54f9 files/0.5.9/95_gentoo_man_page.patch 18159 @@ -69,10 +77,14 @@ AUX 0.5.9/96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae MD5 38976c1da85ba17ba6a46f56cd1de3bf files/0.5.9/96_plugdev_allow_send.patch 1781 RMD160 08f0cbb8960d4753d15d02c8694fae09a6ef2a02 files/0.5.9/96_plugdev_allow_send.patch 1781 SHA256 090d666c8df223fc0ea30f473fa3d52412ef22aff85c1eebf609a3f00dbd652a files/0.5.9/96_plugdev_allow_send.patch 1781 -AUX 0.5.9/series 476 RMD160 f206c5518ab58bab886324f73859ba45f84bfd68 SHA1 04e5272da9492e5589e0a5e567153910e97b47e2 SHA256 5dd1a70e6f89f67b477ec5e5e238fe5c7e2cc52603120965ed4a8953f23ef909 -MD5 ad260e55e13b76098bc7b27a67e583b0 files/0.5.9/series 476 -RMD160 f206c5518ab58bab886324f73859ba45f84bfd68 files/0.5.9/series 476 -SHA256 5dd1a70e6f89f67b477ec5e5e238fe5c7e2cc52603120965ed4a8953f23ef909 files/0.5.9/series 476 +AUX 0.5.9/97_ignore_fixed_drives.patch 1499 RMD160 3d7ba37b8090e84ca3ff83a18d37f2cc5f34770d SHA1 9b90c535e5f72ce46524febe389880d400200e1f SHA256 1ee84c10a3eafc0e4b92345b247daad2f4ae3aa08282b16bfcb69bf5cf95241c +MD5 6d9d8b5c56ff549796c2a2d5cc39bd47 files/0.5.9/97_ignore_fixed_drives.patch 1499 +RMD160 3d7ba37b8090e84ca3ff83a18d37f2cc5f34770d files/0.5.9/97_ignore_fixed_drives.patch 1499 +SHA256 1ee84c10a3eafc0e4b92345b247daad2f4ae3aa08282b16bfcb69bf5cf95241c files/0.5.9/97_ignore_fixed_drives.patch 1499 +AUX 0.5.9/series 562 RMD160 c6328d785f69416425a1f21ddf397f1eab426b75 SHA1 4bcd93dfee8e4a04277dbc31c873164f2bfd082c SHA256 bbfc7a02a3c108a9ff513bb7f2414669a8db21e4dd1f661f6737c55ed93978e7 +MD5 97085ec48659538a9792effbd0fe6b2a files/0.5.9/series 562 +RMD160 c6328d785f69416425a1f21ddf397f1eab426b75 files/0.5.9/series 562 +SHA256 bbfc7a02a3c108a9ff513bb7f2414669a8db21e4dd1f661f6737c55ed93978e7 files/0.5.9/series 562 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 @@ -171,14 +183,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 7169 RMD160 986a4497ad4b0c2472f49d7c08410b2f9c5bba51 SHA1 211c9ec27b37688202c6bd5f92cac978ea261a99 SHA256 fa1698d6b5b0557b77cb8c083d5c257eeaea23f787e88142db394d2d94adf0d5 -MD5 f9730846577c26d6240653b6f942963a hal-0.5.9.ebuild 7169 -RMD160 986a4497ad4b0c2472f49d7c08410b2f9c5bba51 hal-0.5.9.ebuild 7169 -SHA256 fa1698d6b5b0557b77cb8c083d5c257eeaea23f787e88142db394d2d94adf0d5 hal-0.5.9.ebuild 7169 -MISC ChangeLog 27447 RMD160 f0b25913fe1acce8f57f8d1fff9ce4977d835c26 SHA1 3f0a9520f7c04a9d08827a8ae3c4805488bd20ca SHA256 532e1aac2706e0c2027511fc21ad5034a9629edf222fc1d012d0b985799cbe66 -MD5 db35d87aeba3539af7161f1bb3b97a1e ChangeLog 27447 -RMD160 f0b25913fe1acce8f57f8d1fff9ce4977d835c26 ChangeLog 27447 -SHA256 532e1aac2706e0c2027511fc21ad5034a9629edf222fc1d012d0b985799cbe66 ChangeLog 27447 +EBUILD hal-0.5.9.ebuild 7193 RMD160 a36f201410e369b8a939876bd13662c23df1a638 SHA1 6d818520ec9193c92d0e10290a588e49a34135c0 SHA256 7559e53b5a730ce8c819bd3c424311ef66bde22b1e54cbeb9b7844862f99cd04 +MD5 490583431bbaa7a9e38de2c1c0a89100 hal-0.5.9.ebuild 7193 +RMD160 a36f201410e369b8a939876bd13662c23df1a638 hal-0.5.9.ebuild 7193 +SHA256 7559e53b5a730ce8c819bd3c424311ef66bde22b1e54cbeb9b7844862f99cd04 hal-0.5.9.ebuild 7193 +MISC ChangeLog 27969 RMD160 bd890357510ff92647e7b8a0478aea137cee31d1 SHA1 904b2b0bdf8bc8feb9f42d0f2cf4a593677345cb SHA256 1743ed5c4e384708bd0d7d62ca49be3befb30e26f1a38655da2b2b089c7d6eba +MD5 376d315a5d1aa339af85bbceb78d9368 ChangeLog 27969 +RMD160 bd890357510ff92647e7b8a0478aea137cee31d1 ChangeLog 27969 +SHA256 1743ed5c4e384708bd0d7d62ca49be3befb30e26f1a38655da2b2b089c7d6eba ChangeLog 27969 MISC metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 SHA1 fef829210e8555807f9b69ba5afedffb8af8d02c SHA256 0c9aeabf473a6836c25a5db2ca86b880dec1efa9e52310725e08d1e0df93447d MD5 3317c4000387b670183d305ef9937b75 metadata.xml 345 RMD160 aa6e810e9546542453ebe5d6ca46804e99f447f2 metadata.xml 345 @@ -195,7 +207,7 @@ SHA256 d862b002c9a5547954874b2a0cbadd614381d085e850539e6aef2dd9e9d52dfe files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGJPX9oeSe8B0zEfwRAnMiAJ9F8tqomr2K+ute5H8yfsyfdtm6iwCfW9km -/8/M964JAXPVEquKn+UnkYQ= -=I+TN +iD8DBQFGJiuioeSe8B0zEfwRAruwAJsFs2FbChOZerwsvvi4MZrKGwU58QCeLbdW +gzQMeTWX4/Qqai5qDmZcpys= +=a2bu -----END PGP SIGNATURE----- diff --git a/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch b/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch new file mode 100644 index 000000000000..e14c3d280c06 --- /dev/null +++ b/sys-apps/hal/files/0.5.9/13_detect_newer_macbooks.patch @@ -0,0 +1,13 @@ +Index: b/fdi/policy/10osvendor/10-macbookpro-utils.fdi +=================================================================== +--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi 2007-03-07 16:52:19.000000000 -0500 ++++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi 2007-04-18 10:18:41.000000000 -0400 +@@ -6,7 +6,7 @@ + + + +- ++ + + + diff --git a/sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch b/sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch new file mode 100644 index 000000000000..92a0ef1f9df1 --- /dev/null +++ b/sys-apps/hal/files/0.5.9/14_ntfs_allows_utf8.patch @@ -0,0 +1,12 @@ +Index: b/fdi/policy/10osvendor/20-storage-methods.fdi +=================================================================== +--- a/fdi/policy/10osvendor/20-storage-methods.fdi 2007-03-27 01:18:54.000000000 -0400 ++++ b/fdi/policy/10osvendor/20-storage-methods.fdi 2007-04-18 10:20:54.000000000 -0400 +@@ -186,6 +186,7 @@ + gid= + umask= + locale= ++ utf8 + + + -u= diff --git a/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch new file mode 100644 index 000000000000..70f79b84e6e9 --- /dev/null +++ b/sys-apps/hal/files/0.5.9/97_ignore_fixed_drives.patch @@ -0,0 +1,38 @@ +Index: b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/fdi/policy/10osvendor/95-storage-ignore-fixed-drives.fdi 2007-04-18 10:14:56.000000000 -0400 +@@ -0,0 +1,19 @@ ++ ++ ++ ++ ++ ++ ++ ++ true ++ ++ ++ ++ false ++ ++ ++ ++ ++ ++ ++ +Index: b/fdi/policy/10osvendor/Makefile.am +=================================================================== +--- a/fdi/policy/10osvendor/Makefile.am 2007-03-30 15:03:33.000000000 -0400 ++++ b/fdi/policy/10osvendor/Makefile.am 2007-04-18 10:16:27.000000000 -0400 +@@ -7,7 +7,8 @@ + 10-rfkill-switch.fdi \ + 10-laptop-panel-mgmt-policy.fdi \ + 15-storage-luks.fdi \ +- 20-storage-methods.fdi ++ 20-storage-methods.fdi \ ++ 95-storage-ignore-fixed-drives.fdi + + if BUILD_MACBOOKPRO + dist_fdi_DATA += 10-macbookpro-utils.fdi diff --git a/sys-apps/hal/files/0.5.9/series b/sys-apps/hal/files/0.5.9/series index 262056b976ac..6406218c700c 100644 --- a/sys-apps/hal/files/0.5.9/series +++ b/sys-apps/hal/files/0.5.9/series @@ -10,5 +10,8 @@ 10_freebsd_storage_reprobe_fix.patch 11_hal_fix_segfault_probe_volume.patch 12_hal_fix-vol_label_probe_volume.patch +13_detect_newer_macbooks.patch +14_ntfs_allows_utf8.patch 95_gentoo_man_page.patch 96_plugdev_allow_send.patch +97_ignore_fixed_drives.patch diff --git a/sys-apps/hal/hal-0.5.9.ebuild b/sys-apps/hal/hal-0.5.9.ebuild index 66f5bdda41f5..aba2d4e51c77 100644 --- 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.23 2007/04/17 16:26:30 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.9.ebuild,v 1.24 2007/04/18 14:31:07 cardoe Exp $ inherit eutils linux-info autotools flag-o-matic @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" KERNEL_IUSE="kernel_linux kernel_FreeBSD" -IUSE="acpi crypt debug dell disk-partition doc pam pcmcia selinux ${KERNEL_IUSE}" +IUSE="acpi crypt debug dell disk-partition doc pcmcia selinux ${KERNEL_IUSE}" RDEPEND=">=dev-libs/glib-2.6 >=dev-libs/dbus-glib-0.61 @@ -32,8 +32,8 @@ RDEPEND=">=dev-libs/glib-2.6 disk-partition? ( >=sys-apps/parted-1.7.1 ) kernel_linux? ( crypt? ( >=sys-fs/cryptsetup-luks-1.0.1 ) ) selinux? ( sys-libs/libselinux - sec-policy/selinux-hal ) - pam? ( sys-auth/consolekit )" + sec-policy/selinux-hal )" +# pam? ( sys-auth/consolekit )" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -151,9 +151,10 @@ src_compile() { $(use_enable doc docbook-docs) \ $(use_enable doc doxygen-docs) \ $(use_enable selinux) \ - $(use_enable pam console-kit) \ + --disable-console-kit \ ${acpi} \ || die "configure failed" +#$(use_enable pam console-kit) emake || die "make failed" } @@ -172,9 +173,9 @@ src_install() { # initscript newinitd "${FILESDIR}"/0.5.9-hald.rc hald cp "${FILESDIR}"/0.5.9-hald.conf "${WORKDIR}"/ - if use pam; then - sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf - fi +# if use pam; then +# sed -e 's:RC_NEED="":RC_NEED="consolekit":' -i "${WORKDIR}"/0.5.9-hald.conf +# fi if use debug; then sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ -i "${WORKDIR}"/0.5.9-hald.conf -- 2.26.2