Pulling broken versions.

8 files changed, 8 insertions, 462 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index c4541744e66d..cf91412bde7c 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree-drm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.38 2003/09/29 17:39:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.39 2003/10/04 21:28:40 spyderous Exp $
+
+  04 Oct 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r4.ebuild,
+  xfree-drm-4.3.0-r5.ebuild:
+  Pulling broken versions.
 
   29 Sep 2003; Aron Griffis <agriffis@gentoo.org> xfree-drm-4.3.0-r6.ebuild:
   Stable on alpha
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index 2d9bda29c48d..bcd2fd257c93 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,12 +1,6 @@
-MD5 7247aac6e68d8fcec88828f379208666 ChangeLog 7521
+MD5 f4ec99a5c1f4d0cb9809d644d3f4f199 ChangeLog 7690
 MD5 cd0b06404869599fa61bb7976be237a2 metadata.xml 476
-MD5 d1e79ddb524db49430631325d0c10d7d xfree-drm-4.3.0-r3.ebuild 2892
 MD5 5841333d3b65fe40becb5a2561c209e5 xfree-drm-4.3.0-r2.ebuild 2648
-MD5 9211d43b4a5030e30830ce2c2e85ec1d xfree-drm-4.3.0-r4.ebuild 4047
-MD5 253a4b1701bf8181b5552b488ea25e5b xfree-drm-4.3.0-r5.ebuild 4199
 MD5 e8bf51ed323717d6f3cdc65028432154 xfree-drm-4.3.0-r6.ebuild 4947
-MD5 ac5dd043f538e9fed0825d46d6e999e4 files/digest-xfree-drm-4.3.0-r4 168
-MD5 08d125fc239e02143fe64d48dcadb64c files/digest-xfree-drm-4.3.0-r3 169
-MD5 e8df58fc40e04737c8a8e140c5903c44 files/digest-xfree-drm-4.3.0-r5 168
-MD5 916b08e6047de0eeabce236b45a16b34 files/digest-xfree-drm-4.3.0-r6 169
 MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
