Remove xinerama USE flag and make it mandatory. A large number of applications have...

Package-Manager: portage-2.0.53_rc6

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 1a06e8f7e71a4ddbfb22ff5ed4754f72f3e0ac8c..9f5d389185ea477a1dbbed3887d465f4d1dd9904 100644 (file)
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.468 2005/11/02 06:37:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.469 2005/11/02 07:21:22 spyderous Exp $
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-7.0.0_rc1.ebuild:
+  Remove xinerama USE flag and make it mandatory. A large number of
+  applications have mandatory xinerama, so having the library optional makes
+  things unnecessarily complex.
 
 *xorg-x11-7.0.0_rc1 (02 Nov 2005)
 

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 298d31aec5dd75667aabe75d9deb730db4d2f072..645c7b41e1b842ee8455831a694a035b4cd25165 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
-MD5 77a8bec6e9c814cc323e12657bcea975 ChangeLog 107457
+MD5 888659813a3203ab90e864de92fbf6ed ChangeLog 107715
 MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
 MD5 a60034cf312e05f28a2da6b202d53e44 files/digest-xorg-x11-6.8.2-r6 504
 MD5 74c3f07657d69432f516175657c23ba0 files/digest-xorg-x11-6.8.99.15-r4 518
@@ -7,4 +7,4 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 aa1fdddf5e2240d1b9001668019c55a7 xorg-x11-6.8.2-r4.ebuild 55108
 MD5 8eecd782819774d2b23d36e37a2864f7 xorg-x11-6.8.2-r6.ebuild 55222
 MD5 38dbe8c5ae52c31df510280ef0b3187a xorg-x11-6.8.99.15-r4.ebuild 54183
-MD5 e479bc40a7733402de09a98a55e7b534 xorg-x11-7.0.0_rc1.ebuild 1410
+MD5 a55836e3a974359b4bcfb55de2f6fca1 xorg-x11-7.0.0_rc1.ebuild 1383

diff --git a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
index 3d0c094845727cfd784e7c4be7e57e9fa6a48900..6a354ebda21bae7d79bfa1c6b080047fa566b5d0 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.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-x11/xorg-x11-7.0.0_rc1.ebuild,v 1.1 2005/11/02 06:37:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.0.0_rc1.ebuild,v 1.2 2005/11/02 07:21:22 spyderous Exp $
 
 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation (meta
 package)"
@@ -9,7 +9,7 @@ HOMEPAGE="http://xorg.freedesktop.org"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="xinerama xprint"
+IUSE="xprint"
 
 # Collision protect will scream bloody murder if we install over old versions
 RDEPEND="!<x11-base/xorg-x11-7.0.0_rc0"
@@ -35,7 +35,7 @@ RDEPEND="${RDEPEND}
        >=x11-libs/libXfixes-3.0.0
        >=x11-libs/libXv-0.99.1
        >=x11-libs/libXxf86dga-0.99.1
-       xinerama? ( >=x11-libs/libXinerama-0.99.1 )
+       >=x11-libs/libXinerama-0.99.1
        xprint? ( >=x11-libs/libXp-0.99.1 )"
 
 # Some fonts