Adding back nx 2.1 (under p.mask)

svn path=/testing/; revision=197

3 files changed, 136 insertions, 1 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index c8f9d85..e0de579 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -2,13 +2,21 @@ AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576
 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
 AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
+DIST nx-X11-2.1.0-3.tar.gz 32532518 RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 SHA1 3cb5bfa0bed63b71077d9c38b8e0fdf54f2f00e1 SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4
 DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
+DIST nxagent-2.1.0-20.tar.gz 951225 RMD160 77139161c078d2ce3fa752e39df6a09f2be452f8 SHA1 2a11691aecd4662f926071439f1cce7ca7e941aa SHA256 e0378c4e497ce68446a1a8f7616d8b917c7d23e8d13c62486aca9945f8787aa1
 DIST nxagent-3.0.0-85.tar.gz 1537674 RMD160 5c80dbf2c016fafe9e20816c3e7b0fd5291f368c SHA1 f8a18851346454b4c05491db1fe067c812fed717 SHA256 3d5b223e7bd0ae3ba4348fe5afee62d22cf457412f254c33fd11ae5898a716d9
+DIST nxauth-2.1.0-2.tar.gz 30296 RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 SHA1 5027488e7c7252d74971934600cbf9eaf90fec7b SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799
 DIST nxauth-3.0.0-6.tar.gz 30474 RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 SHA1 4813adbfb99908da73979456fa381a40fea7489e SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62
+DIST nxcomp-2.1.0-8.tar.gz 556291 RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 SHA1 a5465b9062aab9e0db5dcab7dbc86c81b40cae37 SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776
 DIST nxcomp-3.0.0-43.tar.gz 530677 RMD160 8d0d04333b1a90d10da0d4653e196c1754dcab28 SHA1 af6554c2748691f6d5206d23215b6acc45141f9b SHA256 cff0ae97284b8a6d32f57cf20617e6aa021565fe3595545e888eeaaaf5aef48e
+DIST nxcompext-2.1.0-5.tar.gz 102588 RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 SHA1 788690ac52eebd2613e6d774679ab133270ff172 SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c
 DIST nxcompext-3.0.0-18.tar.gz 89984 RMD160 8b4e483e0226041d758920957b4a20626342b797 SHA1 ef7021673fbbe11ed5635c1f58052127c0d7466a SHA256 a6c2bb400d6a970e94db453491d345cbeebd4be0a1b3969b38281a658f6fa554
 DIST nxcompshad-3.0.0-19.tar.gz 71747 RMD160 0a0d1142024544956eece74d0ea5929ebdb67ec8 SHA1 37519203e0a12762607f64c3978f01383dab81df SHA256 0011b7cff616001e7e9f846ed4f128b39ed6a4a0a40aa62138afc13fbb0c6cec
+DIST nxdesktop-2.1.0-10.tar.gz 570224 RMD160 7e40aa6807d4565322c9f784341a3521d3feabf5 SHA1 e3c2bc13dc31df4888caff32cb69c8fb216d7855 SHA256 320b5eda1df461228ba6a45a4edf31dd1a10ac1e44abe14ff7fef207b346bc0c
+DIST nxproxy-2.1.0-3.tar.gz 82753 RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e SHA1 2ec0bafb9546bbde155baeb844454da704aabcc9 SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac
 DIST nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc6591892 SHA1 b4e22c541f3ae6f08f16c0239494475519de4045 SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954
+DIST nxviewer-2.1.0-12.tar.gz 228158 RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec SHA1 af1f6dc337cd13739037c45d9284c7596e87c732 SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178
+EBUILD nx-2.1.0-r1.ebuild 3059 RMD160 61da28df62a27565fe378bf7e6a1762665bcf4ce SHA1 adc4dd076f0b4269fc6a0f26eb198a5624d5b7f0 SHA256 c7ef5d61c916809bf8ed2be33786b97cd56df00f0b9f9f99236fa85f8d70b195
 EBUILD nx-3.0.0.ebuild 2703 RMD160 e2dc0de13a428f04967694faa93fa905d44ba4aa SHA1 967eaf032227ef121be46bf173f83551553613d7 SHA256 e5a56cdfd58bb7c69b6249748dab36df7fb6d9d91d0c0fc41756b80ae2fdaf53
