diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-04-20 20:21:53 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-04-20 20:21:53 +0000 |
| commit | bdf43c48a283e9a557cd984a45568b5b59076906 (patch) | |
| tree | a994266629044b0fc09283e84a74b61583c5410e | |
| parent | Stable for alpha, wrt bug #449298 (diff) | |
| download | gentoo-2-bdf43c48a283e9a557cd984a45568b5b59076906.tar.gz gentoo-2-bdf43c48a283e9a557cd984a45568b5b59076906.tar.bz2 gentoo-2-bdf43c48a283e9a557cd984a45568b5b59076906.zip | |
Import David Heidelberger's CONFIG_CHECK improvements from the x11 overlay.
(Portage version: 2.1.11.55/cvs/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | x11-drivers/xf86-video-ati/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog index 6ad9429f50d5..31a607a3fcb7 100644 --- a/x11-drivers/xf86-video-ati/ChangeLog +++ b/x11-drivers/xf86-video-ati/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-drivers/xf86-video-ati # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.198 2013/03/19 09:55:37 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.199 2013/04/20 20:21:53 chithanh Exp $ + + 20 Apr 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + xf86-video-ati-7.1.0.ebuild: + Import David Heidelberger's CONFIG_CHECK improvements from the x11 overlay. 19 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> xf86-video-ati-7.1.0.ebuild: diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild index 64075c0d6c2d..8ece67e9022e 100644 --- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild +++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild,v 1.2 2013/03/19 09:55:37 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-7.1.0.ebuild,v 1.3 2013/04/20 20:21:53 chithanh Exp $ EAPI=5 @@ -17,7 +17,16 @@ RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon] udev? ( virtual/udev )" DEPEND="${RDEPEND}" -CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON" +pkg_pretend() { + if use kernel_linux ; then + if kernel_is -ge 3 9; then + CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON" + else + CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON" + fi + fi + check_extra_config +} src_configure() { XORG_CONFIGURE_OPTIONS=( |