Version bump

8 files changed, 146 insertions, 16 deletions

diff --git a/net-misc/nx-x11/ChangeLog b/net-misc/nx-x11/ChangeLog
index 92d888327fa5..c9e1a3ebdd1e 100644
--- a/net-misc/nx-x11/ChangeLog
+++ b/net-misc/nx-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx-x11
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.5 2004/09/12 09:51:51 stuart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.6 2005/01/02 09:34:56 stuart Exp $
+
+*nx-x11-1.4.0-r3 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0-r2.ebuild,
+  +nx-x11-1.4.0-r3.ebuild:
+  Version bump; thanks to Christian Oyarzun for his help; see bug #71694
 
   12 Sep 2004; Stuart Herbert <stuart@gentoo.org> nx-x11-1.4.0-r1.ebuild,
   nx-x11-1.4.0-r2.ebuild:
diff --git a/net-misc/nx-x11/Manifest b/net-misc/nx-x11/Manifest
index ccfa34fba134..d41f5796d98d 100644
--- a/net-misc/nx-x11/Manifest
+++ b/net-misc/nx-x11/Manifest
@@ -1,9 +1,11 @@
 MD5 9b863994334acfa97e4aa0dd00e64249 ChangeLog 1127
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
-MD5 057e5ecca55a5a1d996c8e74723ae750 nx-x11-1.4.0-r1.ebuild 2587
-MD5 ba0dee977cb28c9e5afaaddfd30f115e nx-x11-1.4.0-r2.ebuild 2599
 MD5 0b65ce6ab6116489fb06ca8851607f9a nx-x11-1.4.0.ebuild 2429
+MD5 057e5ecca55a5a1d996c8e74723ae750 nx-x11-1.4.0-r1.ebuild 2587
+MD5 7c7629d2c02dbe0a0f8979dd89ceb19b nx-x11-1.4.0-r2.ebuild 2662
+MD5 4f57873c3727576aac03265a1134e3f8 nx-x11-1.4.0-r3.ebuild 2849
 MD5 eb14e3a21decffbcb4e290c0419bbf3f files/digest-nx-x11-1.4.0 538
 MD5 6164854275d3f2f7c032776cabb5fca5 files/digest-nx-x11-1.4.0-r1 538
-MD5 fabad2586a6b5100bedc1c5bc5ef2c44 files/digest-nx-x11-1.4.0-r2 539
+MD5 6164854275d3f2f7c032776cabb5fca5 files/digest-nx-x11-1.4.0-r2 538
 MD5 d2caae40bdf5748d68ca46ad1d0ec951 files/nx-x11-1.4.0.xprint.patch 341
+MD5 b1b175fda7a68efc0ea21ac829c6449c files/digest-nx-x11-1.4.0-r3 539
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2 b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
index 6fdc98480b92..6b9e40f84345 100644
--- a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r2
@@ -1,7 +1,7 @@
 MD5 9ea3175d3c7ba81603aef53528ba00af nx-X11-1.4.0-3.tar.gz 32306338
 MD5 d15c60ecec428da9e6c6d9650bd4c4db nxagent-1.4.0-47.tar.gz 302273
 MD5 ea3b8b2b1b31c8cb33b47821ee1958a3 nxauth-1.4.0-1.tar.gz 23085
-MD5 3c45afe2a911468a2b07f69fd7123a59 nxcomp-1.4.0-23.tar.gz 452882
+MD5 1790feafa93c3ca58af117ab6f1f5bca nxcomp-1.3.2-4.tar.gz 432456
 MD5 ab12f1f32329f5da0f53dd0969fe897e nxcompext-1.4.0-3.tar.gz 111409
 MD5 1a323b08280863efbcd8ba0cc8197f22 nxviewer-1.4.0-2.tar.gz 84443
 MD5 adfc84a6a6ccd1a6b3b8ff4212b34980 nxdesktop-1.4.0-36.tar.gz 223822
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r3 b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r3
new file mode 100644
index 000000000000..0cdb31710bcb
--- /dev/null
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.4.0-r3
@@ -0,0 +1,8 @@
+MD5 01901e24b60907c2aefaae569ec02b28 nx-X11-1.4.0-7.tar.gz 32311470
+MD5 4a99a336094e181ae750479a8f7eac6e nxagent-1.4.0-64.tar.gz 305136
+MD5 274319eb06fbab8bbd486836668e1e0a nxauth-1.4.0-2.tar.gz 23070
+MD5 3b659bb177f3706f0b19589d56b120f8 nxcomp-1.4.0-30.tar.gz 454833
+MD5 ab12f1f32329f5da0f53dd0969fe897e nxcompext-1.4.0-3.tar.gz 111409
+MD5 629f90c1f8ef50517e8b1de2c30adcb4 nxviewer-1.4.0-4.tar.gz 84538
+MD5 9399fa94c59fbde2a158618e507635d7 nxdesktop-1.4.0-61.tar.gz 235550
+MD5 b30d7d94e6d98bb503750bab77c19295 nxesd-1.4.0-1.tar.gz 621023
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
index 2609a9ee0202..725f814dcacf 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild,v 1.3 2004/09/12 09:51:51 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r1.ebuild,v 1.4 2005/01/02 09:34:56 stuart Exp $
 
 inherit eutils
 
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
index f8fc79d9b231..a65ff9da2bd4 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild,v 1.3 2004/09/13 00:33:37 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r2.ebuild,v 1.4 2005/01/02 09:34:56 stuart Exp $
 
 inherit eutils
 
