8 files changed, 19 insertions, 53 deletions
diff --git a/net-misc/nxcomp/ChangeLog b/net-misc/nxcomp/ChangeLog
index 35bfdacfe927..5b564d3db303 100644
--- a/net-misc/nxcomp/ChangeLog
+++ b/net-misc/nxcomp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/nxcomp
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.15 2004/09/12 21:12:20 stuart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.16 2005/01/02 10:19:41 stuart Exp $
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> -nxcomp-1.4.0.ebuild:
+  Now installed by nx-x11
+
+*nxcomp-1.4.0-r1 (02 Jan 2005)
+
+  02 Jan 2005; Stuart Herbert <stuart@gentoo.org> +nxcomp-1.4.0-r1.ebuild,
+  -nxcomp-1.4.0.ebuild:
+  Now installed by nx-x11
 
 *nxcomp-1.4.0 (12 Sep 2004)
 
diff --git a/net-misc/nxcomp/Manifest b/net-misc/nxcomp/Manifest
index bb5b5b75d6c5..c67482ccb54f 100644
--- a/net-misc/nxcomp/Manifest
+++ b/net-misc/nxcomp/Manifest
@@ -2,11 +2,9 @@ MD5 aaec787877be70a75aa0b4dd926d5ae3 ChangeLog 1802
 MD5 8e92b9291198042d907534cb08b013f8 metadata.xml 361
 MD5 b9184165fd19bee89dd39752c68eb44e nxcomp-1.2.2-r1.ebuild 764
 MD5 adea8d302171fed8ae5b81482180ce79 nxcomp-1.3.0.ebuild 958
-MD5 3a229e47ff8ae7f4a92d0c9a11b7b09c nxcomp-1.4.0.ebuild 984
 MD5 d66d0aabddc6b2358de259882a878758 nxcomp-1.3.2-r1.ebuild 981
 MD5 1dc664eebfff31254456ac16d9b3e461 nxcomp-1.3.2.ebuild 945
 MD5 93171603dadf0e06996bd9fd833c5064 files/digest-nxcomp-1.2.2-r1 67
 MD5 a766a8d9478498b282f0852b5e38377d files/digest-nxcomp-1.3.0 67
 MD5 bbbdf1a4b71647d0606017837bb7fc69 files/digest-nxcomp-1.3.2 66
 MD5 bbbdf1a4b71647d0606017837bb7fc69 files/digest-nxcomp-1.3.2-r1 66
-MD5 d10a1aaa6ba54fd46ac5be10caa8fcb1 files/digest-nxcomp-1.4.0 67
diff --git a/net-misc/nxcomp/files/digest-nxcomp-1.4.0 b/net-misc/nxcomp/files/digest-nxcomp-1.4.0
deleted file mode 100644
index 2d61c9a4fed3..000000000000
--- a/net-misc/nxcomp/files/digest-nxcomp-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c45afe2a911468a2b07f69fd7123a59 nxcomp-1.4.0-23.tar.gz 452882
diff --git a/net-misc/nxcomp/nxcomp-1.2.2-r1.ebuild b/net-misc/nxcomp/nxcomp-1.2.2-r1.ebuild
index b01c5277361f..6b8a161e58c4 100644
--- a/net-misc/nxcomp/nxcomp-1.2.2-r1.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.2.2-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/nxcomp/nxcomp-1.2.2-r1.ebuild,v 1.3 2004/07/15 03:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.2.2-r1.ebuild,v 1.4 2005/01/02 10:19:41 stuart Exp $
 
 MY_P="${P}-67"
 DESCRIPTION="X11 protocol compression library"
diff --git a/net-misc/nxcomp/nxcomp-1.3.0.ebuild b/net-misc/nxcomp/nxcomp-1.3.0.ebuild
index fc3a7ccb7fce..97d28ad59e8c 100644
--- a/net-misc/nxcomp/nxcomp-1.3.0.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.3.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/nxcomp/nxcomp-1.3.0.ebuild,v 1.7 2004/07/15 03:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.0.ebuild,v 1.8 2005/01/02 10:19:41 stuart Exp $
 
 MY_P="${PN}-1.3.0-48"
 DESCRIPTION="X11 protocol compression library"
diff --git a/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild b/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild
index 8bb5d3ad3169..7b5e27468df2 100644
--- a/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.3.2-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/nxcomp/nxcomp-1.3.2-r1.ebuild,v 1.2 2004/07/15 03:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild,v 1.3 2005/01/02 10:19:41 stuart Exp $
 
 MY_P="${PN}-1.3.2-4"
 DESCRIPTION="X11 protocol compression library"
diff --git a/net-misc/nxcomp/nxcomp-1.3.2.ebuild b/net-misc/nxcomp/nxcomp-1.3.2.ebuild
index e423f65b2737..9097662fc5b5 100644
--- a/net-misc/nxcomp/nxcomp-1.3.2.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.3.2.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/nxcomp/nxcomp-1.3.2.ebuild,v 1.5 2004/07/15 03:13:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.2.ebuild,v 1.6 2005/01/02 10:19:41 stuart Exp $
 
 MY_P="${PN}-1.3.2-4"
 DESCRIPTION="X11 protocol compression library"
diff --git a/net-misc/nxcomp/nxcomp-1.4.0.ebuild b/net-misc/nxcomp/nxcomp-1.4.0.ebuild
deleted file mode 100644
index 943df99ee62b..000000000000
--- a/net-misc/nxcomp/nxcomp-1.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.4.0.ebuild,v 1.1 2004/09/12 21:12:20 stuart Exp $
-
-MY_P="${PN}-1.4.0-23"
-DESCRIPTION="X11 protocol compression library"
-HOMEPAGE="http://www.nomachine.com/"
-SRC_URI="http://www.nomachine.com/download/snapshot/nxsources/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-DEPEND=">=media-libs/jpeg-6b-r3
->=media-libs/libpng-1.2.5-r4
->=sys-devel/gcc-3.2.3-r2
->=sys-libs/glibc-2.3.2-r3
->=sys-libs/zlib-1.1.4-r2
-net-misc/nx-x11"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	./configure
-	DISTCC_HOSTS="localhost" CCACHE_DISABLE="1" emake || die "compile problem"
-}
-
-src_install() {
-	into /usr/NX
-	dolib libXcomp.so.${PV}
-	into /usr
-	preplib /usr/NX
-
-	dodoc README README-IPAQ LICENSE VERSION
-
-	insinto /usr/NX/include
-	doins NX.h
-}