Update some components, ebuild cleanup

Package-Manager: portage-2.1.4_rc4

4 files changed, 153 insertions, 5 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index d11e486b7203..1ded1905b398 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.11 2007/09/20 23:13:27 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.12 2007/12/03 22:17:32 voyageur Exp $
+
+*nx-3.0.0-r1 (03 Dec 2007)
+
+  03 Dec 2007; Bernard Cafarelli <voyageur@gentoo.org> +nx-3.0.0-r1.ebuild:
+  Update some components, ebuild cleanup
 
   20 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
   -files/nx-2.1.0-nxagent-mem-leaks.patch, -nx-2.1.0.ebuild,
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 480b12c8613b..f167e32a0425 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -16,19 +16,25 @@ RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 files/nx-2.1.0-invalid-options.p
 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01 files/nx-2.1.0-invalid-options.patch 978
 DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
 DIST nxagent-3.0.0-85.tar.gz 1537674 RMD160 5c80dbf2c016fafe9e20816c3e7b0fd5291f368c SHA1 f8a18851346454b4c05491db1fe067c812fed717 SHA256 3d5b223e7bd0ae3ba4348fe5afee62d22cf457412f254c33fd11ae5898a716d9
+DIST nxagent-3.0.0-93.tar.gz 1534641 RMD160 8d73b31e4c5930737b19dbb6db0a4de9b69b911b SHA1 a1ac0b4cd222b7663d2c32de7a6937c148a12167 SHA256 6cb345921fb527a7093f96484b9550526f9b9c07e9bb1210a7733cd8ce3f2e24
 DIST nxauth-3.0.0-6.tar.gz 30474 RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 SHA1 4813adbfb99908da73979456fa381a40fea7489e SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62
 DIST nxcomp-3.0.0-43.tar.gz 530677 RMD160 8d0d04333b1a90d10da0d4653e196c1754dcab28 SHA1 af6554c2748691f6d5206d23215b6acc45141f9b SHA256 cff0ae97284b8a6d32f57cf20617e6aa021565fe3595545e888eeaaaf5aef48e
+DIST nxcomp-3.0.0-48.tar.gz 500084 RMD160 0b71022cd986914d4f98144f82a6e16c487a374a SHA1 39f5fc9256e180dee9dad6ef0f2c65cbdca00bb1 SHA256 9df9122d898d8cd4bce83c3cfb8c61133b5138f83ec6887ff5944ab4bf10e79f
 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 nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc6591892 SHA1 b4e22c541f3ae6f08f16c0239494475519de4045 SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954
+EBUILD nx-3.0.0-r1.ebuild 3318 RMD160 ec6164ba91ae239540e395513f8a8f6d3b469a56 SHA1 bac06951cec8e1e46259cff3bf53d7af1190859a SHA256 25f5694a4092465330774945ec714aa7aa5881596b86db30272ad17f885339b1
+MD5 d6b896a49c0e979f059f655d7b66e43f nx-3.0.0-r1.ebuild 3318
+RMD160 ec6164ba91ae239540e395513f8a8f6d3b469a56 nx-3.0.0-r1.ebuild 3318
+SHA256 25f5694a4092465330774945ec714aa7aa5881596b86db30272ad17f885339b1 nx-3.0.0-r1.ebuild 3318
 EBUILD nx-3.0.0.ebuild 2877 RMD160 c63d57674c85dcfe30c41180a621de3db7ffb248 SHA1 9dd04ddb92173eda8afa750105c15c1f64b1c46a SHA256 4ae2434ac53802d29d93ade86e3634915840eb5436e2849524ba8cc5fdfcccbe
 MD5 44fe006e3f6bba525cef39d01911e8eb nx-3.0.0.ebuild 2877
 RMD160 c63d57674c85dcfe30c41180a621de3db7ffb248 nx-3.0.0.ebuild 2877
 SHA256 4ae2434ac53802d29d93ade86e3634915840eb5436e2849524ba8cc5fdfcccbe nx-3.0.0.ebuild 2877
