Bump to update components to latest maintenance release ones

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

3 files changed, 40 insertions, 44 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 8e7f7aae21fd..051d3d8f5e96 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.63 2011/10/26 18:34:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.64 2011/11/04 15:52:52 voyageur Exp $
+
+*nx-3.5.0-r2 (04 Nov 2011)
+
+  04 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> -nx-3.5.0.ebuild,
+  +nx-3.5.0-r2.ebuild:
+  Bump to update components to latest maintenance release ones
 
   26 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> nx-3.4.0-r3.ebuild:
   Apply nx-3.5.0-libpng15.patch also to 3.4.0 wrt
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 7d7593520c45..99b032571f79 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -11,15 +11,13 @@ 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
 AUX nx-3.5.0-libpng15.patch 835 RMD160 7c6685ee2e2ad4d5ac69052123bc1403d149388f SHA1 e72fccc7b55d0bd16d155e7c225b21034aa604ab SHA256 04333308521101d7ed751d98c45ed4e34ca6e1f940a2e5914ad1c10b9d7a83db
 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 nxagent-3.5.0-7.tar.gz 1521470 RMD160 ac83227100a1b8d88b9bf29ab5fd13a4c6b3d66c SHA1 85d1ec4e36ed9899ae964fa532b958c4f514b037 SHA256 5dc8f1125f1c225a676e44817dc44b2460dfa3f6d8f8df047dc835ba24545ff2
 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
@@ -29,17 +27,13 @@ DIST nxproxy-3.4.0-2.tar.gz 80209 RMD160 137fc074cb7690fa87db17ab048f3435adecd6c
 DIST nxproxy-3.5.0-1.tar.gz 80194 RMD160 82d0e132c94ff259485ac166fa4ac380bb9371f5 SHA1 b2ca6cc1bfe1cf667f2fcd77b8fe958d1712748c SHA256 8aa59727dfcd914d73447992120e100c20d17df5aeb42c4ac6712e13d56bbb1e
 EBUILD nx-3.4.0-r3.ebuild 4039 RMD160 6e9d8cf5bcad6d6328b55388585d4e9cb89f427f SHA1 8332d2b1f4e170ce3120ab4fdb5c525f86727c74 SHA256 855171e4d6642811afb11f9e97901edd143855b82c03839d354c68128629b71c
 EBUILD nx-3.5.0-r1.ebuild 3374 RMD160 860dfd57b12a4ec6cf70ea88e1d006025b008377 SHA1 ce6d1196f1b4abcfa0b5066356997a6a67be764d SHA256 79b28bb4c5c61a8bc079ae73c9f98fea973596d553da18c28ac166a2d67a5036