+MD5 916b08e6047de0eeabce236b45a16b34 files/digest-xfree-drm-4.3.0-r6 169
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3
deleted file mode 100644
index 88d8a7b0949d..000000000000
--- a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 08360d2df9a900fd8e418b8c0d778f15 linux-drm-4.3.0-kernelsource-20030504.tar.gz 219677
-MD5 1a580ba8b0059590c9884007acd20bca xfree-drm-4.3.0-r3-gentoo-0.2.tar.bz2 6619
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r4 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r4
deleted file mode 100644
index 62786349aaf4..000000000000
--- a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2913d31c0a9bedac202e7cdae7e2ef8c linux-drm-4.3.0-kernelsource-20030618.tar.gz 248949
-MD5 51259eb43c8d7c88c3d6c68948a4f113 xfree-drm-4.3.0-r4-gentoo-0.2.tar.bz2 972
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r5 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r5
deleted file mode 100644
index 1c930b15e6d8..000000000000
--- a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 71e431370243132109a9c60f6aed4359 linux-drm-4.3.0-kernelsource-20030630.tar.gz 276134
-MD5 35fa1043b25f1a000d4d307103fef834 xfree-drm-4.3.0-r5-gentoo-0.1.tar.bz2 966
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild
deleted file mode 100644
index 7236693dd459..000000000000
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r3.ebuild,v 1.8 2003/08/03 04:45:09 vapier Exp $
-
-# Small note:  we should prob consider using a DRM only tarball, as it will ease
-#              some of the overhead on older systems, and will enable us to
-#              update DRM if there are fixes not already in XFree86 tarballs ...
-
-IUSE="3dfx gamma i8x0 matrox rage128 radeon sis"
-
-inherit eutils
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-SNAPSHOT="20030504"
-PATCHVER="0.2"
-
-S="${WORKDIR}/drm"
-DESCRIPTION="Xfree86 Kernel DRM modules"
-HOMEPAGE="http://www.xfree.org"
-SRC_URI="mirror://gentoo/linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.gz
-	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
-# Latest tarball of DRM sources can be found here:
-#
-#   http://www.xfree86.org/~alanh/
-# 
-# We now use Daenzer's sources at http://people.debian.org/~daenzer/
-
-SLOT="${KV}"
-LICENSE="X11"
-KEYWORDS="~x86 ppc ~alpha"
-
-DEPEND=">=x11-base/xfree-${PV}
-	virtual/linux-sources"
-
-PROVIDE="virtual/drm"
-
-
-VIDCARDS=""
-
-if [ "`use matrox`" ]
-then
-	VIDCARDS="${VIDCARDS} mga.o"
-fi
-if [ "`use 3dfx`" ]
-then
-	VIDCARDS="${VIDCARDS} tdfx.o"
-fi
-if [ "`use rage128`" ]
-then
-	VIDCARDS="${VIDCARDS} r128.o"
-fi
-if [ "`use radeon`" ]
-then
-	VIDCARDS="${VIDCARDS} radeon.o"
-fi
-if [ "`use sis`" ]
-then
-	VIDCARDS="${VIDCARDS} sis.o"
-fi
-if [ "`use i8x0`" ]
-then
-	VIDCARDS="${VIDCARDS} i810.o i830.o"
-fi
-if [ "`use gamma`" ]
-then
-	VIDCARDS="${VIDCARDS} gamma.o"
-fi
-
-# This builds everything if none of the cards are in USE.
-if [ -z "${VIDCARDS}" ]
-then
-	if [ "${ARCH}" = "ppc" ]
-	then
-		VIDCARDS="r128.o radeon.o"
-	else
-		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
-	fi
-fi
-
-src_unpack() {
-	if [ ! -f /usr/src/linux/include/config/MARKER ] ; then
-		die "Please compile kernel sources."
-	fi
-
-	if [ -z "${VIDCARDS}" ] ; then
-		die "Please choose at least one video card."
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	local PATCHDIR=${WORKDIR}/patch
-
-	epatch ${PATCHDIR}/${PF}-gentoo-Makefile-fixup.patch
-	epatch ${PATCHDIR}/${PF}-drm-ioremap.patch
-#	This patch is irrelevant but it was in Daenzer's stuff
-#	epatch ${PATCHDIR}/${PF}-radeon-resume-v8.patch
-	epatch ${PATCHDIR}/${PF}-dristat.patch
-}
-
-src_compile() {
-	check_KV
-	ln -sf Makefile.linux Makefile
-	einfo "Building DRM..."
-	make ${VIDCARDS} \
-		TREE="/usr/src/linux/include" KV="${KV}"
-	make dristat || die
-}
-
-src_install() {
-
-	einfo "installing DRM..."
-	make \
-		TREE="/usr/src/linux/include" \
-		KV="${KV}" \
-		DESTDIR="${D}" \
-		MODS="${VIDCARDS}" \
-		install || die
-	dodoc README*
-	exeinto /usr/X11R6/bin
-	doexe dristat
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" = "/" ]
-	then
-		/sbin/modules-update
-	fi
-}
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild
deleted file mode 100644
index b6a2287e4113..000000000000
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r4.ebuild,v 1.6 2003/08/03 04:45:09 vapier Exp $
-
-# Small note:  we should prob consider using a DRM only tarball, as it will ease
-#              some of the overhead on older systems, and will enable us to
-#              update DRM if there are fixes not already in XFree86 tarballs ...
-
-IUSE="3dfx gamma i8x0 matrox rage128 radeon sis"
-
-# VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis"
-
-inherit eutils xfree
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-SNAPSHOT="20030618"
-PATCHVER="0.2"
-
-S="${WORKDIR}/drm"
-DESCRIPTION="Xfree86 Kernel DRM modules"
-HOMEPAGE="http://www.xfree.org"
-SRC_URI="mirror://gentoo/linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.gz
-	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
-
-# These sources come from one of four places:
-#
-#   http://www.xfree86.org/~alanh/ -- DRM snapshots, outdated 
-#   http://people.debian.org/~daenzer/ -- full tree, often patched but
-#	somewhat outdated
-#   http://dri.sourceforge.net/snapshots/ -- daily CVS snapshots, lacking
-#	gamma and sis
-#   http://dri.sourceforge.net CVS -- full tree
-#   http://cvs.sourceforge.net/cvstarballs/dri-cvsroot.tar.gz -- backup
-#
-# We throw all necessary files into one folder and turn that into our tarball.
-
-SLOT="${KV}"
-LICENSE="X11"
-KEYWORDS="~x86 -ppc ~alpha"
-
-DEPEND=">=x11-base/xfree-${PV}
-	virtual/linux-sources"
-
-PROVIDE="virtual/drm"
-
-
-VIDCARDS=""
-
-if [ `use matrox || vcards matrox` ]
-then
-	VIDCARDS="${VIDCARDS} mga.o"
-fi
-if [ `use 3dfx || vcards 3dfx` ]
-then
-	VIDCARDS="${VIDCARDS} tdfx.o"
-fi
-if [ `use rage128 || vcards rage128` ]
-then
-	VIDCARDS="${VIDCARDS} r128.o"
-fi
-if [ `use radeon || vcards radeon` ]
-then
-	VIDCARDS="${VIDCARDS} radeon.o"
-fi
-if [ `use sis || vcards sis` ]
-then
-	VIDCARDS="${VIDCARDS} sis.o"
-fi
-if use i8x0 &>/dev/null
-then
-	VIDCARDS="${VIDCARDS} i810.o i830.o"
-fi
-if [ `use gamma || vcards gamma` ]
-then
-	VIDCARDS="${VIDCARDS} gamma.o"
-fi
-
-# Add VIDEO_CARDS functionality.
-# Having a module twice (once from USE, once from VIDEO_CARDS)
-# doesn't matter at all.
-
-#vcards matrox &>/dev/null && VIDCARDS="${VIDCARDS} mga.o"
-#vcards 3dfx &>/dev/null && VIDCARDS="${VIDCARDS} tdfx.o"
-#vcards rage128 &>/dev/null && VIDCARDS="${VIDCARDS} r128.o"
-#vcards radeon &>/dev/null && VIDCARDS="${VIDCARDS} radeon.o"
-#vcards sis &>/dev/null && VIDCARDS="${VIDCARDS} sis.o"
-#vcards gamma &>/dev/null && VIDCARDS="${VIDCARDS} gamma.o"
-
-vcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
-
-vcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
-
-# This builds everything if none of the cards are in USE.
-#if [ -z "${VIDCARDS}" ]
-#then
-#	if [ "${ARCH}" = "ppc" ]
-#	then
-#		VIDCARDS="r128.o radeon.o"
-#	else
-#		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
-#	fi
-#fi
-
-src_unpack() {
-	if [ ! -f /usr/src/linux/include/config/MARKER ] ; then
-		die "Please compile kernel sources."
-	fi
-
-	if [ -z "${VIDCARDS}" ] ; then
-		die "Please set at least one video card in VIDEO_CARDS. USE is deprecated."
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	local PATCHDIR=${WORKDIR}/patch
-
-	epatch ${PATCHDIR}/${PF}-gentoo-Makefile-fixup.patch
-	epatch ${PATCHDIR}/${PF}-dristat.patch
-}
-
-src_compile() {
-	check_KV
-	ln -sf Makefile.linux Makefile
-	einfo "Building DRM..."
-	make ${VIDCARDS} \
-		TREE="/usr/src/linux/include" KV="${KV}"
-	make dristat || die
-}
-
-src_install() {
-
-	einfo "installing DRM..."
-	make \
-		TREE="/usr/src/linux/include" \
-		KV="${KV}" \
-		DESTDIR="${D}" \
-		MODS="${VIDCARDS}" \
-		install || die
-	dodoc README*
-	exeinto /usr/X11R6/bin
-	doexe dristat
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" = "/" ]
-	then
-		/sbin/modules-update
-	fi
-
-	einfo "USE is deprecated. Please set your video cards using VIDEO_CARDS."
-	einfo "Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
-
-}
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild
deleted file mode 100644
index 2b804163a4e5..000000000000
--- a/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild,v 1.4 2003/08/03 04:45:09 vapier Exp $
-
-# Small note:  we should prob consider using a DRM only tarball, as it will ease
-#              some of the overhead on older systems, and will enable us to
-#              update DRM if there are fixes not already in XFree86 tarballs ...
-
-IUSE="3dfx gamma i8x0 matrox rage128 radeon sis"
-
-# VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis"
-
-inherit eutils xfree
-
-# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
-# that only we only strip stuff that are safe to strip ...
-RESTRICT="nostrip"
-
-SNAPSHOT="20030630"
-PATCHVER="0.1"
-
-S="${WORKDIR}/drm"
-DESCRIPTION="Xfree86 Kernel DRM modules"
-HOMEPAGE="http://www.xfree.org"
-SRC_URI="mirror://gentoo/linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.gz
-	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
-
-# These sources come from one of these places:
-#
-#   http://www.xfree86.org/~alanh/ -- DRM snapshots, outdated 
-#   http://people.debian.org/~daenzer/ -- full tree, often patched but
-#	somewhat outdated
-#   http://dri.sourceforge.net/snapshots/ -- daily CVS snapshots, lacking
-#	gamma and sis
-#   http://dri.sourceforge.net CVS -- full tree
-#   http://cvs.sourceforge.net/cvstarballs/dri-cvsroot.tar.gz -- backup
-#   rsync -avz --delete rsync://mefriss1.swan.ac.uk/dri/ -- temporary
-#
-# We throw all necessary files into one folder and turn that into our tarball.
-
-SLOT="${KV}"
-LICENSE="X11"
-KEYWORDS="~x86 -ppc"
-
-DEPEND=">=x11-base/xfree-${PV}
-	virtual/linux-sources"
-
-PROVIDE="virtual/drm"
-
-
-VIDCARDS=""
-
-if [ `use matrox || vcards matrox` ]
-then
-	VIDCARDS="${VIDCARDS} mga.o"
-fi
-if [ `use 3dfx || vcards 3dfx` ]
-then
-	VIDCARDS="${VIDCARDS} tdfx.o"
-fi
-if [ `use rage128 || vcards rage128` ]
-then
-	VIDCARDS="${VIDCARDS} r128.o"
-fi
-if [ `use radeon || vcards radeon` ]
-then
-	VIDCARDS="${VIDCARDS} radeon.o"
-fi
-if [ `use sis || vcards sis` ]
-then
-	VIDCARDS="${VIDCARDS} sis.o"
-fi
-if use i8x0 &>/dev/null
-then
-	VIDCARDS="${VIDCARDS} i810.o i830.o"
-fi
-if [ `use gamma || vcards gamma` ]
-then
-	VIDCARDS="${VIDCARDS} gamma.o"
-fi
-
-# Add VIDEO_CARDS functionality.
-# Having a module twice (once from USE, once from VIDEO_CARDS)
-# doesn't matter at all.
-#vcards matrox &>/dev/null && VIDCARDS="${VIDCARDS} mga.o"
-#vcards 3dfx &>/dev/null && VIDCARDS="${VIDCARDS} tdfx.o"
-#vcards rage128 &>/dev/null && VIDCARDS="${VIDCARDS} r128.o"
-#vcards radeon &>/dev/null && VIDCARDS="${VIDCARDS} radeon.o"
-#vcards sis &>/dev/null && VIDCARDS="${VIDCARDS} sis.o"
-#vcards gamma &>/dev/null && VIDCARDS="${VIDCARDS} gamma.o"
-vcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
-vcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
-
-# This builds everything if none of the cards are in USE.
-#if [ -z "${VIDCARDS}" ]
-#then
-#	if [ "${ARCH}" = "ppc" ]
-#	then
-#		VIDCARDS="r128.o radeon.o"
-#	else
-#		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
-#	fi
-#fi
-
-src_unpack() {
-	if [ ! -f /usr/src/linux/include/config/MARKER ] ; then
-		die "Please compile kernel sources."
-	fi
-
-	if [ -z "${VIDCARDS}" ] ; then
-		die "Please set at least one video card in VIDEO_CARDS. USE is deprecated. Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
-	fi
-
-	unpack ${A}
-	cd ${S}
-
-	local PATCHDIR=${WORKDIR}/patch
-
-	epatch ${PATCHDIR}/${PF}-gentoo-Makefile-fixup.patch
-	epatch ${PATCHDIR}/${PF}-dristat.patch
-}
-
-src_compile() {
-	check_KV
-	ln -sf Makefile.linux Makefile
-	einfo "Building DRM..."
-	make ${VIDCARDS} \
-		TREE="/usr/src/linux/include" KV="${KV}"
-	make dristat || die
-}
-
-src_install() {
-
-	einfo "installing DRM..."
-	make \
-		TREE="/usr/src/linux/include" \
-		KV="${KV}" \
-		DESTDIR="${D}" \
-		MODS="${VIDCARDS}" \
-		install || die
-	dodoc README*
-	exeinto /usr/X11R6/bin
-	doexe dristat
-}
-
-pkg_postinst() {
-
-	if [ "${ROOT}" = "/" ]
-	then
-		/sbin/modules-update
-	fi
-
-	einfo "USE is deprecated. Please set your video cards using VIDEO_CARDS."
-	einfo "Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
-
-}