Gid rid of this 20050104 piece of crap. If it had a bum, I wouldn't slap it.

Package-Manager: portage-2.0.51.21

4 files changed, 5 insertions, 216 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index b42a25bbc4da..fb5f9f23da49 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.18 2005/05/03 18:10:57 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.19 2005/05/10 00:46:26 battousai Exp $
+
+  10 May 2005; Bryan Stine <battousai@gentoo.org> -x11-drm-20050104.ebuild:
+  Goodbye, 20050104. You piece of crap.
 
 *x11-drm-20050502 (03 May 2005)
 
diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest
index 8e6e5b7bc63d..3c89c7f1a875 100644
--- a/x11-base/x11-drm/Manifest
+++ b/x11-base/x11-drm/Manifest
@@ -1,13 +1,11 @@
-MD5 d36f669efa58501daace364e80fd9ce8 ChangeLog 16591
+MD5 31ee9c94db75cb27dd4b0f11256ebd7d ChangeLog 16708
 MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368
 MD5 d556d329556844afe526c1f9e24511fd x11-drm-20040827-r1.ebuild 5930
 MD5 ad92bd194d12796398fe35f19ac77c63 x11-drm-20040827.ebuild 5927
-MD5 6aa49f36f8f7572a4382ad75f3530b58 x11-drm-20050104.ebuild 5779
 MD5 48bc21b275bde784adf0d54380f5a9f0 x11-drm-4.3.0-r7.ebuild 7037
 MD5 db4eb556028e7fdd451315f1ca636e48 x11-drm-20050502.ebuild 6120
 MD5 a98e43596ee1f7d9d917e0b9fee7770d files/digest-x11-drm-20040827 252
 MD5 a98e43596ee1f7d9d917e0b9fee7770d files/digest-x11-drm-20040827-r1 252
