(#109124) Add dep on libdmx, within check for USE=minimal. Also move libXres dep...

Package-Manager: portage-2.0.53_rc5

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 93515992efb97372419ca4345789a380ee3d043e..fc30226da884e9db05ce26582247e525ea6afc6f 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.52 2005/10/14 16:31:05 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.53 2005/10/14 18:17:38 spyderous Exp $
+
+  14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-server-0.99.1_p20051013.ebuild:
+  (#109124) Add dep on libdmx, within check for USE=minimal. Also move libXres
+  dep within there, because it's for dmx.
 
   14 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-server-0.99.1_p20051013.ebuild:

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 4420e0713b3695a80d75ce8aae7ca7abf4e5c5f4..1bd98388bf8e94b4d052ed9384a4a3fb689473dd 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,9 +1,9 @@
-MD5 e7b398030cf3416c6688e73746504b27 ChangeLog 10772
-MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 803e951251b6a7c0dda68d3a72fba8ad xorg-server-0.99.1-r10.ebuild 3895
-MD5 d1d0573d048ea36e65463954001365af xorg-server-0.99.1_p20051013.ebuild 3637
+MD5 a84f93821ab378e1a7df6bf550dba4ac ChangeLog 10984
 MD5 5a445ea35d70ce20671a49049b406680 files/0.99.1-r10-check-for-glproto.patch 911
 MD5 54ab2c693d9e7e6e09b20bb8dd7db297 files/0.99.1-r10_CAN-2005-2495.patch 4387
 MD5 21ec9868da064e8a549db3d501373dea files/digest-xorg-server-0.99.1-r10 239
 MD5 ac79344c93d0172934f99d972e3e0d44 files/digest-xorg-server-0.99.1_p20051013 149
 MD5 7fb68ff739074f0ee643388ee39e20f8 files/fix-transparencies.patch 310
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 803e951251b6a7c0dda68d3a72fba8ad xorg-server-0.99.1-r10.ebuild 3895
+MD5 0d2f7f3030e8e21acb97b296426ed486 xorg-server-0.99.1_p20051013.ebuild 3665

diff --git a/x11-base/xorg-server/xorg-server-0.99.1_p20051013.ebuild b/x11-base/xorg-server/xorg-server-0.99.1_p20051013.ebuild
index 67edca48d6ebc37da4eef9c6e55a0a6d7226cc66..28db7b69c94fedebeff646dde2ecf98a4f120c0e 100644 (file)
--- a/x11-base/xorg-server/xorg-server-0.99.1_p20051013.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1_p20051013.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1_p20051013.ebuild,v 1.2 2005/10/14 16:31:05 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1_p20051013.ebuild,v 1.3 2005/10/14 18:17:38 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -43,7 +43,8 @@ RDEPEND="x11-libs/libXfont
        x11-apps/xauth
        x11-apps/xinit
        app-admin/eselect-opengl
-       x11-libs/libXres
+       !minimal? ( x11-libs/libdmx
+               x11-libs/libXres )
        x11-libs/libxkbui" #Xres is dmx-dependent, xkbui is xorgcfg-dependent
 DEPEND="${RDEPEND}
        x11-proto/randrproto