From 2a0a63bca3edb508e085f8f46031a00fd828667d Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 3 Jul 2009 19:54:48 +0300 Subject: modified: app-emulation/wine/wine-9999.ebuild renamed: dev-libs/ptlib/ptlib-2.6.2.ebuild -> dev-libs/ptlib/ptlib-2.6.3.ebuild modified: media-libs/gegl/gegl-0.0.9999.ebuild deleted: net-libs/opal/files/gcc-4.4.patch renamed: net-libs/opal/opal-3.6.2.ebuild -> net-libs/opal/opal-3.6.3.ebuild renamed: sys-apps/hal/hal-9999.ebuild -> sys-apps/hal/hal-0.5.9999.ebuild --- app-emulation/wine/wine-9999.ebuild | 17 +- dev-libs/ptlib/ptlib-2.6.2.ebuild | 98 ----------- dev-libs/ptlib/ptlib-2.6.3.ebuild | 98 +++++++++++ media-libs/gegl/gegl-0.0.9999.ebuild | 2 +- net-libs/opal/files/gcc-4.4.patch | 23 --- net-libs/opal/opal-3.6.2.ebuild | 71 -------- net-libs/opal/opal-3.6.3.ebuild | 71 ++++++++ sys-apps/hal/hal-0.5.9999.ebuild | 313 +++++++++++++++++++++++++++++++++++ sys-apps/hal/hal-9999.ebuild | 313 ----------------------------------- 9 files changed, 490 insertions(+), 516 deletions(-) delete mode 100644 dev-libs/ptlib/ptlib-2.6.2.ebuild create mode 100644 dev-libs/ptlib/ptlib-2.6.3.ebuild delete mode 100644 net-libs/opal/files/gcc-4.4.patch delete mode 100644 net-libs/opal/opal-3.6.2.ebuild create mode 100644 net-libs/opal/opal-3.6.3.ebuild create mode 100644 sys-apps/hal/hal-0.5.9999.ebuild delete mode 100644 sys-apps/hal/hal-9999.ebuild diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 4baba0a..48f017f 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -4,20 +4,17 @@ EAPI="2" -inherit multilib +inherit multilib git autotools -IUSE="alsa cups dbus esd +gecko gnutls +hacks hal jack jpeg lcms ldap nas ncurses +opengl oss png samba scanner ssl +X xcomposite xinerama xml" +IUSE="alsa cups dbus esd +gecko gnutls +hacks hal jack jpeg lcms ldap nas ncurses +opengl oss png pulseaudio samba scanner ssl +X xcomposite xinerama xml" if use hacks ; then EGIT_REPO_URI="git://repo.or.cz/wine/hacks.git" -# EGIT_BRANCH="hacks" - inherit git SRC_URI="" KEYWORDS="" else EGIT_REPO_URI="git://source.winehq.org/git/wine.git" - inherit git SRC_URI="" KEYWORDS="" fi @@ -79,14 +76,14 @@ DEPEND="${RDEPEND} sys-devel/flex" src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - else - unpack ${MY_P}.tar.bz2 - fi + git_src_unpack cd ${S} # epatch ${FILESDIR}/bits.patch # epatch ${FILESDIR}/wined3d.diff + useq pulseaudio && epatch ${FILESDIR}/adding-pulseaudio-to-winecfg.patch + useq pulseaudio && epatch ${FILESDIR}/winepulse-0.17-configure.ac.patch + useq pulseaudio && epatch ${FILESDIR}/winepulse-0.28.patch + eautoreconf } src_prepare() { diff --git a/dev-libs/ptlib/ptlib-2.6.2.ebuild b/dev-libs/ptlib/ptlib-2.6.2.ebuild deleted file mode 100644 index 91230ea..0000000 --- a/dev-libs/ptlib/ptlib-2.6.2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="1" - -inherit eutils - -DESCRIPTION="Network focused portable C++ class library providing high level functions" -HOMEPAGE="http://www.opalvoip.org/" -SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2" - -LICENSE="MPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa bsdvideo debug doc esd ieee1394 ipv6 ldap minimal noaudio novideo oss -sasl sdl ssl sunaudio v4l v4l2 xml" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - esd? ( media-sound/esound ) - ieee1394? ( media-libs/libdv - sys-libs/libavc1394 - media-libs/libdc1394:1 ) - ldap? ( net-nds/openldap ) - sasl? ( dev-libs/cyrus-sasl:2 ) - sdl? ( media-libs/libsdl ) - ssl? ( dev-libs/openssl ) - xml? ( dev-libs/expat )" -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - v4l? ( sys-kernel/linux-headers ) - v4l2? ( sys-kernel/linux-headers ) - !dev-libs/pwlib" - -src_unpack() { - unpack ${A} - cd "${S}" - - # this patch fixes bugs: #145424 and #140358 -# epatch "${FILESDIR}"/${PN}-asm.patch -} - -src_compile() { - local myconf="" - local makeopts="" - - use noaudio && myconf="${myconf} --disable-audio" - use novideo && myconf="${myconf} --disable-video" - - econf \ - ${myconf} \ - $(use_enable alsa) \ - $(use_enable bsdvideo) \ - $(use_enable debug exceptions) \ - $(use_enable debug memcheck) \ - $(use_enable esd) \ - $(use_enable ieee1394 avc) \ - $(use_enable ieee1394 dc) \ - $(use_enable ipv6) \ - $(use_enable ldap openldap) \ - $(use_enable minimal minsize) \ - $(use_enable oss) \ - $(use_enable sasl) \ - $(use_enable sdl) \ - $(use_enable ssl openssl) \ - $(use_enable sunaudio) \ - $(use_enable v4l) \ - $(use_enable v4l2) \ - $(use_enable xml expat) \ - --enable-plugins \ - || die "econf failed" - - if use debug; then - makeopts="${makeopts} DEBUG=1 debug" - fi - - emake ${makeopts} || die "emake failed" -} - -src_install() { - local makeopts - - makeopts="PREFIX=/usr DESTDIR=\"${D}\"" - - if use debug; then - makeopts="${makeopts} DEBUG=1" - fi - - emake ${makeopts} install || die "emake install failed" - - if use doc; then - dohtml -r html/* || die "documentation installation failed" - fi - - dodoc ReadMe.txt ReadMe_QOS.txt History.txt || die "documentation - installation failed" -} diff --git a/dev-libs/ptlib/ptlib-2.6.3.ebuild b/dev-libs/ptlib/ptlib-2.6.3.ebuild new file mode 100644 index 0000000..91230ea --- /dev/null +++ b/dev-libs/ptlib/ptlib-2.6.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="1" + +inherit eutils + +DESCRIPTION="Network focused portable C++ class library providing high level functions" +HOMEPAGE="http://www.opalvoip.org/" +SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2" + +LICENSE="MPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="alsa bsdvideo debug doc esd ieee1394 ipv6 ldap minimal noaudio novideo oss +sasl sdl ssl sunaudio v4l v4l2 xml" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + esd? ( media-sound/esound ) + ieee1394? ( media-libs/libdv + sys-libs/libavc1394 + media-libs/libdc1394:1 ) + ldap? ( net-nds/openldap ) + sasl? ( dev-libs/cyrus-sasl:2 ) + sdl? ( media-libs/libsdl ) + ssl? ( dev-libs/openssl ) + xml? ( dev-libs/expat )" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + v4l? ( sys-kernel/linux-headers ) + v4l2? ( sys-kernel/linux-headers ) + !dev-libs/pwlib" + +src_unpack() { + unpack ${A} + cd "${S}" + + # this patch fixes bugs: #145424 and #140358 +# epatch "${FILESDIR}"/${PN}-asm.patch +} + +src_compile() { + local myconf="" + local makeopts="" + + use noaudio && myconf="${myconf} --disable-audio" + use novideo && myconf="${myconf} --disable-video" + + econf \ + ${myconf} \ + $(use_enable alsa) \ + $(use_enable bsdvideo) \ + $(use_enable debug exceptions) \ + $(use_enable debug memcheck) \ + $(use_enable esd) \ + $(use_enable ieee1394 avc) \ + $(use_enable ieee1394 dc) \ + $(use_enable ipv6) \ + $(use_enable ldap openldap) \ + $(use_enable minimal minsize) \ + $(use_enable oss) \ + $(use_enable sasl) \ + $(use_enable sdl) \ + $(use_enable ssl openssl) \ + $(use_enable sunaudio) \ + $(use_enable v4l) \ + $(use_enable v4l2) \ + $(use_enable xml expat) \ + --enable-plugins \ + || die "econf failed" + + if use debug; then + makeopts="${makeopts} DEBUG=1 debug" + fi + + emake ${makeopts} || die "emake failed" +} + +src_install() { + local makeopts + + makeopts="PREFIX=/usr DESTDIR=\"${D}\"" + + if use debug; then + makeopts="${makeopts} DEBUG=1" + fi + + emake ${makeopts} install || die "emake install failed" + + if use doc; then + dohtml -r html/* || die "documentation installation failed" + fi + + dodoc ReadMe.txt ReadMe_QOS.txt History.txt || die "documentation + installation failed" +} diff --git a/media-libs/gegl/gegl-0.0.9999.ebuild b/media-libs/gegl/gegl-0.0.9999.ebuild index bbb2a9d..a549f09 100644 --- a/media-libs/gegl/gegl-0.0.9999.ebuild +++ b/media-libs/gegl/gegl-0.0.9999.ebuild @@ -26,8 +26,8 @@ DEPEND=">=media-libs/babl-0.0.20 >=x11-libs/gtk+-2.14.0 x11-libs/pango cairo? ( x11-libs/cairo ) + dev-lang/ruby doc? ( app-text/asciidoc - dev-lang/ruby >=dev-lang/lua-5.1.0 app-text/enscript media-gfx/graphviz diff --git a/net-libs/opal/files/gcc-4.4.patch b/net-libs/opal/files/gcc-4.4.patch deleted file mode 100644 index 8514e67..0000000 --- a/net-libs/opal/files/gcc-4.4.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN ../original/configure ./configure ---- ../original/configure 2009-05-19 12:52:57.000000000 +0300 -+++ ./configure 2009-06-21 04:19:51.687358162 +0300 -@@ -5080,7 +5080,6 @@ - opal_debug_flags="-g -D_DEBUG -DSOLARIS" - ;; - *) -- opal_release_flags="-Os" - opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG" - ;; - esac -diff -ruN ../original/plugins/video/H.264/gpl/enc-ctx.cxx ./plugins/video/H.264/gpl/enc-ctx.cxx ---- ../original/plugins/video/H.264/gpl/enc-ctx.cxx 2009-05-19 12:52:39.000000000 +0300 -+++ ./plugins/video/H.264/gpl/enc-ctx.cxx 2009-06-21 04:19:37.890368559 +0300 -@@ -25,6 +25,8 @@ - #include "trace.h" - #include "rtpframe.h" - -+#include -+#include - #include - #include - #if defined(_WIN32) || defined(_WIN32_WCE) diff --git a/net-libs/opal/opal-3.6.2.ebuild b/net-libs/opal/opal-3.6.2.ebuild deleted file mode 100644 index 28b5324..0000000 --- a/net-libs/opal/opal-3.6.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils flag-o-matic - -DESCRIPTION="C++ class library normalising numerous telephony protocols" -HOMEPAGE="http://www.opalvoip.org/" -SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2" - -LICENSE="MPL-1.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug doc java" - -RDEPEND=">=dev-libs/ptlib-2.0.0 - >=media-video/ffmpeg-0.4.7 - media-libs/speex - java? ( virtual/jdk )" - -pkg_setup() { - if use debug && ! built_with_use dev-libs/ptlib debug; then - eerror "You need to build dev-libs/ptlib with USE=debug enabled." - die "dev-libs/ptlib has to be built with USE=debug" - fi - - if ! use debug && built_with_use dev-libs/ptlib debug; then - eerror "You need to build dev-libs/ptlib without USE=debug." - die "dev-libs/ptlib has not to be built with USE=debug" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch ${FILESDIR}/gcc-4.4.patch -# epatch "${FILESDIR}"/${PN}-lpcini.patch -} - -src_compile() { - local makeopts - - filter-ldflags -Wl,--as-needed --as-needed - - # zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from - # http://zfoneproject.com/ that is not in portage - econf \ - $(use_enable debug) \ - $(use_enable java) \ - --enable-plugins \ - --disable-localspeex \ - --disable-zrtp \ - || die "econf failed" - - if use debug; then - makeopts="debug" - else - makeopts="opt" - fi - - emake ${makeopts} || die "emake failed" -} - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed" - - if use doc; then - dohtml -r html/* docs/* || die "documentation installation failed" - fi -} diff --git a/net-libs/opal/opal-3.6.3.ebuild b/net-libs/opal/opal-3.6.3.ebuild new file mode 100644 index 0000000..95f79e5 --- /dev/null +++ b/net-libs/opal/opal-3.6.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils flag-o-matic + +DESCRIPTION="C++ class library normalising numerous telephony protocols" +HOMEPAGE="http://www.opalvoip.org/" +SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2" + +LICENSE="MPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug doc java" + +RDEPEND=">=dev-libs/ptlib-2.0.0 + >=media-video/ffmpeg-0.4.7 + media-libs/speex + java? ( virtual/jdk )" + +pkg_setup() { + if use debug && ! built_with_use dev-libs/ptlib debug; then + eerror "You need to build dev-libs/ptlib with USE=debug enabled." + die "dev-libs/ptlib has to be built with USE=debug" + fi + + if ! use debug && built_with_use dev-libs/ptlib debug; then + eerror "You need to build dev-libs/ptlib without USE=debug." + die "dev-libs/ptlib has not to be built with USE=debug" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + +# epatch ${FILESDIR}/gcc-4.4.patch +# epatch "${FILESDIR}"/${PN}-lpcini.patch +} + +src_compile() { + local makeopts + + filter-ldflags -Wl,--as-needed --as-needed + + # zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from + # http://zfoneproject.com/ that is not in portage + econf \ + $(use_enable debug) \ + $(use_enable java) \ + --enable-plugins \ + --disable-localspeex \ + --disable-zrtp \ + || die "econf failed" + + if use debug; then + makeopts="debug" + else + makeopts="opt" + fi + + emake ${makeopts} || die "emake failed" +} + +src_install() { + emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed" + + if use doc; then + dohtml -r html/* docs/* || die "documentation installation failed" + fi +} diff --git a/sys-apps/hal/hal-0.5.9999.ebuild b/sys-apps/hal/hal-0.5.9999.ebuild new file mode 100644 index 0000000..7b34184 --- /dev/null +++ b/sys-apps/hal/hal-0.5.9999.ebuild @@ -0,0 +1,313 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r6.ebuild,v 1.4 2009/01/21 22:18:36 aballier Exp $ + +inherit eutils linux-info autotools flag-o-matic git + +PATCH_VERSION="3" + +DESCRIPTION="Hardware Abstraction Layer" +HOMEPAGE="http://www.freedesktop.org/Software/hal" +SRC_URI="" + +EGIT_REPO_URI="git://git.freedesktop.org/git/hal" +#EGIT_BOOTSTRAP="./autogen.sh" + + +LICENSE="|| ( GPL-2 AFL-2.0 )" +SLOT="" +KEYWORDS="" + +KERNEL_IUSE="kernel_linux kernel_FreeBSD" +IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}" + +RDEPEND=">=dev-libs/dbus-glib-0.61 + >=dev-libs/glib-2.14 + >=dev-libs/expat-1.95.8 + >=dev-libs/libusb-0.1.10a + >=sys-apps/pciutils-2.2.7-r1 + >=dev-util/gperf-3.0.3 + sys-apps/usbutils + virtual/eject + amd64? ( >=sys-apps/dmidecode-2.7 ) + dell? ( >=sys-libs/libsmbios-0.13.4 ) + disk-partition? ( >=sys-apps/parted-1.8.0 ) + ia64? ( >=sys-apps/dmidecode-2.7 ) + kernel_linux? ( + >=sys-fs/udev-117 + >=sys-apps/util-linux-2.13 + >=sys-kernel/linux-headers-2.6.19 + crypt? ( >=sys-fs/cryptsetup-1.0.5 ) + ) + kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) + x86? ( >=sys-apps/dmidecode-2.7 ) + selinux? ( sys-libs/libselinux sec-policy/selinux-hal )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.35 + doc? ( + app-text/xmlto + dev-libs/libxml2 + dev-util/gtk-doc + app-text/docbook-sgml-utils + )" +PDEPEND="|| ( + app-misc/hal-info + ) + !gnome-extra/hal-device-manager + laptop? ( >=sys-power/pm-utils-0.99.3 )" + +## HAL Daemon drops privledges so we need group access to read disks +HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb" +HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator" + +function check_hotplug_net() { + local CONFIG_CHECK="~HOTPLUG ~NET" + local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n" + local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n" + check_extra_config +} + +function check_inotify() { + local CONFIG_CHECK="~INOTIFY_USER" + local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n" + check_extra_config +} + +function check_acpi_proc() { + local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT" + local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n" + local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n" + check_extra_config +} + +pkg_setup() { + if use kernel_linux ; then + if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then + kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer" + + if kernel_is lt 2 6 23 && use acpi ; then + check_acpi_proc + fi + fi + + check_hotplug_net + check_inotify + fi + + # http://devmanual.gentoo.org/ebuild-writing/functions/ + # http://bugs.gentoo.org/show_bug.cgi?id=191605 + + # Create groups for hotplugging and HAL + enewgroup haldaemon + enewgroup plugdev + + # HAL drops priviledges by default now ... + # ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups) + if use kernel_linux; then + enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} + elif use kernel_FreeBSD; then + enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} + fi + + # Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS} + # If users have a problem with this, let them file a bug + if [[ ${ROOT} == / ]] ; then + if use kernel_linux; then + usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon + elif use kernel_FreeBSD; then + pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD} + fi + fi +} + +S="${WORKDIR}/${PF/-r*/}" + +src_unpack() { + git_src_unpack + cd "${S}" + +# EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \ +# EPATCH_SUFFIX="patch" \ +# EPATCH_SOURCE="${WORKDIR}/hal-0.5.11-patches/" \ +# EPATCH_FORCE="yes" \ +# epatch + +# epatch "${FILESDIR}"/hal-0.5.11-ppc64.patch + + eautoreconf +} + +src_compile() { + local acpi="$(use_enable acpi)" + local backend= + local hardware= + + append-flags -rdynamic + + if use kernel_linux ; then + backend="linux" + elif use kernel_FreeBSD ; then + backend="freebsd" + else + eerror "Invalid backend" + fi + + if use kernel_linux ; then + if use acpi ; then + # Using IBM ACPI and Toshiba ACPI results in double notification as this + # was merged into the Linux Kernel 2.6.22 + if kernel_is lt 2 6 22 ; then + acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba" + else + acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba" + fi + + acpi="$acpi --enable-acpi-proc --enable-acpi-acpid" + else + acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba" + acpi="$acpi --disable-acpi-proc --disable-acpi-acpid" + fi + + hardware="--with-cpufreq --with-usb-csr --with-keymaps" + use arm && hardware="$hardware --with-omap --enable-pmu" + use ppc && hardware="$hardware --enable-pmu" + + if use dell ; then + hardware="$hardware --with-dell-backlight" + else + hardware="$hardware --without-dell-backlight" + fi + + hardware="$hardware --enable-sonypic" + else + hardware="--without-cpufreq --without-usb-csr --without-keymaps" + hardware="$hardware --without-omap" + hardware="$hardware --without-dell-backlight" + hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba" + hardware="$hardware --disable-sonypic" + fi + +# ./autogen.sh --with-backend=${backend} \ +# --with-os-type=gentoo \ +# --with-pid-file=/var/run/hald.pid \ +# --with-hwdata=/usr/share/misc \ +# --with-socket-dir=/var/run/hald \ +# --enable-umount-helper \ +# $(use_enable apm) \ +# $(use_enable debug verbose-mode) \ +# $(use_enable disk-partition parted) \ +# $(use_enable doc docbook-docs) \ +# $(use_enable doc gtk-doc) \ +# --docdir=/usr/share/doc/${PF} \ +# --localstatedir=/var \ +# ${acpi} ${hardware} \ +# || die "configure failed" + econf --with-os-type=gentoo \ + --with-pid-file=/var/run/hald.pid \ + --with-socket-dir=/var/run/hald \ + $(use_enable apm) \ + $(use_enable debug verbose-mode) \ + $(use_enable disk-partition parted) \ + $(use_enable doc docbook-docs) \ + $(use_enable doc gtk-doc) \ + --disable-policy-kit \ + --docdir=/usr/share/doc/${PF} \ + --localstatedir=/var \ + ${acpi} ${hardware} \ + || die "configure failed" + + + + emake || die "make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README + + # hal umount for unclean unmounts + exeinto /lib/udev/ + newexe "${FILESDIR}/hal-unmount.dev" hal_unmount + # initscript + newinitd "${FILESDIR}/0.5.10-hald.rc" hald + + # configuration + cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" + + if use debug; then + sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ + -i "${WORKDIR}/0.5.10-hald.conf" + fi + newconfd "${WORKDIR}/0.5.10-hald.conf" hald + + if use X ; then + # New Configuration Snippets + dodoc "${WORKDIR}/${PN}-config-examples"/*.fdi + dobin "${WORKDIR}/${PN}-config-examples"/migrate-xorg-to-fdi.py + + # Automagic conversion! + elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file" + "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \ + > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \ + ewarn "Failed to migrate your keyboard configuration." + fi + + # We now create and keep /media here as both gnome-mount and pmount + # use these directories, to avoid collision. + keepdir /media + + # We also need to create and keep /etc/fdi/{information,policy,preprobe} + # or else hal bombs. + keepdir /etc/hal/fdi/{information,policy,preprobe} + + # HAL stores it's fdi cache in /var/lib/cache/hald + keepdir /var/lib/cache/hald + + # HAL keeps its unix socket here + keepdir /var/run/hald + keepdir /var/lib/hal +} + +pkg_postinst() { + # Despite what people keep changing this location. Either one works.. it doesn't matter + # http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/ + + elog "The HAL daemon needs to be running for certain applications to" + elog "work. Suggested is to add the init script to your start-up" + elog "scripts, this should be done like this :" + elog "\`rc-update add hald default\`" + echo + elog "Looking for automounting support? Add yourself to the plugdev group" + echo + elog "IF you have additional applications which consume ACPI events, you" + elog "should consider installing acpid to allow applications to share ACPI" + elog "events." + if use X ; then + echo + elog "If you wish to use a non US layout, you may do so by executing:" + elog "setxkbmap or by utilizing your Desktop Environment's" + elog "Keyboard Layout Settings mechanism." + elog "Under GNOME, this is gnome-keyboard-properties, and under KDE" + elog "it is kxkb." + fi + echo + elog "In order have suspend/hibernate function with HAL or apps that use HAL" + elog "(such as gnome-power-manager), you should build HAL with the laptop" + elog "useflag which will install pm-utils." + if use X ; then + echo + elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)" + elog "reads user specific configuration from /etc/hal/fdi/policy/." + if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]] + then + elog "We have converted your existing xorg.conf rules and the FDI is stored" + elog "at /etc/hal/fdi/policy/10-x11-input.fdi" + fi + elog "You should remove the Input sections from your xorg.conf once you have" + elog "migrated the rules to a HAL fdi file." + fi + + ebeep 5 + epause 5 +} diff --git a/sys-apps/hal/hal-9999.ebuild b/sys-apps/hal/hal-9999.ebuild deleted file mode 100644 index 7b34184..0000000 --- a/sys-apps/hal/hal-9999.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.11-r6.ebuild,v 1.4 2009/01/21 22:18:36 aballier Exp $ - -inherit eutils linux-info autotools flag-o-matic git - -PATCH_VERSION="3" - -DESCRIPTION="Hardware Abstraction Layer" -HOMEPAGE="http://www.freedesktop.org/Software/hal" -SRC_URI="" - -EGIT_REPO_URI="git://git.freedesktop.org/git/hal" -#EGIT_BOOTSTRAP="./autogen.sh" - - -LICENSE="|| ( GPL-2 AFL-2.0 )" -SLOT="" -KEYWORDS="" - -KERNEL_IUSE="kernel_linux kernel_FreeBSD" -IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}" - -RDEPEND=">=dev-libs/dbus-glib-0.61 - >=dev-libs/glib-2.14 - >=dev-libs/expat-1.95.8 - >=dev-libs/libusb-0.1.10a - >=sys-apps/pciutils-2.2.7-r1 - >=dev-util/gperf-3.0.3 - sys-apps/usbutils - virtual/eject - amd64? ( >=sys-apps/dmidecode-2.7 ) - dell? ( >=sys-libs/libsmbios-0.13.4 ) - disk-partition? ( >=sys-apps/parted-1.8.0 ) - ia64? ( >=sys-apps/dmidecode-2.7 ) - kernel_linux? ( - >=sys-fs/udev-117 - >=sys-apps/util-linux-2.13 - >=sys-kernel/linux-headers-2.6.19 - crypt? ( >=sys-fs/cryptsetup-1.0.5 ) - ) - kernel_FreeBSD? ( >=dev-libs/libvolume_id-0.77 ) - x86? ( >=sys-apps/dmidecode-2.7 ) - selinux? ( sys-libs/libselinux sec-policy/selinux-hal )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35 - doc? ( - app-text/xmlto - dev-libs/libxml2 - dev-util/gtk-doc - app-text/docbook-sgml-utils - )" -PDEPEND="|| ( - app-misc/hal-info - ) - !gnome-extra/hal-device-manager - laptop? ( >=sys-power/pm-utils-0.99.3 )" - -## HAL Daemon drops privledges so we need group access to read disks -HALDAEMON_GROUPS_LINUX="haldaemon,plugdev,disk,cdrom,cdrw,floppy,usb" -HALDAEMON_GROUPS_FREEBSD="haldaemon,plugdev,operator" - -function check_hotplug_net() { - local CONFIG_CHECK="~HOTPLUG ~NET" - local WARNING_HOTPLUG="CONFIG_HOTPLUG:\tis not set (required for HAL)\n" - local WARNING_NET="CONFIG_NET:\tis not set (required for HAL)\n" - check_extra_config -} - -function check_inotify() { - local CONFIG_CHECK="~INOTIFY_USER" - local WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER:\tis not set (required for HAL)\n" - check_extra_config -} - -function check_acpi_proc() { - local CONFIG_CHECK="~ACPI_PROCFS ~ACPI_PROC_EVENT" - local WARNING_ACPI_PROCFS="CONFIG_ACPI_PROCFS:\tis not set (required for HAL)\n" - local WARNING_ACPI_PROC_EVENT="CONFIG_ACPI_PROC_EVENT:\tis not set (required for HAL)\n" - check_extra_config -} - -pkg_setup() { - if use kernel_linux ; then - if [[ -e "${ROOT}/usr/src/linux/.config" ]] ; then - kernel_is ge 2 6 19 || ewarn "HAL requires a kernel version 2.6.19 or newer" - - if kernel_is lt 2 6 23 && use acpi ; then - check_acpi_proc - fi - fi - - check_hotplug_net - check_inotify - fi - - # http://devmanual.gentoo.org/ebuild-writing/functions/ - # http://bugs.gentoo.org/show_bug.cgi?id=191605 - - # Create groups for hotplugging and HAL - enewgroup haldaemon - enewgroup plugdev - - # HAL drops priviledges by default now ... - # ... so we must make sure it can read disk/cdrom info (ie. be in ${HALDAEMON_GROUPS} groups) - if use kernel_linux; then - enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_LINUX} - elif use kernel_FreeBSD; then - enewuser haldaemon -1 "-1" /dev/null ${HALDAEMON_GROUPS_FREEBSD} - fi - - # Make sure that the haldaemon user is in the ${HALDAEMON_GROUPS} - # If users have a problem with this, let them file a bug - if [[ ${ROOT} == / ]] ; then - if use kernel_linux; then - usermod -G ${HALDAEMON_GROUPS_LINUX} haldaemon - elif use kernel_FreeBSD; then - pw usermod haldaemon -G ${HALDAEMON_GROUPS_FREEBSD} - fi - fi -} - -S="${WORKDIR}/${PF/-r*/}" - -src_unpack() { - git_src_unpack - cd "${S}" - -# EPATCH_MULTI_MSG="Applying Gentoo Patchset ..." \ -# EPATCH_SUFFIX="patch" \ -# EPATCH_SOURCE="${WORKDIR}/hal-0.5.11-patches/" \ -# EPATCH_FORCE="yes" \ -# epatch - -# epatch "${FILESDIR}"/hal-0.5.11-ppc64.patch - - eautoreconf -} - -src_compile() { - local acpi="$(use_enable acpi)" - local backend= - local hardware= - - append-flags -rdynamic - - if use kernel_linux ; then - backend="linux" - elif use kernel_FreeBSD ; then - backend="freebsd" - else - eerror "Invalid backend" - fi - - if use kernel_linux ; then - if use acpi ; then - # Using IBM ACPI and Toshiba ACPI results in double notification as this - # was merged into the Linux Kernel 2.6.22 - if kernel_is lt 2 6 22 ; then - acpi="$acpi --enable-acpi-ibm --enable-acpi-toshiba" - else - acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba" - fi - - acpi="$acpi --enable-acpi-proc --enable-acpi-acpid" - else - acpi="$acpi --disable-acpi-ibm --disable-acpi-toshiba" - acpi="$acpi --disable-acpi-proc --disable-acpi-acpid" - fi - - hardware="--with-cpufreq --with-usb-csr --with-keymaps" - use arm && hardware="$hardware --with-omap --enable-pmu" - use ppc && hardware="$hardware --enable-pmu" - - if use dell ; then - hardware="$hardware --with-dell-backlight" - else - hardware="$hardware --without-dell-backlight" - fi - - hardware="$hardware --enable-sonypic" - else - hardware="--without-cpufreq --without-usb-csr --without-keymaps" - hardware="$hardware --without-omap" - hardware="$hardware --without-dell-backlight" - hardware="$hardware --enable-acpi-ibm --enable-acpi-toshiba" - hardware="$hardware --disable-sonypic" - fi - -# ./autogen.sh --with-backend=${backend} \ -# --with-os-type=gentoo \ -# --with-pid-file=/var/run/hald.pid \ -# --with-hwdata=/usr/share/misc \ -# --with-socket-dir=/var/run/hald \ -# --enable-umount-helper \ -# $(use_enable apm) \ -# $(use_enable debug verbose-mode) \ -# $(use_enable disk-partition parted) \ -# $(use_enable doc docbook-docs) \ -# $(use_enable doc gtk-doc) \ -# --docdir=/usr/share/doc/${PF} \ -# --localstatedir=/var \ -# ${acpi} ${hardware} \ -# || die "configure failed" - econf --with-os-type=gentoo \ - --with-pid-file=/var/run/hald.pid \ - --with-socket-dir=/var/run/hald \ - $(use_enable apm) \ - $(use_enable debug verbose-mode) \ - $(use_enable disk-partition parted) \ - $(use_enable doc docbook-docs) \ - $(use_enable doc gtk-doc) \ - --disable-policy-kit \ - --docdir=/usr/share/doc/${PF} \ - --localstatedir=/var \ - ${acpi} ${hardware} \ - || die "configure failed" - - - - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README - - # hal umount for unclean unmounts - exeinto /lib/udev/ - newexe "${FILESDIR}/hal-unmount.dev" hal_unmount - # initscript - newinitd "${FILESDIR}/0.5.10-hald.rc" hald - - # configuration - cp "${FILESDIR}/0.5.10-hald.conf" "${WORKDIR}/" - - if use debug; then - sed -e 's:HALD_VERBOSE="no":HALD_VERBOSE="yes":' \ - -i "${WORKDIR}/0.5.10-hald.conf" - fi - newconfd "${WORKDIR}/0.5.10-hald.conf" hald - - if use X ; then - # New Configuration Snippets - dodoc "${WORKDIR}/${PN}-config-examples"/*.fdi - dobin "${WORKDIR}/${PN}-config-examples"/migrate-xorg-to-fdi.py - - # Automagic conversion! - elog "Migrating xorg.conf Core Keyboard configuration to HAL FDI file" - "${WORKDIR}/${PN}-config-examples/migrate-xorg-to-fdi.py" 2> /dev/null \ - > "${D}/etc/hal/fdi/policy/10-x11-input.fdi" || \ - ewarn "Failed to migrate your keyboard configuration." - fi - - # We now create and keep /media here as both gnome-mount and pmount - # use these directories, to avoid collision. - keepdir /media - - # We also need to create and keep /etc/fdi/{information,policy,preprobe} - # or else hal bombs. - keepdir /etc/hal/fdi/{information,policy,preprobe} - - # HAL stores it's fdi cache in /var/lib/cache/hald - keepdir /var/lib/cache/hald - - # HAL keeps its unix socket here - keepdir /var/run/hald - keepdir /var/lib/hal -} - -pkg_postinst() { - # Despite what people keep changing this location. Either one works.. it doesn't matter - # http://dev.gentoo.org/~plasmaroo/devmanual/ebuild-writing/functions/ - - elog "The HAL daemon needs to be running for certain applications to" - elog "work. Suggested is to add the init script to your start-up" - elog "scripts, this should be done like this :" - elog "\`rc-update add hald default\`" - echo - elog "Looking for automounting support? Add yourself to the plugdev group" - echo - elog "IF you have additional applications which consume ACPI events, you" - elog "should consider installing acpid to allow applications to share ACPI" - elog "events." - if use X ; then - echo - elog "If you wish to use a non US layout, you may do so by executing:" - elog "setxkbmap or by utilizing your Desktop Environment's" - elog "Keyboard Layout Settings mechanism." - elog "Under GNOME, this is gnome-keyboard-properties, and under KDE" - elog "it is kxkb." - fi - echo - elog "In order have suspend/hibernate function with HAL or apps that use HAL" - elog "(such as gnome-power-manager), you should build HAL with the laptop" - elog "useflag which will install pm-utils." - if use X ; then - echo - elog "X Input Hotplugging (if you build xorg-server with the HAL useflag)" - elog "reads user specific configuration from /etc/hal/fdi/policy/." - if [[ $(cat "${ROOT}etc/hal/fdi/policy/10-x11-input.fdi" | wc -c) -gt 0 ]] - then - elog "We have converted your existing xorg.conf rules and the FDI is stored" - elog "at /etc/hal/fdi/policy/10-x11-input.fdi" - fi - elog "You should remove the Input sections from your xorg.conf once you have" - elog "migrated the rules to a HAL fdi file." - fi - - ebeep 5 - epause 5 -} -- cgit v1.2.3