Pull old version.

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 4 insertions, 226 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 83f6fc1c2444..64dcd6c64110 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -72,10 +72,6 @@ DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd
 DIST xorg-server-1.0.2.tar.bz2 6006486 RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 SHA1 b2257e984c5111093ca80f1f63a7a9befa20b6c0 SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba
 DIST xorg-server-1.1.0.tar.bz2 6322751 RMD160 282007ba280b84701df05ef7b8d03e3f1275f8f0 SHA1 564fbe8ac534c2a0b995f88e919f0eac8dcd5224 SHA256 da1d5ce91098e1187579306275a9664ef6f1cea935fabcbd72f4c77af415a461
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
-EBUILD xorg-server-1.0.2-r6.ebuild 6140 RMD160 48eb86bf38ce9029e33d20c504d0be6eb114ef0e SHA1 8a293b532b39f99be09c94a180e0162595e414c3 SHA256 3b10c1c7d6b1cac5b679baf1881107079d945c81c26e75a997ff3ae333ef019c
-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.0.2-r7.ebuild 6183 RMD160 5d9960af2ca557e578ab99ef42cb57186e406e07 SHA1 8909159499842ba5e52520a2c2261138cdb9248a SHA256 ecc5c1ab8d1ecf0cbaf0239912450cf8bb2b0a741b6fadd92119e2bfce1cfd3a
 MD5 d219f9a6633b6f76630a87466883aee8 xorg-server-1.0.2-r7.ebuild 6183
 RMD160 5d9960af2ca557e578ab99ef42cb57186e406e07 xorg-server-1.0.2-r7.ebuild 6183
@@ -88,17 +84,14 @@ EBUILD xorg-server-1.1.1.ebuild 23848 RMD160 081580bd00438a6faa1ebb96b9463582e6f
 MD5 c8c9969dd7104f3804b83b870fbd9d60 xorg-server-1.1.1.ebuild 23848
 RMD160 081580bd00438a6faa1ebb96b9463582e6f51f2e xorg-server-1.1.1.ebuild 23848
 SHA256 bb48f942cb8a562d4f0dcbc6fc3cb9d834d38a27dd9905c23a8032fc26c69e69 xorg-server-1.1.1.ebuild 23848
-MISC ChangeLog 30261 RMD160 108ac39a619f69314f354cbb095614f1b55ad7c2 SHA1 bb452530e519249ce19c2efd81becda463706e27 SHA256 d9e130ae940ec9a6a34a8e72024a6391a3d64c13c5cebcea3e2bc97059e8ffcf
-MD5 425a2f89692c0b1a9348772475ace5a2 ChangeLog 30261
-RMD160 108ac39a619f69314f354cbb095614f1b55ad7c2 ChangeLog 30261
-SHA256 d9e130ae940ec9a6a34a8e72024a6391a3d64c13c5cebcea3e2bc97059e8ffcf ChangeLog 30261
+MISC ChangeLog 30369 RMD160 c5db8789a0b4ac062d14057737a9848ae8ae427d SHA1 c1cddcb8a26cdd9367daa6ac31bdaea40063368c SHA256 32da7d72563047437a6d4f91ab56a33926066108c423da749012c06021bcf65c
+MD5 d19f28f98bd344b601caeaa3078852fd ChangeLog 30369
+RMD160 c5db8789a0b4ac062d14057737a9848ae8ae427d ChangeLog 30369
+SHA256 32da7d72563047437a6d4f91ab56a33926066108c423da749012c06021bcf65c ChangeLog 30369
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r6 771
-RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r6 771
-SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r6 771
 MD5 a36a121279d71c130aefdf8f84e432cf files/digest-xorg-server-1.0.2-r7 771
 RMD160 1e76b7ca2a6430d0901f036dc90692bb1bf14546 files/digest-xorg-server-1.0.2-r7 771
 SHA256 8d9ab78da2938d08246fae35c4f61a04a7b9932cd722a549707731c9d9a87ab8 files/digest-xorg-server-1.0.2-r7 771
