Bump for 7.0. (#111361) Add patch to fix sparc build.

Package-Manager: portage-2.1_pre1

8 files changed, 89 insertions, 169 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index fb7dd7951282..a64363891adb 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.75 2005/12/17 21:56:46 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.76 2005/12/23 09:39:16 spyderous Exp $
+
+*xorg-server-1.0.1 (23 Dec 2005)
+
+  23 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-1.0.1-Sbus.patch, -xorg-server-0.99.4-r2.ebuild,
+  -xorg-server-1.0.0.ebuild, +xorg-server-1.0.1.ebuild:
+  Bump for 7.0. (#111361) Add patch to fix sparc build.
 
 *xorg-server-1.0.0 (17 Dec 2005)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 94d129e1b4e3..c01dccc2d160 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,5 @@
-MD5 a2a69d41e3c450fc6082f41cc9dce4db ChangeLog 15084
-MD5 aaa8745412b5d8adcbf3d1aaec21e35d files/digest-xorg-server-0.99.4-r2 139
-MD5 334bf98aa35b9cbf0456b6a448990401 files/digest-xorg-server-1.0.0 138
+MD5 5bb54332e59e2497fe1e7d400cce515c ChangeLog 15352
+MD5 3d490e022ae44d377a50153b649185d5 files/digest-xorg-server-1.0.1 138
+MD5 912a66d58d73ad9c95c1c7d40c71f679 files/xorg-server-1.0.1-Sbus.patch 2388
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 34f9d8c2090795f280770eab01a99475 xorg-server-0.99.4-r2.ebuild 4088
-MD5 412efd66ea782d7ba940e00780e99f2b xorg-server-1.0.0.ebuild 4084
+MD5 03e8d3dd29aa3ae9ec7923783e55c2d3 xorg-server-1.0.1.ebuild 4066
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.4-r2 b/x11-base/xorg-server/files/digest-xorg-server-0.99.4-r2
deleted file mode 100644
index 17689c93bc71..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-0.99.4-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
-MD5 a4354b15e6ef7462c070f74bcc7532da xorg-server-0.99.4.tar.bz2 5804941
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.0 b/x11-base/xorg-server/files/digest-xorg-server-1.0.0
deleted file mode 100644
index c42f8f7118e4..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
-MD5 baca22f964ff51d4dc000794ba6f7ecb xorg-server-1.0.0.tar.bz2 5995508
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.1 b/x11-base/xorg-server/files/digest-xorg-server-1.0.1
new file mode 100644
index 000000000000..03b15b3b3286
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-1.0.1
@@ -0,0 +1,2 @@
+MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
+MD5 aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 5975199
diff --git a/x11-base/xorg-server/files/xorg-server-1.0.1-Sbus.patch b/x11-base/xorg-server/files/xorg-server-1.0.1-Sbus.patch
new file mode 100644
index 000000000000..f9b8e7b3822f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.0.1-Sbus.patch
@@ -0,0 +1,73 @@
+--- hw/xfree86/os-support/bus/xf86Sbus.h-	2005-12-19 19:30:39.000000000 +0000
++++ hw/xfree86/os-support/bus/xf86Sbus.h	2005-12-19 19:30:39.000000000 +0000
+@@ -0,0 +1,70 @@
++/*
++ * Platform specific SBUS and OpenPROM access declarations.
++ *
++ * Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com)
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++ * JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
++ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */
++
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#ifndef _XF86_SBUS_H
++#define _XF86_SBUS_H
++
++#if defined(linux)
++#include <asm/types.h>
++#include <linux/fb.h>
++#include <asm/fbio.h>
++#include <asm/openpromio.h>
++#elif defined(SVR4)
++#include <sys/fbio.h>
++#include <sys/openpromio.h>
++#elif defined(__OpenBSD__) && defined(__sparc64__)
++/* XXX */
++#elif defined(CSRG_BASED)
++#if defined(__FreeBSD__)
++#include <sys/types.h>
++#include <sys/fbio.h>
++#include <dev/ofw/openpromio.h>
++#else
++#include <machine/fbio.h>
++#endif
++#else
++#include <sun/fbio.h>
++#endif
++
++#ifndef FBTYPE_SUNGP3
++#define FBTYPE_SUNGP3 -1
++#endif
++#ifndef FBTYPE_MDICOLOR
++#define FBTYPE_MDICOLOR -1
++#endif
++#ifndef FBTYPE_SUNLEO
++#define FBTYPE_SUNLEO -1
++#endif
++#ifndef FBTYPE_TCXCOLOR
++#define FBTYPE_TCXCOLOR -1
++#endif
++#ifndef FBTYPE_CREATOR
++#define FBTYPE_CREATOR -1
++#endif
++
++#endif /* _XF86_SBUS_H */
diff --git a/x11-base/xorg-server/xorg-server-0.99.4-r2.ebuild b/x11-base/xorg-server/xorg-server-0.99.4-r2.ebuild
deleted file mode 100644
index fbe2d41bda24..000000000000
--- a/x11-base/xorg-server/xorg-server-0.99.4-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# 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.4-r2.ebuild,v 1.1 2005/12/06 07:02:35 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# Hack to make sure autoreconf gets run
-#SNAPSHOT="yes"
-
-inherit flag-o-matic x-modular multilib
-
-OPENGL_DIR="xorg-x11"
-
-MESA_PN="Mesa"
-MESA_PV="6.4.1"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-#PATCHES="${FILESDIR}/fix-xkb-compile-path-2.patch"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"
-DESCRIPTION="X.Org X servers"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="dri ipv6 minimal xprint"
-RDEPEND="x11-libs/libXfont
-	x11-libs/xtrans
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
-	media-libs/freetype
-	>=media-libs/mesa-6
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	x11-misc/xkbdata
-	x11-apps/iceauth
-	x11-apps/rgb
-	x11-apps/xauth
-	x11-apps/xinit
-	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	!minimal? ( x11-libs/libdmx
-		x11-libs/libXtst
-		x11-libs/libXres )
-	x11-libs/libxkbui
-	x11-libs/liblbxutil"
-	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
-	# Xaw is dmx- and xorgcfg-dependent
-	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
-	# Xxf86misc and Xxf86vm are xorgcfg-dependent
-	# liblbxutil is lbx- dependent
-DEPEND="${RDEPEND}
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/fixesproto
-	x11-proto/damageproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xf86dgaproto
-	x11-proto/xf86miscproto
-	x11-proto/xf86rushproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xf86bigfontproto
-	x11-proto/compositeproto
-	x11-proto/recordproto
-	x11-proto/resourceproto
-	x11-proto/videoproto
-	x11-proto/scrnsaverproto
-	x11-proto/evieext
-	x11-proto/trapproto
-	>=x11-proto/xineramaproto-1.1-r1
-	x11-proto/fontsproto
-	>=x11-proto/kbproto-1.0-r1
-	x11-proto/inputproto
-	x11-proto/bigreqsproto
-	x11-proto/xcmiscproto
-	>=x11-proto/glproto-1.4.1_pre20051013
-	!minimal? ( x11-proto/dmxproto )
-	dri? ( x11-proto/xf86driproto
-		>=x11-libs/libdrm-2 )
-	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
-		x11-apps/mkfontscale )"
-
-pkg_setup() {
-	# localstatedir is used for the log location; we need to override the default
-	# from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xprint)
-		--enable-xcsecurity
-		--with-mesa-source=${WORKDIR}/${MESA_P}
-		--enable-xorg
-		--enable-xtrap
-		--enable-xevie
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--disable-static
-		--enable-install-setuid
-		--with-default-font-path=/usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1"
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	# As of 20051028, should be taken care of by upstream
-	dosym Xorg /usr/bin/X
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if ! has_version x11-base/xorg-server; then
-		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
-			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
-		fi
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/xorg/modules/libglx*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
diff --git a/x11-base/xorg-server/xorg-server-1.0.0.ebuild b/x11-base/xorg-server/xorg-server-1.0.1.ebuild
index 15a8e8c95039..5b0429ab70a9 100644
--- a/x11-base/xorg-server/xorg-server-1.0.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.0.1.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-1.0.0.ebuild,v 1.1 2005/12/17 21:56:46 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.1.ebuild,v 1.1 2005/12/23 09:39:16 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -15,7 +15,7 @@ MESA_PV="6.4.1"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
-#PATCHES="${FILESDIR}/fix-xkb-compile-path-2.patch"
+PATCHES="${FILESDIR}/${P}-Sbus.patch"
 
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"