From b5a95f27b3db3881263e324ae76ddca9eb24415a Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Sat, 20 Sep 2008 12:07:46 +0000
Subject: [PATCH] removed ebuild for ati-drivers, as a newer version is in the
 official tree

---
 x11-drivers/ati-drivers/Manifest              |  21 -
 .../ati-drivers/ati-drivers-8.502.ebuild      | 437 ------------------
 x11-drivers/ati-drivers/files/09ati           |   3 -
 .../files/8.37.6/fix-ioctl-for-2.6.22.patch   |  17 -
 .../files/8.40.4/ati-drivers-2.6.23.patch     |  41 --
 .../8.40.4/ati-drivers-8.40.4-warnings.patch  |  90 ----
 .../8.433/ati-powermode-opt-path-1.patch      |  33 --
 .../8.443.1/ati-powermode-opt-path-2.patch    |  40 --
 .../8.452/ati-powermode-opt-path-2.patch      |  42 --
 .../8.455.2/ati-powermode-opt-path-2.patch    |  42 --
 .../8.471.3/ati-powermode-opt-path-2.patch    |  42 --
 .../8.476/ati-powermode-opt-path-2.patch      |  42 --
 .../files/ati-drivers-2.6.19.patch            |  67 ---
 .../files/ati-drivers-2.6.20.patch            |  73 ---
 .../files/ati-drivers-8.35.5-2.6.19.patch     |  33 --
 .../files/ati-drivers-8.35.5-2.6.20.patch     |  11 -
 .../files/ati-powermode-opt-path.patch        |  22 -
 .../ati-drivers/files/ati-powermode.sh.patch  |  32 --
 x11-drivers/ati-drivers/files/atieventsd.init |  20 -
 x11-drivers/ati-drivers/files/atieventsd.rc6  |  22 -
 x11-drivers/ati-drivers/files/libGL.la.in     |  32 --
 21 files changed, 1162 deletions(-)
 delete mode 100644 x11-drivers/ati-drivers/Manifest
 delete mode 100644 x11-drivers/ati-drivers/ati-drivers-8.502.ebuild
 delete mode 100644 x11-drivers/ati-drivers/files/09ati
 delete mode 100644 x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch
 delete mode 100644 x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch
 delete mode 100644 x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
 delete mode 100644 x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
 delete mode 100644 x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
 delete mode 100644 x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
 delete mode 100644 x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
 delete mode 100644 x11-drivers/ati-drivers/files/ati-powermode.sh.patch
 delete mode 100644 x11-drivers/ati-drivers/files/atieventsd.init
 delete mode 100644 x11-drivers/ati-drivers/files/atieventsd.rc6
 delete mode 100644 x11-drivers/ati-drivers/files/libGL.la.in

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
deleted file mode 100644
index 8d53ef7..0000000
--- a/x11-drivers/ati-drivers/Manifest
+++ /dev/null
@@ -1,21 +0,0 @@
-AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134
-AUX 8.37.6/fix-ioctl-for-2.6.22.patch 487 RMD160 93e739f8b832529a999ecca2e6a0d447a2ced42f SHA1 5a7e0416be0957d3ed46d0f16cdb25bd1a68359d SHA256 c3df802a987974109db9d439932e88a2cdfa37a37c1a284a56b7b100a3de8f23
-AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88
-AUX 8.40.4/ati-drivers-8.40.4-warnings.patch 3262 RMD160 158206cf638fd0f2ee34e8ff02e6a399933f844d SHA1 7b47d4d89ff80e930cd2fc66f513dbaf66de07d5 SHA256 45caca456493c23a6475bbec63df26a33ead8de59bf52e3c06c4433740dc5261
-AUX 8.433/ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee3467156a7c80b601b17 SHA1 7fa50f72453fe4501af40c8178b748aa39c599c9 SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788
-AUX 8.443.1/ati-powermode-opt-path-2.patch 1493 RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 SHA1 9c1df16348da5e3c32303342eeb31ee66f2a3487 SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465
-AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.455.2/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX 8.476/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
-AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6
-AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8
-AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01
-AUX ati-drivers-8.35.5-2.6.20.patch 333 RMD160 b9ef336b8dd4874854910d8eb62bc15f9ab066bd SHA1 8261034f3e539251adb0ca5b1da880e3f1231559 SHA256 cd4abde649ede2d03b5faa115acc567fcff85b6db39f19ba70d25e194e8973a6
-AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208
-AUX ati-powermode.sh.patch 1142 RMD160 b81cdd4d2a49c2f7b04f7e00e4391b4e0ad67a40 SHA1 eef7f658474ca8e9e66ee1955a851782eba4dd0e SHA256 050602d5e0656961c0b16a75b470a7327a9e8b16f7d0ae3228341b3a8dcc9289
-AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
-AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e
-AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13
-DIST ati-driver-installer-8-8-x86.x86_64.run 63976178 RMD160 ce6541c1577dbf6d296c5a86525fe56172b6d495 SHA1 32981bb142b8fa061b491ca8b41497981e70bcb1 SHA256 4c38f2a074fbdddbfd76f0bd5c83db282229e5a8905fab38526b91506ec0846d
-EBUILD ati-drivers-8.502.ebuild 14674 RMD160 17e81013c4ae17b42c89e294c3b0ff0054b07a78 SHA1 dddbe1c11425d4fb078a385800353b3316ed9977 SHA256 fd2695893d2c547fed6226393dc3a1e0f31e80d4346c63688f13aff5e4d051f1
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.502.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.502.ebuild
deleted file mode 100644
index 30a146f..0000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.502.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.501.ebuild,v 1.3 2008/07/09 22:33:19 opfer Exp $
-
-IUSE="acpi debug"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-8-8-x86.x86_64.run"
-
-LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
-
-# The portage dep is for COLON_SEPARATED support in env-update.
-# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND="x11-base/xorg-server
-	!x11-apps/ati-drivers-extra
-	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	acpi? (
-		x11-apps/xauth
-		sys-power/acpid
-	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
-
-DEPEND="${RDEPEND}
-	x11-proto/xf86miscproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/inputproto"
-
-EMULTILIB_PKG="true"
-
-QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	opt/bin/amdcccle"
-QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
-	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2
-	usr/lib/xorg/modules/glesx.so
-	usr/lib/xorg/modules/amdxmm.so"
-QA_TEXTRELS_amd64="
-	usr/lib64/opengl/ati/lib/libGL.so.1.2
-	usr/lib32/opengl/ati/lib/libGL.so.1.2
-	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so
-	usr/lib32/xorg/modules/glesx.so
-	usr/lib64/xorg/modules/glesx.so"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-
-	# Define module dir.
-	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
-
-	#check kernel and sets up KV_OBJ
-	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
-	BUILD_TARGETS="kmod_build"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
-
-	if ! kernel_is 2 6; then
-		eerror "Need a 2.6 kernel to compile against!"
-		die "Need a 2.6 kernel to compile against!"
-	fi
-
-	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
-		die "${P} is not compatible RCU Preemption, please disable it"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
-	if ! linux_chkconfig_present MTRR; then
-		ewarn "You don't have MTRR support enabled, the direct rendering will not work."
-	fi
-
-	if linux_chkconfig_builtin DRM; then
-		ewarn "You have DRM support enabled builtin, the direct rendering will not work."
-	fi
-
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You need AGP and/or PCI Express support for direct rendering to work."
-	fi
-
-	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
-		eerror "paravirtualization active due to GPL symbol export"
-		eerror "restrictions."
-		eerror "Please disable it:"
-		eerror "	CONFIG_PARAVIRT=n"
-		eerror "in /usr/src/linux/.config or"
-		eerror "	Processor type and features -->"
-		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
-		eerror "in 'menuconfig'"
-		die "CONFIG_PARAVIRT enabled"
-	fi
-
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
-
-	# This is used like $(get_libdir) for paths in ati's package.
-	if use amd64 ; then
-		BASE_DIR="${BASE_DIR}_64a"
-		PKG_LIBDIR=lib64
-		ARCH_DIR="${S}/arch/x86_64"
-	else
-		PKG_LIBDIR=lib
-		ARCH_DIR="${S}/arch/x86"
-	fi
-}
-
-src_unpack() {
-	#Switching to a standard way to extract the files since otherwise no signature file
-	#would be created
-	local src="${DISTDIR}/${A}"
-	sh "${src}" --extract "${S}"  2&>1 /dev/null
-
-	# These are the userspace utilities that we also have source for.
-	# We rebuild these later.
-	rm \
-		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
-		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
-		|| die "bin rm failed"
-
-	if use debug; then
-		# Enable debug mode in the Source Code.
-		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
-			"${MODULE_DIR}/firegl_public.c" \
-			|| die "Failed to enable debug output."
-	fi
-
-	if use acpi; then
-		sed -i \
-			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
-			-e "s:/var/lib/gdm/:/var/gdm/:" \
-			"${S}/common/etc/ati/authatieventsd.sh" \
-			|| die "sed failed."
-
-		# Since "who" is in coreutils, we're using that one instead of "finger".
-		sed -i -e 's:finger:who:' \
-			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
-			|| die "Replacing 'finger' with 'who' failed."
-		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
-		# add funktion to detect default state.
-		epatch "${FILESDIR}"/8.476/ati-powermode-opt-path-2.patch
-	fi
-
-	pushd ${MODULE_DIR} >/dev/null
-	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
-		|| die "symlinking precompiled core failed"
-
-	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
-
-	# When built with ati's make.sh it defines a bunch of macros if
-	# certain .config values are set, falling back to less reliable
-	# detection methods if linux/autoconf.h is not available. We
-	# simply use the linux/autoconf.h settings directly, bypassing the
-	# detection script.
-	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
-	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
-		|| die "MODVERSIONS sed failed"
-	popd >/dev/null
-
-	mkdir extra || die "mkdir failed"
-	cd extra
-	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
-	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
-		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
-	# Add a category.
-	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
-}
-
-src_compile() {
-	linux-mod_src_compile
-
-	einfo "Building fgl_glxgears"
-	cd "${S}"/extra/fgl_glxgears
-	# These extra libs/utils either have an Imakefile that does not
-	# work very well without tweaking or a Makefile ignoring CFLAGS
-	# and the like. We bypass those.
-
-	# The -DUSE_GLU is needed to compile using nvidia headers
-	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
-	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include fgl_glxgears.c \
-		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
-
-	einfo "Building fglrx_gamma lib"
-	cd "${S}"/extra/lib/fglrx_gamma
-	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
-		-lXext || die "fglrx_gamma lib build failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
-	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
-
-	einfo "Building fglrx_gamma util"
-	cd "${S}"/extra/programs/fglrx_gamma
-	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
-		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
-		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
-		|| die "fglrx_gamma util build failed"
-
-}
-
-src_install() {
-	linux-mod_src_install
-
-	# We can do two things here, and neither of them is very nice.
-
-	# For direct rendering libGL has to be able to load one or more
-	# dri modules (files ending in _dri.so, like fglrx_dri.so).
-	# Gentoo's mesa looks for these files in the location specified by
-	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
-	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
-	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
-	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
-	# 64bit. So we can either put the .so files in that (unusual,
-	# compared to "normal" mesa libGL) location or set
-	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
-	# 101539.
-
-	# The problem with this approach is that LIBGL_DRIVERS_PATH
-	# *overrides* the default hardcoded location, it does not extend
-	# it. So if ati-drivers is merged but a non-ati libGL is selected
-	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
-	# (because it changed in a newer mesa or because it was compiled
-	# for a different set of multilib abis than we are) stuff breaks.
-
-	# We create one file per ABI to work with "native" multilib, see
-	# below.
-
-	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
-	doenvd "${T}/03ati-colon-sep"
-
-	# All libraries that we have a 32 bit and 64 bit version of on
-	# amd64 are installed in src_install-libs. Everything else
-	# (including libraries only available in native 64bit on amd64)
-	# goes in here.
-
-	# There used to be some code here that tried to detect running
-	# under a "native multilib" portage ((precursor of)
-	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
-	# should just work (only doing some duplicate work). --marienz
-	if has_multilib_profile; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	else
-		src_install-libs
-	fi
-
-	# This is sorted by the order the files occur in the source tree.
-
-	# X modules.
-	exeinto /usr/$(get_libdir)/xorg/modules/drivers
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-	exeinto /usr/$(get_libdir)/xorg/modules/linux
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
-	exeinto /usr/$(get_libdir)/xorg/modules
-	doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}
-
-	# Arch-specific files.
-	# (s)bin.
-	into /opt
-	if use acpi; then
-		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
-	fi
-	# We cleaned out the compilable stuff in src_unpack
-	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
-
-	# lib.
-	exeinto /usr/$(get_libdir)
-	# Everything except for the libGL.so installed in src_install-libs.
-	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
-	insinto /usr/$(get_libdir)
-	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
-		-maxdepth 1 -type f -not -name '*.so*')
-
-	# Common files.
-	# etc.
-	insinto /etc/ati
-	# Everything except for the authatieventsd.sh script.
-	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
-	if use acpi; then
-		doins common/etc/ati/authatieventsd.sh
-	fi
-
-	# include.
-	insinto /usr
-	doins -r common/usr/include
-	insinto /usr/include/X11/extensions
-	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h
-
-	# Just the atigetsysteminfo.sh script.
-	into /usr
-	dosbin common/usr/sbin/*
-
-	# data files for the control panel.
-	insinto /usr/share
-	doins -r common/usr/share/ati
-	insinto /usr/share/pixmaps
-	doins common/usr/share/icons/ccc_{large,small}.xpm
-	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
-		ccc_large System
-
-	# doc.
-	dohtml -r common/usr/share/doc/fglrx
-
-	if use acpi; then
-		doman common/usr/share/man/man8/atieventsd.8
-
-		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null
-
-		exeinto /etc/acpi
-		doexe ati-powermode.sh
-		insinto /etc/acpi/events
-		doins events/*
-
-		popd >/dev/null
-	fi
-
-	# Done with the "source" tree. Install tools we rebuilt:
-	dobin extra/fgl_glxgears/fgl_glxgears
-	newdoc extra/fgl_glxgears/README README.fgl_glxgears
-
-	dolib extra/lib/fglrx_gamma/*so*
-	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma
-
-	dobin extra/programs/fglrx_gamma/fglrx_xgamma
-	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
-	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma
-
-	# Gentoo-specific stuff:
-	if use acpi; then
-		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
-			|| die "Failed to install atieventsd.init.d"
-		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
-		newconfd "${T}"/atieventsd.conf atieventsd
-	fi
-}
-
-src_install-libs() {
-	if [[ "${ABI}" == "amd64" ]]; then
-		local pkglibdir=lib64
-		local MY_ARCH_DIR="${S}/arch/x86_64"
-	else
-		local pkglibdir=lib
-		local MY_ARCH_DIR="${S}/arch/x86"
-	fi
-	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
-
-	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
-	# To make sure we do not miss a spot when these change.
-	local libmajor=1 libminor=2
-	local libver=${libmajor}.${libminor}
-
-	# The GLX libraries
-	# (yes, this really is "lib" even on amd64/multilib --marienz)
-	exeinto ${ATI_ROOT}/lib
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
-	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
-
-	# Same as the xorg implementation (eselect opengl does not fall
-	# back to xorg-x11 if we omit this symlink, meaning no glx).
-	dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions
-
-	# DRI modules, installed into the path used by recent versions of mesa.
-	exeinto /usr/$(get_libdir)/dri
-	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-
-	# Make up a libGL.la. Ati does not provide one, but mesa does. If
-	# a (libtool-based) libfoo is built with libGL.la present a
-	# reference to it is put into libfoo.la, and compiling
-	# (libtool-based) things that link too libfoo.la will complain if
-	# libGL.la disappears. So if we do not make up a libGL.la
-	# switching between mesa and ati becomes painful.
-	local revision=$(printf '%d%02d%02d' $(get_version_components))
-	sed -e "s:\${libmajor}:${libmajor}:g" \
-		-e "s:\${libminor}:${libminor}:g" \
-		-e "s:\${libdir}:$(get_libdir):g" \
-		-e "s:\${revision}:${revision}:g" \
-		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
-		|| die "sed failed to make libGL.la"
-
-	local envname="${T}"/04ati-dri-path
-	if [[ -n ${ABI} ]]; then
-		envname="${envname}-${ABI}"
-	fi
-	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
-	doenvd "${envname}"
-}
-
-pkg_postinst() {
-	/usr/bin/eselect opengl set --use-old ati
-
-	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
-	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
-	elog
-	elog "If you experience unexplained segmentation faults and kernel crashes"
-	elog "with this driver and multi-threaded applications such as wine,"
-	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
-	elog
-	elog "You will have to source /etc/profile (or logout and back in) for dri"
-	elog "to work, unless you previously had ati-drivers installed."
-
-	# Workaroud screen corruption
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
-
-	linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
-	linux-mod_pkg_postrm
-	/usr/bin/eselect opengl set --use-old xorg-x11
-}
diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati
deleted file mode 100644
index 27180e0..0000000
--- a/x11-drivers/ati-drivers/files/09ati
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/opt/ati/bin
-ROOTPATH=/opt/ati/bin:/opt/ati/sbin
-MANPATH=/opt/ati/man
diff --git a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch b/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
deleted file mode 100644
index 25d5883..0000000
--- a/x11-drivers/ati-drivers/files/8.37.6/fix-ioctl-for-2.6.22.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- common-orig/lib/modules/fglrx/build_mod/firegl_public.c	2007-08-01 16:58:40.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-08-01 16:57:11.000000000 -0500
-@@ -144,12 +144,14 @@
- #define EXPORT_NO_SYMBOLS
- #endif
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #ifdef __x86_64__
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
- #include "linux/ioctl32.h"
- #else
- #include "asm/ioctl32.h"
- #endif
-+#endif
- 
- #ifdef __x86_64__
- #include "asm/compat.h"
diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
deleted file mode 100644
index 9713208..0000000
--- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-2.6.23.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
-@@ -2409,7 +2409,11 @@
- #ifdef pte_offset_map
-     pte_p = pte_offset_map(pmd_p, virtual_addr);
-     if (pte_present(*pte_p))
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-         ret = (ptep_clear_flush_dirty(vma, virtual_addr, pte_p) ? 1 : 0);
-+#else
-+    return 0;
-+#endif
-     else
-         __KE_DEBUG("page not exists!\n");
-     pte_unmap(pte_p); 
-@@ -3399,9 +3403,11 @@
-         sprintf(buf, "0x%Lx %c%c%c%c%c%c\n",
-            *phys_address,
-            pte_present (pte) ? 'p' : '-',
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-            pte_read    (pte) ? 'r' : '-',
--           pte_write   (pte) ? 'w' : '-',
-            pte_exec    (pte) ? 'x' : '-',
-+#endif
-+           pte_write   (pte) ? 'w' : '-',
-            pte_dirty   (pte) ? 'd' : '-',
-            pte_young   (pte) ? 'a' : '-');
-     }
-@@ -5348,7 +5354,11 @@
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
- 
-     if ((slabcache_obj->cache =
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-             kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL, NULL)))
-+#else
-+            kmem_cache_create(slabcache_obj->name, iEntrySize, 0, 0, NULL)))
-+#endif
-     {
-         ret = 1;
-     }
-
diff --git a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch b/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
deleted file mode 100644
index 378435d..0000000
--- a/x11-drivers/ati-drivers/files/8.40.4/ati-drivers-8.40.4-warnings.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur common/lib/modules/fglrx/build_mod/firegl_public.c common/lib/modules/fglrx/build_mod/firegl_public.c
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 13:36:37.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-07-29 14:24:11.000000000 +0200
-@@ -452,7 +452,7 @@
- }
- 
- static unsigned int 
--firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) 
-+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt)
- {
-     if(firegl_interrupt_poll(user_file, (__ke_poll_table*)pt))
-     {
-@@ -1491,7 +1491,8 @@
- int ATI_API_CALL firegl_put_user_ptr(void *src, u32 *dst)
- {
-   void *temp = src;
--  return put_user(temp, dst);
-+  void *dst_temp = dst;
-+  return put_user(temp, dst_temp);
- }
- 
- int ATI_API_CALL firegl_put_user_u16(u16 src, u16 *dst)
-@@ -1883,7 +1884,7 @@
- 
- __ke_pci_dev_t* ATI_API_CALL __ke_pci_find_device (unsigned int vendor, unsigned int dev, __ke_pci_dev_t* from)
- {
--	return (__ke_pci_dev_t*)pci_find_device( vendor, dev, (struct pci_dev *)(void *)from );
-+	return (__ke_pci_dev_t*) pci_get_device(vendor, dev, (struct pci_dev *)(void *) from); 
- }
- 
- void* ATI_API_CALL __ke_malloc(__ke_size_t size)
-@@ -2813,9 +2814,9 @@
- #else
- static void ATI_API_CALL (*irq_handler_func)(int, void*, void*); /* function pointer variable */
- 
--static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1, struct pt_regs *regs)
-+static irqreturn_t ke_irq_handler_wrap(int irq, void *arg1)
- {
--    irq_handler_func(irq, arg1, regs);
-+    irq_handler_func(irq, arg1, NULL);
-     return IRQ_HANDLED;
- }
- 
-@@ -2826,7 +2827,7 @@
-     irq_handler_func = handler;
-     return request_irq(irq,
-         ke_irq_handler_wrap,
--        SA_SHIRQ, dev_name, dev_id);
-+        IRQF_SHARED, dev_name, dev_id);
- }
- 
- void ATI_API_CALL __ke_free_irq(unsigned int irq, void *dev_id)
-@@ -2848,9 +2849,7 @@
- 
- void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd)
- {
--#ifdef FIREGL_IOCTL_COMPAT
--    return 0;
--#else
-+#ifndef FIREGL_IOCTL_COMPAT
-     unregister_ioctl32_conversion(cmd);
- #endif
- }
-@@ -4353,7 +4352,7 @@
- void ATI_API_CALL KCL_CallFuncOnOtherCpus(firegl_void_routine_t func_to_call) 
- {
- #ifdef CONFIG_SMP
--	smp_call_function( firegl_smp_func_parameter_wrap, (void*)func_to_call, 0, 1 );
-+	smp_call_function( (void (*)(void *info)) func_to_call, NULL, 0, 1 );
- #endif
- }
- 
-@@ -5303,7 +5302,7 @@
- /** \brief Type definition of the structure describing Slab Cache object */
- typedef struct tag_kasSlabCache_t
- {
--    kmem_cache_t* cache;        /* OS slab cache object */
-+   struct  kmem_cache* cache;        /* OS slab cache object */
-     spinlock_t lock;            /* OS spinlock object protecting the cache */
-     unsigned int routine_type;  /* Type of routine the cache might be accessed from */
-     char name[14];              /* Cache object name (kernel 2.4 restricts its length to 19 chars) */
-@@ -5344,7 +5343,7 @@
- 
-     slabcache_obj->routine_type = access_type;
-     spin_lock_init(&(slabcache_obj->lock));
--    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)slabcache_obj);
-+    sprintf(slabcache_obj->name, "kas(%08X)", (unsigned int)(long unsigned int)slabcache_obj);
- 
-     DBG_TRACE("creating slab object '%s'", slabcache_obj->name);
-
diff --git a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch
deleted file mode 100644
index 88b89a8..0000000
--- a/x11-drivers/ati-drivers/files/8.433/ati-powermode-opt-path-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -17,6 +17,10 @@
-         fi
- }
- 
-+aticonfig='/opt/bin/aticonfig'
-+
-+# default high power state
-+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
- 
- grep -q closed /proc/acpi/button/lid/*/state
- if [ $? = 0 ]; then
-@@ -46,7 +50,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"	    
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
- 	fi
-     done
- else
-@@ -56,7 +60,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
- 	fi
-     done
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
deleted file mode 100644
index 3819b23..0000000
--- a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig	2007-12-23 22:48:55.873089378 -0600
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-12-23 22:49:59.246421379 -0600
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`who| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
diff --git a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a3..0000000
--- a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a3..0000000
--- a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a3..0000000
--- a/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch
deleted file mode 100644
index f5a35a3..0000000
--- a/x11-drivers/ati-drivers/files/8.476/ati-powermode-opt-path-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -4,6 +4,8 @@
- # Control script for ACPI lid state and AC adapter state
- #
- 
-+aticonfig='/opt/bin/aticonfig'
-+
- getXuser() {
-         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
-         if [ x"$user" = x"" ]; then
-@@ -47,7 +49,7 @@
- done
- 
- #If PPLIB is enabled
--su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
-+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
- if [ $? = 0 ]; then
-    echo "Has PPLIB"
-    has_pplib=1
-@@ -61,15 +63,15 @@
- if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
-     echo "Low power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
-+        su $user -c "$aticonfig --set-powerstate=1"
-     fi
- else
-     echo "high power"
-     if [ ${has_pplib} -eq 1 ]; then
--        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
-+        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
-     else
--        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
-+	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
-     fi
- fi
-
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
deleted file mode 100644
index 160565a..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.19.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/agp3.c	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/agp3.c	2006-10-27 09:44:23.902749464 -0500
-@@ -61,7 +61,6 @@
- #include <linux/modversions.h>
- #endif
- #endif
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/init.h>
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/agpgart_be.c	2006-10-27 09:44:34.265174136 -0500
-@@ -99,9 +99,6 @@
- #endif
- #endif
- 
--#include <linux/config.h>
--
--
- #include <linux/module.h>
- #include <linux/types.h>
- #include <linux/kernel.h>
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h fglrx-install/common/lib/modules/fglrx/build_mod/drm.h
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/drm.h	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/drm.h	2006-10-27 09:44:52.502401656 -0500
-@@ -38,7 +38,6 @@
- #define _DRM_H_
- 
- #if defined(__linux__)
--#include <linux/config.h>
- #include <asm/ioctl.h>		/* For _IO* macros */
- #define DRM_IOCTL_NR(n)		_IOC_NR(n)
- #define DRM_IOC_VOID		_IOC_NONE
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/drmP.h	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/drmP.h	2006-10-27 09:45:03.912667032 -0500
-@@ -42,7 +42,6 @@
-  * can build the DRM (part of PI DRI). 4/21/2000 S + B */
- #include <asm/current.h>
- #endif /* __alpha__ */
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/miscdevice.h>
-diff -urN fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-install-old/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-09-19 19:30:42.000000000 -0500
-+++ fglrx-install/common/lib/modules/fglrx/build_mod/firegl_public.c	2006-10-27 09:45:47.463046368 -0500
-@@ -67,9 +67,6 @@
-  * for example for CPU hot-plugging. I wonder why a desktop
-  * distribution would even include such a kernel patch. */
- #ifdef CONFIG_MEM_MIRROR
--/* Prevent linux/config.h from being included again in subsequent
-- * kernel headers as that would redefine CONFIG_MEM_MIRROR. */
--#include <linux/config.h>
- #warning "Disabling CONFIG_MEM_MIRROR because it does not work with non-GPL modules."
- #warning "This will break page tracking when the fglrx kernel module is used."
- #undef CONFIG_MEM_MIRROR
-@@ -86,7 +83,6 @@
- #include <asm/unistd.h> /* for installing the patch wrapper */
- #include <linux/module.h>
- 
--#include <linux/config.h>
- #include <linux/kernel.h>
- #include <linux/fs.h>
- #include <linux/proc_fs.h>
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
deleted file mode 100644
index aeaba71..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-2.6.20.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-18 10:58:15.000000000 -0500
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2006-12-18 11:14:04.000000000 -0500
-@@ -181,6 +181,70 @@
- int errno;
- #endif // __ia64__
- 
-+#if defined(__i386__)
-+#define __syscall_return(type, res) \
-+do { \
-+        if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \
-+                errno = -(res); \
-+                res = -1; \
-+        } \
-+        return (type) (res); \
-+} while (0)
-+#define _syscall2(type,name,type1,arg1,type2,arg2) \
-+type name(type1 arg1,type2 arg2) \
-+{ \
-+long __res; \
-+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)) \
-+        : "memory"); \
-+__syscall_return(type,__res); \
-+}
-+
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-+type name(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+long __res; \
-+__asm__ volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"ri" ((long)(arg1)),"c" ((long)(arg2)), \
-+                  "d" ((long)(arg3)) : "memory"); \
-+__syscall_return(type,__res); \
-+}
-+#elif defined(__x86_64__)
-+#define __syscall_clobber "r11","rcx","memory" 
-+#define __syscall "syscall"
-+
-+#define __syscall_return(type, res) \
-+do { \
-+        if ((unsigned long)(res) >= (unsigned long)(-127)) { \
-+                errno = -(res); \
-+                res = -1; \
-+        } \
-+        return (type) (res); \
-+} while (0)
-+#define _syscall2(type,name,type1,arg1,type2,arg2) \
-+type name(type1 arg1,type2 arg2) \
-+{ \
-+long __res; \
-+__asm__ volatile (__syscall \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)) : __syscall_clobber ); \
-+__syscall_return(type,__res); \
-+}
-+
-+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-+type name(type1 arg1,type2 arg2,type3 arg3) \
-+{ \
-+long __res; \
-+__asm__ volatile (__syscall \
-+        : "=a" (__res) \
-+        : "0" (__NR_##name),"D" ((long)(arg1)),"S" ((long)(arg2)), \
-+                  "d" ((long)(arg3)) : __syscall_clobber); \
-+__syscall_return(type,__res); \
-+}
-+#endif
-+
- // int mlock(const void *addr, size_t len);
- _syscall2(int, mlock, const void *, addr, size_t, len )
- // int munlock(const void *addr, size_t len);
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
deleted file mode 100644
index 665d8d6..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.19.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-29 23:48:46.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-30 00:15:21.000000000 +0200
-@@ -5055,7 +5057,6 @@
-  */
- unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache)
- {
--    unsigned int ret = 0;
-     kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache;
- 
-     DBG_ENTER("0x%08X", hSlabCache);
-@@ -5069,18 +5070,11 @@
- 
-     DBG_TRACE("destroying slab object '%s'", slabcache_obj->name);
- 
--    if (kmem_cache_destroy(slabcache_obj->cache) == 0)
--    {
--        ret = 1;
--        slabcache_obj->cache = NULL;
--    }
--    else
--    {
--        DBG_ERROR("destroying failed");
--    }
-+    kmem_cache_destroy(slabcache_obj->cache);
-+    slabcache_obj->cache = NULL;
- 
--    DBG_LEAVE("%d", ret);
--    return ret;
-+    DBG_LEAVE("1");
-+    return 1;
- }
- 
- /** \brief Allocate an entry in a Slab Cache
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
deleted file mode 100644
index c830d38..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-29 23:48:46.000000000 +0200
-+++ common/lib/modules/fglrx/build_mod/firegl_public.c	2007-03-30 00:15:21.000000000 +0200
-@@ -171,6 +171,8 @@
- #endif
- #endif
- 
-+#include <linux/freezer.h>
-+
- #include <linux/kmod.h>
- 
- // To enable DBG_* macros set this variable to nonzero
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
deleted file mode 100644
index fb6119e..0000000
--- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh'
---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-02-09 12:25:40 +0000
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2007-02-09 12:28:54 +0000
-@@ -46,7 +46,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"	    
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now"
- 	fi
-     done
- else
-@@ -56,7 +56,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now"
- 	fi
-     done
- fi
-
diff --git a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch b/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
deleted file mode 100644
index cd776e0..0000000
--- a/x11-drivers/ati-drivers/files/ati-powermode.sh.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
-@@ -17,6 +17,10 @@
-         fi
- }
- 
-+aticonfig='/opt/ati/bin/aticonfig'
-+
-+# default high power state
-+default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
- 
- grep -q closed /proc/acpi/button/lid/*/state
- if [ $? = 0 ]; then
-@@ -46,7 +50,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"	    
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=1 --effective=now"
- 	fi
-     done
- else
-@@ -56,7 +60,7 @@
- 	getXuser;
- 	if [ x"$XAUTHORITY" != x"" ]; then
- 	    export DISPLAY=":$displaynum"
--	    su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+	    su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
- 	fi
-     done
- fi
diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init
deleted file mode 100644
index 73139ce..0000000
--- a/x11-drivers/ati-drivers/files/atieventsd.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
-
-depend() {
-    need acpid
-}
-
-start() {
-    ebegin "Starting ${SVCNAME}"
-    start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${SVCNAME}"
-    start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
-    eend $?
-}
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/atieventsd.rc6 b/x11-drivers/ati-drivers/files/atieventsd.rc6
deleted file mode 100644
index 2180e0e..0000000
--- a/x11-drivers/ati-drivers/files/atieventsd.rc6
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.rc6,v 1.2 2006/08/04 12:20:19 chrb Exp $
-
-depend() {
-    need acpid
-}
-
-start() {
-    start-stop-daemon --start --pidfile /var/run/atieventsd.pid \
-      --exec /opt/ati/sbin/atieventsd -- ${ATIEVENTSDOPTS}
-    local pid=`pidof atieventsd`
-    echo $pid > /var/run/atieventsd.pid
-    eend $?
-}
-
-stop() {
-    start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid
-    eend $?
-}
-
diff --git a/x11-drivers/ati-drivers/files/libGL.la.in b/x11-drivers/ati-drivers/files/libGL.la.in
deleted file mode 100644
index 7fdc409..0000000
--- a/x11-drivers/ati-drivers/files/libGL.la.in
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${libmajor}.${libminor} libGL.so.${libmajor} libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs='-L/usr/${libdir} -lX11 -lXext -ldl'
-
-# Version information for libGL.
-current=1
-age=0
-revision=${revision}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/${libdir}'