diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 17:23:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-27 17:23:01 +0000 |
| commit | 3e99ef024871eab2126b45ba85bce76a9abcd73f (patch) | |
| tree | c81d1cd5996b29344212342c4fdf61beb77d3ea5 /x11-base | |
| parent | Fix double declaration of BOOLEAN, #359241; thanks Dennis Yxun (diff) | |
| download | gentoo-2-3e99ef024871eab2126b45ba85bce76a9abcd73f.tar.gz gentoo-2-3e99ef024871eab2126b45ba85bce76a9abcd73f.tar.bz2 gentoo-2-3e99ef024871eab2126b45ba85bce76a9abcd73f.zip | |
Remove sys-apps/hal support wrt #313389.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index b885895ee98f..edb25215ea59 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.575 2011/03/18 18:42:47 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.576 2011/03/27 17:23:01 ssuominen Exp $ + + 27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> + xorg-server-1.7.7-r1.ebuild: + Remove sys-apps/hal support wrt #313389. 18 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> -files/0002-Fix-linking-with-tslib-with-Wl-as-needed.patch, diff --git a/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild index 731de864386d..1bd099f9cc48 100644 --- a/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.11 2010/10/21 13:03:33 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.12 2011/03/27 17:23:01 ssuominen Exp $ EAPI="2" @@ -20,9 +20,8 @@ DESCRIPTION="X.Org X servers" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sh sparc x86 ~x86-fbsd" IUSE_SERVERS="dmx kdrive xorg" -IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND="hal? ( sys-apps/hal ) - tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) +IUSE="${IUSE_SERVERS} tslib ipv6 minimal nptl sdl" +RDEPEND="tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) dev-libs/openssl >=x11-libs/libXfont-1.3.3 >=x11-libs/xtrans-1.2.2 @@ -167,7 +166,7 @@ pkg_setup() { $(use_enable !minimal glx) $(use_enable xorg) $(use_enable nptl glx-tls) - $(use_enable hal config-hal) + --disable-config-hal --sysconfdir=/etc/X11 --localstatedir=/var --enable-install-setuid |