Add modular X deps, remove older 1.5.0 ebuild

(Portage version: 2.1_pre5-r4)

5 files changed, 21 insertions, 68 deletions

diff --git a/net-misc/nxcomp/ChangeLog b/net-misc/nxcomp/ChangeLog
index 206415f4a237..664606b97103 100644
--- a/net-misc/nxcomp/ChangeLog
+++ b/net-misc/nxcomp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nxcomp
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.22 2006/03/05 14:29:12 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/ChangeLog,v 1.23 2006/03/21 18:42:28 agriffis Exp $
+
+  21 Mar 2006; Aron Griffis <agriffis@gentoo.org> nxcomp-1.3.2-r1.ebuild,
+  -nxcomp-1.5.0.ebuild, nxcomp-1.5.0-r1.ebuild:
+  Add modular X deps, remove older 1.5.0 ebuild
 
   05 Mar 2006; Stuart Herbert <stuart@gentoo.org>
   +files/nxcomp-1.5.0-r1-gcc4.patch, nxcomp-1.5.0-r1.ebuild:
diff --git a/net-misc/nxcomp/files/digest-nxcomp-1.5.0 b/net-misc/nxcomp/files/digest-nxcomp-1.5.0
deleted file mode 100644
index 1ef7aff50adb..000000000000
--- a/net-misc/nxcomp/files/digest-nxcomp-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cab094a88acb299cc1e89dfb2c6a95eb nxcomp-1.5.0-65.tar.gz 496878
diff --git a/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild b/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild
index 7b5e27468df2..f11069145194 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.3 2005/01/02 10:19:41 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.3.2-r1.ebuild,v 1.4 2006/03/21 18:42:28 agriffis Exp $
 
 MY_P="${PN}-1.3.2-4"
 DESCRIPTION="X11 protocol compression library"
@@ -10,15 +10,14 @@ 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
-virtual/x11"
-
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
+RDEPEND=">=media-libs/jpeg-6b-r3
+	>=media-libs/libpng-1.2.5-r4
+	>=sys-libs/glibc-2.3.2-r3
+	>=sys-libs/zlib-1.1.4-r2
+	|| ( x11-libs/libXt virtual/x11 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-3.2.3-r2
+	|| ( x11-proto/xproto virtual/x11 )"
 
 S=${WORKDIR}/${PN}
 
diff --git a/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild b/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild
index e75acdcb92ac..47e3606eb5c6 100644
--- a/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild
+++ b/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild,v 1.2 2006/03/05 14:29:13 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcomp/nxcomp-1.5.0-r1.ebuild,v 1.3 2006/03/21 18:42:28 agriffis Exp $
 
 inherit eutils multilib
 
@@ -14,11 +14,14 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 SRC_URI="http://web04.nomachine.com/download/1.5.0/sources/$P-80.tar.gz"
 
-DEPEND="media-libs/jpeg
+RDEPEND="media-libs/jpeg
 	media-libs/libpng
 	virtual/libc
 	sys-libs/zlib
-	virtual/x11"
+	|| ( x11-libs/libXt virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 S=${WORKDIR}/${PN}
 
diff --git a/net-misc/nxcomp/nxcomp-1.5.0.ebuild b/net-misc/nxcomp/nxcomp-1.5.0.ebuild
deleted file mode 100644
index 387a874c487b..000000000000
--- a/net-misc/nxcomp/nxcomp-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.5.0.ebuild,v 1.4 2005/12/15 17:29:33 agriffis Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="X11 protocol compression library"
-HOMEPAGE="http://www.nomachine.com/"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SRC_URI="http://web04.nomachine.com/download/1.5.0/sources/$P-65.tar.gz"
-
-DEPEND="media-libs/jpeg
-	media-libs/libpng
-	virtual/libc
-	sys-libs/zlib
-	virtual/x11"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/nxcomp-1.5.0-pic.patch
-}
-
-src_compile() {
-	./configure
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr/NX
-	dolib libXcomp.so*
-	if [[ $(get_libdir) != lib ]]; then
-		# necessary for nxclient to work, it seems
-		ln -s "$(get_libdir)" ${D}/usr/NX/lib
-	fi
-
-	preplib /usr/NX/lib
-
-	insinto /usr/NX/include
-	doins NX*.h MD5.h
-
-	dodoc README README-IPAQ LICENSE VERSION
-
-	dodir /etc/env.d
-	echo "LDPATH=/usr/NX/$(get_libdir)" >${D}/etc/env.d/50nxcomp
-}