Update to new 3.3.0 maintenance release packages, remove first 3.3.0 ebuild

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-gentoo x86_64

3 files changed, 47 insertions, 30 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 53aa8bd5c277..4ae7fbd53c4b 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2008/12/18 16:42:37 voyageur Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.36 2009/01/16 10:51:59 voyageur Exp $
+
+*nx-3.3.0-r2 (16 Jan 2009)
+
+  16 Jan 2009; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.3.0.ebuild,
+  +nx-3.3.0-r2.ebuild:
+  Update to new 3.3.0 maintenance release packages, remove first 3.3.0
+  ebuild
 
 *nx-3.3.0-r1 (18 Dec 2008)
 
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index f3139ab57fa1..bae0fcbecc7f 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -7,15 +7,18 @@ AUX nx-3.2.0-nxproxy_read_from_stdin.patch 1382 RMD160 1d71a4b9b1e1499b032bf8e32
 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 nx-X11-3.3.0-4.tar.gz 20218976 RMD160 086336d38f4b02168f4f1b966137bbc8b1a8ea10 SHA1 a269f8a35a8e292d15cf4fe9a9418857d7fa9d81 SHA256 76e9272924330b01128d91995b870a3db54548903d55e60c67fcf4ec16a0aaf3
 DIST nxagent-3.2.0-10.tar.gz 1611890 RMD160 da6b8dd5cacbff55dee515e0f5b7c3af5077fffe SHA1 6a63ae12def2d2f30f394864f40516910e7c6c91 SHA256 025ae8cb86ae3699e7cca120751918ab28e42899b9d0c8c304a97a6c6dcd952b
 DIST nxagent-3.2.0-7.tar.gz 1546613 RMD160 5e233d4ebd5979b616297601d7ecd1a0c571fa6d SHA1 59af549448ace121ed3c8f64aeb8207000078baa SHA256 3c0e0eaa96fbda962619c6514ef57b961a926456e374a0f05dde15a81964b4f0
 DIST nxagent-3.3.0-6.tar.gz 1547328 RMD160 9fa919b5631bcca9cd0f338baa51192d4c520406 SHA1 88c4afc14373559995483502bf49111184c0b413 SHA256 fdb81f3b9fdf98b2d367743560591ecb1cb666d168e01946cafda43f4f43ba73
+DIST nxagent-3.3.0-9.tar.gz 1552812 RMD160 04db5a8e0117c9b280f45a2b0d85d95f0fa920af SHA1 186b45e079f97fbf50a9b4ded2640b77d23f4e6a SHA256 87fb4b844b85d47a8ba0f85b9e79e6a6c7929b9d368f28ccdea6ca6b1c194b3b
 DIST nxauth-3.2.0-1.tar.gz 30679 RMD160 5de0b0d6250d8f3cdd846b9ef6351fbd0debc8bd SHA1 46cf2609de09e41db9ee753b0303b1a50c79062b SHA256 7442f2c8d9eb809b72f6078901e7fbbfae77eb1fc22291c697f216ca7ff2a39f
 DIST nxauth-3.3.0-1.tar.gz 30693 RMD160 284f22ccb29ad2b15e560fcd291d33f203211d8a SHA1 d8826654066e4a34ecf6ad903591e76924683d21 SHA256 1a6f9f8694377242a148cd08cfcd0c160be3427ef9792a0481730c9600df0d44
 DIST nxcomp-3.2.0-7.tar.gz 532187 RMD160 8b250470fd95e6af9062fe7ee744e5c44969be8e SHA1 aee9f084f511e7af5527daf88aaee420939b0f4b SHA256 ec1b9a9447bcbfe36cff46aaf4aaa6b3f8f945487438a92d0b8e70d9b7814f97
 DIST nxcomp-3.3.0-3.tar.gz 532407 RMD160 b3e857646c16b22333bc18d8edb15b24970a603d SHA1 2d3f9a9b1a83b32d6e8cc69b9b10c1aacc1f0783 SHA256 069b3baa000b4a6125b86bddaf67c1b7fcd082eaf14b64113558fc30d6c71dd7
 DIST nxcompext-3.2.0-1.tar.gz 90315 RMD160 e50fb4cb0f317b3712f89fe4f89c5a845d5930d9 SHA1 e537f90de73cb0a35e60151b00f3894791f4e516 SHA256 8b146d25272f12427b987892cabf1adabfb4c99fcc24b4859221e2070158612a
 DIST nxcompext-3.3.0-2.tar.gz 91754 RMD160 ac4ef7a5fb1c48c3ece3a030d7dcf366103a9211 SHA1 cb7569c3d4a1a275d2205467aff7d67d2b2a0947 SHA256 c0a207f3dd1e84db03373eba17d16f19e0f6c09d120a64b246aad15cdf80d060
