New version

Package-Manager: portage-2.1.1_pre1-r2

5 files changed, 373 insertions, 12 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 955830e92c10..51ced493f65a 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.41 2006/06/03 06:06:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.42 2006/06/27 23:56:44 lu_zero Exp $
+
+*ati-drivers-8.26.18 (27 Jun 2006)
+
+  27 Jun 2006; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.25.18.ebuild,
+  +ati-drivers-8.26.18.ebuild:
+  New version
 
   03 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index b7700d319a14..bea041361c4f 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -76,6 +76,8 @@ DIST ati-driver-installer-8.24.8-x86.run 36287485 RMD160 c20a2ad9101490cdbe867f7
 DIST ati-driver-installer-8.24.8-x86_64.run 30189769 RMD160 daaa495cf2d7597496f9e4264cfd8ff15c546fd4 SHA256 83859f349af60821a609bb40344b99bb4c48ba35af01c189dceaa458ab9049c7
 DIST ati-driver-installer-8.25.18-x86.run 36270279 RMD160 644309288fae0674f2674fd998862f84d739254a SHA256 3da4f667b5382ede8ee05aa38e60bd0539e6f1699786ca9d8d3e953f31373f34
 DIST ati-driver-installer-8.25.18-x86_64.run 30487934 RMD160 51108aea2b771df97faaf0c1f45c8ca71c8019e4 SHA256 cd4da0c00b1eae4bfba5728c6c4ebfca28c06230912c5aad6bb4a15eeeae1801
+DIST ati-driver-installer-8.26.18-x86.run 23716730 RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 SHA1 5c84a8d3526accccb0154c9d701948629f7ae45d SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55
+DIST ati-driver-installer-8.26.18-x86_64.run 30927154 RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f SHA1 3004c7fe409293ac2882ee7ef80addb92706fc35 SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f
 DIST fglrx64_6_8_0-8.14.13-1.x86_64.rpm 14977136
 DIST fglrx64_6_8_0-8.16.20-1.x86_64.rpm 16328353
 DIST fglrx64_6_8_0-8.18.6-1.x86_64.rpm 17028932
@@ -154,14 +156,18 @@ EBUILD ati-drivers-8.24.8.ebuild 9244 RMD160 44d3b96fd8350cdd5abfa0bd758fb73b1e9
 MD5 6253c8de09815661f933e87c392cdf8f ati-drivers-8.24.8.ebuild 9244
 RMD160 44d3b96fd8350cdd5abfa0bd758fb73b1e9056c4 ati-drivers-8.24.8.ebuild 9244
 SHA256 80d7a25e50fc9c7e3d4d35e6a878b094428d257d8236ccc4bac6873f43c9dd14 ati-drivers-8.24.8.ebuild 9244
