diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-25 06:35:02 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-25 06:35:02 +0000 |
commit | d3fee379133c344255a5afb4c5b4d7cd474b26ff (patch) | |
tree | 0606a9deea0e204026c21190c3f063d3e2013541 /x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild | |
parent | Remove game-launcher mask (diff) | |
download | gentoo-2-d3fee379133c344255a5afb4c5b4d7cd474b26ff.tar.gz gentoo-2-d3fee379133c344255a5afb4c5b4d7cd474b26ff.tar.bz2 gentoo-2-d3fee379133c344255a5afb4c5b4d7cd474b26ff.zip |
Unbreaking kdrive, part 1: Fix logic and variable names when forcing fbdev/vesa on for Xati; Don't skip binary drivers, it needlessly complicates the code for no useful end result.
(Portage version: 2.1.2_pre3-r8)
Diffstat (limited to 'x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild')
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild index fa1eb6bc7a07..b66c624a52a0 100644 --- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.16 2006/10/18 16:02:43 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.17 2006/10/25 06:35:02 dberkholz Exp $ # Must be before x-modular eclass is inherited SNAPSHOT="yes" @@ -359,12 +359,6 @@ src_unpack() { if use kdrive; then einfo "Removing unused kdrive drivers ..." for card in ${IUSE_VIDEO_CARDS}; do - # Skip binary drivers - if [[ ${card} = video_cards_nvidia ]] \ - || [[ ${card} = video_cards_fglrx ]]; then - continue - fi - real_card=${card#video_cards_} # Differences between VIDEO_CARDS name and kdrive server name @@ -377,10 +371,10 @@ src_unpack() { disable_card=0 if ! use ${card}; then # (bug #136370) Radeon needs fbdev and vesa - if ! use x86 \ + if use x86 \ && use video_cards_radeon; then - if [[ ${card} = fbdev ]] \ - || [[ ${card} = vesa ]]; then + if [[ ${real_card} = fbdev ]] \ + || [[ ${real_card} = vesa ]]; then continue fi fi |