From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QGVgp-0000oQ-4E for garchives@archives.gentoo.org; Sun, 01 May 2011 12:23:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 654F71C02C; Sun, 1 May 2011 12:23:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2F23E1C02C for ; Sun, 1 May 2011 12:23:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9791E1B4056 for ; Sun, 1 May 2011 12:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CE19780505 for ; Sun, 1 May 2011 12:23:45 +0000 (UTC) From: "Enrico Tagliavini" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Enrico Tagliavini" Message-ID: Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-11.4.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: f151310aef27b48a7577eb0704b2c18ab62db0b2 Date: Sun, 1 May 2011 12:23:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 16f327dd3d0af9baa97a363ea05f78e5 commit: f151310aef27b48a7577eb0704b2c18ab62db0b2 Author: Enrico Tagliavini gmail com> AuthorDate: Sun May 1 12:23:30 2011 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Sun May 1 12:23:30 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3Df151310a [ati-drivers] temporary workaround for pkg_pretend --- x11-drivers/ati-drivers/ati-drivers-11.4.ebuild | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-11.4.ebuild b/x11-driver= s/ati-drivers/ati-drivers-11.4.ebuild index 3b81486..11fd93d 100644 --- a/x11-drivers/ati-drivers/ati-drivers-11.4.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-11.4.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D4 =20 -inherit eutils multilib linux-mod toolchain-funcs versionator +inherit eutils multilib linux-info linux-mod toolchain-funcs versionator =20 DESCRIPTION=3D"Ati precompiled drivers for r600 (HD Series) and newer ch= ipsets" HOMEPAGE=3D"http://www.ati.com" @@ -217,6 +217,15 @@ _check_kernel_config() { } =20 pkg_pretend() { + # workaround until bug 365543 is solved + if use modules; then + linux-info_pkg_setup + require_configured_kernel + _check_kernel_config + fi +} + +pkg_setup() { if use modules; then MODULE_NAMES=3D"fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/bu= ild_mod/2.6.x)" BUILD_TARGETS=3D"kmod_build" @@ -228,11 +237,7 @@ pkg_pretend() { else BUILD_PARAMS=3D"${BUILD_PARAMS} CFLAGS_MODULE+=3D-DCOMPAT_ALLOC_USER_= SPACE=3Dcompat_alloc_user_space" fi - _check_kernel_config fi -} - -pkg_setup() { # Define module dir. MODULE_DIR=3D"${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" # get the xorg-server version and set BASE_DIR for that