-MISC ChangeLog 2100 RMD160 b29aa413e0e54fdb0b0ccea1ec8488112866789b SHA1 23f9bd50c46e127c85b5416ae9d8517f01967440 SHA256 43ea9d63833da5170dfe99338bdbc97f806ca7d25e79ec38f7d05f9ed6999c76
-MD5 2f3a4c09237544f5ff9336e67313f65a ChangeLog 2100
-RMD160 b29aa413e0e54fdb0b0ccea1ec8488112866789b ChangeLog 2100
-SHA256 43ea9d63833da5170dfe99338bdbc97f806ca7d25e79ec38f7d05f9ed6999c76 ChangeLog 2100
+MISC ChangeLog 2246 RMD160 afd5d74846fe418fe4a763ad547706ff2456ff87 SHA1 4867c905a8d12b4b7b0c13024de3dee56e1dd0e9 SHA256 63cc181f8b9345e74b1a0c4871ed3616cfa68dca7886f1ffbf03b9cb30f4441d
+MD5 65ebfb17e374e83c73b67cb5f347d5c2 ChangeLog 2246
+RMD160 afd5d74846fe418fe4a763ad547706ff2456ff87 ChangeLog 2246
+SHA256 63cc181f8b9345e74b1a0c4871ed3616cfa68dca7886f1ffbf03b9cb30f4441d ChangeLog 2246
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
 MD5 a2d70e2a73718e9fc4f8b89eecc1952b metadata.xml 254
 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f metadata.xml 254
@@ -36,3 +42,6 @@ SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 metadata
 MD5 7358bc01f54e59d931d9904ea33664bf files/digest-nx-3.0.0 1747
 RMD160 1944e6fb81b119521c2e5e392cbd35085a4e13f1 files/digest-nx-3.0.0 1747
 SHA256 339e2fa700c4fbe38f8cc97d359b55c21b860858c62d8f059fd12a02ea3064d0 files/digest-nx-3.0.0 1747
