Version bump, use system freetype, install default icon and keystrokes file. Keep warning for #441878 for now

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 120 insertions, 17 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 1e75f8ed963d..7eed9bf4a079 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.82 2013/08/21 06:33:19 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.83 2013/09/04 11:18:34 voyageur Exp $
+
+*nx-3.5.0.21 (04 Sep 2013)
+
+  04 Sep 2013; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.5.0.21.ebuild:
+  Version bump, use system freetype, install default icon and keystrokes file.
+  Keep warning for #441878 for now
 
 *nx-3.5.0.20-r1 (21 Aug 2013)
 
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 3f4d61adb9d4..28fbfd06bb2f 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -11,6 +11,7 @@ DIST nx-libs-3.5.0.15-full.tar.gz 21887518 SHA256 0edfe8031e917bec5f9b1fb3750022
 DIST nx-libs-3.5.0.16-full.tar.gz 21892581 SHA256 f0f1ac10ce64072df99a11617e3bbd61b71fb93db590236ce4d0b031cf3eae5c SHA512 9b8dc9885906e191c8874a265aabccd18c2423a15b929f2c68243343e72497861c246de61cd87476e30fa2ae54bfe8b3947c6efb752596b2ee2b401044295b60 WHIRLPOOL e9399827420cc36f1b2f46fbe30d6a2519357f4f4278edada93ddf434c9be17dcb1db59ca99026230c51be0c29558948f768eb9b69c71a9fda9e4045a6755f7a
 DIST nx-libs-3.5.0.17-full.tar.gz 21873898 SHA256 199bbcb0efd400b0c9440c1fca2d738e10a11ccef7f7a809656b3286fc5215cd SHA512 fc31f642cbc9fc4a9f480e827426e4cdf4cfe90fd81b8212783a78aca00685e271afb9b17d176ce4b35ac42d0030933e92b944193cd3d8605ce3dfff08f3d3d7 WHIRLPOOL 8cd9a2592a993d59a928961fbeabed11fb2f7346d3ec75d6a41d630a8f375ba25a8d82f006472d3a815aca7957d98a30f3e21a5b80453009f315c1072bae3724
 DIST nx-libs-3.5.0.20-full.tar.gz 21875905 SHA256 ce53b1c1cc5115d1303b652099c7b7e1a50a996ff0f136853a6fd54bb5668da8 SHA512 0cecdde638c454e6bf48cb73037a0b6651eda4cf93c5953f678a122219df6c06cea70509b044482ea1b630ae413b26a701341b20d55347b57170517aa9709eef WHIRLPOOL a2d8e64db333d02ca22d0d0a8e9e2ea97199fb3315af8cb60ffd617a8e8a0b2851ce87d912d40c3cd00e7455a67a096ac48360a5a1df2ffb4c627ecd0dbed513
+DIST nx-libs-3.5.0.21-full.tar.gz 16734083 SHA256 dedc80385746ce9cd9e41f8d08c2e29e0d2b660df6910cef3ee685c08d3ba12c SHA512 8a816e5a1e78b554fe75f4cfcd7987311b3306eebea0fb3a833cfa125bc0e91fb2a1a4a14d620d4f9b0409622fbcc5890a99aecc068abf99f2627584ac739b72 WHIRLPOOL 76e49c3d33ff84df513d27964bb0a54def66c0e10dab4898a9afe0204dd0c51e886b9fd9dfd8849ef3aaf7a9775dd76f4c248e33ef8333b4fa04fad662d87acf
 EBUILD nx-3.5.0.14-r1.ebuild 2583 SHA256 e925145052a03be959747dc211d456083f9f42cf2d4ac8a30f4f252d1856cf99 SHA512 7d6018c5eb4c640de63ad50116de8fc4d4a37e39932d5c4bcbd6764030fadf072dc94e7e629b4635dbcefa6ed1a77c609e07870c06c7019475d94b9092392af3 WHIRLPOOL 95ab93868ceff0c0ff954d8580eed2ba2b8bcca1a5fd94aeeb2bd9a290caa7f6cf059c3a8026e90dc9bef9e3b301723c08ea48aeb4534abfbf825b9e16db4813
 EBUILD nx-3.5.0.15.ebuild 2573 SHA256 d6c4be35c34c53eac912d8c8b9b5337286208ae50b188375d041869d5dee9b12 SHA512 d92e15144ad86eb29e4e74b05dda1d8dcf3644e21d63cc24c28eec4f560b2dfa231e7d1e59485dd0812012ffb31ce5a5337479be7e56158a8fdb10676ddb34b2 WHIRLPOOL d3ebc23e01f33b890fdd3a758622c7cc73a37740bf2dacb8edb84132825b4d3c61ef1f8948d762a1340c172d75d0841583d9241e7f69ee28213c392642eec517
 EBUILD nx-3.5.0.16.ebuild 2580 SHA256 6178bdf080ecd1e650596e073bce03d1d3a6e6bfb4f77e6b6f95d860b021b22c SHA512 c3e9b38075f24cf32e0d0cde98b9f95c43b43788d90f208bbb2b4299875d1e5364b5e2c562858761f6049db061df31f5ce0caa22e680578272979752bd9ba6db WHIRLPOOL e34eb74540ae9c04c3aad2140fd129eae91394ee184cb31c5afae396cd7a3f23e3d7f04b6e4496910de48fce0c2b92ffc1593545f76a40107910ea43d57e0b36
