EAPI 1, enabling nxclient USE-flag by default, update the flag description

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 35 insertions, 21 deletions

diff --git a/net-misc/nxserver-freenx/ChangeLog b/net-misc/nxserver-freenx/ChangeLog
index d9e665cc5c18..6d096f893d19 100644
--- a/net-misc/nxserver-freenx/ChangeLog
+++ b/net-misc/nxserver-freenx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxserver-freenx
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.55 2008/12/19 16:12:10 voyageur Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.56 2009/01/23 10:09:12 voyageur Exp $
+
+*nxserver-freenx-0.7.3-r3 (23 Jan 2009)
+
+  23 Jan 2009; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml,
+  -nxserver-freenx-0.7.3-r1.ebuild, +nxserver-freenx-0.7.3-r3.ebuild:
+  EAPI 1, enabling nxclient USE-flag by default, update the flag description
 
 *nxserver-freenx-0.7.3-r2 (19 Dec 2008)
 
diff --git a/net-misc/nxserver-freenx/metadata.xml b/net-misc/nxserver-freenx/metadata.xml
index b5b449635261..7023779e95ea 100644
--- a/net-misc/nxserver-freenx/metadata.xml
+++ b/net-misc/nxserver-freenx/metadata.xml
@@ -7,6 +7,6 @@
   desktops over low-bandwidth links such as the Internet, WANS, and wireless
 </longdescription>
   <use>
-    <flag name="nxclient">Add support for the commercial nxclient</flag>
+	  <flag name="nxclient">Allow to install <pkg>net-misc/nxclient</pkg> in parallel with this package, using it to display messages in the sessions</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild
index 3358794e625f..9a00d18fd4bc 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r1.ebuild,v 1.2 2008/11/24 14:14:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.3-r3.ebuild,v 1.1 2009/01/23 10:09:12 voyageur Exp $
 
-inherit multilib eutils
+EAPI=1
+
+inherit multilib eutils toolchain-funcs
 
 MY_PN="freenx-server"
 DESCRIPTION="Free Software Implementation of the NX Server"
@@ -12,29 +14,30 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="strip"
-IUSE="arts cups esd nxclient"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	sys-apps/gawk
+IUSE="arts cups esd +nxclient"
+
+DEPEND="x11-misc/gccmakedep
+	x11-misc/imake"
+RDEPEND="dev-tcltk/expect
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
 	net-analyzer/gnu-netcat
-	nxclient? ( net-misc/nxclient )
-	!nxclient? ( !net-misc/nxclient
-				 || ( x11-misc/xdialog
-					  x11-apps/xmessage ) )
 	>=net-misc/nx-2.1.0
+	sys-apps/gawk
+	virtual/ssh
+	x11-apps/xauth
+	x11-apps/xrdb
+	x11-apps/sessreg
 	arts? ( kde-base/arts )
 	cups? ( net-print/cups )
 	esd? ( media-sound/esound )
+	nxclient? ( net-misc/nxclient )
+	!nxclient? ( !net-misc/nxclient
+				 || ( x11-misc/xdialog
+					  x11-apps/xmessage ) )
 	!net-misc/nxserver-freeedition
 	!net-misc/nxserver-2xterminalserver"
 
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	x11-apps/xauth
-	x11-apps/xrdb
-	x11-apps/sessreg"
-
 S=${WORKDIR}/${MY_PN}-${PV}
 
 export NX_HOME_DIR=/var/lib/nxserver/home
@@ -49,6 +52,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-nxloadconfig.patch
 	epatch "${FILESDIR}"/${P}-roundrobin.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
 	epatch "${FILESDIR}"/${PN}-0.7.2-cups.patch
 
 	sed -e "s/3\.\[012\]/3.[0123]/g" \
@@ -74,6 +78,10 @@ src_unpack() {
 	fi
 }
 
+src_compile() {
+	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" || die "compilation failed"
+}
+
 src_install() {
 	export NX_ETC_DIR=/etc/nxserver
 	export NX_SESS_DIR=/var/lib/nxserver/db