diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2007-02-19 21:24:35 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2007-02-19 21:24:35 +0000 |
| commit | 4a8043c64a1200e174d7350eda31bc6e92ca6b0e (patch) | |
| tree | 72986e654f0ac2e1649f2484f44b0fb74144f371 /media-libs | |
| parent | Stablized _pre14 on amd64, removed older versions, added RESTRICT=test to _pre14 (diff) | |
| download | historical-4a8043c64a1200e174d7350eda31bc6e92ca6b0e.tar.gz historical-4a8043c64a1200e174d7350eda31bc6e92ca6b0e.tar.bz2 historical-4a8043c64a1200e174d7350eda31bc6e92ca6b0e.zip | |
Re-add die to mesa if building +xcb when libX11 is -xcb. (Bug #163761, Petteri
Räty)
Package-Manager: portage-2.1.2-r9
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mesa/Manifest | 16 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.5.2.ebuild | 10 |
3 files changed, 22 insertions, 10 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 7e02fd799e72..d4c24615eb80 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.138 2007/02/18 08:00:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.139 2007/02/19 21:24:35 joshuabaergen Exp $ + + 19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.5.2.ebuild: + Re-add die to mesa if building +xcb when libX11 is -xcb. (Bug #163761, Petteri + Räty) 18 Feb 2007; Ryan Hill <dirtyepic@gentoo.org> mesa-6.5.2.ebuild: Apply previous fix to the 6.5.2 ebuild as well. diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 7b5ff0a2741a..9d69814ea9fc 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -57,14 +57,14 @@ EBUILD mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 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 8825 RMD160 7e4efe85ca03995869eb2d06589c7702e07e021f SHA1 31c627f4e6e2b89f88cf53ef9e815703199b91d3 SHA256 9ffe35207ef5f24c4c91d7cc99fc7e4af58291157d2c582c593d49105abd04cb -MD5 0571f9ebd50385256aedc0ef1c5baabf mesa-6.5.2.ebuild 8825 -RMD160 7e4efe85ca03995869eb2d06589c7702e07e021f mesa-6.5.2.ebuild 8825 -SHA256 9ffe35207ef5f24c4c91d7cc99fc7e4af58291157d2c582c593d49105abd04cb mesa-6.5.2.ebuild 8825 -MISC ChangeLog 25160 RMD160 7adf722906c260fa4603806a96782f5aacb2e130 SHA1 05e4f8824c970ab6dbbce963da478590aa901e62 SHA256 0c21805848f018278f31086d1584d5061a75f1ccd92bec1919dca5d22341b2b3 -MD5 718e49e357ef072666a55a6755bd5719 ChangeLog 25160 -RMD160 7adf722906c260fa4603806a96782f5aacb2e130 ChangeLog 25160 -SHA256 0c21805848f018278f31086d1584d5061a75f1ccd92bec1919dca5d22341b2b3 ChangeLog 25160 +EBUILD mesa-6.5.2.ebuild 8985 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 SHA1 792fd696d6254ce8e4b0c3b1e29317ec0554bb02 SHA256 8724b3d005228dcdfdfc05c799272a16bb73c310af895eede7caab693f3b8ef6 +MD5 430f13380cc4d0fbb3b2bda923fd0a4d mesa-6.5.2.ebuild 8985 +RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 mesa-6.5.2.ebuild 8985 +SHA256 8724b3d005228dcdfdfc05c799272a16bb73c310af895eede7caab693f3b8ef6 mesa-6.5.2.ebuild 8985 +MISC ChangeLog 25331 RMD160 94f2224857725bbd7698ecdce5665d280a3b7152 SHA1 90002b53f1dd3819ad13d19a4c1e5941115112a0 SHA256 fd5df435ef0391aaaa69e240764ad2224b5838631308c21c07c0ed3488374ccb +MD5 9e35ab7a4c40d486801aa3f352308754 ChangeLog 25331 +RMD160 94f2224857725bbd7698ecdce5665d280a3b7152 ChangeLog 25331 +SHA256 fd5df435ef0391aaaa69e240764ad2224b5838631308c21c07c0ed3488374ccb ChangeLog 25331 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.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild index dbfc0d2e69ec..563d9222ed1f 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-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.4 2007/02/18 08:00:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.5 2007/02/19 21:24:35 joshuabaergen Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -72,6 +72,14 @@ if use debug; then fi pkg_setup() { + if use xcb; then + if ! built_with_use x11-libs/libX11 xcb; then + msg="You must build libX11 with xcb enabled." + eerror ${msg} + die ${msg} + fi + fi + if use debug; then strip-flags append-flags -g |