Add patch to respect CFLAGS/CXXFLAGS, spotted by vapier in bug #250587, add some lines from old xorg-x11 ebuild for nx-X11 compilation, may help for bug #237370, and switch to EAPI 2 for use dependencies

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 189 insertions, 2 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 8923c1d5b197..53aa8bd5c277 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.34 2008/11/24 14:08:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.35 2008/12/18 16:42:37 voyageur Exp $
+
+*nx-3.3.0-r1 (18 Dec 2008)
+
+  18 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/nx-3.3.0-cflags.patch, +nx-3.3.0-r1.ebuild:
+  Add patch to respect CFLAGS/CXXFLAGS, spotted by vapier in bug #250587,
+  add some lines from old xorg-x11 ebuild for nx-X11 compilation, may help
+  for bug #237370, and switch to EAPI 2 for use dependencies
 
 *nx-3.3.0 (24 Nov 2008)
 
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 9f8dc1087429..f3139ab57fa1 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -4,6 +4,7 @@ AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc
 AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
 AUX nx-3.1.0-gcc-4.3.patch 373 RMD160 3a8585a19fae38b7814e85c68a475df18765fbc6 SHA1 ba38ca0ee36b2c48ee09d855c4b32027e10c0fcc SHA256 696c7545ebbb14c0bc7c6d88d3ab8b9b7bf0758c4b636c8c3a85b408b5d0c05d
 AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 RMD160 1d71a4b9b1e1499b032bf8e32523881554eb278e SHA1 5e5417d4a2fd5f0e3d5c447876f3c8e912c78a34 SHA256 7674e887e1be1134110e2219a96b413efa2b32d9be50de77d15b9dcbad8a4d76
+AUX nx-3.3.0-cflags.patch 1322 RMD160 04228677d9e948843d7ad44c9663dbb96159bdac SHA1 41c873be0ce50ddb4fc6d965213c7bbd61647328 SHA256 88e9506a5809e1357c29b4f0ec1777b69335e35e90a22ab14f98fd616d67fc6e
 DIST nx-X11-3.2.0-2.tar.gz 20215674 RMD160 33bb389ffc3a7ec5a8e7ccc6e8451c0860924dcc SHA1 aa49a8fc86491cd8c9d8cb363bd7944463740738 SHA256 d0058597b9d9693dc20498ed4c61d7887c21c29a978d9c8bc59a5fc120ab9af0
 DIST nx-X11-3.3.0-3.tar.gz 20228803 RMD160 c62fe56a2d41cda2c2ead31aca9a0a66d9402b94 SHA1 036afa0d50127304068e343cc636426685fadf9f SHA256 4b14a2eda3a70a1ad1fc9f7ed958a3c970c9368df111944c963f4441b0f5c0c2
 DIST nxagent-3.2.0-10.tar.gz 1611890 RMD160 da6b8dd5cacbff55dee515e0f5b7c3af5077fffe SHA1 6a63ae12def2d2f30f394864f40516910e7c6c91 SHA256 025ae8cb86ae3699e7cca120751918ab28e42899b9d0c8c304a97a6c6dcd952b
@@ -21,6 +22,7 @@ DIST nxproxy-3.2.0-1.tar.gz 82736 RMD160 9b702bdc0f1a79ccef46e93b0215f0d5e155e97
 DIST nxproxy-3.3.0-2.tar.gz 80151 RMD160 02ca3840ff23efeebdfc2441e17def87f8e48cf4 SHA1 3703e4e5d9097c54b34190fc2a17208385ec7533 SHA256 dc1b5e26c4629d35b59dcb25852bcf705c29053a20763a7339b5d890614a9e87
 EBUILD nx-3.2.0-r2.ebuild 3195 RMD160 b06a17f08d6407a0d66e4f083a67430a829e600f SHA1 abf34e4d9b3e3236d16f33540fb2ee5270b6bf7e SHA256 7bbd4dbd85665b84c72c296f2fd8ea350ce506f245c47b7a7bd85ef04bd6854b
 EBUILD nx-3.2.0-r5.ebuild 3279 RMD160 a6c4d2f5579fe2bb4ca45a9d71a4f686097699a5 SHA1 1630218012642bd0dfb9816b7003d19a9e968fdc SHA256 6a1fe169aa56daa224d2d17d3ed2ed4ab76bec04415d2eaf4d2b5606e657690b
+EBUILD nx-3.3.0-r1.ebuild 3613 RMD160 529fa9e1a19a6edce64d868a724c2f0ab20ef2f2 SHA1 001d1f8f88b5c1daed3f7d701f70aba9d4a365b0 SHA256 91d1930e313f3d39609c9df1d14a57076694a4f8d25be24705ce7bd4a8282dc1
 EBUILD nx-3.3.0.ebuild 3286 RMD160 0638db5193effbb9ff9fe396f1b28512a3e17795 SHA1 d00375bf570478e7d502f8d9bd886905f1caf0d2 SHA256 6321261c1ebdc0b02433e6e5bcfa84d9d6b52d78359f34aaaebe17029c6ddaf8
-MISC ChangeLog 4928 RMD160 2b1a239364cec1a0a610c78e6c53071240b856dd SHA1 f6b945bedf1a644fbc2b7341f6f2c1644a4f0510 SHA256 5547a11935a0bae46c7f690062dff59963395cafd9f899776285554a15b4886f
+MISC ChangeLog 5275 RMD160 3b07085f20dbf30abc2dc5bdfabec063a025d4c1 SHA1 6401f2dd80b5689b16d9419df8a0d03d2acacb54 SHA256 cf3e0bcedfb3d443b6ae26436a060a1d8400def1b121aecc07d309be84e6e390
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
diff --git a/net-misc/nx/files/nx-3.3.0-cflags.patch b/net-misc/nx/files/nx-3.3.0-cflags.patch
new file mode 100644
index 000000000000..35562939c5b2
--- /dev/null
+++ b/net-misc/nx/files/nx-3.3.0-cflags.patch
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+ 
+ dnl Set our default compilation flags.
+ 
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+ 
+ dnl Reset default linking directives.
+ 
+--- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+ 
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+ 
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+ 
+ if test -d "../nx-X11/exports/include" ; then
diff --git a/net-misc/nx/nx-3.3.0-r1.ebuild b/net-misc/nx/nx-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..f56e92ad99ba
--- /dev/null
+++ b/net-misc/nx/nx-3.3.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/12/18 16:42:37 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-6.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-3.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-2.tar.gz"
+SRC_NXCOMPSHAD="nxcompshad-$PV-2.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="rdesktop vnc"
+
+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
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( || ( net-misc/vnc[server] net-misc/tightvnc[server] ) )"
+
+DEPEND="${RDEPEND}
+		x11-misc/gccmakedep
+		x11-misc/imake
+		x11-proto/inputproto"
+
+S=${WORKDIR}/${PN}-X11
+
+src_unpack() {
+	unpack ${A}
+
+	# 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
+
+	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*
+}