From: Simon Stelling Date: Sat, 17 Feb 2007 15:54:26 +0000 (+0000) Subject: set CONFIG depending on ABI on amd64; bug 125125 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f0062a2bcbf7fbffbdde2ff18abb82b86677b3a;p=gentoo.git set CONFIG depending on ABI on amd64; bug 125125 Package-Manager: portage-2.1.2-r9 --- diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 99b7925c1f9b..e867c82f46d0 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.135 2007/01/24 07:15:44 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.136 2007/02/17 15:54:26 blubb Exp $ + + 17 Feb 2007; Simon Stelling mesa-6.5.1-r1.ebuild, + mesa-6.5.2.ebuild: + set CONFIG depending on ABI on amd64; bug 125125 24 Jan 2007; Donnie Berkholz ; -files/64bit-fix-have-dix-config.patch, diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 1e6c803c937a..89dcb57a2ef9 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -49,22 +49,22 @@ EBUILD mesa-6.5-r3.ebuild 9167 RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c S MD5 322719f46e0956b212398bb467c1aea5 mesa-6.5-r3.ebuild 9167 RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c mesa-6.5-r3.ebuild 9167 SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4 mesa-6.5-r3.ebuild 9167 -EBUILD mesa-6.5.1-r1.ebuild 8442 RMD160 aa1d9611d6e4583713bfe2f201c430b2e4c72c2d SHA1 89e450d59ee56a7fdcd86deb09b7baae3c0ea6af SHA256 b94e8f06c49b673164568f5257cccdcd3e2fe33df03a24334554f158c991a54e -MD5 f35b1420f67885482835bd471ece1f9c mesa-6.5.1-r1.ebuild 8442 -RMD160 aa1d9611d6e4583713bfe2f201c430b2e4c72c2d mesa-6.5.1-r1.ebuild 8442 -SHA256 b94e8f06c49b673164568f5257cccdcd3e2fe33df03a24334554f158c991a54e mesa-6.5.1-r1.ebuild 8442 +EBUILD mesa-6.5.1-r1.ebuild 8519 RMD160 1d6209e7f5db700531ab256b76f3c9f4576309d1 SHA1 84d4b7000007fecd111bb3708dff846a1910d200 SHA256 8bc657588f9d94587a1a235b61ec1d37c11191bddb45974266cc569c0cadc659 +MD5 0890c451c0e39d1d5f61be3d6d19ffaa mesa-6.5.1-r1.ebuild 8519 +RMD160 1d6209e7f5db700531ab256b76f3c9f4576309d1 mesa-6.5.1-r1.ebuild 8519 +SHA256 8bc657588f9d94587a1a235b61ec1d37c11191bddb45974266cc569c0cadc659 mesa-6.5.1-r1.ebuild 8519 EBUILD mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 SHA1 f8bc45a2802786978bb3407f9b8dea64d7c620a4 SHA256 8f492fd251ae5948a6a4627f2146288d337c853bdeb63161192d48aebc31140b MD5 402ba128e34a3566d6d058ad2eda0939 mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 mesa-6.5.1-r4.ebuild 9325 SHA256 8f492fd251ae5948a6a4627f2146288d337c853bdeb63161192d48aebc31140b mesa-6.5.1-r4.ebuild 9325 -EBUILD mesa-6.5.2.ebuild 8752 RMD160 94533a21ce9becfb866cc0890b0edb0a28a45c49 SHA1 f2d567a619003525ce1a74a4feaf34948f3b9ad1 SHA256 ea5a85bf21e8eecf2bdca78f483a2c73d93c03657bb4c32d37d6fec21bdd76d8 -MD5 ed5b0eb13a88ebea5be3e700cdf48019 mesa-6.5.2.ebuild 8752 -RMD160 94533a21ce9becfb866cc0890b0edb0a28a45c49 mesa-6.5.2.ebuild 8752 -SHA256 ea5a85bf21e8eecf2bdca78f483a2c73d93c03657bb4c32d37d6fec21bdd76d8 mesa-6.5.2.ebuild 8752 -MISC ChangeLog 24763 RMD160 bd9ca3144270230325cb81be2981b837720e7c25 SHA1 05709dfb8c429b6e48de01b9f05b777f43c67a50 SHA256 0a45203fd51706708eb4409f3c0501ae99c1c0b0f54e95d551cfe160a392df13 -MD5 a30d0b9aeebe6565297724e218e2dd9c ChangeLog 24763 -RMD160 bd9ca3144270230325cb81be2981b837720e7c25 ChangeLog 24763 -SHA256 0a45203fd51706708eb4409f3c0501ae99c1c0b0f54e95d551cfe160a392df13 ChangeLog 24763 +EBUILD mesa-6.5.2.ebuild 8823 RMD160 dce690c6f26dc4bdbf10ba3449fb3290b71ee0d9 SHA1 ce5848f4e4df76833f6ef2ab321eff44e8006348 SHA256 e7fb5176c69dc1ced9cfc082609fbc972daf6148fda56079f55b27bf9baf9312 +MD5 f9148f3f2f3be376b66a3d6ce9bd30e9 mesa-6.5.2.ebuild 8823 +RMD160 dce690c6f26dc4bdbf10ba3449fb3290b71ee0d9 mesa-6.5.2.ebuild 8823 +SHA256 e7fb5176c69dc1ced9cfc082609fbc972daf6148fda56079f55b27bf9baf9312 mesa-6.5.2.ebuild 8823 +MISC ChangeLog 24903 RMD160 d0ff8de9c10f3814b75b9888e194071260499867 SHA1 7bc6d8589eed897ea9647abd7f45ff59dcd6fe22 SHA256 22464200454e393ca6cf8f9058ee8a20d06540b197bca2e98daa59a4e711cad4 +MD5 8b2cf9cdcb99112d6b30794b0afbd1cc ChangeLog 24903 +RMD160 d0ff8de9c10f3814b75b9888e194071260499867 ChangeLog 24903 +SHA256 22464200454e393ca6cf8f9058ee8a20d06540b197bca2e98daa59a4e711cad4 ChangeLog 24903 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/media-libs/mesa/mesa-6.5.1-r1.ebuild b/media-libs/mesa/mesa-6.5.1-r1.ebuild index 0630180c8573..f2d4baa880ea 100644 --- a/media-libs/mesa/mesa-6.5.1-r1.ebuild +++ b/media-libs/mesa/mesa-6.5.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.10 2006/12/01 18:16:05 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.11 2007/02/17 15:54:26 blubb Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -83,10 +83,11 @@ pkg_setup() { CONFIG="freebsd-dri-amd64" elif use kernel_FreeBSD; then CONFIG="freebsd-dri" - elif use x86; then + elif use x86 ; then CONFIG="linux-dri-x86" elif use amd64; then - CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "amd64" ]] && CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "x86" ]] && CONFIG="linux-dri-x86" elif use ppc; then CONFIG="linux-dri-ppc" else diff --git a/media-libs/mesa/mesa-6.5.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild index 1c50f5772cc1..dcd34220f528 100644 --- a/media-libs/mesa/mesa-6.5.2.ebuild +++ b/media-libs/mesa/mesa-6.5.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.2 2006/12/08 05:02:30 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.3 2007/02/17 15:54:26 blubb Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -88,7 +88,8 @@ pkg_setup() { elif use x86; then CONFIG="linux-dri-x86" elif use amd64; then - CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "amd64" ]] && CONFIG="linux-dri-x86-64" + [[ ${ABI} -eq "x86" ]] && CONFIG="linux-dri-x86" elif use ppc; then CONFIG="linux-dri-ppc" else