From 175ec5cb99d981c9f49f5065f0471672e37afb8a Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Sat, 8 Jan 2005 13:18:18 +0000 Subject: [PATCH] new release, mark 0.4.2 x86 --- sys-apps/hal/ChangeLog | 8 +- sys-apps/hal/Manifest | 7 +- sys-apps/hal/files/digest-hal-0.4.4 | 1 + ...l-0.4.4-check_ide_floppy_for_zip_fdi.patch | 45 ++++++++ sys-apps/hal/hal-0.4.2-r1.ebuild | 6 +- sys-apps/hal/hal-0.4.4.ebuild | 104 ++++++++++++++++++ 6 files changed, 165 insertions(+), 6 deletions(-) create mode 100644 sys-apps/hal/files/digest-hal-0.4.4 create mode 100644 sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch create mode 100644 sys-apps/hal/hal-0.4.4.ebuild diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 113e3cfd0f67..eb9dac85d1cb 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,12 @@ # 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.18 2004/12/22 17:51:30 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.19 2005/01/08 13:18:18 foser Exp $ + +*hal-0.4.4 (08 Jan 2005) + + 08 Jan 2005; foser hal-0.4.4.ebuild : + New release, dep fixes & add USE doc for doxygen docs + Add patch for zip as floppy drive detection *hal-0.4.2-r1 (22 Dec 2004) diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 48e206b12cdf..973ffed2ce3f 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -1,7 +1,8 @@ -MD5 bb7a85ec3632609303b29906c2daca49 hal-0.4.2-r1.ebuild 2686 +MD5 bfbd716101b6fbb11494bb0d514e598f hal-0.4.2-r1.ebuild 2685 +MD5 e1cdd8db96c5129b4983eaf86e322b0f hal-0.4.4.ebuild 2564 MD5 6e4743bdb465990bb5b63311bf4e46d9 hal-0.4.1-r1.ebuild 2529 MD5 3e506a597274c818f662edbe0c7d2b59 hal-0.2.98-r1.ebuild 2062 -MD5 d7ca668a47f31f354f6814e663134f71 ChangeLog 2598 +MD5 f8f275e08c7897fe0fac9dfa5c20256a ChangeLog 2786 MD5 731695e9263a5a2e1eeba290b36078d5 metadata.xml 219 MD5 192112dfb678a9795a93d3cdcc50bb95 files/hald 543 MD5 715f2a2e9a6980bae0823241ea50787f files/hal-0.4.0-allow-floppy-drives.patch 738 @@ -10,5 +11,7 @@ MD5 f1cf07edc63d04f0ef33911de97ea2f2 files/digest-hal-0.4.1-r1 62 MD5 a9afa7e41b21ea5f012765a8ced6c10d files/digest-hal-0.4.2-r1 62 MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 1194 MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028 +MD5 11d67cf37182e289664f50de3ee6172f files/digest-hal-0.4.4 62 +MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch 1920 MD5 eeb1838cdb78726ab674194f0d268270 files/hal-0.4.2-fstab_sync_crash.patch 468 MD5 a0ce1c268e0b7d0967ec7b8e0d0d26d2 files/hal-0.4.1-old_storage_policy.patch 1216 diff --git a/sys-apps/hal/files/digest-hal-0.4.4 b/sys-apps/hal/files/digest-hal-0.4.4 new file mode 100644 index 000000000000..fe307283dc7c --- /dev/null +++ b/sys-apps/hal/files/digest-hal-0.4.4 @@ -0,0 +1 @@ +MD5 aa01a43d7818727e5b0bcdbd2b18b4c9 hal-0.4.4.tar.gz 1341394 diff --git a/sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch b/sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch new file mode 100644 index 000000000000..561094cbedc3 --- /dev/null +++ b/sys-apps/hal/files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch @@ -0,0 +1,45 @@ +Index: fdi/20freedesktop/ide-drives.fdi +=================================================================== +RCS file: /cvs/hal/hal/fdi/20freedesktop/ide-drives.fdi,v +retrieving revision 1.1.2.4 +diff -u -p -r1.1.2.4 ide-drives.fdi +--- fdi/20freedesktop/ide-drives.fdi 31 Dec 2004 12:01:52 -0000 1.1.2.4 ++++ fdi/20freedesktop/ide-drives.fdi 7 Jan 2005 19:24:46 -0000 +@@ -48,6 +48,37 @@ + + + ++ ++ ++ ++ ++ ++ zip ++ true ++ true ++ ++ 4 ++ ++ ++ ++ ++ zip ++ true ++ true ++ ++ 4 ++ ++ ++ ++ ++ jaz ++ true ++ true ++ ++ 4 ++ ++ ++ + + + diff --git a/sys-apps/hal/hal-0.4.2-r1.ebuild b/sys-apps/hal/hal-0.4.2-r1.ebuild index 2d86680419d7..217b7e2cdb07 100644 --- a/sys-apps/hal/hal-0.4.2-r1.ebuild +++ b/sys-apps/hal/hal-0.4.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.2-r1.ebuild,v 1.1 2004/12/22 17:51:30 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.2-r1.ebuild,v 1.2 2005/01/08 13:18:18 foser Exp $ inherit eutils python @@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/~david/${P}.tar.gz" LICENSE="|| ( GPL-2 AFL-2.0 )" SLOT="0" -KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64" +KEYWORDS="x86 ~amd64 ~ia64 ~ppc ~ppc64" IUSE="debug pcmcia" RDEPEND=">=dev-libs/glib-2.4 diff --git a/sys-apps/hal/hal-0.4.4.ebuild b/sys-apps/hal/hal-0.4.4.ebuild new file mode 100644 index 000000000000..db1a76228aeb --- /dev/null +++ b/sys-apps/hal/hal-0.4.4.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.4.ebuild,v 1.1 2005/01/08 13:18:18 foser Exp $ + +inherit eutils 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 ~amd64 ~ia64 ~ppc ~ppc64" +IUSE="debug pcmcia doc" + +RDEPEND=">=dev-libs/glib-2.4 + >=sys-apps/dbus-0.22-r1 + dev-libs/expat + sys-fs/udev + sys-apps/hotplug + sys-libs/libcap + dev-libs/popt + >=sys-apps/util-linux-2.12i + sys-kernel/linux26-headers" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.29 + doc? ( app-doc/doxygen )" + +# dep on a specific util-linux version for +# managed mount patches #70873 + +src_unpack() { + + unpack ${A} + + cd ${S} + # remove pamconsole option + epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch + # support IDE zip drives as floppy + epatch ${FILESDIR}/${P}-check_ide_floppy_for_zip_fdi.patch + +} + +src_compile() { + + # FIXME : docs + econf \ + `use_enable debug verbose-mode` \ + `use_enable pcmcia pcmcia-support` \ + --enable-fstab-sync \ + --enable-hotplug-map \ + --disable-docbook-docs \ + `use_enable doc doxygen-docs` \ + --with-pid-file=/var/run/hald/hald.pid \ + || die + + emake || die + +} + +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 + + # place our pid file + keepdir /var/run/hald + + 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() { + + # make sure the permissions on the pid dir are alright & after preinst + chown haldaemon:haldaemon /var/run/hald + + 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 /etc/fstab runtime on the filesystem" + ewarn "and should be considered a security risk." + 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\`" + +} -- 2.26.2