summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-09-02 21:51:04 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-09-02 21:51:04 +0000
commit8008d9102ba83fa00c568478fa1526637af7df12 (patch)
tree33da494f879fe753509f593217dfa140557e3d07 /x11-apps
parentFix tarball name, again (diff)
downloadhistorical-8008d9102ba83fa00c568478fa1526637af7df12.tar.gz
historical-8008d9102ba83fa00c568478fa1526637af7df12.tar.bz2
historical-8008d9102ba83fa00c568478fa1526637af7df12.zip
Make nouveau support optional, bug #433683.
Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/intel-gpu-tools/ChangeLog6
-rw-r--r--x11-apps/intel-gpu-tools/Manifest4
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild13
3 files changed, 17 insertions, 6 deletions
diff --git a/x11-apps/intel-gpu-tools/ChangeLog b/x11-apps/intel-gpu-tools/ChangeLog
index fa9d30a14d47..b7f3e9bfd7c2 100644
--- a/x11-apps/intel-gpu-tools/ChangeLog
+++ b/x11-apps/intel-gpu-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/intel-gpu-tools
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/ChangeLog,v 1.11 2012/09/01 11:36:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/ChangeLog,v 1.12 2012/09/02 21:51:04 chithanh Exp $
+
+ 02 Sep 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ intel-gpu-tools-1.3.ebuild:
+ Make nouveau support optional, bug #433683.
*intel-gpu-tools-1.3 (01 Sep 2012)
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 96852df209fb..e8669aff08ca 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -5,6 +5,6 @@ DIST intel-gpu-tools-1.3.tar.bz2 589027 SHA256 51d22fdb3d415a1b3b7d0a172c1bb24de
EBUILD intel-gpu-tools-1.0.2.ebuild 488 SHA256 9fe74a9bfd2c7787452533628f77ea031c973baf270500ed07c515669de8f409 SHA512 96a5e9f2014244655218f91329a7482e357bb0bde87eba285329c11ac185e7e7329d5603e021063d562787f50404dcc45f8b3cc42d7fcbb39560388dbad3fb2b WHIRLPOOL b5e327170dc1ac9308242015d323c46c3853774ac05ef38dc18659d2f6ac55a780c2c3323e84e283a46dc9cfbd0ae187872eed1f10d76116746fe64517d0a55e
EBUILD intel-gpu-tools-1.1.ebuild 451 SHA256 7027338db8b523616da32d41f8c9fa6b29dda8552b967444964adb41af92ac5f SHA512 4f15e52bc88e694f3ab16f6624c9a015295cf1230d3f8b80d65a33c77eea098bb08cebb02230c96fadf138b75744bb6b05efb1927eb6b45eb5ae84953dbc9e74 WHIRLPOOL ac7b17b2f4a91ec385d47319637e643f0d2af85e506d8258b106b91e6c05a8660f8c2767aaf6e723f661357ce4113b90037b993bbe4ef6fb072d6350423cd58b
EBUILD intel-gpu-tools-1.2.ebuild 458 SHA256 fdad3dbf94c6b85fa6731441358ddebf3592c3f958a17ba80be5a608b2f9a6d9 SHA512 89f084c31683674e22a18175d0ea40eb5ef64d7753d5fb9f79548fa28aa6ed26e4b00ab988a92a0ac222251020be0ccd5501e257c685b2d3b73a71a1a558bd9c WHIRLPOOL a086480bf28b211867405023d163d7b5382ea553fbccd3fdb8848415f56b149cffed88f944bbcbce46b2d2643869f421981f8c62fd87e208479291f64528b308
-EBUILD intel-gpu-tools-1.3.ebuild 465 SHA256 8555e2485768bf2091e73a8b715ab716bcbaa71022021f2ae53dd7141d9e50f1 SHA512 09ea1367564ca9bcbd24cf29476a12746f0994a6bfe0c87283d4a2fea0e67ed309d895e8adc12e3106d82506b08c1d348d23950c4101fa598ebbd69eaa99beec WHIRLPOOL 31410110e12c333b0a267d7616b710951a2b2ebd4d7b3519cd37fce0de4e4fb2e99f723d61c2ce62487ea74597790ab11ac21ba4452008de63c867d539e32c04
-MISC ChangeLog 1830 SHA256 1648486c627ea3be97eb0334212107c8a3550f036584415e337bb562431aaa16 SHA512 a41b833581b8cf5e888b7f2dfec7adb77a290559ba172c9e415934169992daf65708911403748e5def2c9c936b1f4fe1a061cefbe6dcf1726292ecb791c9e141 WHIRLPOOL da07879963c65db328c0c6e240c7d515915d513ae87ffc431f2151266b57695f4b5e399cb3c344b9d98a9fa0391ffc9ea0fcd688813cc628f72832693c79cefe
+EBUILD intel-gpu-tools-1.3.ebuild 621 SHA256 35e292476cf2826fb062133acd1daa8d62bbdadbc5386db4591841f1ff1bd047 SHA512 576d8215319fc167e9efc2ebd757aa8d383387c44631974af0140061e3d5b7ce4d4da7b4e4544f3b5490824a6ba093c31e1dd41778b5e9cab5a69f673565e168 WHIRLPOOL 52ed342c64d4a0fddadc20540937594fb8f90704a6b706e1baf11ea3cb25c75746a40cee4f199731abadf97bc451511a706b9e86ce6fd9c8bc1f41bb3c3958b9
+MISC ChangeLog 1976 SHA256 18d2133e318e5a9f0ab81f2eaed9c737dcd6f78e81cf3dead00dc7318823123b SHA512 f2d69efba597a3359bf941064afc772a9c6c9067e088ffcac8c01bbbd49ecdd5f6729bda976f2f2c60b4db136152698a20ad19f8e92f491ac271ef84467cfc3d WHIRLPOOL 933a65e1c334f675469445a6ca2e48bb6a66012da04cd01beea296afe0a4b487d76743c284cfcc02ae5df2c284cd2b932fb590eb0dee4b9ad8028223c25dafec
MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild
index a472794014c3..69be97342eae 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild
@@ -1,16 +1,23 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild,v 1.1 2012/09/01 11:36:38 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.3.ebuild,v 1.2 2012/09/02 21:51:04 chithanh Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="intel gpu userland tools"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="video_cards_nouveau"
RESTRICT="test"
DEPEND="x11-libs/cairo
- >=x11-libs/libdrm-2.4.31[video_cards_intel]
+ >=x11-libs/libdrm-2.4.31[video_cards_intel,video_cards_nouveau?]
>=x11-libs/libpciaccess-0.10"
RDEPEND="${DEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable video_cards_nouveau nouveau)
+ )
+ xorg-2_src_configure
+}