Don't try to install xorg.conf.example if the xorg server isn't built. (Bug

#151670, Balint Dobai-Pataky)
Package-Manager: portage-2.1.2_pre3-r3

3 files changed, 17 insertions, 11 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 0373c02feffc..9d8cd2b72b46 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.179 2006/10/15 15:01:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.180 2006/10/17 23:29:11 joshuabaergen Exp $
+
+  17 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Don't try to install xorg.conf.example if the xorg server isn't built.  (Bug
+  #151670, Balint Dobai-Pataky)
 
   15 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-server-1.1.1-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 28c8819e3b96..fdd9d80ead71 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -125,18 +125,18 @@ EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e
 MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569
 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569
 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 xorg-server-1.1.0-r1.ebuild 24569
-EBUILD xorg-server-1.1.1-r1.ebuild 16737 RMD160 b4a7244776d3c8e2518ae2351b56ebbe61a713cb SHA1 e10332c0a33e33e60f851d2a90cc55daf574d0d9 SHA256 c9964321520db44f5d6a902d75f658373655a129684e5d5b7c0ddbe7f5a14519
-MD5 98dd040d449b7781a694c6936cf7d365 xorg-server-1.1.1-r1.ebuild 16737
-RMD160 b4a7244776d3c8e2518ae2351b56ebbe61a713cb xorg-server-1.1.1-r1.ebuild 16737
-SHA256 c9964321520db44f5d6a902d75f658373655a129684e5d5b7c0ddbe7f5a14519 xorg-server-1.1.1-r1.ebuild 16737
+EBUILD xorg-server-1.1.1-r1.ebuild 16809 RMD160 8afa1288f7e9762772fa1f7c828957f17ed18486 SHA1 401f4c66b31a1eff0298e4ea4aff4a3217d6ce6a SHA256 0419d99f3b8a08e544dbb8ad6b38cbd379ebbabad9781198b05e69c20836b547
+MD5 2e18359b7f5073325042919bafd87578 xorg-server-1.1.1-r1.ebuild 16809
+RMD160 8afa1288f7e9762772fa1f7c828957f17ed18486 xorg-server-1.1.1-r1.ebuild 16809
+SHA256 0419d99f3b8a08e544dbb8ad6b38cbd379ebbabad9781198b05e69c20836b547 xorg-server-1.1.1-r1.ebuild 16809
 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb
 MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-MISC ChangeLog 36925 RMD160 18dcbce3aacf17f2c19a50bc9a4ed854b302613f SHA1 87e409cf54426418f61e753a9d5d073225ce79af SHA256 d2cec1e568fe9d636e42c04101c993a4a9ae247db093bdf9fdd35bc238274e2f
-MD5 7410aa2ffcac12f4a6d165bc3082d406 ChangeLog 36925
-RMD160 18dcbce3aacf17f2c19a50bc9a4ed854b302613f ChangeLog 36925
-SHA256 d2cec1e568fe9d636e42c04101c993a4a9ae247db093bdf9fdd35bc238274e2f ChangeLog 36925
+MISC ChangeLog 37125 RMD160 045d2dbd958f083a23799b715c4da68fd29f2a07 SHA1 c12a42e011f9d063a10f61188148eb833d754f9d SHA256 933df3b5ff62e8056106a01ebd1d8b0e15fe7844745ab170264a3be08543ac84
+MD5 db19ae6aa7306620432ffa55d38686ca ChangeLog 37125
+RMD160 045d2dbd958f083a23799b715c4da68fd29f2a07 ChangeLog 37125
+SHA256 933df3b5ff62e8056106a01ebd1d8b0e15fe7844745ab170264a3be08543ac84 ChangeLog 37125
 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.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
index a6cbf5e97e89..d98637766dcb 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-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.1-r1.ebuild,v 1.14 2006/10/15 15:01:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.15 2006/10/17 23:29:11 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -435,7 +435,8 @@ src_install() {
 		|| die "couldn't install extra modes"
 
 	# Bug #151421 - this file is not built with USE="minimal"
-	if ! use minimal; then
+	# Bug #151670 - this file is also not build if USE="-xorg"
+	if ! use minimal &&	use xorg; then
 		# Install xorg.conf.example
 		insinto /etc/X11
 		doins hw/xfree86/xorg.conf.example \