+MD5 ac3da98e0ff4429fb72464800996b42c files/digest-nx-3.0.0-r1 1747
+RMD160 c6aee97069b63678826d76539fc16d37eb094dc1 files/digest-nx-3.0.0-r1 1747
+SHA256 b2a6f5fc16ba510c9eca5e28d33740f94f2de42f190931e155d86d0770d2718b files/digest-nx-3.0.0-r1 1747
diff --git a/net-misc/nx/files/digest-nx-3.0.0-r1 b/net-misc/nx/files/digest-nx-3.0.0-r1
new file mode 100644
index 000000000000..f74f2d4119fa
--- /dev/null
+++ b/net-misc/nx/files/digest-nx-3.0.0-r1
@@ -0,0 +1,21 @@
+MD5 8b3deb7de091119a159aba15baf7f0b1 nx-X11-3.0.0-37.tar.gz 20183918
+RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 nx-X11-3.0.0-37.tar.gz 20183918
+SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df nx-X11-3.0.0-37.tar.gz 20183918
+MD5 a9e6e89644db210adfb35a04eaedfc6b nxagent-3.0.0-93.tar.gz 1534641
+RMD160 8d73b31e4c5930737b19dbb6db0a4de9b69b911b nxagent-3.0.0-93.tar.gz 1534641
+SHA256 6cb345921fb527a7093f96484b9550526f9b9c07e9bb1210a7733cd8ce3f2e24 nxagent-3.0.0-93.tar.gz 1534641
+MD5 872c9972ea9614479372c065dbcd9fab nxauth-3.0.0-6.tar.gz 30474
+RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 nxauth-3.0.0-6.tar.gz 30474
+SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62 nxauth-3.0.0-6.tar.gz 30474
+MD5 8b761b9c7544cb79e0da8de0de9d8850 nxcomp-3.0.0-48.tar.gz 500084
+RMD160 0b71022cd986914d4f98144f82a6e16c487a374a nxcomp-3.0.0-48.tar.gz 500084
+SHA256 9df9122d898d8cd4bce83c3cfb8c61133b5138f83ec6887ff5944ab4bf10e79f nxcomp-3.0.0-48.tar.gz 500084
+MD5 bafe1d93b863f4ae8e93b141f299be9c nxcompext-3.0.0-18.tar.gz 89984
+RMD160 8b4e483e0226041d758920957b4a20626342b797 nxcompext-3.0.0-18.tar.gz 89984
+SHA256 a6c2bb400d6a970e94db453491d345cbeebd4be0a1b3969b38281a658f6fa554 nxcompext-3.0.0-18.tar.gz 89984
+MD5 fb5e6c5dbbb1e453282ea6176547e987 nxcompshad-3.0.0-19.tar.gz 71747
+RMD160 0a0d1142024544956eece74d0ea5929ebdb67ec8 nxcompshad-3.0.0-19.tar.gz 71747
+SHA256 0011b7cff616001e7e9f846ed4f128b39ed6a4a0a40aa62138afc13fbb0c6cec nxcompshad-3.0.0-19.tar.gz 71747
+MD5 739c3a4d54e6e3254a13084b117ca60f nxproxy-3.0.0-4.tar.gz 82730
+RMD160 b96e8752fce7015da88e2e304c8647abc6591892 nxproxy-3.0.0-4.tar.gz 82730
+SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954 nxproxy-3.0.0-4.tar.gz 82730
diff --git a/net-misc/nx/nx-3.0.0-r1.ebuild b/net-misc/nx/nx-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..a96c73e7b628
--- /dev/null
+++ b/net-misc/nx/nx-3.0.0-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.0.0-r1.ebuild,v 1.1 2007/12/03 22:17:32 voyageur Exp $
+
+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-37.tar.gz"
+SRC_NXAGENT="nxagent-$PV-93.tar.gz"
+SRC_NXAUTH="nxauth-$PV-6.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-48.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-18.tar.gz"
+SRC_NXCOMPSHAD="nxcompshad-$PV-19.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-4.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 ~x86"
+IUSE="rdesktop vnc"
+
+RDEPEND="x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	>=media-libs/jpeg-6b-r4
+	>=media-libs/libpng-1.2.8
+	>=sys-libs/zlib-1.2.3
+	rdesktop? ( net-misc/rdesktop )
+	vnc? ( || ( net-misc/vnc net-misc/tightvnc ) )"
+
+DEPEND="${RDEPEND}
+		x11-misc/gccmakedep
+		x11-misc/imake"
+
+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
+
+	cd "${WORKDIR}"/nxcomp
+	epatch "${FILESDIR}"/${PN}-2.1.0-deprecated-headers.patch
+	epatch "${FILESDIR}"/${PN}-2.1.0-invalid-options.patch
+	eautoreconf
+}
+
+src_compile() {
+	cd "${WORKDIR}"/nxcomp || die "No nxcomp directory found"
+	econf || die "nxcomp econf failed"
+	emake || die "nxcomp emake failed"
+
+	cd "${WORKDIR}"/nxcompshad || die "No nxcompshad directory found"
+
+	econf || die "nxcompshad econf failed"
+	emake || die "nxcompshad emake failed"
+
+	cd "${WORKDIR}"/nxproxy || die "No nxproxy directory found"
+	econf || die "nxproxy econf failed"
+	emake || die "nxproxy emake failed"
+
+	cd "${WORKDIR}"/nx-X11 || die "No nx-X11 directory found"
+	emake World || die "nx-X11 emake failed"
+
+	cd "${WORKDIR}"/nxcompext || die "No nxcompext directory found"
+	econf || die "nxcompext econf failed"
+	emake || die "nxcompext emake failed"
+}
+
+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 "${WORKDIR}"/nx-X11/programs/Xserver/nxagent
+	dobin "${WORKDIR}"/nx-X11/programs/nxauth/nxauth
+	dobin "${WORKDIR}"/nxproxy/nxproxy
+
+	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*
+	dolib.so "${WORKDIR}"/nxcompshad/libXcompshad.so*
+}