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/Manifest8
-rw-r--r--x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild10
3 files changed, 15 insertions, 9 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index efcc3945107d..192a45dbe541 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.30 2005/08/21 13:15:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.31 2005/08/21 22:00:15 spyderous Exp $
+
+ 21 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-server-0.99.1-r4.ebuild:
+ xprint build is broken; force it off.
21 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
xorg-server-0.99.1-r4.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index b92df3310ad1..d4639f80a833 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,6 @@
-MD5 121e05ee6b0a40e8e7572be833393257 ChangeLog 5595
-MD5 b39471d395149bf6ab2c3aaa83108962 xorg-server-0.99.1-r4.ebuild 3596
-MD5 c701b68bb6d7f5d733fc97598b9c60e6 files/digest-xorg-server-0.99.1-r4 237
-MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876
+MD5 134fb90e84a01192292df4991386bf37 ChangeLog 5725
+MD5 c260994b130937c580724129501918cc xorg-server-0.99.1-r4.ebuild 3644
MD5 cda95e8d1c7c9540a7619dbe007c125d files/fix-xf86misc-typo.patch 615
+MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876
MD5 15b113cf1db95c72eb12426c0f2bf9ae files/xorg-server-0.99.1-x86_64-1.patch 452
+MD5 c701b68bb6d7f5d733fc97598b9c60e6 files/digest-xorg-server-0.99.1-r4 237
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild
index 2107607ac6d8..4d5c61f5e4b5 100644
--- a/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r4.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-r4.ebuild,v 1.2 2005/08/21 13:15:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r4.ebuild,v 1.3 2005/08/21 22:00:15 spyderous Exp $
# Must be before x-modular eclass is inherited
# Hack to make sure autoreconf gets run
@@ -26,7 +26,8 @@ SRC_URI="${SRC_URI}
http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch.gz"
DESCRIPTION="X.Org X servers"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="dri ipv6 minimal xprint"
+#IUSE="dri ipv6 minimal xprint"
+IUSE="dri ipv6 minimal"
RDEPEND="x11-libs/libXfont
x11-libs/xtrans
x11-libs/libXau
@@ -67,9 +68,9 @@ DEPEND="${RDEPEND}
x11-proto/bigreqsproto
x11-proto/xcmiscproto
x11-proto/glproto
- xprint? ( x11-proto/printproto )
dri? ( x11-proto/xf86driproto
x11-libs/libdrm )"
+# xprint? ( x11-proto/printproto )
pkg_setup() {
# localstatedir is used for the log location; we need to override the default
@@ -81,7 +82,7 @@ pkg_setup() {
$(use_enable !minimal xvfb)
$(use_enable !minimal xnest)
$(use_enable dri)
- $(use_enable xprint)
+ --disable-xprint
--with-mesa-source=${WORKDIR}/${MESA_P}
--enable-glx
--enable-xorg
@@ -89,6 +90,7 @@ pkg_setup() {
--enable-xevie
--sysconfdir=/etc/X11
--localstatedir=/var"
+# $(use_enable xprint)
# X won't start if -fomit-frame-pointer isn't filtered
filter-flags -fomit-frame-pointer