Bump with latest nxagent from NX 3.4.0 second maintenance release

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

3 files changed, 139 insertions, 2 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index fff2383c5df1..738982fcc722 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.51 2010/06/14 20:37:34 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.52 2010/08/26 15:20:32 voyageur Exp $
+
+*nx-3.4.0-r3 (26 Aug 2010)
+
+  26 Aug 2010; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.4.0-r3.ebuild:
+  Bump with latest nxagent from NX 3.4.0 second maintenance release
 
   14 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.3.0-r1.ebuild,
   -nx-3.3.0-r4.ebuild, -nx-3.3.0-r5.ebuild:
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 33f0c54bbd1a..c811178c2f8d 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -8,6 +8,7 @@ AUX nx-3.3.0-cflags.patch 1322 RMD160 04228677d9e948843d7ad44c9663dbb96159bdac S
 AUX nx-3.3.0-nxcomp-glibc2.10.patch 455 RMD160 dbb8ff05d042ec8a565f55dae51ddc51d8ed0854 SHA1 3c5522c749764fc42e549c87930790cac60fd01e SHA256 3d9938912d565962e7f00b4dfc1549b6a71de5335c97206658d4088a7122508d
 DIST nx-X11-3.4.0-1.tar.gz 20214042 RMD160 61a11bee10aebfee9eb92f8a05efcc18c6b46af1 SHA1 a254793a89610a299048928b16b86c82beeb7724 SHA256 755eaba4ad85d890db531b6c83f9bc1dcdca74095c27a1f08709c5369a629033
 DIST nx-X11-3.4.0-3.tar.gz 20245244 RMD160 98f0a39ce7dd0ba2ddfe6f1e7db0c8a2384b78e4 SHA1 74dbc9cfea6d93361e362298421cdac82f5d910d SHA256 7819ffb49859277ae5003574b683410c6ff03e80dfb523da7c32dbf70774a903
+DIST nxagent-3.4.0-11.tar.gz 1558371 RMD160 cf9eacae4fcd76cd4dee895ec47d1c3867c99201 SHA1 25d0090c99df7513b0979773c22fe75084404683 SHA256 0fc1a4b0888a51047d9771031668ab1e8d7a02aa0d733597e8a820098b924026
 DIST nxagent-3.4.0-3.tar.gz 1562019 RMD160 00d1b6e28d7cabd847a4564b32938f38e13a4afb SHA1 4774fe8157ee599de5e5f436a5dd97579f3e7225 SHA256 5707474c1f6afd7e510193fd85511a2433ea2197e34e10836ceea26c20996efd
 DIST nxagent-3.4.0-8.tar.gz 1563583 RMD160 3277111c9b3529d53921e50c916e096d6c861131 SHA1 c8f3f191fe67ca2678925d73f45a0204dcaeb9f9 SHA256 e6bb0b66a5f858e6383961b300ee39c748bdb05a9876dec3491cfc2374b0c973
 DIST nxauth-3.4.0-1.tar.gz 30613 RMD160 ccae2bd5983905666e50e67697f4e19c3a72ffbb SHA1 3d367e0e11baeca8028a73473deace0aec998cd0 SHA256 49b20af35ccd16f5871e409f959a692d4dca3d65ea6d5f7007daa81adebb400b
@@ -17,6 +18,7 @@ DIST nxcompshad-3.4.0-1.tar.gz 78496 RMD160 88dab03082144f8e1aeedc22f22d99bd0b47
 DIST nxcompshad-3.4.0-3.tar.gz 77220 RMD160 861366ef776aa71fcfdba25ae21e8ece135ad8fc SHA1 93df71868b7eb74cb9fae9f4f8b9630e51f8191a SHA256 8c5a67ea156afb0fb2a50adbb89b8b26b6f0860cf3f53c45eb53f59ec4deaa98
 DIST nxproxy-3.4.0-2.tar.gz 80209 RMD160 137fc074cb7690fa87db17ab048f3435adecd6cb SHA1 7d359c3e50708c4e774b126cc1e646c5f6ed3c3a SHA256 ecf740db00f2a223f520809f6cf5623d05eb2709e2ea8eadfb9a97b906fabfa6
 EBUILD nx-3.4.0-r2.ebuild 3847 RMD160 94c8b53271ac96239c1fdb7fc9fbfc5c9329be78 SHA1 7db9bca19b292662833be667ac4ecdc711e8e437 SHA256 d7d37e7b8875c8acd61bfd7b34d6e72fd7cc2655cabdbf25435c34b167f68a86
