Attempt to re-unify portage and x11 overlay ebuilds.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

3 files changed, 24 insertions, 7 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index d63d6f11b826..2ecf90b33e28 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.309 2012/12/25 16:41:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.310 2012/12/29 00:07:31 chithanh Exp $
+
+  29 Dec 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  ati-drivers-12.6_beta_pre897.ebuild:
+  Attempt to re-unify portage and x11 overlay ebuilds.
 
 *ati-drivers-12.11_beta11 (25 Dec 2012)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 23585cbfbc68..5709d51178d9 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -22,7 +22,7 @@ EBUILD ati-drivers-12.11_beta.ebuild 20872 SHA256 73376250771262c484f18eaf8a1b2d
 EBUILD ati-drivers-12.11_beta11.ebuild 21107 SHA256 79a049901d5649a9b9af68902432b59f0880c677f56e31e2b61c230d0becb13c SHA512 6d1663a2851fb217f56c270c915d27f866ad95d7878119c26685e19ddd58145dddfac8d7f51084ffaa84ae91b4b4b027d330cec80298d7eaacfa34ce6d6cec2e WHIRLPOOL f7c1daca9b2c5d86bd95bcb5870451b7df0ef2d83fb0ba43e118a3820fd5ba77a33c505594fc6c20229432b9899eaa6fe731ecd432fb7699f3d009f2bb118597
 EBUILD ati-drivers-12.4.ebuild 20111 SHA256 89925b2ab055678fb1fef5a01884a49b90f80490bff088ac4abbbc95867d844b SHA512 746506aa777170635ad476e1825482cae1353641e3cc28618eae550a7d94fe0ecf22fec01ffafb2d6668f587756c8370a1c01d3e38da97018268ef8aa830c4cc WHIRLPOOL 37cdd95364aca1e1790d9d284d5002ebd81e97fd0e6d6326d2aa89f172a2b9db0452fac2a074e2d85939c740294fd07e90b921bae4b518ff6b9ad09b05c39ca5
 EBUILD ati-drivers-12.6.ebuild 20226 SHA256 ddaff0b867bc57e2c0cb8be1e2e4976a6ff410eadaaf970a23dba0fef013dafc SHA512 6a127eb3e77e6f5dd51beddc4962bfdf1a1cf686a25e819e5c69b7c9eecdb4aa3bb39e0777be137091b6a7a85f9bf330c3313dcbbf683d6e7b23b9185d658130 WHIRLPOOL f145ac5fdb30026acd0d5b50d356a17a34e58f57281b01d81df1b5ffcf06e95f646dead76fefb6bf662967a024171607711702e99b6e86cfd6b4829f67f24ce5
-EBUILD ati-drivers-12.6_beta_pre897.ebuild 19864 SHA256 f7e914311098c98e32f099aed1edf3667ec90cd3234fdb8bde9b108226533d79 SHA512 efad551845fead3e75f663cd39aa76060ee5aa3fbd15e5dcaa889895cb5abfb3c94653a8130a8f512af6c76ca7d481293f4a58625ada7786cfe9932a038e45bd WHIRLPOOL 6d20fee583d58a860297f975f3741dab64b1d15a7fe74c8e5fbc920b6aaa943b4fbca199a3b0453e7fa48f3b8adaf8afc0bf3970c09f43182cc69d8d9b2afca7
+EBUILD ati-drivers-12.6_beta_pre897.ebuild 20385 SHA256 2e50c885e6e477682519da1d4927d33c1719e085802abaa2c7848557e1d66493 SHA512 6020fb41944b6d1c5d4bbadcf8b26cb55c31821dedcbe845e63e72dc780a755080cb7570d0b6d219e1730099754f5d53a4f4a8f7ea1ae2ebe4e4426b55132c07 WHIRLPOOL 4981a5477adaa2c7b7aa6a5464bb0474becaba43ccf7686fa0aa7575dfb39f7e3913cbe1e334ebddafec0bb79a9f36c2fec316613be5b24736b53d7c5e672359
 EBUILD ati-drivers-12.8.ebuild 20502 SHA256 c34568cd7b15db053b3dba1cd54563b09cc03efd8c2ff5697a98349be5f58562 SHA512 1879c18b52c2255b3bbcacabcf2800b7ef06694205031adff919a3c26e02a70e08dd6b0b45452bf7aa156567dc74137ed72b2718899a4c6581c6949515b7faaf WHIRLPOOL ede73ff8edf5971af7f672090830511f9882d624cae5411a561a24990a5993cc5f0e51ba636db753a1fd1b944ad041a460564b5a11a6c3d3d8d93bba058c0678
