diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-05-14 22:16:51 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-05-14 22:16:51 +0000 |
| commit | a8633cea2e335e7608bb362892e95a0ca2e07977 (patch) | |
| tree | fd3306462e57e6aa5bb08afb77c8a6d7f3e61f11 /x11-base/xorg-server | |
| parent | Update to 1.4.0 release (still not officially announced). This version intent... (diff) | |
| download | gentoo-2-a8633cea2e335e7608bb362892e95a0ca2e07977.tar.gz gentoo-2-a8633cea2e335e7608bb362892e95a0ca2e07977.tar.bz2 gentoo-2-a8633cea2e335e7608bb362892e95a0ca2e07977.zip | |
(#133295) Fix kdrive build when s3 is on, because it also sedded out the s3 from the middle of sis300. Also a fix for turning off sis300 at all. Fixes by Kent Fredric.
(Portage version: 2.1_pre10-r5)
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.99.903.ebuild | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index c0fe50b7c648..34a32c3c93c3 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # 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.118 2006/05/14 19:11:49 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.119 2006/05/14 22:16:51 spyderous Exp $ + + 14 May 2006; Donnie Berkholz <spyderous@gentoo.org>; + xorg-server-1.0.99.903.ebuild: + (#133295) Fix kdrive build when s3 is on, because it also sedded out the s3 + from the middle of sis300. Also a fix for turning off sis300 at all. Fixes + by Kent Fredric. 14 May 2006; Donnie Berkholz <spyderous@gentoo.org>; xorg-server-1.0.2-r4.ebuild, xorg-server-1.0.99.903.ebuild: diff --git a/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild b/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild index 34da4d75a8ad..27e18f5fc341 100644 --- a/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild +++ b/x11-base/xorg-server/xorg-server-1.0.99.903.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.0.99.903.ebuild,v 1.3 2006/05/14 19:11:49 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.0.99.903.ebuild,v 1.4 2006/05/14 22:16:51 spyderous Exp $ # Must be before x-modular eclass is inherited # Hack to make sure autoreconf gets run @@ -544,10 +544,11 @@ src_unpack() { real_card=${real_card/radeon/ati} real_card=${real_card/nv/nvidia} real_card=${real_card/siliconmotion/smi} + real_card=${real_card/%sis/sis300} if ! use ${card}; then ebegin " ${real_card}" sed -i \ - -e "s:${real_card}::g" \ + -e "s:\b${real_card}\b::g" \ ${S}/hw/kdrive/Makefile.am \ || die "sed of ${real_card} failed" eend |