@@ -18,24 +19,13 @@ EBUILD nx-3.5.0.17-r1.ebuild 2686 SHA256 0ee40e5aa6402a64e1d864ab2c6f77551dc55ac
 EBUILD nx-3.5.0.17.ebuild 2594 SHA256 e3ece940a0fcd8794e0f8a28e203be8285db900a752b877dd8bc3526891f4c0f SHA512 9b26323fe9a5ce032e3d78a6fc669341e734d7309d2983b2a4f0be565f62c61125a2b5dc8d55edf5cbe5a1daaf2dc6541af4de3d14c568d199fbc01333d719e6 WHIRLPOOL 8278e288adcf56ae8e63fabd450e815163134d421cd79cffce9517d10280eeccb691511b8c3d7157c867c9862f44a235c9f24fd5265287e34d2316b1e7e8e495
 EBUILD nx-3.5.0.20-r1.ebuild 2844 SHA256 75cd946905432a290449c68cce0f4c8c4eab9e9cd4570c4e1f4dc39ef683cf93 SHA512 41666f70d2491e6c0e7fc6b8771c248a4dc0d2892ee1d2f4ae85fdd1f73a2d661d184dd3452b57b0fcdca452a185b05cca4498589a023fce3d51f35b992c7ddc WHIRLPOOL 84c3083541915fb54eb989d3c8f3970fecd4c2c1c4891ea9b7d0f26f0147520fb077254bd09e575e46bfbab11f04be04a7ee9f6674e96d2f67fd48333ff7d072
 EBUILD nx-3.5.0.20.ebuild 2686 SHA256 5a9dcfbe7ee27275b2af0f4c1755f359287291ccd928e19b36d26307cb2d3202 SHA512 7d6abda7ab08acab12b8d50538d99e7d010320e8c05f35329b04ee2dec44c204bfd7434fa4df571e61b01569d8931b1323ae0b52ac1e7bff4dbe7ec1f4abdadb WHIRLPOOL bc5b506364c8bf00b466bb009a2089c08a47bea3969c1610cc76c44d7ee147f923f8252d501610a0baed813b47cd78f18b54d6a540c4319d00dd458d20fb7de6
-MISC ChangeLog 12893 SHA256 babe66abb0bb5f860e9137eef30755f14ce257c0311ced654f59933edca40117 SHA512 cc067ba87176ac1282727c496317182c3314839653012203924644eb5ec5443f4dae154566628158f6e3df3023ed7645206dc1c3e1981adcb09fa51ec2ab935f WHIRLPOOL a210ff99d1b95f65143ce501c2e44dde9ac9c180767d5aa62b37b6d53b608188094e38cc83f09b9b282dd9713237fd8024cd075ac6f5b48d9b0361308f5d9529
+EBUILD nx-3.5.0.21.ebuild 2925 SHA256 b60ac2125f55522b3d4fb0f4f5955766bb0728a8643f04d618c2806c842dd112 SHA512 63086a7d46136775eeb15f257726fdca7e1cabf46efbfd4ba727764d748ee59f991c26ac967685498981c6a798a30cf9da9984bb1f3eb18cd0403be975df6c55 WHIRLPOOL 7640b4e3fb1119aaa03ef4463d2b719fb7f3aafbee0e9e2107b7c16ff37144f795efa2cc3a4b6e79f5444e5dc328e15ce13fd73586a0f85738b81486e0cc9543
+MISC ChangeLog 13114 SHA256 199b095f4c195d1dedb0992ca317bcbf1d7d9e3fb0bba93f74183335552d869c SHA512 5a1d895f0dab190f382ded63c1e0b8e65aae22e6dd89b798471ce7ec71d3a7f6b69f158b786fbc26f16bf279b85fa689c37e6df7a0e66be918530eea1528f658 WHIRLPOOL fac8fc86a4ebcac1f1955fd5cc7e1f5628a444ce50614ef2add56c35c2d3944e9df93f102ed96d463b9e4bb52ebe611b42fb388bb0661220f382b0923df3d57f
 MISC metadata.xml 254 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 SHA512 ec6af573e67162251786be7ef21a5ea10a4c5ca8b9f080828fa5b72f5d20862150b5033f80afdb6665b243bd24d1c82348b65c91855f4756c5585738a7ce4286 WHIRLPOOL 4456b9fe62e80868740cabd66c246a77ebdab37904be853b977a38a974f07e89d3abcd82e3502e741bc7004016b455768b08ba9cda76bd42a535b1d3ac6ca2ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSFF8zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DzilumQEP/1P2VvAbCL02Y/7oiTILHjlD
