diff options
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index 7deeb7a20757..3c1dd4b03ee1 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.128 2006/06/27 02:43:54 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.129 2006/06/27 03:49:50 joshuabaergen Exp $ + + 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Fix kdrive+ATI build. (Priit Laes, bug #136370) 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> xorg-server-1.1.0-r1.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild index de389982c902..b67fb156df38 100644 --- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.1.0-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.0-r1.ebuild,v 1.3 2006/06/27 02:43:54 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.4 2006/06/27 03:49:50 joshuabaergen Exp $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -560,6 +560,14 @@ src_unpack() { if use kdrive; then einfo "Removing unused kdrive drivers ..." for card in ${IUSE_VIDEO_CARDS}; do + # (bug #136370) Radeon needs fbdev and vesa + if use video_cards_radeon; then + if [[ ${card} = video_cards_fbdev ]] \ + || [[ ${card} = video_cards_vesa ]]; then + continue + fi + fi + real_card=${card#video_cards_} # Differences between VIDEO_CARDS name and kdrive server name |