summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChi-Thanh Christopher Nguyen <chithanh@gentoo.org>2011-06-21 00:25:34 +0200
committerChi-Thanh Christopher Nguyen <chithanh@gentoo.org>2011-06-21 00:25:34 +0200
commit422ae12affc374c968ae8b96e75a0635e0a571ac (patch)
treecad5f4cbf252110c5056babd6aa8268c28993669 /x11-base
parentx11-drivers/xf86-video-intel: require xorg-server-1.10 for sna (diff)
downloadx11-422ae12affc374c968ae8b96e75a0635e0a571ac.tar.gz
x11-422ae12affc374c968ae8b96e75a0635e0a571ac.tar.bz2
x11-422ae12affc374c968ae8b96e75a0635e0a571ac.zip
x11-base/xorg-server: sync with portage, drop util-macros dependency
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/Manifest2
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild12
2 files changed, 11 insertions, 3 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index fdfc8b01..92416fd4 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,5 +4,5 @@ AUX xdm.initd-3 5551 RMD160 7af6e239e3e75ea88a0766ef2f4976a8b5c51c95 SHA1 bd3022
AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA256 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea
AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a0795232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200
AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee SHA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c
-EBUILD xorg-server-9999.ebuild 6807 RMD160 d69ec1f52c12c40098d238eab2406b436fc70dd3 SHA1 53c9a298900de9e5662635afda226eceb7e005fd SHA256 da1888bbd2edaa3660f723f9503d2f1f5b2a042b436fe0239a70c6ff50767c4f
+EBUILD xorg-server-9999.ebuild 6867 RMD160 eb0707e3b51c3c66f29684a964bcec46e31de1b3 SHA1 ad45c472b06337d73509a7697ef21aa3515c5757 SHA256 ce154a50162f0d77a0fcef843ab6f2dafb406135b45db38bef3be50e0e33cbff
MISC metadata.xml 597 RMD160 97841b147e1e821d9f2b6043a917dce7cb2eee0b SHA1 11804da8122c390ca0d77a2cb3f1b14b3b71b8c2 SHA256 883b829fff2d4a6d5dd5f2ac16d087cab2569070c9b466544330301ce4f151d0
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 65a7d33b..90664b5e 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -79,8 +79,16 @@ DEPEND="${RDEPEND}
>=x11-proto/xf86vidmodeproto-2.2.99.1
>=x11-proto/xineramaproto-1.1.3
>=x11-proto/xproto-7.0.17
- >=x11-misc/util-macros-1.14
- dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
+ dmx? (
+ >=x11-proto/dmxproto-2.2.99.1
+ doc? (
+ || (
+ www-client/links
+ www-client/lynx
+ www-client/w3m
+ )
+ )
+ )
!minimal? (
>=x11-proto/xf86driproto-2.1.0
>=x11-proto/dri2proto-2.3