Have the ebuild fail if no server will be built, instead of appearing to

complete successfully but not installing enough binaries for a usable X.
(Bug #132140)
(Portage version: 2.1_rc4-r1)

2 files changed, 22 insertions, 3 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 21117b965c95..c45f0cd98f1c 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.121 2006/05/23 04:30:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.122 2006/06/04 18:28:25 joshuabaergen Exp $
+
+  04 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.0.ebuild:
+  Have the ebuild fail if no server will be built, instead of appearing to
+  complete successfully but not installing enough binaries for a usable X.
+  (Bug #132140)
 
 *xorg-server-1.1.0 (23 May 2006)
 
diff --git a/x11-base/xorg-server/xorg-server-1.1.0.ebuild b/x11-base/xorg-server/xorg-server-1.1.0.ebuild
index 1aa7b68d9ee6..48c583c8aa4b 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0.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.ebuild,v 1.1 2006/05/23 04:30:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0.ebuild,v 1.2 2006/06/04 18:28:25 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -106,10 +106,12 @@ IUSE_VIDEO_CARDS="
 
 	video_cards_nvidia
 	video_cards_fglrx"
+IUSE_SERVERS="dmx kdrive xorg"
 IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
+	${IUSE_SERVERS}
 	3dfx
-	dmx dri ipv6 kdrive minimal nptl sdl xorg xprint"
+	dri ipv6 minimal nptl sdl xprint"
 RDEPEND="x11-libs/libXfont
 	x11-libs/xtrans
 	x11-libs/libXau
@@ -475,6 +477,8 @@ PDEPEND="
 LICENSE="${LICENSE} MIT"
 
 pkg_setup() {
+	ensure_a_server_is_building
+
 	# localstatedir is used for the log location; we need to override the default
 	# from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies
@@ -646,3 +650,12 @@ xprint_src_install() {
 	dodoc ${D}/etc/profile.d/xprint*
 	rm -f ${D}/etc/profile.d/xprint*
 }
+
+ensure_a_server_is_building() {
+	for server in ${IUSE_SERVERS}; do
+		use ${server} && return;
+	done
+	eerror "You need to specify at least one server to build."
+	eerror "Valid servers are: ${IUSE_SERVERS}."
+	die "No servers were specified to build."
+}