-MD5 eae1f8dbce515e888b8b6554aa3a98e2 files/digest-x11-drm-20050104 162
 MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-x11-drm-4.3.0-r7 363
 MD5 88b8c90e440b3db246a7d06cf53640ae files/modules.d-x11-drm 40
 MD5 bf8c931ce86a904875d80f5568ada534 files/digest-x11-drm-20050502 162
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20050104 b/x11-base/x11-drm/files/digest-x11-drm-20050104
deleted file mode 100644
index db0b46acb425..000000000000
--- a/x11-base/x11-drm/files/digest-x11-drm-20050104
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48071a1b6e27a0e98cd9bee9ddc404fe x11-drm-20050104-gentoo-0.1.tar.bz2 4376
-MD5 4f99fd3c607e296a4e62a5cbd0daf83d linux-drm-20050104-kernelsource.tar.bz2 501612
diff --git a/x11-base/x11-drm/x11-drm-20050104.ebuild b/x11-base/x11-drm/x11-drm-20050104.ebuild
deleted file mode 100644
index 3e59d89003b1..000000000000
--- a/x11-base/x11-drm/x11-drm-20050104.ebuild
+++ /dev/null
@@ -1,210 +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/x11-drm/x11-drm-20050104.ebuild,v 1.2 2005/01/25 02:39:17 battousai Exp $
-
-inherit eutils x11 linux-mod
-
-IUSE=""
-IUSE_VIDEO_CARDS="3dfx ffb i810 i830 i915 mach64 matrox rage128 radeon savage sis via"
-
-# 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"
-
-S="${WORKDIR}/drm"
-PATCHVER="0.1"
-PATCHDIR="${WORKDIR}/patch"
-EXCLUDED="${WORKDIR}/excluded"
-
-DESCRIPTION="DRM Kernel Modules for X11"
-HOMEPAGE="http://dri.sf.net"
-SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
-	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
-
-SLOT="${KV}"
-LICENSE="X11"
-KEYWORDS="~x86 ~alpha ~ia64 ~ppc ~amd64"
-
-DEPEND="virtual/x11
-	virtual/linux-sources
-	>=sys-apps/portage-2.0.49-r13"
-
-PROVIDE="virtual/drm"
-
-pkg_setup() {
-	# Require at least one video card
-	if [ -z "${VIDEO_CARDS}" ]
-	then
-		die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. Possible VIDEO_CARDS values are: ${IUSE_VIDEO_CARDS}."
-	fi
-
-	if [ "${ARCH}" != "sparc" ] && use video_cards_ffb
-	then
-		die "The ffb driver is for sparc-specific hardware. Please remove it from your VIDEO_CARDS."
-	fi
-
-	ewarn "Using koutput kernels is now deprecated. If you use a koutput kernel, please"
-	ewarn "switch to kernel >=2.6.6 with a normal build system."
-
-	# Set video cards to build for.
-	set_vidcards
-
-	# DRM CVS is undergoing changes which require splitting source to support both 2.4
-	# and 2.6 kernels. This determines which to use.
-	get_drm_build_dir
-
-	return 0
-}
-
-src_unpack() {
-	unpack linux-drm-${PV}-kernelsource.tar.bz2
-	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
-
-	cd ${S}
-
-	patch_prepare
-
-	# Apply patches
-	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
-
-	# Substitute new directory under /lib/modules/${KV}
-	cd ${SRC_BUILD}
-	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
-
-	cp ${S}/tests/*.c ${SRC_BUILD}
-}
-
-src_compile() {
-	einfo "Building DRM in ${SRC_BUILD}..."
-	cd ${SRC_BUILD}
-
-	# This now uses an M= build system. Makefile does most of the work.
-	unset ARCH
-	make M="${SRC_BUILD}" \
-		LINUXDIR="${ROOT}/usr/src/linux" \
-		DRM_MODULES="${VIDCARDS}" \
-		modules || die_error
-
-	# Building the programs. These are useful for developers and getting info from DRI and DRM.
-	#
-	# libdrm objects are needed for drmstat.
-	cd ${S}/libdrm
-	make || die "Could not build libdrm"
-
-	cd ${SRC_BUILD}
-	# LINUXDIR is needed to allow Makefiles to find kernel release.
-	make LINUXDIR="${ROOT}/usr/src/linux" dristat || die "Building dristat failed."
-	make LINUXDIR="${ROOT}/usr/src/linux" drmstat || die "Building drmstat failed."
-}
-
-src_install() {
-	einfo "Installing DRM..."
-	cd ${SRC_BUILD}
-
-	unset ARCH
-	make KV="${KV}" \
-		LINUXDIR="${ROOT}/usr/src/linux" \
-		DESTDIR="${D}" \
-		RUNNING_REL="${KV}" \
-		MODULE_LIST="${VIDCARDS}" \
-		install || die "Install failed."
-
-	dodoc README.drm
-
-	exeinto /usr/X11R6/bin
-	doexe dristat
-	doexe drmstat
-
-	# Strip binaries, leaving /lib/modules untouched (bug #24415)
-	strip_bins \/lib\/modules
-
-	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
-	keepdir /etc/modules.d
-	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
-	sed -i 's:%KV%:'${KV}':g' ${D}/etc/modules.d/${PN}
-}
-
-pkg_postinst() {
-	if use video_cards_sis
-	then
-		einfo "SiS direct rendering only works on 300 series chipsets."
-		einfo "SiS framebuffer also needs to be enabled in the kernel."
-	fi
-
-	if use video_cards_mach64
-	then
-		einfo "The Mach64 DRI driver is insecure."
-		einfo "Malicious clients can write to system memory."
-		einfo "For more information, see:"
-		einfo "http://dri.sourceforge.net/cgi-bin/moin.cgi/ATIMach64?value=CategoryHardwareChipset."
-	fi
-
-	einfo "Checking kernel module dependencies"
-	update_modules
-	update_depmod
-}
-
-# Functions used above are defined below:
-
-set_vidcards() {
-	set_kvobj
-
-	VIDCARDS=""
-
-	use video_cards_matrox && \
-		VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
-	use video_cards_3dfx && \
-		VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
-	use video_cards_rage128 && \
-		VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
-	use video_cards_radeon && \
-		VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
-	use video_cards_i810 && \
-		VIDCARDS="${VIDCARDS} i810.${KV_OBJ}"
-	use video_cards_i830 && \
-		VIDCARDS="${VIDCARDS} i830.${KV_OBJ}"
-	use video_cards_i915 && \
-		VIDCARDS="${VIDCARDS} i915.${KV_OBJ}"
-#	use video_cards_gamma && \
-#		VIDCARDS="${VIDCARDS} gamma.${KV_OBJ}"
-	use video_cards_mach64 && \
-		VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
-	use video_cards_savage && \
-		VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
-	use video_cards_sis && \
-		VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
-	use video_cards_via && \
-		VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
-	use video_cards_ffb && \
-		VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
-}
-
-patch_prepare() {
-	# Handle exclusions based on the following...
-	#     All trees (0**), Standard only (1**), Others (none right now)
-	#     2.4 vs. 2.6 kernels
-
-	kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED}
-	kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
-
-	# There is only one tree being maintained now. No numeric exclusions need
-	# to be done based on DRM tree.
-}
-
-die_error() {
-	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
-	eerror "this could mean that you were using an unsupported kernel build system. All"
-	eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6"
-	eerror "are supported."
-	die "Unable to build DRM modules."
-}
-
-get_drm_build_dir() {
-	if kernel_is 2 4
-	then
-		SRC_BUILD="${S}/linux"
-	elif kernel_is 2 6
-	then
-		SRC_BUILD="${S}/linux-2.6"
-	fi
-}