diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-27 03:49:50 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-27 03:49:50 +0000 |
| commit | 36d277a56556acf872c991ab714e502a6ef2ca36 (patch) | |
| tree | 78048a447e4a2a32db5466625ee46d08726adf61 /x11-base | |
| parent | Version bump, security bug #138054. (diff) | |
| download | historical-36d277a56556acf872c991ab714e502a6ef2ca36.tar.gz historical-36d277a56556acf872c991ab714e502a6ef2ca36.tar.bz2 historical-36d277a56556acf872c991ab714e502a6ef2ca36.zip | |
Fix kdrive+ATI build. (Priit Laes, bug #136370)
Package-Manager: portage-2.1.1_pre1-r3
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 16 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 10 |
3 files changed, 22 insertions, 10 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/Manifest b/x11-base/xorg-server/Manifest index ab15506ad896..aa1bd7dc2e47 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -71,14 +71,14 @@ EBUILD xorg-server-1.0.2-r6.ebuild 6140 RMD160 48eb86bf38ce9029e33d20c504d0be6eb MD5 65ebbfe3b11ecbc256d305d02aa215e7 xorg-server-1.0.2-r6.ebuild 6140 RMD160 48eb86bf38ce9029e33d20c504d0be6eb114ef0e xorg-server-1.0.2-r6.ebuild 6140 SHA256 3b10c1c7d6b1cac5b679baf1881107079d945c81c26e75a997ff3ae333ef019c xorg-server-1.0.2-r6.ebuild 6140 -EBUILD xorg-server-1.1.0-r1.ebuild 23794 RMD160 7b28815cd736fe6d788be470e8ba7202fac4987a SHA1 88b9a5b8384060d3d26c60ef4b33b4611248f794 SHA256 318001592b7827a3c4981e6a6dd9c7d80334bbc92a9e184086b4c8500b2f5212 -MD5 5dec68af615550b7719fe629a055a017 xorg-server-1.1.0-r1.ebuild 23794 -RMD160 7b28815cd736fe6d788be470e8ba7202fac4987a xorg-server-1.1.0-r1.ebuild 23794 -SHA256 318001592b7827a3c4981e6a6dd9c7d80334bbc92a9e184086b4c8500b2f5212 xorg-server-1.1.0-r1.ebuild 23794 -MISC ChangeLog 28075 RMD160 fda9e0efb99b98de14da7f00d399008b460c95c0 SHA1 2d984e7ef2df403d3e85510610fad1c262e834f2 SHA256 5b0fc921e091b6ded870599de358253c4ebc58dfc09cbeafb1cacd8a284d07b8 -MD5 f66145fab10788f59d4367b124da5e12 ChangeLog 28075 -RMD160 fda9e0efb99b98de14da7f00d399008b460c95c0 ChangeLog 28075 -SHA256 5b0fc921e091b6ded870599de358253c4ebc58dfc09cbeafb1cacd8a284d07b8 ChangeLog 28075 +EBUILD xorg-server-1.1.0-r1.ebuild 23994 RMD160 026e29079dd475065c826ba1491f766c7d6bf0cf SHA1 46e877dbe9c67e09f578f0f7cfb79f6a2090138c SHA256 b7dd761b396ef5e5cad5d27f951bfad806e1f7e3a9264df3b9073f47d911675e +MD5 e8d1933dc55fb1e53a084e178147189b xorg-server-1.1.0-r1.ebuild 23994 +RMD160 026e29079dd475065c826ba1491f766c7d6bf0cf xorg-server-1.1.0-r1.ebuild 23994 +SHA256 b7dd761b396ef5e5cad5d27f951bfad806e1f7e3a9264df3b9073f47d911675e xorg-server-1.1.0-r1.ebuild 23994 +MISC ChangeLog 28215 RMD160 4a1ff9933a22274cac5c918b02016c2a874e7846 SHA1 69b760c8641105ab64317cf511003cc8a09028f4 SHA256 ea6f020ad892072c54e20220352cba55551211d3a16df40e5deb122809f32bb5 +MD5 f87626d4658ff58173e9589fb0c13cfa ChangeLog 28215 +RMD160 4a1ff9933a22274cac5c918b02016c2a874e7846 ChangeLog 28215 +SHA256 ea6f020ad892072c54e20220352cba55551211d3a16df40e5deb122809f32bb5 ChangeLog 28215 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 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 |