+EBUILD nx-3.4.0-r3.ebuild 3848 RMD160 7629372904763dc60f98e18eb7251b5a2ac92d18 SHA1 6f08d1fa81de2252569920a16c25346ced3b4efc SHA256 c734e88f360a4e8c38e3234f316af94a9ae99bcf44580cc8473683a041597e0b
 EBUILD nx-3.4.0.ebuild 3840 RMD160 0d057d893b7b5d5804872db2ffc52138404b7342 SHA1 c80223545071fbf6b42b8e4628910ac4b8728b6d SHA256 9664dcb0648c5f770afe63c535011680012437ffcb19f02a2cb00f76b38aed44
-MISC ChangeLog 7597 RMD160 c2ff8bbe2086806d90424ffb23688a460402a17a SHA1 b9443439487bcd0120156680c31ea5acff6dc5d5 SHA256 cb368602ee7d00f9e7baad68f7eb4ad39683614237ef57cbc13bb29d3532d826
+MISC ChangeLog 7770 RMD160 d5ac612a38e1b312dcee8809189e60ff51146a3b SHA1 be53bcc7526fde22e45161d7b566dffb0d40bde5 SHA256 a701ae3dc1dd9b2c17e5189fa3f96174650711dbecb3544b15bb4054056d3b4c
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
diff --git a/net-misc/nx/nx-3.4.0-r3.ebuild b/net-misc/nx/nx-3.4.0-r3.ebuild
new file mode 100644
index 000000000000..891530d365aa
--- /dev/null
+++ b/net-misc/nx/nx-3.4.0-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.4.0-r3.ebuild,v 1.1 2010/08/26 15:20:32 voyageur Exp $
+
+EAPI=2
+inherit autotools eutils multilib
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.nomachine.com/developers.php"
+
+URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
+SRC_NX_X11="nx-X11-$PV-3.tar.gz"
+SRC_NXAGENT="nxagent-$PV-11.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-1.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-1.tar.gz"
+SRC_NXCOMPSHAD="nxcompshad-$PV-3.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-2.tar.gz"
+
+SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMPSHAD $URI_BASE/$SRC_NXCOMP"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	>=media-libs/jpeg-6b-r4
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.3"
+
+DEPEND="${RDEPEND}
+		x11-misc/gccmakedep
+		x11-misc/imake
+		x11-proto/inputproto"
+
+S=${WORKDIR}/${PN}-X11
+
+src_prepare() {
+	# For nxcl/qtnx
+	cd "${WORKDIR}"/nxproxy
+	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
+
+	# Quiet some warnings
+	cd "${WORKDIR}"/nxcomp
+	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
+	# GCC 4.4 + glibc 2.10
+	epatch "${FILESDIR}"/${PN}-3.3.0-nxcomp-glibc2.10.patch
+
+	cd "${WORKDIR}"
+	# Fix sandbox violation
+	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
+	# -fPIC
+	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
+	# Respect CFLAGS/CXXFLAGS
+	epatch "${FILESDIR}"/${PN}-3.3.0-cflags.patch
+	# Run autoreconf in all neeed folders
+	for i in nxcomp nxcompext nxcompshad nxproxy; do
+		cd "${WORKDIR}"/${i}
+		eautoreconf ${i}
+		cd "${WORKDIR}"
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	cd "${S}"
+	HOSTCONF="config/cf/host.def"
+	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+}
+
+src_configure() {
+	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
+	econf || die "nxcomp econf failed"
+
+	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
+	econf || die "nxcompshad econf failed"
+
+	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
+	econf || die "nxproxy econf failed"
+
+	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
+	econf || die "nxcompext econf failed"
+}
+
+src_compile() {
+	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
+	emake || die "nxcomp emake failed"
+
+	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
+	emake || die "nxcompshad emake failed"
+
+	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
+	emake || die "nxproxy emake failed"
+
+	cd "${S}" || die "No nx-X11 directory found"
+	# Again, from xorg-x11-6.9.0-r3.ebuild
+	unset MAKE_OPTS
+	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make" || die "nx-X11 emake failed"
+
+	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
+	emake || die "nxcompext emake failed"
+}
+
+src_install() {
+	NX_ROOT=/usr/$(get_libdir)/NX
+
+	for x in nxagent nxauth nxproxy; do
+		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||
+			die " $x wrapper creation failed"
+	done
+
+	into ${NX_ROOT}
+	dobin "${S}"/programs/Xserver/nxagent
+	dobin "${S}"/programs/nxauth/nxauth
+	dobin "${WORKDIR}"/nxproxy/nxproxy
+
+	dolib.so "${S}"/lib/X11/libX11.so*
+	dolib.so "${S}"/lib/Xext/libXext.so*
+	dolib.so "${S}"/lib/Xrender/libXrender.so*
+	dolib.so "${WORKDIR}"/nxcomp/libXcomp.so*
+	dolib.so "${WORKDIR}"/nxcompext/libXcompext.so*
+	dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
+}