summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2006-09-19 03:38:53 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2006-09-19 03:38:53 +0000
commit25a5541807d06f3b0098a4f2f684dd4ea33d94cd (patch)
tree79d8f044b4fd168f8dfb020547804fbdfecdc4bc /gnome-base
parentStable x86 as well (diff)
downloadgentoo-2-25a5541807d06f3b0098a4f2f684dd4ea33d94cd.tar.gz
gentoo-2-25a5541807d06f3b0098a4f2f684dd4ea33d94cd.tar.bz2
gentoo-2-25a5541807d06f3b0098a4f2f684dd4ea33d94cd.zip
Remove hal flag. Bug #147496
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-applets/ChangeLog6
-rw-r--r--gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild12
2 files changed, 11 insertions, 7 deletions
diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index bad9ead76b27..d824a234254f 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/gnome-applets
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.185 2006/09/15 20:47:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.186 2006/09/19 03:38:53 dang Exp $
+
+ 19 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+ gnome-applets-2.16.0.1.ebuild:
+ Remove hal flag. Bug #147496
15 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
gnome-applets-2.16.0.1.ebuild:
diff --git a/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild
index a795fee8872b..60a227117a63 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild,v 1.4 2006/09/15 20:47:17 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.16.0.1.ebuild,v 1.5 2006/09/19 03:38:53 dang Exp $
inherit eutils gnome2 autotools
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acpi apm doc gstreamer hal ipv6"
+IUSE="acpi apm doc gstreamer ipv6"
RDEPEND=">=x11-libs/gtk+-2.6
>=dev-libs/glib-2.6
@@ -27,7 +27,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
>=app-admin/system-tools-backends-1.1.3
>=gnome-base/gnome-desktop-2.11.1
>=x11-libs/libnotify-0.3.2
- hal? ( >=sys-apps/hal-0.5.3 )
+ >=sys-apps/hal-0.5.3
>=sys-apps/dbus-0.34
>=dev-python/pygtk-2.6
>=dev-python/gnome-python-2.10
@@ -58,8 +58,8 @@ DOCS="AUTHORS ChangeLog NEWS README"
MAKEOPTS="${MAKEOPTS} -j1"
pkg_setup() {
- G2CONF="--disable-scrollkeeper --enable-flags \
- $(use_enable ipv6) $(use_with hal)"
+ G2CONF="--disable-scrollkeeper --enable-flags --with-hal \
+ $(use_enable ipv6)"
if use gstreamer; then
G2CONF="${G2CONF} --with-gstreamer=0.10"
@@ -69,7 +69,7 @@ pkg_setup() {
G2CONF="${G2CONF} --disable-battstat"
fi
- if use ppc && ! use apm && ! use hal; then
+ if use ppc && ! use apm; then
G2CONF="${G2CONF} --disable-battstat"
fi
G2CONF="${G2CONF} $(use_enable doc gtk-doc)"