Run configure in src_configure. Remove unneeded || die. Whitespace. Split and sort configure options.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key A792A613)

2 files changed, 36 insertions, 17 deletions

diff --git a/net-misc/tigervnc/ChangeLog b/net-misc/tigervnc/ChangeLog
index 97ec6c4f375f..9e2d4e6034bd 100644
--- a/net-misc/tigervnc/ChangeLog
+++ b/net-misc/tigervnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/tigervnc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.143 2012/11/14 20:25:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/ChangeLog,v 1.144 2012/11/15 06:24:54 jer Exp $
+
+  15 Nov 2012; Jeroen Roovers <jer@gentoo.org> tigervnc-1.2.0.ebuild:
+  Run configure in src_configure. Remove unneeded || die. Whitespace. Split and
+  sort configure options.
 
   14 Nov 2012; Raúl Porcel <armin76@gentoo.org> tigervnc-1.2.0.ebuild:
   Remove unneeded java patch, bug #442612
diff --git a/net-misc/tigervnc/tigervnc-1.2.0.ebuild b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
index ba9e317bbd39..c5416180a60b 100644
--- a/net-misc/tigervnc/tigervnc-1.2.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.4 2012/11/14 20:25:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tigervnc/tigervnc-1.2.0.ebuild,v 1.5 2012/11/15 06:24:54 jer Exp $
 
 EAPI="4"
 
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
 		>=x11-proto/videoproto-2.2.2
 		>=x11-proto/xcmiscproto-1.2.0
 		>=x11-proto/xineramaproto-1.1.3
-	        >=x11-libs/xtrans-1.2.2
+		>=x11-libs/xtrans-1.2.2
 		>=x11-proto/dri2proto-2.8
 		opengl? ( >=media-libs/mesa-7.8_rc[nptl=] )
 	)"
@@ -124,27 +124,42 @@ src_configure() {
 		$(cmake-utils_use_enable pam PAM)
 		$(cmake-utils_use_build java JAVA)
 	)
-	cmake-utils_src_configure
-}
 
-src_compile() {
-	cmake-utils_src_compile
+	cmake-utils_src_configure
 
-	if use server ; then
+	if use server; then
 		cd unix/xserver
 		econf \
-			--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
-			--disable-xwin --disable-xephyr --disable-kdrive --with-pic \
-			--disable-static --disable-xinerama --without-dtrace \
-			--disable-unit-tests --disable-devel-docs --disable-dri \
+			$(use_enable nptl glx-tls) \
+			$(use_enable opengl glx) \
 			--disable-config-dbus \
 			--disable-config-hal \
 			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			--disable-kdrive \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			--disable-xinerama \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
 			--enable-dri2 \
-			$(use_enable opengl glx) \
-			$(use_enable nptl glx-tls) \
-			|| die "econf server failed"
-		emake || die "emake server failed"
+			--with-pic \
+			--without-dtrace
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server ; then
+		cd unix/xserver
+		emake
 	fi
 }
 
@@ -156,7 +171,7 @@ src_install() {
 
 	if use server ; then
 		cd unix/xserver/hw/vnc
-		emake DESTDIR="${D}" install || die "emake install failed"
+		emake DESTDIR="${D}" install
 		! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
 
 		newconfd "${FILESDIR}"/${PN}.confd ${PN}