-T5F26JfaJaEtIxueXJqR+FjTy1Ir3zen6bOCatUby2+GetU0MeF4auzsu4phwTBk
-cnnlHvIsxlTTystET729wNbUqZ3fo/pmK7jeV3oxkW0O/Z43uv9xvyltCRJqjgZm
-fSsOlNfKc78taoUZ4Io4Ig40a2dUPmYpstp11JtxZEgHNJbm2vVZP0ZX9QTMf5j1
-FLIyqyQlLHLdovD+aL4XAqyFThg4cPcTa4dIoaU2JOXcfYwVlGrm5porrwZ9o27v
-db6/KIwxgmYacmqP7XxwY+5kxsbQhygTdQPgDAK5UP0eUuPrkcS/SbkZljEEvHml
-7V0301W4e4dDpQv4TXIkcBdc+BSXQ1yMsRV+v/NjJfxlcU+guL8WeTb7FLVRkefK
-aZJ2LUQb7fWKiS8301mRnM5htO1zQroloAMqKked7mRIsT6FYN/VooyFKKeSqhSd
-9ZUURg/BUT9sKmvMU7yj/epvAeUBww62epPeFETU8XN5VacbCtD+7bD4cpWuP8NH
-dl+YB8l9EJepE2yoEWPgjOyCaHOWJYAzr1MXNjlqMkt1QoPIKFbJaHwaruRWeaN6
-QrfCoKwkujMu6O3Pg92CUtiCZKAspYjKTuAOVXPFfXuABMHop3amlCOX2NawcaUw
-NiPy4haP+JZWLG2rvUZL
-=sH+1
+iF4EAREIAAYFAlInF4gACgkQFYEBGcdFJfLdHQD/Z7eHGprgh9Df+pM3r1qC3Bgl
+lTPHHNi2xpvHghkjGmIA/3ghdHbPTjeSQJcCl3Nze+0Q04sBIX+1u6f7RLCezG+d
+=7C2M
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nx/nx-3.5.0.21.ebuild b/net-misc/nx/nx-3.5.0.21.ebuild
new file mode 100644
index 000000000000..a72c60c121e9
--- /dev/null
+++ b/net-misc/nx/nx-3.5.0.21.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 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.21.ebuild,v 1.1 2013/09/04 11:18:34 voyageur Exp $
+
+EAPI=5
+inherit autotools eutils multilib readme.gentoo
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.nomachine.com/developers.php
+	http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
+	media-libs/freetype:2
+	>=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}/nx-libs-${PV}
+
+DOC_CONTENTS="If you get problems with rendering gtk+ apps, enable the xlib-xcb
+useflag on x11-libs/cairo."
+
+src_prepare() {
+	# For nxcl/qtnx
+	cd "${S}"/nxproxy
+	epatch "${FILESDIR}"/${PN}-3.2.0-nxproxy_read_from_stdin.patch
+
+	cd "${S}"
+	# 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
+	# Drop force -O3, set AR/RANLIB and
+	# run autoreconf in all neeed folders
+	epatch "${FILESDIR}"/${PN}-3.5.0.17-cflags_ar_ranlib.patch
+	for i in nxcomp nxcompext nxcompshad nxproxy; do
+		cd "${S}"/${i}
+		eautoreconf ${i}
+		cd "${S}"
+	done
+
+	# From xorg-x11-6.9.0-r3.ebuild
+	cd "${S}/nx-X11"
+	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}
+}
+
+src_configure() {
+	cd "${S}"/nxproxy
+	econf
+}
+
+src_compile() {
+	cd "${S}/nx-X11"
+	FAST=1 emake World WORLDOPTS="" MAKE="make" \
+		AR="$(tc-getAR) clq" RANLIB="$(tc-getRANLIB)" \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+	cd "${S}"/nxproxy
+	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}"/nx-X11/programs/Xserver/nxagent
+	dobin "${S}"/nx-X11/programs/nxauth/nxauth
+	dobin "${S}"/nxproxy/nxproxy
+
+	for lib in X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xinerama Xpm Xrandr Xrender Xtst;
+	do
+		dolib.so "${S}"/nx-X11/lib/${lib}/libNX_${lib}.so*
+	done
+
+	dolib.so "${S}"/nxcomp/libXcomp.so*
+	dolib.so "${S}"/nxcompext/libXcompext.so*
+	dolib.so "${S}"/nxcompshad/libXcompshad.so*
+
+	insinto /etc/nxagent
+	newins etc/keystrokes.cfg keystroke.cfg
+	doicon nx-X11/programs/Xserver/hw/nxagent/x2go.xpm
+
+	readme.gentoo_create_doc
+}