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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 38 insertions, 24 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/Manifest b/net-misc/nxserver-freenx/Manifest
index 039d86d97013..c9ac56957e82 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -9,7 +9,7 @@ AUX nxserver.init 568 RMD160 a48a0d4853fcd28c0ec6dd2e0366bc69ac1e4b28 SHA1 3980d
 DIST freenx-server-0.7.2.tar.gz 105394 RMD160 fd962a4d7f26db7d5d7aeb8a169950ce54c88759 SHA1 036a51fb4850007558f41b1968d47c2232ee0315 SHA256 9fea37f0c95a2e9a634dbb1537871ebc3187fce285b8b31d3109e56dc712a6ed
 DIST freenx-server-0.7.3.tar.gz 114680 RMD160 7a635b2d4796f4ab405c974c881985ea66e8efaf SHA1 888344f946cfb0802e2532e6b93601248c909eb8 SHA256 1afa8a64def93ee95a10f9105de2e6a6ff18076ee187c8ad20b34dc54116a3e4
 EBUILD nxserver-freenx-0.7.2-r2.ebuild 3634 RMD160 62ee3e7d5470dfe8eb2c6c49862488c6364c44e3 SHA1 c36ac4bdf75093b71e5ee18df350452508515f72 SHA256 1f6eb34bbbd0deed164d89641695f818fd04376e1b2f02d62460093474b237d8
-EBUILD nxserver-freenx-0.7.3-r1.ebuild 3662 RMD160 1b8f4bccfb1b5a2a4640eaa2323efc9ed2758018 SHA1 08827c96aee9d0ccb7e0e84f99b734b2f6ce939c SHA256 0b34097cada930afcf030b8c07d68af166b5ab368cbf469b0783f8cfa150a772
 EBUILD nxserver-freenx-0.7.3-r2.ebuild 3837 RMD160 696377cc795a200d55f16fd7529bea12eb4a8692 SHA1 11d5ff236629626e93f56d6f6e6d593d31917be3 SHA256 5daffb2981241a8e76bc0d8d882633369b87db1e5c6fd4a1264ef443fffc1822
-MISC ChangeLog 12991 RMD160 5b4e615d28041f9ab3b568a1ef049593526191e4 SHA1 5ab608e901fa5c3514aa5e1c13ecda9856cbd92d SHA256 66b984d2ea7d5a2e6315be0c65643c0a7ed0a1ec486fa640536794ead061d744
-MISC metadata.xml 444 RMD160 320adc515fae7b427d477b0aef5175f1b9abf1d7 SHA1 70ec3ac0ab16d652576871bc07970b4799cfe0a0 SHA256 ec5e28af478976bd4ab094f5c4f668d443b82711550d7fd1d320688b4178a4fb
+EBUILD nxserver-freenx-0.7.3-r3.ebuild 3846 RMD160 8dfe47dc7450d388d56dca1bfe16f0e71af4b0bf SHA1 d0315609950f6cedb19b0b9f9e4df3f2ca362ba1 SHA256 17fed103dcfb2c434e7f16f359e5c70af967f8c143184cf671b673f9a2e7d49a
+MISC ChangeLog 13249 RMD160 8bc4183d591051e06c5b1237e9c9800c82493718 SHA1 5e5c29f9844db6ae8e4880ba356f7caec49388a4 SHA256 ab3dec98b1c0b97fbc6052b87b570ddde2cf9b4c2d09f07fdc94410bdf2c2094
+MISC metadata.xml 525 RMD160 6b438e37f35775bbce33bbb1a04494049956aa04 SHA1 cf904293a398fd2acb8492d4c0a6c43045d71ea5 SHA256 50af7f059bc7dbf3a4040618c7c9bfa9a6f57ce7eeb2d135ed912a60bcc373bc
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