+DIST nxcompext-3.3.0-3.tar.gz 90483 RMD160 ab3bc24b0cca1bfe6c07defbdb8358d79a180332 SHA1 4c811a6ebdebf2a975ee80bfbbed92af550e7082 SHA256 73c121ac5c1a5016d356440e8d4c3173ecb1f5cd38c44ad26be01e574638215c
 DIST nxcompshad-3.2.0-3.tar.gz 76668 RMD160 8f3069b11f854ff912e26baa34db672c3841b56e SHA1 63e674ee203468b306c25f676140a3de51bd4677 SHA256 e0da5cccacff237c5cf856d81a51ea4cf7e4356a1241f0e4898366758ad364bb
 DIST nxcompshad-3.3.0-2.tar.gz 78918 RMD160 49a6ab845d0a22f5bb9e32ad2717dd1dff1270a6 SHA1 e2b366bd6f2e9dfc2d3c9e91636969da99f29a89 SHA256 f0a957ed393b6956c8a7a6ed980409b31cfd188db127ed8967c1264d29dbee84
 DIST nxproxy-3.2.0-1.tar.gz 82736 RMD160 9b702bdc0f1a79ccef46e93b0215f0d5e155e97c SHA1 f6f37e00275c0c131a9e6dc77e987a7088b6ff51 SHA256 5642ce40e2f34caeed433e8c0ac010e2e7e738c2c5aa8fc59bba892a8b542d84
@@ -23,6 +26,6 @@ DIST nxproxy-3.3.0-2.tar.gz 80151 RMD160 02ca3840ff23efeebdfc2441e17def87f8e48cf
 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 5275 RMD160 3b07085f20dbf30abc2dc5bdfabec063a025d4c1 SHA1 6401f2dd80b5689b16d9419df8a0d03d2acacb54 SHA256 cf3e0bcedfb3d443b6ae26436a060a1d8400def1b121aecc07d309be84e6e390
+EBUILD nx-3.3.0-r2.ebuild 3613 RMD160 614c95024994df25e4e980b9216cc6a5d698ed6a SHA1 179115c04328fcf698fd909ba13135a829eabca3 SHA256 fef680edaa46b064fc326e5b4b33785650fcedc75e57ba6fc803e475bf6e0608
+MISC ChangeLog 5480 RMD160 057214335981237c37b4758045298afb267efa82 SHA1 8ff46358a7725142aba08a266ce96f7e54d340b6 SHA256 02979b71f924e91adac28c227d1ccb86e266a038a0802f5f4946dbfe62aa16bc
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
diff --git a/net-misc/nx/nx-3.3.0.ebuild b/net-misc/nx/nx-3.3.0-r2.ebuild
index f540143e0716..4710b7e16836 100644
--- a/net-misc/nx/nx-3.3.0.ebuild
+++ b/net-misc/nx/nx-3.3.0-r2.ebuild
@@ -1,18 +1,19 @@
-# 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/nx/nx-3.3.0.ebuild,v 1.1 2008/11/24 14:08:17 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.3.0-r2.ebuild,v 1.1 2009/01/16 10:51:59 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_NX_X11="nx-X11-$PV-4.tar.gz"
+SRC_NXAGENT="nxagent-$PV-9.tar.gz"
 SRC_NXAUTH="nxauth-$PV-1.tar.gz"
 SRC_NXCOMP="nxcomp-$PV-3.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-2.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-3.tar.gz"
 SRC_NXCOMPSHAD="nxcompshad-$PV-2.tar.gz"
 SRC_NXPROXY="nxproxy-$PV-2.tar.gz"
 
@@ -34,7 +35,7 @@ RDEPEND="x11-libs/libXau
 	>=media-libs/libpng-1.2.8
 	>=sys-libs/zlib-1.2.3
 	rdesktop? ( net-misc/rdesktop )
-	vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+	vnc? ( || ( net-misc/vnc[server] net-misc/tightvnc[server] ) )"
 
 DEPEND="${RDEPEND}
 		x11-misc/gccmakedep
@@ -43,33 +44,37 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-X11
 
-pkg_setup() {
-	if use vnc; then
-		if has_version net-misc/vnc && ! built_with_use net-misc/vnc server;
-		then
-			die "net-misc/vnc needs to be built with USE=\"server\" for VNC support"
-		fi
-
-		if has_version net-misc/tightvnc && ! built_with_use net-misc/tightvnc server;
-		then
-			die "net-misc/tightvnc needs to be built with USE=\"server\" for VNC support"
-		fi
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch "${FILESDIR}"/1.5.0/nxcomp-1.5.0-pic.patch
-
+	# 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
-	eautoreconf
+
+	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() {
@@ -87,7 +92,9 @@ src_compile() {
 	emake || die "nxproxy emake failed"
 
 	cd "${S}" || die "No nx-X11 directory found"
-	emake World || die "nx-X11 emake failed"
+	# 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"