new release

13 files changed, 263 insertions, 87 deletions

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index 80294bd54660..93955bce05ce 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.7 2004/10/02 15:49:13 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.8 2004/10/28 22:22:37 foser Exp $
+
+*hal-0.4.0 (29 Oct 2004)
+
+  29 Oct 2004; foser <foser@gentoo.org> hal-0.4.0.ebuild :
+  New release (#68243)
+  Fix LICENSE
+  Add a few patches from RH & some fixes to counter them
 
 *hal-0.2.98-r1 (02 Oct 2004)
 
diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index d02d9da3c034..4bee3adec715 100644
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,9 +1,12 @@
-MD5 00e64b30bed4c184135d7192d6d09cd7 hal-0.2.98-r1.ebuild 2064
-MD5 3bb693df02d9dda8e7fd239ae41137a9 hal-0.2.98.ebuild 1955
-MD5 880087601659287254cb61ad878c9199 ChangeLog 1307
+MD5 61261554ddcd26a4720cd42600670f45 hal-0.2.98-r1.ebuild 2066
+MD5 5f372bd476e29ee45409cacd8774748f hal-0.4.0.ebuild 2478
+MD5 d08b6349e7c971dd17da7aa8547b053f ChangeLog 1485
 MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219
-MD5 18d89d8976e9422f0ee10e92d8e7885f hal-0.2.97.ebuild 1745
 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543
+MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738
 MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98-r1 63
-MD5 9ba9094143c1d09db466d61bb7d7b3d5 files/digest-hal-0.2.97 63
-MD5 72d398ab014b2630043ef2a4d9990e2f files/digest-hal-0.2.98 63
+MD5 14380bf35823146ebc30fb47bfcad39c files/hal-0.4.0-storage-policy-never-use-uuid.patch 1405
+MD5 467820e480b84fd75a783dbcbb282c2a files/digest-hal-0.4.0 62
+MD5 fa38b59d0ab9bdf0ff3363cd756d902a files/hal-0.4.0-old_storage_policy.patch 1217
+MD5 3eb5f234297bb915e58f5e7b1dc39e7e files/hal-0.4.0-fix-fstab-sync-crasher.patch 2422
+MD5 90ea63d4a4b9885b7a6eab147dcb428b files/hal-0.4.0-clean-on-startup.patch 2653
diff --git a/sys-apps/hal/files/digest-hal-0.2.97 b/sys-apps/hal/files/digest-hal-0.2.97
deleted file mode 100644
index 377a8445a224..000000000000
--- a/sys-apps/hal/files/digest-hal-0.2.97
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d156860f508ea384282a367774fe85bb hal-0.2.97.tar.gz 1238713
diff --git a/sys-apps/hal/files/digest-hal-0.2.98 b/sys-apps/hal/files/digest-hal-0.2.98
deleted file mode 100644
index 7eaa6f7cc441..000000000000
--- a/sys-apps/hal/files/digest-hal-0.2.98
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc289e50e00330032604e02392ffde3a hal-0.2.98.tar.gz 1221966
diff --git a/sys-apps/hal/files/digest-hal-0.4.0 b/sys-apps/hal/files/digest-hal-0.4.0
new file mode 100644
index 000000000000..6942fe7f23aa
--- /dev/null
+++ b/sys-apps/hal/files/digest-hal-0.4.0
@@ -0,0 +1 @@
+MD5 2ced1620a85cd547c53aa72787d8b06e hal-0.4.0.tar.gz 1319354
diff --git a/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch b/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch
new file mode 100644
index 000000000000..6a8dff4cc6ec
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-allow-floppy-drives.patch
@@ -0,0 +1,17 @@
+Index: fdi/90defaultpolicy/storage-policy.fdi
+===================================================================
+RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
+retrieving revision 1.5
+diff -u -p -r1.5 storage-policy.fdi
+--- fdi/90defaultpolicy/storage-policy.fdi	15 Oct 2004 20:46:08 -0000	1.5
++++ fdi/90defaultpolicy/storage-policy.fdi	18 Oct 2004 23:51:33 -0000
+@@ -30,6 +30,9 @@
+       <match key="storage.bus" string="sata">
+ 	<merge key="storage.policy.should_mount" type="bool">true</merge>
+       </match>
++      <match key="storage.bus" string="platform">
++	<merge key="storage.policy.should_mount" type="bool">true</merge>
++      </match>
+     </match>
+ 
+     <!-- Handle drives with non-partitioned media  -->
diff --git a/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch b/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch
new file mode 100644
index 000000000000..237c5712524e
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-clean-on-startup.patch
@@ -0,0 +1,92 @@
+? changes
+? foo.c
+? hal-0.4.0-clean-on-startup.patch
+? hal-0.4.0.tar.gz
+? hal-storage.pc
+? intltool-extract
+? intltool-extract.in
+? intltool-merge
+? intltool-merge.in
+? intltool-update
+? intltool-update.in
+? mkinstalldirs
+? doc/api/Doxyfile
+? doc/api/Makefile
+? doc/api/Makefile.in
+? doc/api/html
+? doc/conf/Makefile
+? doc/conf/Makefile.in
+? doc/spec/Makefile
+? doc/spec/Makefile.in
+? doc/spec/hal-spec.xml
+? doc/spec/spec.tar
+? fdi/30osvendor/Makefile
+? fdi/30osvendor/Makefile.in
+? fdi/40oem/Makefile
+? fdi/40oem/Makefile.in
+? fdi/50user/Makefile
+? fdi/50user/Makefile.in
+? fdi/90defaultpolicy/Makefile
+? fdi/90defaultpolicy/Makefile.in
+? fdi/95userpolicy/Makefile
+? fdi/95userpolicy/Makefile.in
+? hald/foo
+? libhal-storage/.deps
+? libhal-storage/.libs
+? libhal-storage/Makefile
+? libhal-storage/Makefile.in
+? libhal-storage/libhal-storage.la
+? libhal-storage/libhal-storage.lo
+? po/Makefile
+? po/Makefile.in
+? po/Makefile.in.in
+? po/POTFILES
+? po/da.gmo
+? po/de.gmo
+? po/fr.gmo
+? po/hal.pot
+? po/nl.gmo
+? tools/foo
+? tools/fstab-sync
+? tools/fstab-sync.8
+? tools/linux/hal-hotplug-map
+Index: tools/fstab-sync.c
+===================================================================
+RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
+retrieving revision 1.23
+diff -u -p -r1.23 fstab-sync.c
+--- tools/fstab-sync.c	14 Oct 2004 18:37:28 -0000	1.23
++++ tools/fstab-sync.c	15 Oct 2004 00:33:54 -0000
+@@ -74,11 +74,6 @@ static boolean verbose = FALSE;
+ #define TEMP_FSTAB_PREFIX ".fstab.hal."
+ #define TEMP_FSTAB_MAX_LENGTH 64
+ 
+-#undef FSTAB_SYNC_MOUNT_ROOT
+-#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD
+-#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC
+-#undef FSTAB_SYNC_MOUNT_ACCESS
+-
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
+@@ -1657,10 +1652,8 @@ main (int argc, const char *argv[])
+         N_("add an entry to fstab"), N_("UDI")},
+       {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
+         N_("remove an entry from fstab"), N_("UDI")},
+-#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
+       {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
+         N_("Remove all generated entries from fstab")},
+-#endif
+       {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
+         N_("Report detailed information about operation progress")},
+ 
+@@ -1694,9 +1687,7 @@ main (int argc, const char *argv[])
+       
+       /* when invoked for the /org/freedesktop/Hal/devices/computer UDI we clean the fstab */
+       if (getenv ("HALD_STARTUP") != NULL && strcmp (hal_device_udi, "/org/freedesktop/Hal/devices/computer") == 0) {
+-#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
+ 	should_clean = TRUE;
+-#endif
+       } else {
+       
+ 	/* when we are invoked by hald, make some early tests using the
diff --git a/sys-apps/hal/files/hal-0.4.0-fix-fstab-sync-crasher.patch b/sys-apps/hal/files/hal-0.4.0-fix-fstab-sync-crasher.patch
new file mode 100644
index 000000000000..34d13b326e01
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-fix-fstab-sync-crasher.patch
@@ -0,0 +1,70 @@
+Index: tools/fstab-sync.c
+===================================================================
+RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
+retrieving revision 1.25
+diff -u -p -r1.25 fstab-sync.c
+--- tools/fstab-sync.c	15 Oct 2004 20:53:45 -0000	1.25
++++ tools/fstab-sync.c	19 Oct 2004 00:17:10 -0000
+@@ -1653,27 +1653,23 @@ main (int argc, const char *argv[])
+   openlog (PROGRAM_NAME, LOG_PID, LOG_USER);
+   
+   struct poptOption options[] = {
+-      {"add", 'a', POPT_ARG_STRING, &udi_to_add, 0,
+-        N_("add an entry to fstab"), N_("UDI")},
+-      {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
+-        N_("remove an entry from fstab"), N_("UDI")},
+-      {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
+-        N_("Remove all generated entries from fstab")},
+-      {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
+-        N_("Report detailed information about operation progress")},
++      {"add",     'a', POPT_ARG_STRING, &udi_to_add,    0, N_("add an entry to fstab"), N_("UDI")},
++      {"remove",  'r', POPT_ARG_STRING, &udi_to_remove, 0, N_("remove an entry from fstab"), N_("UDI")},
++      {"clean",   'c', POPT_ARG_NONE,   &should_clean,  0, N_("Remove all generated entries from fstab"), NULL},
++      {"verbose", 'v', POPT_ARG_NONE,   &verbose,       0, N_("Report detailed information about operation progress"), NULL},
+ 
+       POPT_AUTOHELP
+ 
+-      {NULL, '\0', 0, NULL},
++      {NULL, '\0', 0, NULL, 0, NULL, NULL}
+   };
+ 
+   popt_context = poptGetContext (PROGRAM_NAME, argc, argv, options, 0);
+-
++	  
+   while ((i = poptGetNextOpt (popt_context)) != -1)
+     {
+       if (i < -1)
+         {
+-          poptPrintHelp (popt_context, stderr, 0);
++	  poptPrintHelp (popt_context, stderr, 0);
+           return 1;
+         }
+     }
+@@ -1760,7 +1756,6 @@ main (int argc, const char *argv[])
+ 			  break;
+ 		  }
+ 	  }
+-  poptFreeContext (popt_context);
+ 
+   hal_context = hal_initialize (NULL, FALSE);
+   fsy_mount_root = hal_drive_policy_default_get_mount_root (hal_context);
+@@ -1792,8 +1787,8 @@ main (int argc, const char *argv[])
+     retval = clean ();
+   else
+     {
+-      poptPrintHelp (popt_context, stderr, 0);
+-      return 1;
++	poptPrintHelp (popt_context, stderr, 0);
++	return 1;
+     }
+ 
+   if (hal_device_udi != NULL) {
+@@ -1816,6 +1811,8 @@ main (int argc, const char *argv[])
+     fstab_update_debug (_("\n"));
+   }
+ 
++  poptFreeContext (popt_context);
++
+ out:
+   return retval;
+ }
diff --git a/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch b/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch
new file mode 100644
index 000000000000..a2df781eb710
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-old_storage_policy.patch
@@ -0,0 +1,17 @@
+--- hal-0.4.0/fdi/90defaultpolicy/storage-policy.fdi	2004-10-14 23:59:29.000000000 +0200
++++ hal-0.4.0/fdi/90defaultpolicy/storage-policy.fdi.patched	2004-10-21 12:48:16.223876512 +0200
+@@ -6,11 +6,12 @@
+   <device>
+     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+       <merge key="storage.policy.default.mount_root" type="string">/media</merge>
+-      <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
++      <merge key="storage.policy.default.use_managed_keyword" type="bool">false</merge>
+       <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
+       <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
+       <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
+-      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
++      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">false</merge>
++      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
+       <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
+     </match>
+   </device>
diff --git a/sys-apps/hal/files/hal-0.4.0-storage-policy-never-use-uuid.patch b/sys-apps/hal/files/hal-0.4.0-storage-policy-never-use-uuid.patch
new file mode 100644
index 000000000000..e006dd24f939
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.4.0-storage-policy-never-use-uuid.patch
@@ -0,0 +1,25 @@
+Index: fdi/90defaultpolicy/storage-policy.fdi
+===================================================================
+RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
+retrieving revision 1.4
+diff -u -r1.4 storage-policy.fdi
+--- fdi/90defaultpolicy/storage-policy.fdi	14 Oct 2004 21:58:55 -0000	1.4
++++ fdi/90defaultpolicy/storage-policy.fdi	15 Oct 2004 20:43:16 -0000
+@@ -83,13 +83,10 @@
+ 	  <merge key="volume.policy.should_mount" type="bool">true</merge>
+ 	  <merge key="volume.policy.mount_filesystem" type="copy_property">volume.fstype</merge>
+ 	  
+-	  <!-- Fallback is '<storage.drive_type>', e.g. disk, compact_flash etc. -->
+-	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.drive_type</merge>
+-	  
+-	  <!-- Better: if available use UUID -->
+-          <match key="volume.uuid" empty="false">
+-            <merge key="volume.policy.desired_mount_point" type="copy_property">volume.uuid</merge>
+-          </match>
++	  <!-- Fallback is '<storage.bus>', appended with 'disk', e.g. usbdisk,
++	       idedisk, scsidisk etc. -->
++	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
++	  <append key="volume.policy.desired_mount_point" type="string">disk</append>
+ 	  
+           <!-- Best: If available use filesystem label -->
+           <match key="volume.label" empty="false">
diff --git a/sys-apps/hal/hal-0.2.97.ebuild b/sys-apps/hal/hal-0.2.97.ebuild
deleted file mode 100644
index 0a9b9c0af5d1..000000000000
--- a/sys-apps/hal/hal-0.2.97.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.2.97.ebuild,v 1.5 2004/09/18 22:24:14 lv Exp $
-
-inherit eutils debug python
-
-DESCRIPTION="Hardware Abstraction Layer"
-HOMEPAGE="http://www.freedesktop.org/Software/hal"
-
-SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-LICENSE="GPL-2 | AFL-2.0"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.2.2
-	>=sys-apps/dbus-0.22
-	dev-libs/expat
-	sys-fs/udev
-	sys-apps/hotplug"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	# FIXME : docs
-	econf \
-		--disable-doxygen-docs \
-		--disable-docbook-docs \
-		|| die
-
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	# initscript
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/hald
-
-	# fstab automatic device creation
-	dosym /usr/sbin/fstab-sync /etc/hal/device.d/fstab-sync
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-
-}
-
-pkg_preinst() {
-
-	enewgroup haldaemon || die "Problem adding haldaemon group"
-	enewuser haldaemon -1 /bin/false /dev/null haldaemon || die "Problem adding haldaemon user"
-
-}
-
-pkg_postinst() {
-
-	ewarn "Enabled in this ebuild by default is the usage of fstab-sync"
-	ewarn "that will create mount rules for non-existing devices in"
-	ewarn "fstab if needed, mount points will be created in /media."
-	ewarn "This functionality alters your fstab runtime on the filesystem"
-	ewarn "and might have unforseen side-effects."
-	echo
-	einfo "The HAL daemon needs to be running for certain applications to"
-	einfo "work. Suggested is to add the init script to your start-up"
-	einfo "scripts, this should be done like this :"
-	einfo "\`rc-update add hald default\`"
-
-}
diff --git a/sys-apps/hal/hal-0.2.98-r1.ebuild b/sys-apps/hal/hal-0.2.98-r1.ebuild
index 098db0d5c073..f10cadcc1f91 100644
--- a/sys-apps/hal/hal-0.2.98-r1.ebuild
+++ b/sys-apps/hal/hal-0.2.98-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.2.98-r1.ebuild,v 1.1 2004/10/02 15:49:13 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.2.98-r1.ebuild,v 1.2 2004/10/28 22:22:37 foser Exp $
 
 inherit eutils debug python
 
@@ -8,10 +8,10 @@ DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
 
 SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-LICENSE="GPL-2 | AFL-2.0"
+LICENSE="|| ( GPL-2 AFL-2.0 )"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.2.2
diff --git a/sys-apps/hal/hal-0.2.98.ebuild b/sys-apps/hal/hal-0.4.0.ebuild
index 090c7d69c496..99aed02b9768 100644
--- a/sys-apps/hal/hal-0.2.98.ebuild
+++ b/sys-apps/hal/hal-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.2.98.ebuild,v 1.2 2004/09/21 14:35:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.0.ebuild,v 1.1 2004/10/28 22:22:37 foser Exp $
 
 inherit eutils debug python
 
@@ -8,7 +8,7 @@ DESCRIPTION="Hardware Abstraction Layer"
 HOMEPAGE="http://www.freedesktop.org/Software/hal"
 
 SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
-LICENSE="GPL-2 | AFL-2.0"
+LICENSE="|| ( GPL-2 AFL-2.0 )"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -25,6 +25,22 @@ RDEPEND=">=dev-libs/glib-2.2.2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# remove RH only stuff
+	epatch ${FILESDIR}/${P}-old_storage_policy.patch
+	# fix floppy drives be shown
+	epatch ${FILESDIR}/${P}-allow-floppy-drives.patch
+	# fix default drivenames fallback & other RH goodies
+	epatch ${FILESDIR}/${P}-storage-policy-never-use-uuid.patch
+	epatch ${FILESDIR}/${P}-clean-on-startup.patch
+	epatch ${FILESDIR}/${P}-fix-fstab-sync-crasher.patch
+
+}
+
 src_compile() {
 
 	# FIXME : docs
@@ -44,6 +60,9 @@ src_install() {
 
 	make DESTDIR=${D} install || die
 
+	# We install this in a seperate package to avoid gnome-python dep
+	rm ${D}/usr/bin/hal-device-manager
+
 	# initscript
 	exeinto /etc/init.d/
 	doexe ${FILESDIR}/hald