-MISC .nx-3.0.0.ebuild.swp 12288 RMD160 3468633aca29a56b621b259fa8a311c0acda359b SHA1 f2fabb05f9c852388db56f0b63a50b154d81844b SHA256 f0e0dbb3409f181b587e772f99494b912995c97499889f31f71d0c8a2bd3bafe
 MISC metadata.xml 312 RMD160 245dc74ea927b730125f0581c38d728319a37824 SHA1 e586c8dc5fbbcdddacf4bdf7fc739bfc9fb716df SHA256 9d3698e1818b09e36ecd3350cf578e2561794828453110d2645c6cceca1cf7dc
diff --git a/net-misc/nx/nx-2.1.0-r1.ebuild b/net-misc/nx/nx-2.1.0-r1.ebuild
new file mode 100644
index 0000000..8eace27
--- /dev/null
+++ b/net-misc/nx/nx-2.1.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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-20.tar.gz"
+SRC_NXAUTH="nxauth-$PV-2.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-8.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-5.tar.gz"
+SRC_NXDESKTOP="nxdesktop-$PV-10.tar.gz"
+SRC_NXVIEWER="nxviewer-$PV-12.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-3.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_NXCOMP
+	rdesktop? ( $URI_BASE/$SRC_NXDESKTOP )
+	vnc? ( $URI_BASE/$SRC_NXVIEWER )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="rdesktop vnc"
+
+RDEPEND="x86? ( x11-libs/libXau
+		   		x11-libs/libXdmcp
+				x11-libs/libXpm
+				>=media-libs/jpeg-6b-r4
+				>=media-libs/libpng-1.2.8
+				>=sys-libs/zlib-1.2.3 )
+		 amd64? ( >=app-emulation/emul-linux-x86-xlibs-10.0 )"
+
+DEPEND="${RDEPEND}
+		x11-misc/gccmakedep
+		x11-misc/imake"
+
+S=${WORKDIR}/${PN}-X11
+
+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
+
+	cd ${WORKDIR}/nxcomp
+	epatch ${FILESDIR}/${P}-deprecated-headers.patch
+	epatch ${FILESDIR}/${P}-invalid-options.patch
+	eautoreconf
+}
+
+src_compile() {
+	# nx-X11 will only compile in 32-bit
+	use amd64 && multilib_toolchain_setup x86
+
+	cd ${WORKDIR}/nxcomp || die
+	econf || die
+	emake || die
+
+	cd ${WORKDIR}/nxproxy || die
+	econf || die
+	emake || die
+
+	cd ${WORKDIR}/nx-X11 || die
+	emake World || die
+
+	cd ${WORKDIR}/nxcompext || die
+	econf || die
+	emake || die
+
+	if use vnc ; then
+		cd ${WORKDIR}/nxviewer || die
+		xmkmf -a || die
+		emake World || die
+	fi
+
+	if use rdesktop ; then
+		cd ${WORKDIR}/nxdesktop || die
+		CC=(tc-getCC) ./configure || die
+		emake || die
+	fi
+}
+
+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
+	done
+	if use vnc ; then
+		make_wrapper nxviewer ./nxviewer ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
+		make_wrapper nxpasswd ./nxpasswd ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
+	fi
+	if use rdesktop ; then
+		make_wrapper nxdesktop ./nxdesktop ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
+	fi
+
+	into ${NX_ROOT}
+	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
+	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
+	dobin ${WORKDIR}/nxproxy/nxproxy
+
+	if use vnc ; then
+		dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer
+		dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd
+	fi
+
+	if use rdesktop ; then
+		dobin ${WORKDIR}/nxdesktop/nxdesktop
+	fi
+
+	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so*
+	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so*
+	dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so*
+	dolib.so ${WORKDIR}/nxcomp/libXcomp.so*
+	dolib.so ${WORKDIR}/nxcompext/libXcompext.so*
+}
diff --git a/profiles/package.mask b/profiles/package.mask
new file mode 100644
index 0000000..4affed6
--- /dev/null
+++ b/profiles/package.mask
@@ -0,0 +1,5 @@
+# Bernard Cafarelli <voyageur@gentoo.org> (18 Sep 2007)
+# Has potential OPEN security bugs in its code
+# Unmask only if you know what you are doing
+# See bug #192712 for more information
+<net-misc/nx-3.0