-EBUILD ati-drivers-8.25.18.ebuild 9596 RMD160 c6741cdbc64967064f340191890e99631779ba03 SHA1 0f3cfd4095d1648ea1bcb6b6a5a899f22fee9b03 SHA256 5be8b4e8eb27ef867a839828fae045370151c1840da65815646282ae0a263471
-MD5 e2e5598b336938e5065d7f77c6466a18 ati-drivers-8.25.18.ebuild 9596
-RMD160 c6741cdbc64967064f340191890e99631779ba03 ati-drivers-8.25.18.ebuild 9596
-SHA256 5be8b4e8eb27ef867a839828fae045370151c1840da65815646282ae0a263471 ati-drivers-8.25.18.ebuild 9596
-MISC ChangeLog 29862 RMD160 aff49e89fd8942b25852d279b8f78e9f6dc5f2a2 SHA1 afcd68db2e02347e6ce80bcc59366e50e063887f SHA256 8c72c9e24dc33547f56639a2d2d5d980cf7dfa7b6ec34475095d81f564b2970e
-MD5 a1c410c002860204e730fc87003ce8f1 ChangeLog 29862
-RMD160 aff49e89fd8942b25852d279b8f78e9f6dc5f2a2 ChangeLog 29862
-SHA256 8c72c9e24dc33547f56639a2d2d5d980cf7dfa7b6ec34475095d81f564b2970e ChangeLog 29862
+EBUILD ati-drivers-8.25.18.ebuild 9626 RMD160 46474f18cf41cec14ae970e6abb2287295e105b4 SHA1 d94060dec076ea6491680a80b1bd5991f25f6370 SHA256 ba3b29f1c80b17038b5c1bce4616987ec0937c6158d0378d67805c01b2f4c85b
+MD5 f218eab19f44af1cfe1c72291b25b405 ati-drivers-8.25.18.ebuild 9626
+RMD160 46474f18cf41cec14ae970e6abb2287295e105b4 ati-drivers-8.25.18.ebuild 9626
+SHA256 ba3b29f1c80b17038b5c1bce4616987ec0937c6158d0378d67805c01b2f4c85b ati-drivers-8.25.18.ebuild 9626
+EBUILD ati-drivers-8.26.18.ebuild 9709 RMD160 8e3be8c55c12e208ba8cf7498802cc2e26bcac4a SHA1 2ba3492c35ab12d94e291748c865c8cfbaea83c5 SHA256 2072e45d32b6610948f71b9407e247695f06dd06c64c549a42ddb6eef37f7772
+MD5 fd471cf445a3bd8c942ae87df01cea9c ati-drivers-8.26.18.ebuild 9709
+RMD160 8e3be8c55c12e208ba8cf7498802cc2e26bcac4a ati-drivers-8.26.18.ebuild 9709
+SHA256 2072e45d32b6610948f71b9407e247695f06dd06c64c549a42ddb6eef37f7772 ati-drivers-8.26.18.ebuild 9709
+MISC ChangeLog 30015 RMD160 f581a971ad7b8dd71a9660a26cd17c7e9d3d4e44 SHA1 412203a34680b33a1e4348189d465dc0723bb4f4 SHA256 f8f34ba53ffa973068a95e5006aa75a01a9ac27dc2ef34718d463bc11121b39e
+MD5 7877b35a4bbc8da18bd60f39f8adeca6 ChangeLog 30015
+RMD160 f581a971ad7b8dd71a9660a26cd17c7e9d3d4e44 ChangeLog 30015
+SHA256 f8f34ba53ffa973068a95e5006aa75a01a9ac27dc2ef34718d463bc11121b39e ChangeLog 30015
 MISC metadata.xml 227 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff SHA1 47e1824ff5e7e3789fcbb4ca5de9c3ccd9162b76 SHA256 4fbed7030b32bcdc95b70000adbbcb6f1d73092c4a2f20e6cfb737a1b44d6e07
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 RMD160 e2ed1445a0405b39e40741d3d1f67746daab8fff metadata.xml 227
@@ -223,3 +229,6 @@ SHA256 10c9172a288f6ee2c6362c7ea4dab08bfbf24b6c470283b5bbba2ff85e158791 files/di
 MD5 e946b14b251ce9d45bac8901c5becebd files/digest-ati-drivers-8.25.18 599
 RMD160 90654e309cb3899cb37167e7a460ef8e4b158c23 files/digest-ati-drivers-8.25.18 599
 SHA256 7a56d95f00b852cfa213ac342f4e1394e84ec7bf035852127cfbee2a615c565a files/digest-ati-drivers-8.25.18 599