@@ -13,12 +13,13 @@ URI_BASE2="http://www.nomachine.com/download/nxsources/"
 SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
 SRC_NXAGENT="nxagent-1.4.0-47.tar.gz"
 SRC_NXAUTH="nxauth-1.4.0-1.tar.gz"
-SRC_NXCOMP="nxcomp-1.4.0-23.tar.gz"
+SRC_NXCOMP_3="nxcomp-1.3.2-4.tar.gz"
+SRC_NXCOMP_4="nxcomp-1.4.0-23.tar.gz"
 SRC_NXCOMPEXT="nxcompext-1.4.0-3.tar.gz"
 SRC_NXVIEWER="nxviewer-1.4.0-2.tar.gz"
 SRC_NXDESKTOP="nxdesktop-1.4.0-36.tar.gz"
 SRC_NXESD="nxesd-1.4.0-1.tar.gz"
-SRC_URI="$URI_BASE/${SRC_NX_X11} $URI_BASE/${SRC_NXAGENT} $URI_BASE/${SRC_NXAUTH} $URI_BASE/${SRC_NXCOMP} $URI_BASE/${SRC_NXCOMPEXT} $URI_BASE/${SRC_NXVIEWER} $URI_BASE/${SRC_NXDESKTOP} $URI_BASE/${SRC_NXESD}"
+SRC_URI="$URI_BASE/${SRC_NX_X11} $URI_BASE/${SRC_NXAGENT} $URI_BASE/${SRC_NXAUTH} $URI_BASE2/${SRC_NXCOMP_3} $URI_BASE/${SRC_NXCOMPEXT} $URI_BASE/${SRC_NXVIEWER} $URI_BASE/${SRC_NXDESKTOP} $URI_BASE/${SRC_NXESD}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
@@ -33,7 +34,7 @@ src_unpack() {
 	unpack ${SRC_NX_X11}
 	unpack ${SRC_NXAGENT}
 	unpack ${SRC_NXAUTH}
-	unpack ${SRC_NXCOMP}
+	unpack ${SRC_NXCOMP_4}
 	unpack ${SRC_NXCOMPEXT}
 	unpack ${SRC_NXVIEWER}
 	unpack ${SRC_NXDESKTOP}
@@ -72,7 +73,7 @@ src_install() {
 	dobin ../nxviewer/nxpasswd/nxpasswd
 	dobin ../nxdesktop/nxdesktop
 
-	dolib ../nxcomp/libXcomp.so
+	newlib ../nxcomp/libXcomp.so libXcomp-1.4.0.so
 	dolib ../nxcompext/libXcompext.so
 	dolib lib/X11/libX11.so
 	dolib lib/Xext/libXext.so
diff --git a/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild b/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..3aaa4ca4a584
--- /dev/null
+++ b/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0-r3.ebuild,v 1.1 2005/01/02 09:34:56 stuart Exp $
+
+inherit eutils
+
+MY_PN="${PN//x11/X11}"
+MY_PV="${PV}-7"
+DESCRIPTION="A special version of the X11 libraries supporting NX compression technology"
+HOMEPAGE="http://www.nomachine.com/developers.php"
+URI_BASE="http://www.nomachine.com/download/nxsources/"
+URI_BASE2="http://www.nomachine.com/download/nxsources/"
+SRC_NX_X11="${MY_PN}-${MY_PV}.tar.gz"
+SRC_NXAGENT="nxagent-1.4.0-64.tar.gz"
+SRC_NXAUTH="nxauth-1.4.0-2.tar.gz"
+SRC_NXCOMP="nxcomp-1.4.0-30.tar.gz"
+SRC_NXCOMPEXT="nxcompext-1.4.0-3.tar.gz"
+SRC_NXVIEWER="nxviewer-1.4.0-4.tar.gz"
+SRC_NXDESKTOP="nxdesktop-1.4.0-61.tar.gz"
+SRC_NXESD="nxesd-1.4.0-1.tar.gz"
+SRC_URI="$URI_BASE/nx-X11/${SRC_NX_X11} $URI_BASE/nxagent/${SRC_NXAGENT} $URI_BASE/nxauth/${SRC_NXAUTH} $URI_BASE/nxcomp/${SRC_NXCOMP} $URI_BASE/nxcompext/${SRC_NXCOMPEXT} $URI_BASE/nxviewer/${SRC_NXVIEWER} $URI_BASE/nxdesktop/${SRC_NXDESKTOP} $URI_BASE/nxesd/${SRC_NXESD}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+#RESTRICT="nostrip"
+DEPEND="virtual/x11"
+#RDEPEND=""
+S=${WORKDIR}/${MY_PN}
+
+src_unpack() {
+	# we can't use ${A} because of bug #61977
+	unpack ${SRC_NX_X11}
+	unpack ${SRC_NXAGENT}
+	unpack ${SRC_NXAUTH}
+	unpack ${SRC_NXCOMP}
+	unpack ${SRC_NXCOMPEXT}
+	unpack ${SRC_NXVIEWER}
+	unpack ${SRC_NXDESKTOP}
+	unpack ${SRC_NXESD}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-${PV}.xprint.patch
+}
+
+src_compile() {
+	emake World || die "unable to build nx-11"
+
+	cd ../nxviewer
+	xmkmf || die "unable to create makefile for nxviewer"
+	emake World || die "unable to make nxviewer"
+
+	cd ../nxdesktop
+	./configure --prefix=/usr/NX --mandir=/usr/share/man --sharedir=/usr/share || die "Unable to configure nxdesktop"
+	emake || die "Unable to build nxdesktop"
+
+	return
+
+	# mxesd support will have to wait for a later release
+
+	cd ../nxesd
+	econf --prefix=/usr/NX || die "Unable to configure nxesd"
+	emake || die "Unable to build nxesd"
+}
+
+src_install() {
+	into /usr/NX
+
+	dobin programs/Xserver/nxagent
+	dobin programs/nxauth/nxauth
+	dobin ../nxviewer/nxviewer/nxviewer
+	dobin ../nxviewer/nxpasswd/nxpasswd
+	dobin ../nxdesktop/nxdesktop
+
+	pushd lib/X11/
+	dolib libX11.so.6.2
+	dolib libX11.so
+	popd
+
+	pushd lib/Xext/
+	dolib libXext.so.6.4
+	dolib libXext.so
+	popd
+
+	pushd lib/Xrender/
+	dolib libXrender.so.1.2
+	dolib libXrender.so
+	popd
+
+	pushd ../nxcomp/
+	dolib libXcomp.so.1.4.0
+	dolib libXcomp.so
+	popd
+
+	pushd ../nxcompext/
+	dolib libXcompext.so.1.4.0
+	dolib libXcompext.so
+	popd
+
+	preplib /usr/NX
+
+	insinto /usr/X11R6/include
+	doins ../nxcomp/NX.h
+
+	dodir /var/lib/nxserver
+
+	return
+
+	# nxesd support will have to wait for a later release
+
+	cd ../nxesd
+	emake DESTDIR=${D} install || die "unable to install nxesd"
+}
diff --git a/net-misc/nx-x11/nx-x11-1.4.0.ebuild b/net-misc/nx-x11/nx-x11-1.4.0.ebuild
index 6fd35cee3768..6532e24cc8a8 100644
--- a/net-misc/nx-x11/nx-x11-1.4.0.ebuild
+++ b/net-misc/nx-x11/nx-x11-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0.ebuild,v 1.3 2004/09/07 20:48:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.4.0.ebuild,v 1.4 2005/01/02 09:34:56 stuart Exp $
 
 MY_PN="${PN//x11/X11}"
 MY_PV="${PV}-3"