diff --git a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r6 b/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r6
deleted file mode 100644
index b2e8218ffcfa..000000000000
--- a/x11-base/xorg-server/files/digest-xorg-server-1.0.2-r6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2f35e003812df5817ebec8fc3c6943e8 1.0.2-overlay-window.patch.bz2 6388
-RMD160 f1223f88da72461585ff72e5cc3c0e15cd9a1306 1.0.2-overlay-window.patch.bz2 6388
-SHA256 99653c8f59a3d3dd2bd6979e4a52cfb81a32dd3d8bead0bd06274bad57823a67 1.0.2-overlay-window.patch.bz2 6388
-MD5 7674d2c603b5834259e4e5a820cefd5b MesaLib-6.4.2.tar.bz2 2913009
-RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 MesaLib-6.4.2.tar.bz2 2913009
-SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 MesaLib-6.4.2.tar.bz2 2913009
-MD5 5cd3316f07ed32a05cbd69e73a71bc74 xorg-server-1.0.2.tar.bz2 6006486
-RMD160 ee47746009fa7c36e692bf4bae629ccd1bd0d4b4 xorg-server-1.0.2.tar.bz2 6006486
-SHA256 b30c57271d147c1f45ba7f15fcc7e7917b61c6dfb97d514e25c7bc91ddd970ba xorg-server-1.0.2.tar.bz2 6006486
diff --git a/x11-base/xorg-server/xorg-server-1.0.2-r6.ebuild b/x11-base/xorg-server/xorg-server-1.0.2-r6.ebuild
deleted file mode 100644
index 3cfad6fcb445..000000000000
--- a/x11-base/xorg-server/xorg-server-1.0.2-r6.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# 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.0.2-r6.ebuild,v 1.1 2006/06/20 16:37:28 spyderous 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.2"
-MESA_P="${MESA_PN}-${MESA_PV}"
-MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
-
-PATCHES="${FILESDIR}/${P}-Sbus.patch
-	${FILESDIR}/CVE-2006-1526-xrender-mitri.patch
-	${FILESDIR}/${P}-sparc64-cfbrrop-fix.patch
-	${FILESDIR}/${P}-64bit-fix-indirect-vertex-array.patch
-	${FILESDIR}/${P}-64bit-fix-have-dix-config.patch
-	${FILESDIR}/${P}-64bit-fix-for-glx.patch
-	${FILESDIR}/${P}-Xprt-build.patch
-	${FILESDIR}/${P}-xprint-init.patch
-	${FILESDIR}/${PV}-Xprint-xprintdir.patch
-	${FILESDIR}/${PV}-try-to-fix-xorgcfg.patch
-	${FILESDIR}/${PV}-fix-xorgconfig-rgbpath-and-mouse.patch
-	${DISTDIR}/${PV}-overlay-window.patch.bz2
-	${FILESDIR}/${PV}-fix-readKernelMapping-overrun.patch
-	${FILESDIR}/x11r7.0-setuid.diff"
-
-SRC_URI="${SRC_URI}
-	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
-	http://dev.gentoo.org/~spyderous/xorg-x11/1.0.2/1.0.2-overlay-window.patch.bz2"
-DESCRIPTION="X.Org X servers"
-# It's suid and has lazy bindings, so FEATURES="stricter" doesn't work
-RESTRICT="stricter"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-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
-	media-fonts/font-adobe-75dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-misc/xbitmaps
-	|| ( x11-misc/xkeyboard-config 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-1.0.2
-	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-4
-	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-0.3
-	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 )"
-LICENSE="${LICENSE} MIT"
-
-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
-
-	# --enable-xorg needed because darwin defaults off
-	# --enable-install-setuid needed because sparcs default off
-	CONFIGURE_OPTIONS="
-		$(use_enable ipv6)
-		$(use_enable !minimal dmx)
-		$(use_enable !minimal xvfb)
-		$(use_enable !minimal xnest)
-		$(use_enable dri)
-		$(use_enable xprint)
-		--with-mesa-source=${WORKDIR}/${MESA_P}
-		--enable-xorg
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--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"
-
-	# (#121394) Causes window corruption
-	filter-flags -fweb
-
-	# Nothing else provides new enough glxtokens.h
-	ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
-	OLD_IMPLEM="$(eselect opengl show)"
-	eselect opengl set --impl-headers ${OPENGL_DIR}
-}
-
-src_install() {
-	x-modular_src_install
-
-	dynamic_libgl_install
-
-	use xprint && xprint_src_install
-}
-
-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/extensions/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}
-		eselect opengl set ${OLD_IMPLEM}
-}
-
-xprint_src_install() {
-	# RH-style init script, we provide a wrapper
-	exeinto /usr/$(get_libdir)/misc
-	doexe ${S}/Xprint/etc/init.d/xprint
-	# Patch init script for fonts location
-	sed -e 's:/lib/X11/fonts/:/share/fonts/:g' \
-		-i ${D}/usr/$(get_libdir)/misc/xprint
-	# Install the wrapper
-	newinitd ${FILESDIR}/xprint.init xprint
-	# Install profile scripts
-	insinto /etc/profile.d
-	doins ${S}/Xprint/etc/profile.d/xprint*
-	insinto /etc/X11/xinit/xinitrc.d
-	newins ${S}/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh \
-		92xprint-xpserverlist.sh
-	# Patch profile scripts
-	sed -e "s:/bin/sh.*get_xpserverlist:/usr/$(get_libdir)/misc/xprint \
-		get_xpserverlist:g" -i ${D}/etc/profile.d/xprint* \
-		${D}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-	# Move profile scripts, we can't touch /etc/profile.d/ in Gentoo
-	dodoc ${D}/etc/profile.d/xprint*
-	rm -f ${D}/etc/profile.d/xprint*
-}