diff options
author | Marinus Schraal <foser@gentoo.org> | 2005-05-27 21:51:21 +0000 |
---|---|---|
committer | Marinus Schraal <foser@gentoo.org> | 2005-05-27 21:51:21 +0000 |
commit | 8dd4bf4a9e8f05611b794433fc3f326f28eeb72e (patch) | |
tree | 07a17cdb7eaa8dc8415f5f8024a00362d5479bb7 /sys-apps | |
parent | strip HOMEPAGE #94139 (diff) | |
download | gentoo-2-8dd4bf4a9e8f05611b794433fc3f326f28eeb72e.tar.gz gentoo-2-8dd4bf4a9e8f05611b794433fc3f326f28eeb72e.tar.bz2 gentoo-2-8dd4bf4a9e8f05611b794433fc3f326f28eeb72e.zip |
new release, mark 0.4.7-r2 x86 & cleanup
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/hal/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/hal/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.2.98-r1 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.1-r1 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.2-r1 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.4-r1 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.5-r1 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.7 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.7-r1 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/digest-hal-0.4.8 | 1 | ||||
-rw-r--r-- | sys-apps/hal/files/hal-0.4.8-fix_dvdram.patch | 11 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.2.98-r1.ebuild | 83 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.1-r1.ebuild | 103 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.2-r1.ebuild | 106 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.4-r1.ebuild | 108 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.5-r1.ebuild | 103 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.7-r2.ebuild | 18 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.7.ebuild | 121 | ||||
-rw-r--r-- | sys-apps/hal/hal-0.4.8.ebuild (renamed from sys-apps/hal/hal-0.4.7-r1.ebuild) | 33 |
19 files changed, 53 insertions, 653 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index 541ff5ad6541..98e71faf07b9 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/hal # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.36 2005/05/09 03:04:44 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.37 2005/05/27 21:51:21 foser Exp $ + +*hal-0.4.8 (27 May 2005) + + 27 May 2005; foser <foser@gentoo.org> hal-0.4.8.ebuild : + New release, add sanity back to pkg_setup + Fixed headers dep (#89550) + Add patch to fix dvdram detection 09 May 2005; Aron Griffis <agriffis@gentoo.org> hal-0.4.5-r2.ebuild: stable on ia64 diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index 669d1e111e46..062f89d14fe9 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -3,6 +3,7 @@ MD5 3421ea82543d71c44ee06c3f9605d775 hal-0.4.5-r1.ebuild 2592 MD5 f6c71019d8f7b2dab5ef13de1abd9244 hal-0.4.1-r1.ebuild 2567 MD5 08dc21645866be8d5f12b30bd25e77f1 hal-0.4.7-r2.ebuild 3406 MD5 8a56df2be3b94b0e0e958c48e6c14df5 hal-0.2.98-r1.ebuild 2102 +MD5 5709c67641b04661774317feedaf3cb4 hal-0.4.8.ebuild 3289 MD5 4de36bde0054e10e722225fe4ffd6c6b hal-0.4.4-r1.ebuild 2758 MD5 df44cfbd597367a6ac40680750d2b3bd hal-0.4.7-r1.ebuild 3150 MD5 0d714f805453baef6cc52afc9bc5465d hal-0.4.5-r2.ebuild 3152 @@ -27,7 +28,9 @@ MD5 0693dbefb790150740986cce82039b82 files/hal-0.4.2-cdrom_media_check.patch 119 MD5 399570c945e0f4bffbeb645e057e027b files/hal-0.4.1-dm_devices_tab.patch 1028 MD5 a4d2c4884a3dedf2450cf37508d3c122 files/hal-0.4.7-vfat_mount_utf8.patch 670 MD5 3031a9fe74f43859c313d5f3076e68cd files/digest-hal-0.4.7 62 +MD5 2bbbb519c89110dfec96cf63cf541afc files/digest-hal-0.4.8 62 MD5 314ebeadb0a53e448e74ad6a3eead3f8 files/hal-0.4.4-check_ide_floppy_for_zip_fdi.patch 1920 +MD5 e3ecbfe57c0833d32f0ea57a0de58aee files/hal-0.4.8-fix_dvdram.patch 465 MD5 2b00af86c624d74107035a007ac3c9da files/hal-0.4.4-volume_id_fat.patch 849 MD5 b0e12a62ce698e1eb2a32139498330cd files/hal-0.4.5-gentoo_gphoto2_usermap.patch 817 MD5 f3ba6ada28cf947f8a7b7ec8fdd708ba files/hal-0.4.5-net_lockup.patch 2429 diff --git a/sys-apps/hal/files/digest-hal-0.2.98-r1 b/sys-apps/hal/files/digest-hal-0.2.98-r1 deleted file mode 100644 index 7eaa6f7cc441..000000000000 --- a/sys-apps/hal/files/digest-hal-0.2.98-r1 +++ /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.1-r1 b/sys-apps/hal/files/digest-hal-0.4.1-r1 deleted file mode 100644 index c130690c7dfa..000000000000 --- a/sys-apps/hal/files/digest-hal-0.4.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 8c06c46ff1925c521cd4196d8b61d8ae hal-0.4.1.tar.gz 1333684 diff --git a/sys-apps/hal/files/digest-hal-0.4.2-r1 b/sys-apps/hal/files/digest-hal-0.4.2-r1 deleted file mode 100644 index 6b8be036974e..000000000000 --- a/sys-apps/hal/files/digest-hal-0.4.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 dd3469f1b501879719fa47795a0f48fb hal-0.4.2.tar.gz 1310359 diff --git a/sys-apps/hal/files/digest-hal-0.4.4-r1 b/sys-apps/hal/files/digest-hal-0.4.4-r1 deleted file mode 100644 index fe307283dc7c..000000000000 --- a/sys-apps/hal/files/digest-hal-0.4.4-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 aa01a43d7818727e5b0bcdbd2b18b4c9 hal-0.4.4.tar.gz 1341394 diff --git a/sys-apps/hal/files/digest-hal-0.4.5-r1 b/sys-apps/hal/files/digest-hal-0.4.5-r1 deleted file mode 100644 index c4ca2b2c74d4..000000000000 --- a/sys-apps/hal/files/digest-hal-0.4.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 780d0bf4849c83ea4f8ab9b4102229c2 hal-0.4.5.tar.gz 1343158 diff --git a/sys-apps/hal/files/digest-hal-0.4.7 b/sys-apps/hal/files/digest-hal-0.4.7 deleted file mode 100644 index 031b4dff3230..000000000000 --- a/sys-apps/hal/files/digest-hal-0.4.7 +++ /dev/null @@ -1 +0,0 @@ -MD5 3386817a6811cce803bcfa8a20b05c51 hal-0.4.7.tar.gz 1349064 diff --git a/sys-apps/hal/files/digest-hal-0.4.7-r1 b/sys-apps/hal/files/digest-hal-0.4.7-r1 deleted file mode 100644 index 031b4dff3230..000000000000 --- a/sys-apps/hal/files/digest-hal-0.4.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3386817a6811cce803bcfa8a20b05c51 hal-0.4.7.tar.gz 1349064 diff --git a/sys-apps/hal/files/digest-hal-0.4.8 b/sys-apps/hal/files/digest-hal-0.4.8 new file mode 100644 index 000000000000..50fd20d1fce5 --- /dev/null +++ b/sys-apps/hal/files/digest-hal-0.4.8 @@ -0,0 +1 @@ +MD5 0b8aa2e8b45769bb56276e464918525f hal-0.4.8.tar.gz 1353568 diff --git a/sys-apps/hal/files/hal-0.4.8-fix_dvdram.patch b/sys-apps/hal/files/hal-0.4.8-fix_dvdram.patch new file mode 100644 index 000000000000..19988b359336 --- /dev/null +++ b/sys-apps/hal/files/hal-0.4.8-fix_dvdram.patch @@ -0,0 +1,11 @@ +--- hald/linux/block_class_device.c 2005-03-28 21:15:19.000000000 +0200 ++++ hald/linux/block_class_device.c 2005-05-19 09:24:52.000000000 +0200 +@@ -350,7 +350,7 @@ + hal_device_property_set_bool (d, "storage.cdrom.dvdr", TRUE); + } + if (capabilities & CDC_DVD_RAM) { +- hal_device_property_set_bool (d, "storage.dvdram", TRUE); ++ hal_device_property_set_bool (d, "storage.cdrom.dvdram", TRUE); + } + + /* while we're at it, check if we support media changed */ diff --git a/sys-apps/hal/hal-0.2.98-r1.ebuild b/sys-apps/hal/hal-0.2.98-r1.ebuild deleted file mode 100644 index 8c9d228d098d..000000000000 --- a/sys-apps/hal/hal-0.2.98-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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.2.98-r1.ebuild,v 1.6 2005/01/12 14:22:15 johnm 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="~amd64 ppc x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.2.2 - >=sys-apps/dbus-0.22-r1 - dev-libs/expat - sys-fs/udev - sys-apps/hotplug - sys-libs/libcap - || ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_compile() { - - # FIXME : docs - econf \ - --enable-fstab-sync \ - --enable-hotplug-map \ - --disable-doxygen-docs \ - --disable-docbook-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 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.4.1-r1.ebuild b/sys-apps/hal/hal-0.4.1-r1.ebuild deleted file mode 100644 index fb786ea7078e..000000000000 --- a/sys-apps/hal/hal-0.4.1-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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.1-r1.ebuild,v 1.7 2005/01/12 14:22:15 johnm 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 amd64 ~ia64 ppc ppc64" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.2.2 - >=sys-apps/dbus-0.22-r1 - dev-libs/expat - sys-fs/udev - sys-apps/hotplug - sys-libs/libcap - >=sys-apps/util-linux-2.12i - || ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.29" - -# 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 - # fix floppy drives be shown - epatch ${FILESDIR}/${PN}-0.4.0-allow-floppy-drives.patch - # smallish device manaager fix - cd ${S}/tools/device-manager - epatch ${FILESDIR}/${P}-dm_devices_tab.patch - -} - -src_compile() { - - # FIXME : docs - econf \ - --enable-fstab-sync \ - --enable-hotplug-map \ - --disable-doxygen-docs \ - --disable-docbook-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 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.4.2-r1.ebuild b/sys-apps/hal/hal-0.4.2-r1.ebuild deleted file mode 100644 index dd4466ed4742..000000000000 --- a/sys-apps/hal/hal-0.4.2-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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.6 2005/01/22 06:08:34 vapier 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" - -RDEPEND=">=dev-libs/glib-2.4 - >=sys-apps/dbus-0.22-r1 - dev-libs/expat - sys-fs/udev - sys-apps/hotplug - sys-libs/libcap - >=sys-apps/util-linux-2.12i - || ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.29" - -# 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 - # fix floppy drives be shown - epatch ${FILESDIR}/${PN}-0.4.0-allow-floppy-drives.patch - # fix for some odd cdromdrives giving misinformation - epatch ${FILESDIR}/${P}-cdrom_media_check.patch - # fix possible fstab sync crash - epatch ${FILESDIR}/${P}-fstab_sync_crash.patch - -} - -src_compile() { - - # FIXME : docs - econf \ - `use_enable debug verbose-mode` \ - `use_enable pcmcia pcmcia-support` \ - --enable-fstab-sync \ - --enable-hotplug-map \ - --disable-doxygen-docs \ - --disable-docbook-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\`" - -} diff --git a/sys-apps/hal/hal-0.4.4-r1.ebuild b/sys-apps/hal/hal-0.4.4-r1.ebuild deleted file mode 100644 index 7c15759cbe97..000000000000 --- a/sys-apps/hal/hal-0.4.4-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# 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-r1.ebuild,v 1.4 2005/01/12 14:54:54 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/linux-headers-2.6 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 - # fix joliet label (#77140) - epatch ${FILESDIR}/${P}-iso_label_selection.patch - # fix fat on large volumes - epatch ${FILESDIR}/${P}-volume_id_fat.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\`" - -} diff --git a/sys-apps/hal/hal-0.4.5-r1.ebuild b/sys-apps/hal/hal-0.4.5-r1.ebuild deleted file mode 100644 index 46cc81c6f174..000000000000 --- a/sys-apps/hal/hal-0.4.5-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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.5-r1.ebuild,v 1.1 2005/01/17 13:09:55 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/linux-headers-2.6 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 - # pick up the gentoo usermap - epatch ${FILESDIR}/${P}-gentoo_gphoto2_usermap.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\`" - -} diff --git a/sys-apps/hal/hal-0.4.7-r2.ebuild b/sys-apps/hal/hal-0.4.7-r2.ebuild index a97e1b510b1e..aa3d76345dae 100644 --- a/sys-apps/hal/hal-0.4.7-r2.ebuild +++ b/sys-apps/hal/hal-0.4.7-r2.ebuild @@ -1,6 +1,6 @@ # 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.7-r2.ebuild,v 1.3 2005/05/23 20:34:55 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.7-r2.ebuild,v 1.4 2005/05/27 21:51:21 foser Exp $ inherit eutils python linux-info versionator flag-o-matic @@ -10,11 +10,11 @@ SRC_URI="http://freedesktop.org/~david/dist/${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 doc livecd" RDEPEND=">=dev-libs/glib-2.4 - >=sys-apps/dbus-0.22-r1 + =sys-apps/dbus-0.23* dev-libs/expat sys-fs/udev sys-apps/hotplug @@ -33,10 +33,16 @@ DEPEND="${RDEPEND} # We need to run at least a 2.6.10 kernel, this is a # way to ensure that to some extent pkg_setup() { + use livecd && return - linux-info_pkg_setup - kernel_is ge 2 6 10 \ - || die "You need a 2.6.10 or newer kernel to build this package" + + if get_version; then + kernel_is ge 2 6 10 && return + elif get_running_version; then + kernel_is ge 2 6 10 && return + fi + + die "You need to run a 2.6.10 or newer kernel to build & use this pack" } diff --git a/sys-apps/hal/hal-0.4.7.ebuild b/sys-apps/hal/hal-0.4.7.ebuild deleted file mode 100644 index 213ae8a861b1..000000000000 --- a/sys-apps/hal/hal-0.4.7.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# 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.7.ebuild,v 1.1 2005/02/06 17:21:27 foser Exp $ - -inherit eutils python linux-info versionator flag-o-matic - -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/linux-headers-2.6 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 - -# We need to run at least a 2.6.10 kernel, this is a -# way to ensure that to some extent -pkg_setup() { - - if get_version; then - kernel_is ge 2 6 10 && break - else - RKV=$(uname -r) - RKV=${RKV//-*} - if version_is_at_least "2.6.10" ${RKV}; then - break - fi - fi - die "You need a 2.6.10 or newer kernel to build this pack" - -} - -src_unpack() { - - unpack ${A} - - cd ${S} - # remove pamconsole option - epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch - # pick up the gentoo usermap - epatch ${FILESDIR}/${PN}-0.4.5-gentoo_gphoto2_usermap.patch - -} - -src_compile() { - - # FIXME : docs - econf \ - `use_enable debug verbose-mode` \ - `use_enable pcmcia pcmcia-support` \ - --enable-sysfs-carrier \ - --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\`" - -} diff --git a/sys-apps/hal/hal-0.4.7-r1.ebuild b/sys-apps/hal/hal-0.4.8.ebuild index 483d49e41213..b4ce0931d5dc 100644 --- a/sys-apps/hal/hal-0.4.7-r1.ebuild +++ b/sys-apps/hal/hal-0.4.8.ebuild @@ -1,6 +1,6 @@ # 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.7-r1.ebuild,v 1.1 2005/03/21 21:38:04 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.4.8.ebuild,v 1.1 2005/05/27 21:51:21 foser Exp $ inherit eutils python linux-info versionator flag-o-matic @@ -11,17 +11,17 @@ 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" +IUSE="debug pcmcia doc livecd" RDEPEND=">=dev-libs/glib-2.4 - >=sys-apps/dbus-0.22-r1 + =sys-apps/dbus-0.23* dev-libs/expat sys-fs/udev sys-apps/hotplug sys-libs/libcap dev-libs/popt >=sys-apps/util-linux-2.12i - || ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )" + >=sys-kernel/linux-headers-2.6" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -35,15 +35,11 @@ DEPEND="${RDEPEND} pkg_setup() { if get_version; then - kernel_is ge 2 6 10 && break - else - RKV=$(uname -r) - RKV=${RKV//-*} - if version_is_at_least "2.6.10" ${RKV}; then - break - fi + kernel_is ge 2 6 10 && return + elif get_running_version; then + kernel_is ge 2 6 10 && return fi - die "You need a 2.6.10 or newer kernel to build this pack" + die "You need to run a 2.6.10 or newer kernel to build & use this pack" } @@ -56,11 +52,15 @@ src_unpack() { epatch ${FILESDIR}/${PN}-0.4.1-old_storage_policy.patch # pick up the gentoo usermap epatch ${FILESDIR}/${PN}-0.4.5-gentoo_gphoto2_usermap.patch - # don't doubleadd devices - epatch ${FILESDIR}/${P}-dont_add_device_twice-r1.patch # fix memleaks cd ${S}/hald - epatch ${FILESDIR}/${P}-device_info_leak.patch + # detect floppy drives on >=2.6.12 kernels as well + epatch ${FILESDIR}/${PN}-0.4.7-sys_floppy_detection.patch + # set defaultpolicy for vfat from iocharset=utf8 to utf8 (#83025) + cd ${S} + epatch ${FILESDIR}/${PN}-0.4.7-vfat_mount_utf8.patch + # fix dvdram entry + epatch ${FILESDIR}/${P}-fix_dvdram.patch } @@ -96,6 +96,9 @@ src_install() { # place our pid file keepdir /var/run/hald + # keep the policy setup intact + keepdir /usr/share/hal/fdi/{95userpolicy,50user,40oem,30osvendor,10generic} + dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README } |