Bump to latest fixes in agent and X11 library

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

3 files changed, 131 insertions, 2 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index cfe33b916471..43998bd0f6fc 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.44 2009/07/06 10:48:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.45 2009/09/01 21:36:33 voyageur Exp $
+
+*nx-3.3.0-r5 (01 Sep 2009)
+
+  01 Sep 2009; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.3.0-r5.ebuild:
+  Bump to latest fixes in agent and X11 library
 
   06 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.3.0-r3.ebuild,
   nx-3.3.0-r4.ebuild, +files/nx-3.3.0-nxcomp-glibc2.10.patch:
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 0be1c516e895..21959ff3d3bd 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -8,7 +8,9 @@ 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.3.0-3.tar.gz 20228803 RMD160 c62fe56a2d41cda2c2ead31aca9a0a66d9402b94 SHA1 036afa0d50127304068e343cc636426685fadf9f SHA256 4b14a2eda3a70a1ad1fc9f7ed958a3c970c9368df111944c963f4441b0f5c0c2
 DIST nx-X11-3.3.0-6.tar.gz 20198434 RMD160 100c49246c653d71359c06ee431b6b610aab0788 SHA1 79408d3c11640c331110184da3afda5b8bc41730 SHA256 45a299924a92869559f2952944859b2940d16230cab49dc4bba5f05b76ebac9e
+DIST nx-X11-3.3.0-7.tar.gz 20213692 RMD160 6cb320b7d833a191c7cf3e82dc2ce837be8e5ea0 SHA1 aa43f945abd806d6937fdaf69f6e763083cfd406 SHA256 63a18849bfc56ec1beb03dd381596c01e88c1e9513d583b002b3afeab32eaf1f
 DIST nxagent-3.3.0-13.tar.gz 1557203 RMD160 56064c878b6f3c0eb2103bab6609e87830a52b81 SHA1 6a9d26f01954d00b3b1976617b7ae8ce05e669d4 SHA256 721b90ea2a31675c0b591e6f6242527c796ddd2e8ce52fa6ea125d765248d3d9
+DIST nxagent-3.3.0-18.tar.gz 1560977 RMD160 e16f583fcf096f256e55b310f46fec3d156dfcd0 SHA1 93210ab8396dbe539deac252aafdba13b862229b SHA256 72162b4b825e9540b81e97f7426df962f5f6dde473c072bf34c96ba4a926abb7
 DIST nxagent-3.3.0-6.tar.gz 1547328 RMD160 9fa919b5631bcca9cd0f338baa51192d4c520406 SHA1 88c4afc14373559995483502bf49111184c0b413 SHA256 fdb81f3b9fdf98b2d367743560591ecb1cb666d168e01946cafda43f4f43ba73
 DIST nxauth-3.3.0-1.tar.gz 30693 RMD160 284f22ccb29ad2b15e560fcd291d33f203211d8a SHA1 d8826654066e4a34ecf6ad903591e76924683d21 SHA256 1a6f9f8694377242a148cd08cfcd0c160be3427ef9792a0481730c9600df0d44
 DIST nxcomp-3.3.0-3.tar.gz 532407 RMD160 b3e857646c16b22333bc18d8edb15b24970a603d SHA1 2d3f9a9b1a83b32d6e8cc69b9b10c1aacc1f0783 SHA256 069b3baa000b4a6125b86bddaf67c1b7fcd082eaf14b64113558fc30d6c71dd7
@@ -20,5 +22,6 @@ DIST nxcompshad-3.3.0-3.tar.gz 79066 RMD160 0c55207493fa4701cf27cfe91e2d0ddcc024
 DIST nxproxy-3.3.0-2.tar.gz 80151 RMD160 02ca3840ff23efeebdfc2441e17def87f8e48cf4 SHA1 3703e4e5d9097c54b34190fc2a17208385ec7533 SHA256 dc1b5e26c4629d35b59dcb25852bcf705c29053a20763a7339b5d890614a9e87
 EBUILD nx-3.3.0-r1.ebuild 3609 RMD160 5304d98684fbf0b3780aa6987196679275be6dd2 SHA1 8f6ec1ba526530de9d0330e5fcdd5f358993096e SHA256 78fdf851e448d68c46d843e4e8a585e396e62de41dbf267971e95f7b0b1659ed
 EBUILD nx-3.3.0-r4.ebuild 3566 RMD160 f02319f695edb44635fe92de3a6c5e139735f21a SHA1 c0250d336bfe16f74a6be468fc1d4317ad2f42e3 SHA256 235f582f4283d6dfd703185e1143198fc6fe18ea31c1a81f9064840c6fad517c
-MISC ChangeLog 6585 RMD160 e7cb7fab1451ced89e145f523d62788ec7b2a9c3 SHA1 281407a23ac4d2e58aed78f048b61f4da807cb9d SHA256 18bee2d3380bd28d3305a0f3c919baad3d3816b20ff3eae91d18c1efb4b88a2c
+EBUILD nx-3.3.0-r5.ebuild 3566 RMD160 175ec87d55609efec9698f2e3f746c88e904ef96 SHA1 547e0fb22292ee8464dd4e883d8504435d248c2d SHA256 c7b63e1deb859bdee13a2f7f36ab7f42ff7a2939938b462f20c1fe89798bd286
+MISC ChangeLog 6738 RMD160 553cc97be52a6b7ebb418e2256ee374c8d9eebef SHA1 0a5ccbd7379727e73ebd4ddc019f99d4d2c9c971 SHA256 58593c4ceffe8b3b5937e785a543dae27a5efafbf8150b7d7363726c77c57e03
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
diff --git a/net-misc/nx/nx-3.3.0-r5.ebuild b/net-misc/nx/nx-3.3.0-r5.ebuild
new file mode 100644
index 000000000000..35824e85700d
--- /dev/null
+++ b/net-misc/nx/nx-3.3.0-r5.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0-r5.ebuild,v 1.1 2009/09/01 21:36:33 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-7.tar.gz"
+SRC_NXAGENT="nxagent-$PV-18.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-4.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-4.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}"/${P}-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_compile() {
+	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
+	econf || die "nxcomp econf failed"
+	emake || die "nxcomp emake failed"
+
+	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
+
+	econf || die "nxcompshad econf failed"
+	emake || die "nxcompshad emake failed"
+
+	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
+	econf || die "nxproxy econf failed"
+	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"
+	econf || die "nxcompext econf failed"
+	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*
+}