diff options
author | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-27 02:43:54 +0000 |
---|---|---|
committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-06-27 02:43:54 +0000 |
commit | b76a3bf627bf7cd0eb54ca0739eff34ee79a9fe2 (patch) | |
tree | 3632419e76da2d398180b35ca334c967e495f96d /x11-base | |
parent | Version bump to 1.5.1. (diff) | |
download | historical-b76a3bf627bf7cd0eb54ca0739eff34ee79a9fe2.tar.gz historical-b76a3bf627bf7cd0eb54ca0739eff34ee79a9fe2.tar.bz2 historical-b76a3bf627bf7cd0eb54ca0739eff34ee79a9fe2.zip |
Allow USE="-* minimal" for xorg-server so that Xvfb can be built by itself.
(Patch by Ed Catmur, bug #137991)
Package-Manager: portage-2.1.1_pre1-r3
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 7 | ||||
-rw-r--r-- | x11-base/xorg-server/Manifest | 16 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild | 8 |
3 files changed, 18 insertions, 13 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index bc3c243b62c8..7deeb7a20757 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,11 @@ # 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.127 2006/06/21 02:40:43 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.128 2006/06/27 02:43:54 joshuabaergen Exp $ + + 26 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> + xorg-server-1.1.0-r1.ebuild: + Allow USE="-* minimal" for xorg-server so that Xvfb can be built by itself. + (Patch by Ed Catmur, bug #137991) 21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; xorg-server-1.1.0-r1.ebuild: diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 1c425f208de7..ab15506ad896 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 23755 RMD160 0bce683c6185e542ce46b02621dd01390bc58fb0 SHA1 0fc3d04a110f61f4940a23ca4c662a83dd4f4c09 SHA256 0e8a083741af91ed97db40d41b0b88083f74aaa18e482a76b65f79c774a5e688 -MD5 d01a268772b5a7ad75855392e1e297f6 xorg-server-1.1.0-r1.ebuild 23755 -RMD160 0bce683c6185e542ce46b02621dd01390bc58fb0 xorg-server-1.1.0-r1.ebuild 23755 -SHA256 0e8a083741af91ed97db40d41b0b88083f74aaa18e482a76b65f79c774a5e688 xorg-server-1.1.0-r1.ebuild 23755 -MISC ChangeLog 27868 RMD160 7334237dd6f089102ef2d975a066d780d2210a7b SHA1 15f9f3731a54e7c968cbc5867a28dacfd638872f SHA256 f23c724d1d1411a196fbca6196ee1ca842749cc3f85e0e66df0aeb505e25b766 -MD5 8b31329d463cf0be5ae757742a5d3363 ChangeLog 27868 -RMD160 7334237dd6f089102ef2d975a066d780d2210a7b ChangeLog 27868 -SHA256 f23c724d1d1411a196fbca6196ee1ca842749cc3f85e0e66df0aeb505e25b766 ChangeLog 27868 +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 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 d5c19e8aa591..de389982c902 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.2 2006/06/21 02:40:43 spyderous Exp $ +# $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 $ # Must be before x-modular eclass is inherited #SNAPSHOT="yes" @@ -227,7 +227,7 @@ PDEPEND=" input_devices_synaptics? ( x11-drivers/synaptics ) input_devices_wacom? ( x11-misc/linuxwacom ) ) - ( + !minimal? ( >=x11-drivers/xf86-input-acecad-1.1.0 >=x11-drivers/xf86-input-calcomp-1.1.0 >=x11-drivers/xf86-input-citron-2.2.0 @@ -326,7 +326,7 @@ PDEPEND=" video_cards_3dfx? ( 3dfx? ( >=media-libs/glide-v3-3.10 ) ) ) - ( + !minimal? ( >=x11-drivers/xf86-video-dummy-0.2.0 >=x11-drivers/xf86-video-fbdev-0.2.0 @@ -496,7 +496,7 @@ PDEPEND=" LICENSE="${LICENSE} MIT" pkg_setup() { - ensure_a_server_is_building + use minimal || ensure_a_server_is_building # localstatedir is used for the log location; we need to override the default # from ebuild.sh |