x11-drivers/ati-drivers: version bump

2 files changed, 25 insertions, 33 deletions

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 8b35e951..c14f4752 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,7 +1,7 @@
 DIST amd-catalyst-13.10-beta2-linux-x86.x86_64.zip 122409608 SHA256 e68c82236647e168704c8a652dfd1b35afbd80f4ee9439627f5d05c92c0bc977 SHA512 981e3c6e260b8ca4257c58c38e3da269f823811b79916cd4f64c56b2319e7624f9b5dd0bdc8184f42fb46320d6d50d17a8259bfa9103506d282c7defe31feae2 WHIRLPOOL 65e72ab7151e7f2094398566778c18778131095c545aab9b3f0c900e0852f2b38621292d5d34331c5f758294681a1ec1c885fc4fbf0e80388fe9d0de655d9259
+DIST amd-catalyst-13.11-beta6-linux-x86.x86_64.zip 160487039 SHA256 f09ed24b6541e5bd91ff0f76d2c94dff50d671a1ebc71c99ef6847f904eb2b70 SHA512 b7261f411a08927f48b3c56151dc1590bfae8201ae7f3fbab1a041531006f45c543b1077d3ecbd983a65a9ec249172019db9160ec71018308ff49243a29000a4 WHIRLPOOL a7d1a6f53cd6d61dac3c4176d0e2bb2d373b79c8a351555158100aa995c1e9f15cc2fd82e5f727ff99244c2e15f83953455152c60066b50f220713e640b424f7
 DIST amd-catalyst-13.11-betav1-linux-x86.x86_64.zip 122951918 SHA256 6597cf12dc50437c59b2517b45408013c15612952d759b15cef7e8498ccd290a SHA512 c31ba31d32db42041306da61275a51a1b9aa6556493cca338facfe84d5a80c8a744a33fbc93b31b65ff50e2367662e4c9a05610d7d848b9dfa8a38c964be4c4a WHIRLPOOL c7af5b350fa45179657a5949f4dd42b9c74a6855c51f2add6ec67404a37ad0463567e4b6961bc94a47c1858295fec4a8d66e55dee074a323436c553dc3bbde64
 DIST amd-catalyst-13.4-linux-x86.x86_64.zip 122588023 SHA256 ebec78c7f78db3601d1c97116a6823076a7765318e16d88b619ebc80d4c6d1d5 SHA512 ce012f46527ee0073f658e97dd793954930b934b96be9e1c6cd1d344e7734ef81949b484701d5e7e1ebb221f46b5a617f4efb4445e42c06ac0a8b4eca76463fc WHIRLPOOL cb0f7af6d0474c3d521c5785bab49d76da7e09e1ddd02dc0e72b70b5afdb2bd1e07d4a4115a755f213718e7c32c816697d993b73706d58be68fa043aef1ad551
