summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-27 17:23:01 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-27 17:23:01 +0000
commit1aa2a0f9a454d7401e072b869b424d2a9632d9ae (patch)
treea8670020a1ff3b210e7bd141c99550bd0327bc29 /x11-base
parentFix double declaration of BOOLEAN, #359241; thanks Dennis Yxun (diff)
downloadhistorical-1aa2a0f9a454d7401e072b869b424d2a9632d9ae.tar.gz
historical-1aa2a0f9a454d7401e072b869b424d2a9632d9ae.tar.bz2
historical-1aa2a0f9a454d7401e072b869b424d2a9632d9ae.zip
Remove sys-apps/hal support wrt #313389.
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest4
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild11
3 files changed, 12 insertions, 9 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/Manifest b/x11-base/xorg-server/Manifest
index 76084d8f92e7..aca0cb529ca9 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -12,8 +12,8 @@ DIST xorg-server-1.7.7-patches-01.tar.bz2 5226 RMD160 26c7cf8ebe70f61cd49bbbc46a
DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af465829 SHA1 0f1b71363843b7e394d6de62d0db5b74d3e645ef SHA256 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad11047ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458
DIST xorg-server-1.9.5.tar.bz2 5172054 RMD160 6383b126ed313943fc5cb0939fdae4a737aabb70 SHA1 03be24d6906f3ed3237057a5a7df2b02723c9749 SHA256 3fc775097c4f0e8f731447d0183ee709ae37c44c0c286ba00a4b028274e029dc
-EBUILD xorg-server-1.7.7-r1.ebuild 7368 RMD160 ccd93332ed25c2884d25cb0de0e0c774bf457fc8 SHA1 88f38a3a42b06000852a0068c568ad7a89d2f394 SHA256 24f07ebc80adfa98007d5bfab22c19a0b5c079c4bd073838e5502422380e7839
+EBUILD xorg-server-1.7.7-r1.ebuild 7336 RMD160 0afea4afbad1f371d17ba295a3d119f2d63aaac2 SHA1 eef30bd532f0e36e89e0e43770ce3abb0b7cbba4 SHA256 d685018cf11a71d5c0acb797df8273081cc2ac44336fe35f808a8698fd827d5c
EBUILD xorg-server-1.9.4.ebuild 7804 RMD160 be63938727e77f858c9de4ed6892809b21abadd3 SHA1 d5d35ea11f5840459af5e001a1a86701f4ca7192 SHA256 bab747527e1ec78239d0894c08d49178739ea75ffc5afb29b9b4daf07adaf295
EBUILD xorg-server-1.9.5.ebuild 7813 RMD160 c72d1a16efe64a502739eac678da908a7aa7a52f SHA1 754e7537c8dcd412e619e377388f7f6cdbdd7b88 SHA256 745a7b00690e761f295340cab7116d522d701b00f1c1319f14d339e15c899488
-MISC ChangeLog 124832 RMD160 039c3a5a72ff390e5ca7c9d98375e2fedcdde7f5 SHA1 1c2c74a350df0d4350bd02bf509c42ad1b4ca913 SHA256 0198907fa9665adbb8658f3f7524ac6897327e19d4106abb2fd59bbf9d354a75
+MISC ChangeLog 124961 RMD160 287882b506b3914f586290908e313f9ebea9a7b5 SHA1 049675b4ce0f614b0a91267f5ee2535054442622 SHA256 5960d118a68102c4d4dd00f1d336ee97b93a412f2a18f83c1e0b88a8a76170ba
MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
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