-EBUILD nx-3.5.0.ebuild 3802 RMD160 07edcdc1b5309b4db7af8894524fdfdc8c95d8b7 SHA1 4872f65b32e96eda67799cd403dd15161b7ae15c SHA256 7ad6552ab8a3d0b4609ce9556833eb895f7883c0568be5378b13ac432976bfcc
-MISC ChangeLog 9494 RMD160 22e6df29702d55921c3f023bebf525df5d0e4ede SHA1 102c6889cf76b3604b456060ffca3df3db697740 SHA256 c1b16e6b9c17a069b5511dbf7d1afbe0be1e5d94289740ce8a609569a33b0092
+EBUILD nx-3.5.0-r2.ebuild 3374 RMD160 83748e6cab159aa6d375eb17cfeeca30ede952a3 SHA1 89aac89f15e9c33698dadaaf45af0c1ad25025de SHA256 922b2406d5ca48b11ee055ccaea4a1b0124255e3a5b03d186c241c55794f1922
+MISC ChangeLog 9681 RMD160 c278e93be6dc9ab1cfb4f8393450564ae82550a3 SHA1 08a50134c5f86f81656f3faa6d129a3431ef9c66 SHA256 9e47d1eaebcad5a86815e1e7e94a5723c638d2203ee345f3c3dfcc0d1f52df32
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOqFJfAAoJEEdUh39IaPFNcVUIAKOPyyMHHAY/i7k3yfO9v5+4
-NCQLHeYEFNOr1ouITD4tw7Oe2p5gQiAqFOiCcD6xyLu+SFJOw6J0twcqI55wBJpx
-9VFumFrhnImL/iT3sVkWK60ziG2++kgdFyRSaGG+jxZIUw+v7N0rNgsoOzcVccme
-8A4WPUs3L0eOtSISeFAM3eFl1qES3wWxN/l3I02yGN/mL2TII5xRyMKvLdoMzLDc
-vvRJR6U+we3NVvga1qZ/UC+r1dbU1RC6eO/FcqhftpV2Dv5553JcKe4L5jE/qGax
-gl71mLNK0y/dBRQPPQGJEFnrp7vXo02eiX85BCWshkp1aNNshp4QshUTe91nwO8=
-=CcZU
+iF4EAREIAAYFAk60Cl8ACgkQFYEBGcdFJfJtcQD/Q3mRxLLMXcnv9GatTMo61W9O
+dbJyWqJ8h9yOSVEQV/QA+wTHuFDIwC041vkZRdYoqV1trdojYMy3NHpAu+z39WVv
+=lSYy
 -----END PGP SIGNATURE-----
diff --git a/net-misc/nx/nx-3.5.0.ebuild b/net-misc/nx/nx-3.5.0-r2.ebuild
index 6020c9a33614..327055e67364 100644
--- a/net-misc/nx/nx-3.5.0.ebuild
+++ b/net-misc/nx/nx-3.5.0-r2.ebuild
@@ -1,18 +1,18 @@
 # 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.2 2011/09/14 12:44:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.5.0-r2.ebuild,v 1.1 2011/11/04 15:52:52 voyageur Exp $
 
-EAPI=2
+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-1.tar.gz"
-SRC_NXAGENT="nxagent-$PV-2.tar.gz"
+SRC_NX_X11="nx-X11-$PV-2.tar.gz"
+SRC_NXAGENT="nxagent-$PV-7.tar.gz"
 SRC_NXAUTH="nxauth-$PV-1.tar.gz"
-SRC_NXCOMP="nxcomp-$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"
@@ -22,9 +22,10 @@ SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY $UR
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="elibc_glibc"
 
-RDEPEND="x11-libs/libXau
+RDEPEND="elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) )
+	x11-libs/libXau
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXdmcp
@@ -47,6 +48,10 @@ src_prepare() {
 	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
@@ -70,39 +75,29 @@ src_prepare() {
 	# Respect LDFLAGS
 	echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
 	echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+	echo "#define BuildXInputLib YES" >> ${HOSTCONF}
 }
 
 src_configure() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	econf || die "nxcomp econf failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-	econf || die "nxcompshad econf failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	econf || die "nxproxy econf failed"
-
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	econf || die "nxcompext econf failed"
+	for i in nxcomp nxcompshad nxproxy nxcompext ; do
+		cd "${WORKDIR}"/${i}
+		econf
+	done
 }
 
 src_compile() {
-	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
-	emake || die "nxcomp emake failed"
-
-	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
-	emake || die "nxcompshad emake failed"
-
-	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
-	emake || die "nxproxy emake failed"
+	for i in nxcomp nxcompshad nxproxy; do
+		cd "${WORKDIR}"/${i}
+		emake
+	done
 
-	cd "${S}" || die "No nx-X11 directory found"
+	cd "${S}"
 	# 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"
+	FAST=1 emake -j1 World WORLDOPTS="" MAKE="make"
 
-	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
-	emake || die "nxcompext emake failed"
+	cd "${WORKDIR}"/nxcompext
+	emake
 }
 
 src_install() {
@@ -120,6 +115,7 @@ src_install() {
 
 	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*