+MD5 864cc020053f67a28c2399f0c5e830fa files/digest-ati-drivers-8.26.18 599
+RMD160 9010de31d186da94f756eda0c6da2769d187283f files/digest-ati-drivers-8.26.18 599
+SHA256 180ded06d335b8f8053b8a8587d1707fe650e4915e87a7ca7315326e8727939f files/digest-ati-drivers-8.26.18 599
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
index 98fbe03d58f4..acb4d466553f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
@@ -1,6 +1,6 @@
 # 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/ati-drivers-8.25.18.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild,v 1.5 2006/06/27 23:56:44 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -224,11 +224,11 @@ src_install() {
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
 		cat >>${T}/09ati <<EOF
 
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH $ATI_LIBGL_PATH"
+LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
 	doenvd ${T}/09ati
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.26.18.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.26.18.ebuild
new file mode 100644
index 000000000000..c303c9257fa0
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.26.18.ebuild
@@ -0,0 +1,340 @@
+# 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/ati-drivers-8.26.18.ebuild,v 1.1 2006/06/27 23:56:44 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-mod linux-info toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-x86.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
+	 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 stricter"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
+QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
+QA_TEXTREL_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
+QA_TEXTREL_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
+
+choose_driver_paths() {
+	ARCH_DIR="${WORKDIR}/arch"
+	COMMON_DIR="${WORKDIR}/common"
+
+	#new modular X paths, 0 is a workaround.
+	if has_version "x11-base/xorg-server"; then
+		BASE_DIR="${WORKDIR}/x690"
+		xlibdir="xorg"
+	else
+		BASE_DIR="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+		xlibdir=""
+
+		# Determine if we are facing X.org 6.8.99 aka 6.9
+		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+		then
+			BASE_DIR="${BASE_DIR}90"
+		else
+			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		fi
+	fi
+
+	if use amd64 ; then
+		BASE_DIR="${BASE_DIR}_64a"
+		ARCH_DIR="${ARCH_DIR}/x86_64"
+	else
+		ARCH_DIR="${ARCH_DIR}/x86"
+	fi
+}
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	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
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+			ewarn "could work only using the internal support."
+		fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	if has_version "x11-base/xorg-server"; then
+		X11_IMPLEM=xorg-x11
+	elif has_version "<x11-base/xorg-x11-6.8.99"; then
+		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	else
+		X11_IMPLEM_P="$(best_version virtual/x11)"
+		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+		X11_IMPLEM="${X11_IMPLEM##*\/}"
+		X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	fi
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_paths
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	#if kernel_is ge 2 6 16; then
+	#	epatch ${FILESDIR}/${PN}-8.22.5-intermodule.patch
+	#	epatch ${FILESDIR}/${PN}-8.23.7-noiommu.patch
+	#	epatch ${FILESDIR}/${PN}-8.23.7-gcc41.patch
+	#fi
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s \
+	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
+	|| die "cannot find precompiled core"
+
+	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 || ewarn "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dynamic 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_LIBGL_PATH=""
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	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 ${ARCH_DIR}/usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/common/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
+		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+	fi
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
+EOF
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir="$(get_libdir)/${xlibdir}"
+	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+	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/$(get_libdir)/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${ARCH_DIR}/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/$(get_libdir)/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/X11R6/"
+	else
+		local X11_DIR="/usr/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+			${D}/usr/$(get_libdir)
+	else
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
+			${D}/usr/$(get_libdir)
+	fi
+
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	dodir /etc
+	cp -pPR ${COMMON_DIR}/etc/* ${D}/etc/
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	einfo "To change your xorg.conf you can use the bundled \"aticonfig\""
+	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
+	echo
+	einfo "If you experience unexplained segmentation faults and kernel crashes"
+	einfo "with this driver and multi-threaded applications such as wine,"
+	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	# DRM module
+	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/digest-ati-drivers-8.26.18 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18
new file mode 100644
index 000000000000..181d0151e3e9
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18
@@ -0,0 +1,6 @@
+MD5 0cd66013e31fbaa6470f3dad3391cfd1 ati-driver-installer-8.26.18-x86.run 23716730
+RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 ati-driver-installer-8.26.18-x86.run 23716730
+SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55 ati-driver-installer-8.26.18-x86.run 23716730
+MD5 a755a02cd7bb71697ac4c249d0e32eb0 ati-driver-installer-8.26.18-x86_64.run 30927154
+RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f ati-driver-installer-8.26.18-x86_64.run 30927154
+SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f ati-driver-installer-8.26.18-x86_64.run 30927154