public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2007-10-28 12:05 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 13+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2007-10-28 12:05 UTC (permalink / raw
  To: gentoo-commits

eva         07/10/28 12:05:35

  Modified:             virtualx.eclass
  Log:
  fix DEPEND of the eclass

Revision  Changes    Path
1.27                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.26&r2=1.27

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- virtualx.eclass	26 Mar 2007 19:59:20 -0000	1.26
+++ virtualx.eclass	28 Oct 2007 12:05:34 -0000	1.27
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.26 2007/03/26 19:59:20 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.27 2007/10/28 12:05:34 eva Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
 # This eclass can be used for packages that needs a working X environment to build
 
-DEPEND="X? ( x11-base/xorg-server )"
+DEPEND="X? ( x11-base/xorg-server x11-apps/xhost )"
 IUSE="X"
 
 DESCRIPTION="Based on the $ECLASS eclass"



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2009-06-15  5:37 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 13+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-06-15  5:37 UTC (permalink / raw
  To: gentoo-commits

ssuominen    09/06/15 05:37:51

  Modified:             virtualx.eclass
  Log:
  Remove reference of X11R6 directory from eerror msg wrt #265911, first comments

Revision  Changes    Path
1.28                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.27&r2=1.28

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- virtualx.eclass	28 Oct 2007 12:05:34 -0000	1.27
+++ virtualx.eclass	15 Jun 2009 05:37:51 -0000	1.28
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.27 2007/10/28 12:05:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.28 2009/06/15 05:37:51 ssuominen Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -66,7 +66,7 @@
 				eerror ""
 				eerror "Unable to start Xvfb."
 				eerror ""
-				eerror "'/usr/X11R6/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
+				eerror "'/usr/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
 				eerror ""
 				${XVFB} :${XDISPLAY} -screen 0 800x600x24
 				eerror ""






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2009-08-10 15:44 Remi Cardona (remi)
  0 siblings, 0 replies; 13+ messages in thread
From: Remi Cardona (remi) @ 2009-08-10 15:44 UTC (permalink / raw
  To: gentoo-commits

remi        09/08/10 15:44:37

  Modified:             virtualx.eclass
  Log:
  add workaround in virtualx to fix 'missing fixed font' (bug #278487)

Revision  Changes    Path
1.29                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.28&r2=1.29

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- virtualx.eclass	15 Jun 2009 05:37:51 -0000	1.28
+++ virtualx.eclass	10 Aug 2009 15:44:37 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.28 2009/06/15 05:37:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.29 2009/08/10 15:44:37 remi Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -55,7 +55,12 @@
 		#
 		# Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
 		#
-		${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
+		# Use "-fp built-ins" because it's only part of the default font path
+		# for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
+		# bug 278487 until xorg-server is properly patched
+		#
+		# Rémi Cardona <remi@gentoo.org> (10 Aug 2009)
+		${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
 		sleep 2
 
 		local start=${XDISPLAY}
@@ -66,9 +71,9 @@
 				eerror ""
 				eerror "Unable to start Xvfb."
 				eerror ""
-				eerror "'/usr/bin/Xvfb :${XDISPLAY} -screen 0 800x600x24' returns:"
+				eerror "'/usr/bin/Xvfb :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
 				eerror ""
-				${XVFB} :${XDISPLAY} -screen 0 800x600x24
+				${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
 				eerror ""
 				eerror "If possible, correct the above error and try your emerge again."
 				eerror ""
@@ -76,7 +81,7 @@
 			fi
 
 			XDISPLAY=$((${XDISPLAY}+1))
-			${XVFB} :${XDISPLAY} -screen 0 800x600x24 &>/dev/null &
+			${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
 			sleep 2
 		done
 






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2009-10-19 21:12 Jonathan Callen (abcd)
  0 siblings, 0 replies; 13+ messages in thread
From: Jonathan Callen (abcd) @ 2009-10-19 21:12 UTC (permalink / raw
  To: gentoo-commits

abcd        09/10/19 21:12:07

  Modified:             virtualx.eclass
  Log:
  Switch virtualx.eclass to use the "test" USE flag by default (bug 157998)

Revision  Changes    Path
1.30                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.29&r2=1.30

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- virtualx.eclass	10 Aug 2009 15:44:37 -0000	1.29
+++ virtualx.eclass	19 Oct 2009 21:12:07 -0000	1.30
@@ -1,13 +1,41 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.29 2009/08/10 15:44:37 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.30 2009/10/19 21:12:07 abcd Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
 # This eclass can be used for packages that needs a working X environment to build
 
-DEPEND="X? ( x11-base/xorg-server x11-apps/xhost )"
-IUSE="X"
+# Is a dependency on xorg-server and xhost needed?
+# Valid values are "always", "tests", and "manual"
+VIRTUALX_REQUIRED="${VIRTUALX_REQUIRED:-tests}"
+
+# Dep string available for use outside of eclass, in case a more
+# complicated dep is needed
+VIRTUALX_DEPEND="x11-base/xorg-server
+	x11-apps/xhost"
+
+case ${VIRTUALX_REQUIRED} in
+	always)
+		DEPEND="${VIRTUALX_DEPEND}"
+		RDEPEND=""
+		;;
+	tests)
+		DEPEND="test? ( ${VIRTUAX_DEPEND} )"
+		RDEPEND=""
+		IUSE="test"
+		;;
+	manual)
+		;;
+	*)
+		eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
+		eerror "Valid values are:"
+		eerror "  always"
+		eerror "  tests"
+		eerror "  manual"
+		die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
+		;;
+esac
 
 DESCRIPTION="Based on the $ECLASS eclass"
 
@@ -40,7 +68,7 @@
 		export SANDBOX_DISABLED="1"
 
 		local i=0
-		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do i=$((${i}+1));done; echo ${i})
+		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
 
 		# If we are in a chrooted environment, and there is already a
 		# X server started outside of the chroot, Xvfb will fail to start
@@ -66,12 +94,12 @@
 		local start=${XDISPLAY}
 		while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
 			# Stop trying after 15 tries
-			if [[ $((${XDISPLAY} - ${start})) -gt 15 ]] ; then
+			if ((XDISPLAY - start > 15)) ; then
 
 				eerror ""
 				eerror "Unable to start Xvfb."
 				eerror ""
-				eerror "'/usr/bin/Xvfb :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
+				eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
 				eerror ""
 				${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
 				eerror ""
@@ -80,7 +108,7 @@
 				die
 			fi
 
-			XDISPLAY=$((${XDISPLAY}+1))
+			((XDISPLAY++))
 			${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
 			sleep 2
 		done
@@ -93,14 +121,14 @@
 		export DISPLAY=:${XDISPLAY}
 		#Do not break on error, but setup $retval, as we need
 		#to kill Xvfb
-		${maketype} $*
+		${maketype} "$@"
 		retval=$?
 
 		#Now kill Xvfb
 		kill $(cat /tmp/.X${XDISPLAY}-lock)
 	else
 		#Normal make if we can connect to an X display
-		${maketype} $*
+		${maketype} "$@"
 		retval=$?
 	fi
 
@@ -110,17 +138,17 @@
 #Same as "make", but setup the Xvfb hack if needed
 Xmake() {
 	export maketype="make"
-	virtualmake "$*"
+	virtualmake "$@"
 }
 
 #Same as "emake", but setup the Xvfb hack if needed
 Xemake() {
 	export maketype="emake"
-	virtualmake "$*"
+	virtualmake "$@"
 }
 
 #Same as "econf", but setup the Xvfb hack if needed
 Xeconf() {
 	export maketype="econf"
-	virtualmake "$*"
+	virtualmake "$@"
 }






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2009-10-19 23:52 Jonathan Callen (abcd)
  0 siblings, 0 replies; 13+ messages in thread
From: Jonathan Callen (abcd) @ 2009-10-19 23:52 UTC (permalink / raw
  To: gentoo-commits

abcd        09/10/19 23:52:39

  Modified:             virtualx.eclass
  Log:
  Fix typo, thanks to zx2c4 for spotting issue

Revision  Changes    Path
1.31                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.30&r2=1.31

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- virtualx.eclass	19 Oct 2009 21:12:07 -0000	1.30
+++ virtualx.eclass	19 Oct 2009 23:52:39 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.30 2009/10/19 21:12:07 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.31 2009/10/19 23:52:39 abcd Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -21,7 +21,7 @@
 		RDEPEND=""
 		;;
 	tests)
-		DEPEND="test? ( ${VIRTUAX_DEPEND} )"
+		DEPEND="test? ( ${VIRTUALX_DEPEND} )"
 		RDEPEND=""
 		IUSE="test"
 		;;






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2009-10-21 23:59 Jonathan Callen (abcd)
  0 siblings, 0 replies; 13+ messages in thread
From: Jonathan Callen (abcd) @ 2009-10-21 23:59 UTC (permalink / raw
  To: gentoo-commits

abcd        09/10/21 23:59:51

  Modified:             virtualx.eclass
  Log:
  Allow changing the USE flag for the dependency

Revision  Changes    Path
1.32                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.31&r2=1.32

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- virtualx.eclass	19 Oct 2009 23:52:39 -0000	1.31
+++ virtualx.eclass	21 Oct 2009 23:59:51 -0000	1.32
@@ -1,14 +1,19 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.31 2009/10/19 23:52:39 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.32 2009/10/21 23:59:51 abcd Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
 # This eclass can be used for packages that needs a working X environment to build
 
 # Is a dependency on xorg-server and xhost needed?
-# Valid values are "always", "tests", and "manual"
-VIRTUALX_REQUIRED="${VIRTUALX_REQUIRED:-tests}"
+# Valid values are "always", "optional", and "manual"
+# "tests" is treated as a synonym for "optional"
+: ${VIRTUALX_REQUIRED:=optional}
+
+# If VIRTUALX_REQUIRED=optional, what use flag should control
+# the dependency? Default is "test"
+: ${VIRTUALX_USE:=test}
 
 # Dep string available for use outside of eclass, in case a more
 # complicated dep is needed
@@ -20,10 +25,10 @@
 		DEPEND="${VIRTUALX_DEPEND}"
 		RDEPEND=""
 		;;
-	tests)
-		DEPEND="test? ( ${VIRTUALX_DEPEND} )"
+	optional|tests)
+		DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
 		RDEPEND=""
-		IUSE="test"
+		IUSE="${VIRTUALX_USE}"
 		;;
 	manual)
 		;;
@@ -31,7 +36,7 @@
 		eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
 		eerror "Valid values are:"
 		eerror "  always"
-		eerror "  tests"
+		eerror "  optional (default if unset)"
 		eerror "  manual"
 		die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
 		;;






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2009-12-21 17:27 Jonathan Callen (abcd)
  0 siblings, 0 replies; 13+ messages in thread
From: Jonathan Callen (abcd) @ 2009-12-21 17:27 UTC (permalink / raw
  To: gentoo-commits

abcd        09/12/21 17:27:28

  Modified:             virtualx.eclass
  Log:
  Remove usage of SANDBOX_DISABLED, per bug 107479

Revision  Changes    Path
1.33                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.32&r2=1.33

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- virtualx.eclass	21 Oct 2009 23:59:51 -0000	1.32
+++ virtualx.eclass	21 Dec 2009 17:27:28 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.32 2009/10/21 23:59:51 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.33 2009/12/21 17:27:28 abcd Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -44,18 +44,9 @@
 
 DESCRIPTION="Based on the $ECLASS eclass"
 
-#
-# Brian Harring <ferringb@gentoo.org> 11/04/2004
-# do not disable the sandbox during the depend phase.
-# ebuilds shouldn't touch the fs during depend phase, nor screw with the sandbox.
-#
-if [[ ${EBUILD_PHASE/depend} == "${EBUILD_PHASE}" ]] ; then
-	[[ -z ${SANDBOX_DISABLED} ]] && export SANDBOX_DISABLED="0" || :
-fi
-
 virtualmake() {
 	local retval=0
-	local OLD_SANDBOX_DISABLED="${SANDBOX_DISABLED}"
+	local OLD_SANDBOX_ON="${SANDBOX_ON}"
 	local XVFB=$(type -p Xvfb)
 	local XHOST=$(type -p xhost)
 
@@ -70,7 +61,7 @@
 		einfo "Scanning for an open DISPLAY to start Xvfb ..."
 
 		# We really do not want SANDBOX enabled here
-		export SANDBOX_DISABLED="1"
+		export SANDBOX_ON="0"
 
 		local i=0
 		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
@@ -119,7 +110,7 @@
 		done
 
 		# Now enable SANDBOX again if needed.
-		export SANDBOX_DISABLED="${OLD_SANDBOX_DISABLED}"
+		export SANDBOX_ON="${OLD_SANDBOX_ON}"
 
 		einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
 






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2010-03-04 21:18 Jonathan Callen (abcd)
  0 siblings, 0 replies; 13+ messages in thread
From: Jonathan Callen (abcd) @ 2010-03-04 21:18 UTC (permalink / raw
  To: gentoo-commits

abcd        10/03/04 21:18:28

  Modified:             virtualx.eclass
  Log:
  Make xorg-server optional on prefix (assume its available on the host, as it is not available in the prefix)

Revision  Changes    Path
1.34                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/virtualx.eclass?r1=1.33&r2=1.34

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- virtualx.eclass	21 Dec 2009 17:27:28 -0000	1.33
+++ virtualx.eclass	4 Mar 2010 21:18:27 -0000	1.34
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.33 2009/12/21 17:27:28 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.34 2010/03/04 21:18:27 abcd Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -17,7 +17,7 @@
 
 # Dep string available for use outside of eclass, in case a more
 # complicated dep is needed
-VIRTUALX_DEPEND="x11-base/xorg-server
+VIRTUALX_DEPEND="!prefix? ( x11-base/xorg-server )
 	x11-apps/xhost"
 
 case ${VIRTUALX_REQUIRED} in






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2010-05-15  5:40 Ryan Hill (dirtyepic)
  0 siblings, 0 replies; 13+ messages in thread
From: Ryan Hill (dirtyepic) @ 2010-05-15  5:40 UTC (permalink / raw
  To: gentoo-commits

dirtyepic    10/05/15 05:40:46

  Modified:             virtualx.eclass
  Log:
  Document for eclass-manpages.

Revision  Changes    Path
1.35                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.34&r2=1.35

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- virtualx.eclass	4 Mar 2010 21:18:27 -0000	1.34
+++ virtualx.eclass	15 May 2010 05:40:46 -0000	1.35
@@ -1,22 +1,31 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.34 2010/03/04 21:18:27 abcd Exp $
-#
-# Author: Martin Schlemmer <azarah@gentoo.org>
-#
-# This eclass can be used for packages that needs a working X environment to build
-
-# Is a dependency on xorg-server and xhost needed?
-# Valid values are "always", "optional", and "manual"
-# "tests" is treated as a synonym for "optional"
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.35 2010/05/15 05:40:46 dirtyepic Exp $
+
+# Original author: Martin Schlemmer <azarah@gentoo.org>
+
+# @ECLASS: virtualx.eclass
+# @MAINTAINER:
+#  x11@gentoo.org
+# @BLURB: This eclass can be used for packages that needs a working X environment to build.
+
+# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
+# @DESCRIPTION:
+#  Is a dependency on xorg-server and xhost needed?
+#  Valid values are "always", "optional", and "manual".
+#  "tests" is a synonym for "optional".
 : ${VIRTUALX_REQUIRED:=optional}
 
-# If VIRTUALX_REQUIRED=optional, what use flag should control
-# the dependency? Default is "test"
+# @ECLASS-VARIABLE: VIRTUALX_USE
+# @DESCRIPTION:
+#  If VIRTUALX_REQUIRED=optional, what USE flag should control
+#  the dependency?
 : ${VIRTUALX_USE:=test}
 
-# Dep string available for use outside of eclass, in case a more
-# complicated dep is needed
+# @ECLASS-VARIABLE: VIRTUALX_DEPEND
+# @DESCRIPTION:
+#  Dep string available for use outside of eclass, in case a more
+#  complicated dep is needed.
 VIRTUALX_DEPEND="!prefix? ( x11-base/xorg-server )
 	x11-apps/xhost"
 
@@ -42,8 +51,6 @@
 		;;
 esac
 
-DESCRIPTION="Based on the $ECLASS eclass"
-
 virtualmake() {
 	local retval=0
 	local OLD_SANDBOX_ON="${SANDBOX_ON}"
@@ -131,19 +138,25 @@
 	return ${retval}
 }
 
-#Same as "make", but setup the Xvfb hack if needed
+# @FUNCTION: Xmake
+# @DESCRIPTION: 
+#  Same as "make", but set up the Xvfb hack if needed.
 Xmake() {
 	export maketype="make"
 	virtualmake "$@"
 }
 
-#Same as "emake", but setup the Xvfb hack if needed
+# @FUNCTION: Xemake
+# @DESCRIPTION: 
+#  Same as "emake", but set up the Xvfb hack if needed.
 Xemake() {
 	export maketype="emake"
 	virtualmake "$@"
 }
 
-#Same as "econf", but setup the Xvfb hack if needed
+# @FUNCTION: Xeconf
+# @DESCRIPTION: 
+#  Same as "econf", but set up the Xvfb hack if needed.
 Xeconf() {
 	export maketype="econf"
 	virtualmake "$@"






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2011-03-09 13:31 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 13+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-09 13:31 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/03/09 13:31:51

  Modified:             virtualx.eclass
  Log:
  Sync virtualx.eclass from x11 overlay as per review ~week ago.

Revision  Changes    Path
1.36                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.35&r2=1.36

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- virtualx.eclass	15 May 2010 05:40:46 -0000	1.35
+++ virtualx.eclass	9 Mar 2011 13:31:51 -0000	1.36
@@ -1,118 +1,137 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.35 2010/05/15 05:40:46 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.36 2011/03/09 13:31:51 scarabeus Exp $
 
 # Original author: Martin Schlemmer <azarah@gentoo.org>
 
 # @ECLASS: virtualx.eclass
 # @MAINTAINER:
-#  x11@gentoo.org
+# x11@gentoo.org
 # @BLURB: This eclass can be used for packages that needs a working X environment to build.
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @DESCRIPTION:
-#  Is a dependency on xorg-server and xhost needed?
-#  Valid values are "always", "optional", and "manual".
-#  "tests" is a synonym for "optional".
-: ${VIRTUALX_REQUIRED:=optional}
+# Variable specifying the dependency on xorg-server and xhost.
+# Possible special values are "always" and "manual", which specify
+# the dependency to be set unconditionaly or not at all.
+# Any other value is taken as useflag desired to be in control of
+# the dependency (eg. VIRTUALX_REQUIRED="kde" will add the dependency
+# into "kde? ( )" and add kde into IUSE.
+: ${VIRTUALX_REQUIRED:=test}
 
-# @ECLASS-VARIABLE: VIRTUALX_USE
+# @ECLASS-VARIABLE: VIRTUALX_DEPEND
 # @DESCRIPTION:
-#  If VIRTUALX_REQUIRED=optional, what USE flag should control
-#  the dependency?
-: ${VIRTUALX_USE:=test}
+# Dep string available for use outside of eclass, in case a more
+# complicated dep is needed.
+# You can specify the variable BEFORE inherit to add more dependencies.
+VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
+	!prefix? ( x11-base/xorg-server[-minimal] )
+	x11-apps/xhost
+"
 
-# @ECLASS-VARIABLE: VIRTUALX_DEPEND
+# @ECLASS-VARIABLE: VIRTUALX_COMMAND
 # @DESCRIPTION:
-#  Dep string available for use outside of eclass, in case a more
-#  complicated dep is needed.
-VIRTUALX_DEPEND="!prefix? ( x11-base/xorg-server )
-	x11-apps/xhost"
+# Command (or eclass function call) to be run in the X11 environment
+# (within virtualmake function).
+: ${VIRTUALX_COMMAND:="emake"}
+
+has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer."
 
 case ${VIRTUALX_REQUIRED} in
+	manual)
+		;;
 	always)
 		DEPEND="${VIRTUALX_DEPEND}"
 		RDEPEND=""
 		;;
 	optional|tests)
+		# deprecated section YAY.
+		ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
+		ewarn "QA: You can drop the variable definition completely from ebuild,"
+		ewarn "QA: because it is default behaviour."
+
+		if [[ -n ${VIRTUALX_USE} ]]; then
+			# so they like to specify the useflag
+			ewarn "QA: VIRTUALX_USE variable is deprecated."
+			ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
+			ewarn "QA: to achieve the same behaviour."
+		fi
+
+		[[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
 		DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
 		RDEPEND=""
 		IUSE="${VIRTUALX_USE}"
 		;;
-	manual)
-		;;
 	*)
-		eerror "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
-		eerror "Valid values are:"
-		eerror "  always"
-		eerror "  optional (default if unset)"
-		eerror "  manual"
-		die "Invalid value (${VIRTUALX_REQUIRED}) for VIRTUALX_REQUIRED"
+		DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
+		RDEPEND=""
+		IUSE="${VIRTUALX_REQUIRED}"
 		;;
 esac
 
+# @FUNCTION: virtualmake
+# @DESCRIPTION: 
+# Function which attach to running X session or start new Xvfb session
+# where the VIRTUALX_COMMAND variable content gets executed.
 virtualmake() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	local i=0
 	local retval=0
 	local OLD_SANDBOX_ON="${SANDBOX_ON}"
 	local XVFB=$(type -p Xvfb)
 	local XHOST=$(type -p xhost)
+	local xvfbargs="-screen 0 800x600x24"
+
+	# backcompat for maketype
+	if [[ -n ${maketype} ]]; then
+		ewarn "QA: ebuild is exporting \$maketype=${maketype}"
+		ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead."
+		ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now."
+		VIRTUALX_COMMAND=${maketype}
+	fi
 
 	# If $DISPLAY is not set, or xhost cannot connect to an X
 	# display, then do the Xvfb hack.
 	if [[ -n ${XVFB} && -n ${XHOST} ]] && \
-	   ( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
+			( [[ -z ${DISPLAY} ]] || ! (${XHOST} &>/dev/null) ) ; then
+		debug-print "${FUNCNAME}: running Xvfb hack"
 		export XAUTHORITY=
 		# The following is derived from Mandrake's hack to allow
 		# compiling without the X display
 
 		einfo "Scanning for an open DISPLAY to start Xvfb ..."
-
-		# We really do not want SANDBOX enabled here
-		export SANDBOX_ON="0"
-
-		local i=0
-		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
-
 		# If we are in a chrooted environment, and there is already a
 		# X server started outside of the chroot, Xvfb will fail to start
 		# on the same display (most cases this is :0 ), so make sure
 		# Xvfb is started, else bump the display number
 		#
 		# Azarah - 5 May 2002
-		#
-		# Changed the mode from 800x600x32 to 800x600x24 because the mfb
-		# support has been dropped in Xvfb in the xorg-x11 pre-releases.
-		# For now only depths up to 24-bit are supported.
-		#
-		# Sven Wegener <swegener@gentoo.org> - 22 Aug 2004
-		#
-		# Use "-fp built-ins" because it's only part of the default font path
-		# for Xorg but not the other DDXs (Xvfb, Kdrive, etc). Temporarily fixes
-		# bug 278487 until xorg-server is properly patched
-		#
-		# Rémi Cardona <remi@gentoo.org> (10 Aug 2009)
-		${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
+		XDISPLAY=$(i=0; while [[ -f /tmp/.X${i}-lock ]] ; do ((i++));done; echo ${i})
+		debug-print "${FUNCNAME}: XDISPLAY=${XDISPLAY}"
+
+		# We really do not want SANDBOX enabled here
+		export SANDBOX_ON="0"
+
+		debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
+		${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
 		sleep 2
 
 		local start=${XDISPLAY}
-		while [[ ! -f /tmp/.X${XDISPLAY}-lock ]] ; do
+		while [[ ! -f /tmp/.X${XDISPLAY}-lock ]]; do
 			# Stop trying after 15 tries
 			if ((XDISPLAY - start > 15)) ; then
-
-				eerror ""
-				eerror "Unable to start Xvfb."
-				eerror ""
-				eerror "'${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24' returns:"
-				eerror ""
-				${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24
-				eerror ""
+				eerror "'${XVFB} :${XDISPLAY} ${xvfbargs}' returns:"
+				echo
+				${XVFB} :${XDISPLAY} ${xvfbargs}
+				echo
 				eerror "If possible, correct the above error and try your emerge again."
-				eerror ""
-				die
+				die "Unable to start Xvfb"
 			fi
 
 			((XDISPLAY++))
-			${XVFB} :${XDISPLAY} -fp built-ins -screen 0 800x600x24 &>/dev/null &
+			debug-print "${FUNCNAME}: ${XVFB} :${XDISPLAY} ${xvfbargs}"
+			${XVFB} :${XDISPLAY} ${xvfbargs} &>/dev/null &
 			sleep 2
 		done
 
@@ -122,42 +141,52 @@
 		einfo "Starting Xvfb on \$DISPLAY=${XDISPLAY} ..."
 
 		export DISPLAY=:${XDISPLAY}
-		#Do not break on error, but setup $retval, as we need
-		#to kill Xvfb
-		${maketype} "$@"
+		# Do not break on error, but setup $retval, as we need
+		# to kill Xvfb
+		debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
+		${VIRTUALX_COMMAND} "$@"
 		retval=$?
 
-		#Now kill Xvfb
+		# Now kill Xvfb
 		kill $(cat /tmp/.X${XDISPLAY}-lock)
 	else
-		#Normal make if we can connect to an X display
-		${maketype} "$@"
+		debug-print "${FUNCNAME}: attaching to running X display"
+		# Normal make if we can connect to an X display
+		debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
+		${VIRTUALX_COMMAND} "$@"
 		retval=$?
 	fi
 
-	return ${retval}
+	# die if our command failed
+	[[ $? -ne 0 ]] && die "${FUNCNAME}: the ${VIRTALX_COMMAND} failed."
 }
 
 # @FUNCTION: Xmake
 # @DESCRIPTION: 
-#  Same as "make", but set up the Xvfb hack if needed.
+# Same as "make", but set up the Xvfb hack if needed.
+# Deprecated call.
 Xmake() {
-	export maketype="make"
-	virtualmake "$@"
+	debug-print-function ${FUNCNAME} "$@"
+
+	ewarn "QA: you should not execute make directly"
+	ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make"
+	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
 }
 
 # @FUNCTION: Xemake
 # @DESCRIPTION: 
-#  Same as "emake", but set up the Xvfb hack if needed.
+# Same as "emake", but set up the Xvfb hack if needed.
 Xemake() {
-	export maketype="emake"
-	virtualmake "$@"
+	debug-print-function ${FUNCNAME} "$@"
+
+	VIRTUALX_COMMAND="emake" virtualmake "$@"
 }
 
 # @FUNCTION: Xeconf
 # @DESCRIPTION: 
 #  Same as "econf", but set up the Xvfb hack if needed.
 Xeconf() {
-	export maketype="econf"
-	virtualmake "$@"
+	debug-print-function ${FUNCNAME} "$@"
+
+	VIRTUALX_COMMAND="econf" virtualmake "$@"
 }






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2011-03-13  8:25 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 13+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-13  8:25 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/03/13 08:25:36

  Modified:             virtualx.eclass
  Log:
  Fixup die per gentoo-dev discussion. Thanks to Michal (mgorny) and Pavel (phajdan.jr) for spotting.

Revision  Changes    Path
1.37                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.36&r2=1.37

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- virtualx.eclass	9 Mar 2011 13:31:51 -0000	1.36
+++ virtualx.eclass	13 Mar 2011 08:25:36 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.36 2011/03/09 13:31:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.37 2011/03/13 08:25:36 scarabeus Exp $
 
 # Original author: Martin Schlemmer <azarah@gentoo.org>
 
@@ -158,7 +158,7 @@
 	fi
 
 	# die if our command failed
-	[[ $? -ne 0 ]] && die "${FUNCNAME}: the ${VIRTALX_COMMAND} failed."
+	[[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed."
 }
 
 # @FUNCTION: Xmake






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2011-03-13 19:37 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 13+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-03-13 19:37 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/03/13 19:37:28

  Modified:             virtualx.eclass
  Log:
  Always explicitely return 0.

Revision  Changes    Path
1.38                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.37&r2=1.38

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- virtualx.eclass	13 Mar 2011 08:25:36 -0000	1.37
+++ virtualx.eclass	13 Mar 2011 19:37:28 -0000	1.38
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.37 2011/03/13 08:25:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.38 2011/03/13 19:37:28 scarabeus Exp $
 
 # Original author: Martin Schlemmer <azarah@gentoo.org>
 
@@ -159,6 +159,8 @@
 
 	# die if our command failed
 	[[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed."
+
+	return 0 # always return 0, it can be altered by failed kill for Xvfb
 }
 
 # @FUNCTION: Xmake






^ permalink raw reply	[flat|nested] 13+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass
@ 2011-06-09 21:42 Matt Turner (mattst88)
  0 siblings, 0 replies; 13+ messages in thread
From: Matt Turner (mattst88) @ 2011-06-09 21:42 UTC (permalink / raw
  To: gentoo-commits

mattst88    11/06/09 21:42:58

  Modified:             virtualx.eclass
  Log:
  virtualx.eclass should depend on xorg-server[xvfb] instead of -minimal, bug 357295

Revision  Changes    Path
1.39                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.38&r2=1.39

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- virtualx.eclass	13 Mar 2011 19:37:28 -0000	1.38
+++ virtualx.eclass	9 Jun 2011 21:42:58 -0000	1.39
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.38 2011/03/13 19:37:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.39 2011/06/09 21:42:58 mattst88 Exp $
 
 # Original author: Martin Schlemmer <azarah@gentoo.org>
 
@@ -25,7 +25,7 @@
 # complicated dep is needed.
 # You can specify the variable BEFORE inherit to add more dependencies.
 VIRTUALX_DEPEND="${VIRTUALX_DEPEND}
-	!prefix? ( x11-base/xorg-server[-minimal] )
+	!prefix? ( x11-base/xorg-server[xvfb] )
 	x11-apps/xhost
 "
 






^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-06-09 21:43 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-19 23:52 [gentoo-commits] gentoo-x86 commit in eclass: virtualx.eclass Jonathan Callen (abcd)
  -- strict thread matches above, loose matches on Subject: below --
2011-06-09 21:42 Matt Turner (mattst88)
2011-03-13 19:37 Tomas Chvatal (scarabeus)
2011-03-13  8:25 Tomas Chvatal (scarabeus)
2011-03-09 13:31 Tomas Chvatal (scarabeus)
2010-05-15  5:40 Ryan Hill (dirtyepic)
2010-03-04 21:18 Jonathan Callen (abcd)
2009-12-21 17:27 Jonathan Callen (abcd)
2009-10-21 23:59 Jonathan Callen (abcd)
2009-10-19 21:12 Jonathan Callen (abcd)
2009-08-10 15:44 Remi Cardona (remi)
2009-06-15  5:37 Samuli Suominen (ssuominen)
2007-10-28 12:05 Gilles Dartiguelongue (eva)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox