diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2006-05-14 22:16:51 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-05-14 22:16:51 +0000 |
| commit | 80bf86219157257e3623713e3a2bf1005bea2eb2 (patch) | |
| tree | b252c74dcd077d17b7466292eccef659b5e65116 /x11-base | |
| parent | Update to 1.4.0 release (still not officially announced). This version intent... (diff) | |
| download | historical-80bf86219157257e3623713e3a2bf1005bea2eb2.tar.gz historical-80bf86219157257e3623713e3a2bf1005bea2eb2.tar.bz2 historical-80bf86219157257e3623713e3a2bf1005bea2eb2.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.
Package-Manager: portage-2.1_pre10-r5
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.0.99.903.ebuild | 5 |
3 files changed, 18 insertions, 11 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/Manifest b/x11-base/xorg-server/Manifest index 4504adaa89fd..29114f75b55b 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -59,14 +59,14 @@ EBUILD xorg-server-1.0.2-r4.ebuild 5822 RMD160 55ea6d5ccfc3232192d568cb4203a9b5a MD5 28d9a20a439505b72d64e52de533a5fa xorg-server-1.0.2-r4.ebuild 5822 RMD160 55ea6d5ccfc3232192d568cb4203a9b5a7a547a4 xorg-server-1.0.2-r4.ebuild 5822 SHA256 ddab1937bfa5e69d99db039a15417f3c0ec2c45a1e75ab5b076b23e5dd6e69e3 xorg-server-1.0.2-r4.ebuild 5822 -EBUILD xorg-server-1.0.99.903.ebuild 22496 RMD160 6b01579f820789b1d657bc6016b4a5a686bf3dfa SHA1 57c1ac3b34600caea770e5ff9359bbdc9ec9e7a6 SHA256 6639a5c12c1d3984e1eaee37366276acfa1aa7e0db92b4693475664607c9d030 size 22496 -MD5 3617eeabf70d014be43afd2cb49df188 xorg-server-1.0.99.903.ebuild 22496 -RMD160 6b01579f820789b1d657bc6016b4a5a686bf3dfa xorg-server-1.0.99.903.ebuild 22496 -SHA256 6639a5c12c1d3984e1eaee37366276acfa1aa7e0db92b4693475664607c9d030 xorg-server-1.0.99.903.ebuild 22496 -MISC ChangeLog 25391 RMD160 5af0fb9b3abbfbf71bc5751a9518bd5eb292f003 SHA1 07dd2afa1c4a66491ed46c1015362906574bdf08 SHA256 2ffa376dabfca6ce366ca261fc2597ae8f11c150085616e265ef770866745e53 size 25391 -MD5 77dd90cb29913abf13a920c747ef3425 ChangeLog 25391 -RMD160 5af0fb9b3abbfbf71bc5751a9518bd5eb292f003 ChangeLog 25391 -SHA256 2ffa376dabfca6ce366ca261fc2597ae8f11c150085616e265ef770866745e53 ChangeLog 25391 +EBUILD xorg-server-1.0.99.903.ebuild 22538 RMD160 8445ccfcb57070e61ec2bc21fa516fbee1aafe6b SHA1 dcb1d3422c88ad49e87e6de371b69ee84e6f8d6f SHA256 e2c4db6ec1f1068bbcbc02f4d37685520630f7234fbef67e3803f17e6cebfaab size 22538 +MD5 265ce9a3299a70ae20dd71f7e94c2a2e xorg-server-1.0.99.903.ebuild 22538 +RMD160 8445ccfcb57070e61ec2bc21fa516fbee1aafe6b xorg-server-1.0.99.903.ebuild 22538 +SHA256 e2c4db6ec1f1068bbcbc02f4d37685520630f7234fbef67e3803f17e6cebfaab xorg-server-1.0.99.903.ebuild 22538 +MISC ChangeLog 25654 RMD160 0ca4d9328a9c5ca636e92329be86bab8a66a2003 SHA1 2ddf98cf3312d4746e747a7d5198eb43112fdaeb SHA256 e8fca32bbdbbef97d5e9f112c81685ad37d5b153fa52ee28569d0cd5e585910f size 25654 +MD5 86f0484131fc47adcff5981876cab048 ChangeLog 25654 +RMD160 0ca4d9328a9c5ca636e92329be86bab8a66a2003 ChangeLog 25654 +SHA256 e8fca32bbdbbef97d5e9f112c81685ad37d5b153fa52ee28569d0cd5e585910f ChangeLog 25654 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 size 156 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 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 |