summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest16
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild6
3 files changed, 16 insertions, 12 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 3c1dd4b03ee1..f13c5f3e904a 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.129 2006/06/27 03:49:50 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.130 2006/06/28 02:19:00 joshuabaergen Exp $
+
+ 27 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ xorg-server-1.1.0-r1.ebuild:
+ Only pull in loadable drivers if the xorg USE-flag is set. (bug #135873)
26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
xorg-server-1.1.0-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index aa1bd7dc2e47..0173c096048e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -71,14 +71,14 @@ EBUILD xorg-server-1.0.2-r6.ebuild 6140 RMD160 48eb86bf38ce9029e33d20c504d0be6eb
MD5 65ebbfe3b11ecbc256d305d02aa215e7 xorg-server-1.0.2-r6.ebuild 6140
RMD160 48eb86bf38ce9029e33d20c504d0be6eb114ef0e xorg-server-1.0.2-r6.ebuild 6140
SHA256 3b10c1c7d6b1cac5b679baf1881107079d945c81c26e75a997ff3ae333ef019c xorg-server-1.0.2-r6.ebuild 6140
-EBUILD xorg-server-1.1.0-r1.ebuild 23994 RMD160 026e29079dd475065c826ba1491f766c7d6bf0cf SHA1 46e877dbe9c67e09f578f0f7cfb79f6a2090138c SHA256 b7dd761b396ef5e5cad5d27f951bfad806e1f7e3a9264df3b9073f47d911675e
-MD5 e8d1933dc55fb1e53a084e178147189b xorg-server-1.1.0-r1.ebuild 23994
-RMD160 026e29079dd475065c826ba1491f766c7d6bf0cf xorg-server-1.1.0-r1.ebuild 23994
-SHA256 b7dd761b396ef5e5cad5d27f951bfad806e1f7e3a9264df3b9073f47d911675e xorg-server-1.1.0-r1.ebuild 23994
-MISC ChangeLog 28215 RMD160 4a1ff9933a22274cac5c918b02016c2a874e7846 SHA1 69b760c8641105ab64317cf511003cc8a09028f4 SHA256 ea6f020ad892072c54e20220352cba55551211d3a16df40e5deb122809f32bb5
-MD5 f87626d4658ff58173e9589fb0c13cfa ChangeLog 28215
-RMD160 4a1ff9933a22274cac5c918b02016c2a874e7846 ChangeLog 28215
-SHA256 ea6f020ad892072c54e20220352cba55551211d3a16df40e5deb122809f32bb5 ChangeLog 28215
+EBUILD xorg-server-1.1.0-r1.ebuild 24004 RMD160 111828c2186415fbf8c7854cf31a838cfcda7fd0 SHA1 0089cb001ab5e86b6a06c2b5b3d36fd517599c24 SHA256 efa43e9416ec90586e7dc6ebaed1e743d17bd1c29cbc2f68bc9ffff6ac95dc18
+MD5 ed32e265e43d6390c148c42d1777bc66 xorg-server-1.1.0-r1.ebuild 24004
+RMD160 111828c2186415fbf8c7854cf31a838cfcda7fd0 xorg-server-1.1.0-r1.ebuild 24004
+SHA256 efa43e9416ec90586e7dc6ebaed1e743d17bd1c29cbc2f68bc9ffff6ac95dc18 xorg-server-1.1.0-r1.ebuild 24004
+MISC ChangeLog 28379 RMD160 3bbeab860f4f89514ec4797270022a86372669f9 SHA1 e2ea2b85121d81b9c6de17feb05c188daacca67e SHA256 4f93923230127ec200f90ad64bc5b123a5d722bdb1d09376fc4bf3d11bf0daec
+MD5 696959d7c64a7297c387bd626425722d ChangeLog 28379
+RMD160 3bbeab860f4f89514ec4797270022a86372669f9 ChangeLog 28379
+SHA256 4f93923230127ec200f90ad64bc5b123a5d722bdb1d09376fc4bf3d11bf0daec ChangeLog 28379
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index b67fb156df38..82b8c1b2d91b 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.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/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.4 2006/06/27 03:49:50 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.5 2006/06/28 02:19:01 joshuabaergen Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -193,7 +193,7 @@ DEPEND="${RDEPEND}
###############################################################################
###############################################################################
PDEPEND="
- || (
+ xorg? ( || (
(
input_devices_acecad? ( >=x11-drivers/xf86-input-acecad-1.1.0 )
input_devices_aiptek? ( >=x11-drivers/xf86-input-aiptek-1.0.1 )
@@ -492,7 +492,7 @@ PDEPEND="
x86-fbsd? (
>=x11-drivers/xf86-video-vmware-10.13.0 )
)
- )"
+ ) )"
LICENSE="${LICENSE} MIT"
pkg_setup() {