Bump to update components to latest maintenance release ones, support libpng 1.5 (bug #378285) thanks to ssuominen, add libXi to fix undefined symbol (bug #317863), EAPI 4, and ebuild cleanups. Also add ~ppc keyword (tested in 3.4.0). Still need to fix glibc-2.14/rpc support

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 150 insertions, 5 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 1715925a236d..8bff76cb145b 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.58 2011/06/30 14:50:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.59 2011/09/14 12:44:37 voyageur Exp $
+
+*nx-3.5.0-r1 (14 Sep 2011)
+
+  14 Sep 2011; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.5.0-r1.ebuild:
+  Bump to update components to latest maintenance release ones, support libpng
+  1.5 (bug #378285) thanks to ssuominen, add libXi to fix undefined symbol (bug
+  #317863), EAPI 4, and ebuild cleanups. Also add ~ppc keyword (tested in
+  3.4.0). Still need to fix glibc-2.14/rpc support
 
   30 Jun 2011; Brent Baude <ranger@gentoo.org> nx-3.4.0-r3.ebuild:
   Marking nx-3.4.0-r3 ~ppc for bug 344041
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 532e5e768638..cd33e595536d 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576bac9913cc SHA1 97402172c1039e4f86b977f27a4571a8a77d1c6b SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971
 AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e80cea SHA1 f3febd574eb07c244a6fc91323631f99fad5fa34 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e
 AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973
@@ -8,12 +11,15 @@ 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-3.tar.gz 20245244 RMD160 98f0a39ce7dd0ba2ddfe6f1e7db0c8a2384b78e4 SHA1 74dbc9cfea6d93361e362298421cdac82f5d910d SHA256 7819ffb49859277ae5003574b683410c6ff03e80dfb523da7c32dbf70774a903
 DIST nx-X11-3.5.0-1.tar.gz 20219290 RMD160 36075707cc2599f62e236f00951eaf345090578d SHA1 41391a796cf7ceaa5874eec7d7b1d08a473f04b6 SHA256 a81672d918c72d425a4eb2a98b454586b3f396e46f108c2b4945ff5e41e9fc4d
+DIST nx-X11-3.5.0-2.tar.gz 20345475 RMD160 85ca4499c46fce1bebbf7b96101dd764d1ba7f35 SHA1 cf85890dad11cb9edc382d7e540fdc866fe82e04 SHA256 11a48ea553c31da9f04a1dfa0a190efa7eed3b6bd4280a22ddbd602a754cbe22
 DIST nxagent-3.4.0-11.tar.gz 1558371 RMD160 cf9eacae4fcd76cd4dee895ec47d1c3867c99201 SHA1 25d0090c99df7513b0979773c22fe75084404683 SHA256 0fc1a4b0888a51047d9771031668ab1e8d7a02aa0d733597e8a820098b924026
 DIST nxagent-3.5.0-2.tar.gz 1563203 RMD160 2fc11e77d968d618bf9d2d817214cce7164dddf2 SHA1 321f99efae9ee5e99307051c7607388606322d60 SHA256 d6b1e88576241be1097c9dc3fdcb69ae77c4716beceb0ad0e56d2e5827ec6adc
+DIST nxagent-3.5.0-5.tar.gz 1515411 RMD160 092a8f79416a6426fd7f982e8698086658917446 SHA1 e7b013e7c349fb8a69046f2eaa7f325b4fd96be8 SHA256 74ebd64d350002433e93a4a13dddbbee416547e6a33048a044272bf4412ad864
 DIST nxauth-3.4.0-1.tar.gz 30613 RMD160 ccae2bd5983905666e50e67697f4e19c3a72ffbb SHA1 3d367e0e11baeca8028a73473deace0aec998cd0 SHA256 49b20af35ccd16f5871e409f959a692d4dca3d65ea6d5f7007daa81adebb400b
 DIST nxauth-3.5.0-1.tar.gz 30671 RMD160 497e602744a2421da294aad5cc3122e8c8e00047 SHA1 d876bb0e8df7978f3142c92cf804f5b6f486f0c7 SHA256 93d730075c486dba7c8fdd41e1465f0712237cb9580d195f65784ce203ce3257
 DIST nxcomp-3.4.0-1.tar.gz 534482 RMD160 1ed59164ca73e2c52d560bf15d3a350a512716ce SHA1 6ebc7451896293df2b6fb488567d70d686ece9ee SHA256 db439fde378776997775294b01933e28c1ecd3670ace8b4cf7d831177006d73a
 DIST nxcomp-3.5.0-1.tar.gz 534205 RMD160 5a115c7f0be26c15b86f03bd82bc11e6ba17d2fd SHA1 cee6b79ebce967703ae1eca7dfe805176f7d2bc6 SHA256 de2f62258c9f049ca89af53a957c30232720e60c39925281d901467cd5e9d0be
+DIST nxcomp-3.5.0-2.tar.gz 532999 RMD160 b537b40aedcc0eca6cfac14da8ff702857e04c28 SHA1 4028078d3318c2287b13b1c81f2ce1ccb69273ad SHA256 30a51228509a083b4196e86596a6efb85b2e75e703f5d842158c9a27abb6ebc6
 DIST nxcompext-3.4.0-1.tar.gz 90215 RMD160 99205a950af62641a04faf234431f7411b06320f SHA1 2a594c6cdb837a2de20079db0702daa2ba1c288f SHA256 75be77fe0cdc3aca21afd0b72590d600b131b849b8e65926c237c3d87dd1160e
 DIST nxcompext-3.5.0-1.tar.gz 91725 RMD160 69a8ed8e0f3ddd2ef57c3a2898f4bcc0e90adb76 SHA1 91a26af67e455d68822737934a08c9990674408f SHA256 abc94c5465ea72f2aa282680b06ca840d70edb8b4d9e512b69acc0dbaa7f8af1
 DIST nxcompshad-3.4.0-3.tar.gz 77220 RMD160 861366ef776aa71fcfdba25ae21e8ece135ad8fc SHA1 93df71868b7eb74cb9fae9f4f8b9630e51f8191a SHA256 8c5a67ea156afb0fb2a50adbb89b8b26b6f0860cf3f53c45eb53f59ec4deaa98
@@ -21,6 +27,14 @@ DIST nxcompshad-3.5.0-2.tar.gz 77293 RMD160 5bfb7b929cf6a809dd279254df37f83721aa
 DIST nxproxy-3.4.0-2.tar.gz 80209 RMD160 137fc074cb7690fa87db17ab048f3435adecd6cb SHA1 7d359c3e50708c4e774b126cc1e646c5f6ed3c3a SHA256 ecf740db00f2a223f520809f6cf5623d05eb2709e2ea8eadfb9a97b906fabfa6
 DIST nxproxy-3.5.0-1.tar.gz 80194 RMD160 82d0e132c94ff259485ac166fa4ac380bb9371f5 SHA1 b2ca6cc1bfe1cf667f2fcd77b8fe958d1712748c SHA256 8aa59727dfcd914d73447992120e100c20d17df5aeb42c4ac6712e13d56bbb1e
 EBUILD nx-3.4.0-r3.ebuild 3987 RMD160 371bdab9488958b8488f269e363b6902a8b5d7e5 SHA1 8ed054dd58008714d96e8cadb9c519a1f0b91976 SHA256 dc6542b6be153bed0d45a1ef0d58fe96c813d74f9192d9088e334ba8b69e6f21
-EBUILD nx-3.5.0.ebuild 3797 RMD160 4ece63309564493995b9d207c0929d6e448e83d3 SHA1 f80975995cbd6eaac1aa2651c5ab879ed6ca064b SHA256 0675077a39e434a7a05592972de43630e1da0f2fc41c6eaab792f479dae87f4a
-MISC ChangeLog 8511 RMD160 12b88fd65e136151384b8addbf36417fdc0f1cbb SHA1 a76d21ddeb3079ca78eeb51dcdee799db8a4afff SHA256 fdb5a21f2db342c90826510dfa766a0c5e3e052325482cb85046ea078dbbc3f3
+EBUILD nx-3.5.0-r1.ebuild 3374 RMD160 9a8f1b3a45df48c7b03174f6a4dd3cf564cbca60 SHA1 cafa03f40b348865f9b5d17d0cb654dfdd4efd1f SHA256 d21ccbbe7ab932008b9076c352952f61529ee430c62f4eddb181935543014481
+EBUILD nx-3.5.0.ebuild 3802 RMD160 07edcdc1b5309b4db7af8894524fdfdc8c95d8b7 SHA1 4872f65b32e96eda67799cd403dd15161b7ae15c SHA256 7ad6552ab8a3d0b4609ce9556833eb895f7883c0568be5378b13ac432976bfcc
+MISC ChangeLog 8902 RMD160 1b9ab05c59d43a9de74e3928b10de821aa2dd9da SHA1 06873390b42f467f2b3f00c0f41e0b9c6eda92d4 SHA256 e583dc6545ff117228907cb2d669508b83042eb05b085717692b61b2590b7b85
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5wocEACgkQFYEBGcdFJfLa6QD+KtAHmV3OlWSBYxcGjeKI4cQ0
+y31L09HhN1ueLsVeDGAA/Ro0hsF+eY2Sl15d9SztoOhsDcXRN9mc3csfhNpfT3TH
+=dLES
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nx/nx-3.5.0-r1.ebuild b/net-misc/nx/nx-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..e3ca14558461
--- /dev/null
+++ b/net-misc/nx/nx-3.5.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0-r1.ebuild,v 1.1 2011/09/14 12:44:37 voyageur Exp $
+
+EAPI=4
+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-2.tar.gz"
+SRC_NXAGENT="nxagent-$PV-5.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-2.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-1.tar.gz"
+SRC_NXCOMPSHAD="nxcompshad-$PV-2.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-1.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 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg"
+
+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
+
+	# libpn-1.5 support
+	cd "${WORKDIR}"/nxcomp
+	epatch "${FILESDIR}"/${P}-libpng15.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}
+	# Respect LDFLAGS
+	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define BuildXInputLib YES" >> ${HOSTCONF}
+}
+
+src_configure() {
+	for i in nxcomp nxcompshad nxproxy nxcompext ; do
+		cd "${WORKDIR}"/${i}
+		econf
+	done
+}
+
+src_compile() {
+	for i in nxcomp nxcompshad nxproxy; do
+		cd "${WORKDIR}"/${i}
+		emake
+	done
+
+	cd "${S}"
+	# Again, from xorg-x11-6.9.0-r3.ebuild
+	unset MAKE_OPTS
+	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make"
+
+	cd "${WORKDIR}"/nxcompext
+	emake
+}
+
+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/Xi/libXi.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*
+}
diff --git a/net-misc/nx/nx-3.5.0.ebuild b/net-misc/nx/nx-3.5.0.ebuild
index 29f664fc6a2f..6020c9a33614 100644
--- a/net-misc/nx/nx-3.5.0.ebuild
+++ b/net-misc/nx/nx-3.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.ebuild,v 1.1 2011/05/22 14:33:10 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0.ebuild,v 1.2 2011/09/14 12:44:37 voyageur Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -21,7 +21,7 @@ SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $UR
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libXau