-MISC ChangeLog 82424 SHA256 670f6484ecc33e9beff4881f3165bf2e5f4285cae0862c528c787826e20b2141 SHA512 71cedd5a100beaab653aa26d936cbe144def4e14a4206667cc088fae99de495c17801f84295f3ccd9b0c048799021f6a2a10615fd4684fb85c751971474dd6d6 WHIRLPOOL 4e88b4cb55c9e59b8dd9883a795d2018e01c782c37301eb38ba39ecb23b9d36aca0829e2be4e29d3387f2173736ea5defd52168cbb5065a5cc62513267e82b52
+MISC ChangeLog 82588 SHA256 771c742867f0464520adffd633be5dd6203b1183c3c81ccf1b27cf6da52422b6 SHA512 3894916a9d997e8623e4682be39c22dedb469ddbc8578fd8772672eb64e2a786345f6623ebb96839a8f342d4d332bc0fd66b0d32e375cea43774ccb27d0aa4d0 WHIRLPOOL 7be9aa84cac032ee2d8891dacbd5429b575bdee31b3b57b2f73bf49389bf0877a077821982c12c1cd9857fb66f13696d7279dd5886921d2a0704585ca78d7dfc
 MISC metadata.xml 751 SHA256 1f754b139a8a3ccccd14009301161f637683bb85486fd16d85ff91184fa1c00d SHA512 39b5e639fb21365b6fe540f3a3a44893dbaaab7e596d8378b483b0d9528d4309f83d59795fa8611ed817ce237a4da6e8962e9f2c40be999ce0475cd3a6e8360a WHIRLPOOL 65c0072c51656b88a13b5a0f980b3cc0b1cc4f0fab8515df12fc7bdf14d78378f7f5a0857dbff1e9571bc7fda448a0f7f4bfb067e7f48d99ef5b484a8af5713a
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
index 9de10d3b4010..26a6e230826e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.9 2012/12/25 16:41:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild,v 1.10 2012/12/29 00:07:31 chithanh Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ fi
 IUSE="debug +modules multilib qt4 static-libs"
 
 LICENSE="AMD GPL-2 QPL-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="1"
 
 RESTRICT="bindist"
@@ -47,8 +47,8 @@ RDEPEND="
 			x11-libs/libXcursor
 			x11-libs/libXfixes
 			x11-libs/libXxf86vm
-			x11-libs/qt-core
-			x11-libs/qt-gui
+			x11-libs/qt-core:4
+			x11-libs/qt-gui:4
 	)
 "
 
@@ -327,6 +327,10 @@ src_prepare() {
 	#fixes bug #420751
 	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
 
+	# compile fix for linux-3.7
+	# https://bugs.gentoo.org/show_bug.cgi?id=438516
+	epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch"
+
 	# Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8
 	# see https://bugs.gentoo.org/show_bug.cgi?id=448216 
 	epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch"
@@ -581,11 +585,20 @@ src_install-libs() {
 		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
 	done
 
+	# See https://bugs.gentoo.org/show_bug.cgi?id=443466
+	dodir /etc/revdep-rebuild/
+	echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers"
+
 	#remove static libs if not wanted
 	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
 }
 
 pkg_postinst() {
+	if has_version ">=x11-base/xorg-server-1.11.99"; then
+		ewarn "Problems have been reported with this driver and xorg-server-1.12."
+		ewarn "Stay with xorg-server-1.11 if you experience hangs (bug #436252)."
+	fi
+
 	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
 	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
 	elog