-DIST amd-catalyst-13.8-beta2-linux-x86.x86_64.zip 122411525 SHA256 76e03e39804882d738b809e201732e4bc3318c7c536f9f977ef06db42d7bf978 SHA512 3411097dc790bcd9bc1e14bf6a5b5e90a3dae8a4a48d0503bcb0e61fe829df30565cc94adb5ccfed2046ad9c21b85266cf8fdf9f86b045480070d1fe36bd4502 WHIRLPOOL 010dea81b0e5ea231b39305d692369359f29abb4f42c43c3bca5f0140ceb5f3f1171adf802f19313064a62f3c6546476e2c2b7e78150a15d0f106b37f2984137
 DIST amd-catalyst-13.9-linux-x86.x86_64.zip 120482826 SHA256 ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3 SHA512 887c1146920ba7e5b31efd63b1a1b7d9cab586e8c6d705706e0b176b3527e542f452d919cd015c3a04d6f42c884f27d983b2a9229b70716129a94674dd7f62b4 WHIRLPOOL d8b6c7ed772898914c256674ae08a8b3d3054eb5bdfc2f00dc4c796a36b4654c3101410786adb54eaae44ff35386db2aa8d8db12d70805f8732d0709412bdbcc
 DIST amd-driver-installer-12.6-legacy-x86.x86_64.zip 3762108 SHA256 56acf0db1df14d6a49f2dcbbb8b447586e976862644243e5844c230fb87c9523 SHA512 509e5fee93ae3c0641724bf7f722c7726dcda7499cfde86dede850be1de8a3aeb36da3c4910b332680233305d48d1d25dc4438c27db16b54e81da3103fc4b391 WHIRLPOOL 13c3dc574f3023feaed189789031592a08cca1140750f4a78c1657ccd35c5e82f99abf113817173b5477de9bee0f57fb9f6c9a9242d8e9ecec76bbcfdce78450
 DIST amd-driver-installer-catalyst-12.11-beta11-x86.x86_64.zip 8937807 SHA256 48ad89d89791e2500711847e8061b34c2592a6c468aebb46a93fa2ec4076ac23 SHA512 f88278705172cc1241d09d38954811ea1502a148b88cb75f27165716a349446ecf5710cc899ffbe44d0129a5c22b1c3bc3777c5fde63c85514c3db80cbbc56b9 WHIRLPOOL 8e4544d73e46557311eae443779ca564ea4db713af49bc525c376c7d9c6db001ad821242c77d9b58d3d532a1d688c9f5a7e599ce553e629d7c2196128f174bdf
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild
index ffb2cbea..97b71c3d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.11_beta6.ebuild
@@ -8,9 +8,9 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti
 
 DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
 HOMEPAGE="http://www.amd.com"
-#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
+#RUN="${WORKDIR}/amd-catalyst-13.11-beta1-linux-x86.x86_64.run"
 SLOT="1"
-DRIVERS_URI="https://www2.ati.com/drivers/beta/amd-catalyst-13.8-beta2-linux-x86.x86_64.zip"
+DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-13.11-beta6-linux-x86.x86_64.zip"
 XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
 SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
 FOLDER_PREFIX="common/"
@@ -148,40 +148,33 @@ QA_DT_HASH="
 	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
 "
 
-CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
-ERROR_MTRR="CONFIG_MTRR required for direct rendering."
-ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
-	rendering to work."
-ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
-	as GPL-only. This prevents ${P} from compiling with an error like this:
-	FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
-ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
-	kernel to reject loading the fglrx module with
-	\"ERROR: could not insert 'fglrx': Exec format error.\"
-	You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
-
-_check_kernel_config() {
-	if ! linux_chkconfig_present AGP && \
-		! linux_chkconfig_present PCIEPORTBUS; then
-		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
-		ewarn "Direct rendering will not work."
-	fi
-
-	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
-		die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
-	fi
-
-	if use amd64 && ! linux_chkconfig_present COMPAT; then
-		die "CONFIG_COMPAT must be enabled for amd64 kernels."
-	fi
-}
-
 pkg_pretend() {
+	local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR"
+	use amd64 && CONFIG_CHECK+=" COMPAT"
+
+	local ERROR_MTRR="CONFIG_MTRR required for direct rendering."
+	local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct
+		rendering to work."
+	local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire
+		as GPL-only. This prevents ${P} from compiling with an error like this:
+		FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+	local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause
+		kernel to reject loading the fglrx module with
+		\"ERROR: could not insert 'fglrx': Exec format error.\"
+		You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead."
+	local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38."
+
 	# workaround until bug 365543 is solved
 	if use modules; then
 		linux-info_pkg_setup
 		require_configured_kernel
-		_check_kernel_config
+		kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL"
+		check_extra_config
+		if ! linux_chkconfig_present AGP && \
+			! linux_chkconfig_present PCIEPORTBUS; then
+			ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+			ewarn "Direct rendering will not work."
+		fi
 	fi
 
 	if ! has XT ${PAX_MARKINGS} && use pax_kernel; then
@@ -305,7 +298,6 @@ src_prepare() {
 	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
 
 	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch"
-	epatch "${FILESDIR}/ati-drivers-13.8-proc-permissions.diff"
 
 	# Fix #483400
 	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"