Fix 32bit dri support on amd64, bug 101539

(Portage version: 2.0.52-r1)

8 files changed, 555 insertions, 42 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 0e0246b639f0..616a63ad5c04 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.110 2005/09/13 22:20:37 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.111 2005/09/13 22:47:19 herbs Exp $
+
+*ati-drivers-8.16.20-r1 (13 Sep 2005)
+*ati-drivers-8.14.13-r5 (13 Sep 2005)
 
   13 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
-  ati-drivers-8.14.13-r4.ebuild, ati-drivers-8.16.20.ebuild:
+  +ati-drivers-8.14.13-r5.ebuild, +ati-drivers-8.16.20-r1.ebuild:
   Fix 32bit dri support on amd64, bug 101539.
 
   10 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index b9a4a57fabfd..c48649a8d4a8 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,15 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 105e48927920d0a38ce78b201f10b5ba ati-drivers-8.14.13-r3.ebuild 7659
+MD5 68dd160d7cfb5b89a52b0f266ac70552 ati-drivers-8.16.20-r1.ebuild 6495
+MD5 dac14a37469832f92c8ebc01b6041d2d ati-drivers-8.14.13-r5.ebuild 7763
 MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
-MD5 68dd160d7cfb5b89a52b0f266ac70552 ati-drivers-8.16.20.ebuild 6495
-MD5 dac14a37469832f92c8ebc01b6041d2d ati-drivers-8.14.13-r4.ebuild 7763
+MD5 6d40d224dc4e867ae0c5221e03372e0b ati-drivers-8.16.20.ebuild 6227
+MD5 a31a5dcb55a1fc8bc341ab9a0e87d42c ati-drivers-8.14.13-r4.ebuild 7495
 MD5 3e17bddce39f88c2f8ac054ed4b2c66d ChangeLog 19848
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20-r1 158
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
 MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
 MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
@@ -19,10 +19,4 @@ MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDJ1DD2G5bA0cA/ScRAvSsAJ9tHkZfFQksY+s+gnjC7X4rGAPrcwCfQyS+
-sOv3l5TcbP/sa9+wA74McBk=
-=2eQ7
------END PGP SIGNATURE-----
+MD5 b9868c358d04b898fac7ee197572857d files/digest-ati-drivers-8.14.13-r5 157
diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild
index 39d6c5930654..49bb78831834 100644
--- a/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.14.13-r4.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/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.3 2005/09/13 22:20:37 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.4 2005/09/13 22:47:19 herbs Exp $
 
 IUSE="opengl dlloader"
 
@@ -156,25 +156,14 @@ src_install() {
 	fi &> /dev/null
 
 	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
 	exeinto /opt/ati/bin
 	doexe usr/X11R6/bin/*
 
 	#ati custom stuff
 	insinto /usr
 	doins -r ${WORKDIR}/usr/include
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
-EOF
-	fi
-
-	doenvd ${T}/09ati
 }
 
 src_install-libs() {
diff --git a/media-video/ati-drivers/ati-drivers-8.14.13-r5.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r5.ebuild
new file mode 100644
index 000000000000..ebd599b087ae
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-8.14.13-r5.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.14.13-r5.ebuild,v 1.1 2005/09/13 22:47:19 herbs Exp $
+
+IUSE="opengl dlloader"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
+	 amd64? ( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	rpm_src_unpack
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if kernel_is 2 6
+	then
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+		epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/ioctl32.patch
+	epatch ${FILESDIR}/p1.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	else
+		export _POSIX2_VERSION="199209"
+		# That is the dirty way to avoid the id -u check
+		sed -e 's:`id -u`:0:' \
+			-e "s:\`uname -r\`:${KV_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dinamic libGL stuff's home to ensure
+	# we don't have stale libs floating around ...
+	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	cd ${WORKDIR}
+
+	# DRM module
+	insinto /lib/modules/${KV_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	else
+		einfo "Adapting fglrx_drv to dlloader..."
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so \
+					   ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o \
+					   -Xlinker -L/usr/lib/modules -Xlinker -R/usr/lib/modules \
+					   -Xlinker -L/usr/lib/modules/linux -Xlinker -R/usr/lib/modules/linux \
+					   -Xlinker -L/usr/lib/modules/extensions -Xlinker -R/usr/lib/modules/extensions \
+					   -lfbdevhw -lglx -lfglrxdrm -ldrm -lxaa -lramdac -ldri -lfb -lint10 -lvgahw -li2c -lddc -lvbe
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	else
+		einfo "Adapting libfglrxdrm to dlloader..."
+		ar x ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so \
+			module.o FireGLdrm.o
+		rm module.o FireGLdrm.o
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/media-video/ati-drivers/ati-drivers-8.16.20-r1.ebuild b/media-video/ati-drivers/ati-drivers-8.16.20-r1.ebuild
new file mode 100644
index 000000000000..28863d9d8fe6
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-8.16.20-r1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.16.20-r1.ebuild,v 1.1 2005/09/13 22:47:19 herbs Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
+	 amd64? ( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
+
+LICENSE="ATI"
+KEYWORDS="-*" #~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	rpm_src_unpack
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+#	if kernel_is 2 6
+#	then
+#	fi
+	epatch ${FILESDIR}/ioctl32.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	else
+		export _POSIX2_VERSION="199209"
+		# That is the dirty way to avoid the id -u check
+		sed -e 's:`id -u`:0:' \
+			-e "s:\`uname -r\`:${KV_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dinamic libGL stuff's home to ensure
+	# we don't have stale libs floating around ...
+	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	cd ${WORKDIR}
+
+	# DRM module
+	insinto /lib/modules/${KV_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/media-video/ati-drivers/ati-drivers-8.16.20.ebuild b/media-video/ati-drivers/ati-drivers-8.16.20.ebuild
index eb1f2efdd05c..6e8894034bac 100644
--- a/media-video/ati-drivers/ati-drivers-8.16.20.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.16.20.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/media-video/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.8 2005/09/13 22:20:37 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.9 2005/09/13 22:47:19 herbs Exp $
 
 IUSE="opengl"
 
@@ -154,21 +154,10 @@ src_install() {
 	doexe usr/X11R6/bin/*
 
 	#ati custom stuff
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
 	insinto /usr
 	doins -r ${WORKDIR}/usr/include
-
-	#env.d entry
-	cp ${FILESDIR}/09ati ${T}/
-
-	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
-	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		cat >>${T}/09ati <<EOF
-
-LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
-EOF
-	fi
-
-	doenvd ${T}/09ati
 }
 
 src_install-libs() {
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r5 b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r5
new file mode 100644
index 000000000000..778371d228cc
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r5
@@ -0,0 +1,2 @@
+MD5 fb60a74066df40d3f3db929ace759b80 fglrx_6_8_0-8.14.13-1.i386.rpm 1236272
+MD5 fc6c39cdf856955359c6f7087a78581c fglrx64_6_8_0-8.14.13-1.x86_64.rpm 14977136
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.16.20-r1 b/media-video/ati-drivers/files/digest-ati-drivers-8.16.20-r1
new file mode 100644
index 000000000000..1f351a19affd
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-8.16.20-r1
@@ -0,0 +1,2 @@
+MD5 db413c61d9d00a96c6a103fe9cf697d5 fglrx_6_8_0-8.16.20-1.i386.rpm 11463523
+MD5 71524b4690b1df108c2cc5d37f945856 fglrx64_6_8_0-8.16.20-1.x86_64.rpm 16328353