Add modular X deps, remove older 1.5.0 ebuilds

Package-Manager: portage-2.1_pre5-r4

8 files changed, 51 insertions, 178 deletions

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 60417dd53fd7..94231b1013b5 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxclient
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.26 2006/03/05 15:22:38 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.27 2006/03/21 20:37:04 agriffis Exp $
+
+  21 Mar 2006; Aron Griffis <agriffis@gentoo.org> nxclient-1.4.0-r5.ebuild,
+  -nxclient-1.5.0.ebuild, -nxclient-1.5.0-r1.ebuild,
+  nxclient-1.5.0-r2.ebuild:
+  Add modular X deps, remove older 1.5.0 ebuilds
 
   05 Mar 2006; Stuart Herbert <stuart@gentoo.org> nxclient-1.5.0-r2.ebuild:
   Added missing lib-compat DEP; see bug #115574
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 46fd40358846..eab9a732dd44 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -1,12 +1,34 @@
-MD5 7710a49292c8b0456a4bcc54213009e6 ChangeLog 4125
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2cd1fcff81beb7379e677b5c095e4a29 ChangeLog 4334
+RMD160 a2a61716517fc615a65cdf4b27649f107feb641b ChangeLog 4334
+SHA256 db203a0a5750936fca53cc1a74dda405542f970f1e14ecb95e8706999dcec3c8 ChangeLog 4334
 MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.3.0/50nxclient 57
+RMD160 a0e6eb6022859da08876263d60ab80ebfa58525a files/1.3.0/50nxclient 57
+SHA256 ebf64a790519261542ca7210f17a3b0f668ce79f5486cdd515ba499560410c02 files/1.3.0/50nxclient 57
 MD5 f44884663100850b12e1fdb12b55645b files/1.5.0/50nxclient 38
+RMD160 6d29978719f6b46dfa07f9ebcc8c04c9c5a48fbf files/1.5.0/50nxclient 38
+SHA256 e90d501d1600a5cd811e6da1a2a1ffdecaa4dfbeb58df3352313ac1100bc9f28 files/1.5.0/50nxclient 38
 MD5 6532e2cbed5e3c88e36520dc46b1be4b files/digest-nxclient-1.4.0-r5 71
-MD5 f88ec7c11f1f61ad0c0c390e5325e8d5 files/digest-nxclient-1.5.0 149
-MD5 3b564ade1d67ddea768e937fa379c857 files/digest-nxclient-1.5.0-r1 149
+RMD160 9d61e0a9112df802ea66f7a48f2148c17b42cec7 files/digest-nxclient-1.4.0-r5 71
+SHA256 81db6b132b8d9207677faa33916c8afa3be3eebc23b8bd40eb26fb6b6240f2b0 files/digest-nxclient-1.4.0-r5 71
 MD5 142a71ee05218b6014d4d8872bc9cd7e files/digest-nxclient-1.5.0-r2 73
+RMD160 54c1c36eada0e5b52d6b7a195e201150272af928 files/digest-nxclient-1.5.0-r2 73
+SHA256 6102246c13cd6e58ddc17a005f40f54159d067d651101635f2734d9b62a1f1b9 files/digest-nxclient-1.5.0-r2 73
 MD5 c1c67a77261d3b3fede94b41a9d0ce1e metadata.xml 455
-MD5 4429f22294184b7381a98271588fc29b nxclient-1.4.0-r5.ebuild 1648
-MD5 79c0f4b4ba001e5eb9d0f7dc41ad5085 nxclient-1.5.0-r1.ebuild 2195
-MD5 598e31070c7b9fd59bcf5e6f0915d6a9 nxclient-1.5.0-r2.ebuild 2241
-MD5 ceb7fb63bb0069577d0bf90e30241ab1 nxclient-1.5.0.ebuild 2192
+RMD160 4be2c66d765fbe16df201f981c76f0c10265b921 metadata.xml 455
+SHA256 f1b98d76aa41c8483716a7ec1b48a7c70a943edfc07ae39bac23d95bd5ce27cd metadata.xml 455
+MD5 50aec3b613c8f24cd291f2a645bd089e nxclient-1.4.0-r5.ebuild 1702
+RMD160 a3941b63fbb8254e2c302ddd2fbfac4c527813fe nxclient-1.4.0-r5.ebuild 1702
+SHA256 7ac7ef17c202055b38bd3e1287b65b64a9c81d54190bf9a633fcb49b41236d07 nxclient-1.4.0-r5.ebuild 1702
+MD5 f0e6e7745483a6c3cbcb373819f84258 nxclient-1.5.0-r2.ebuild 2336
+RMD160 46d7680de235f3e534f94fbacdaac7ff73e3e65f nxclient-1.5.0-r2.ebuild 2336
+SHA256 a6300f437f542d002078eeec0aeada6ac44dcc2c43d1ebbd4fb7f2f3ae64206f nxclient-1.5.0-r2.ebuild 2336
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEIGP7JrHF4yAQTrARAgKoAKDKV28oy/u9qHpb6H9hfleHPtEZDwCgsDuL
+OQutfnxeNlz7+If/rDv3kHE=
+=fIjZ
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxclient/files/digest-nxclient-1.5.0 b/net-misc/nxclient/files/digest-nxclient-1.5.0
deleted file mode 100644
index 44534b443cb1..000000000000
--- a/net-misc/nxclient/files/digest-nxclient-1.5.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0ac180f732ad7b5ba9ea0d99d415fa9a nxclient-1.5.0-113.i386.rpm 3397925
-MD5 f94d1b661a2bf2b3d4e407f22021a9d6 nxclient-1.5.0-113.i386.tar.gz 3400813
diff --git a/net-misc/nxclient/files/digest-nxclient-1.5.0-r1 b/net-misc/nxclient/files/digest-nxclient-1.5.0-r1
deleted file mode 100644
index 29e28d4c23e7..000000000000
--- a/net-misc/nxclient/files/digest-nxclient-1.5.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4f8e68873438f79e8f4f31f41ba2a824 nxclient-1.5.0-135.i386.rpm 3334053
-MD5 83b7c9a45223cc59ec08d8007fb0d61b nxclient-1.5.0-135.i386.tar.gz 3335394
diff --git a/net-misc/nxclient/nxclient-1.4.0-r5.ebuild b/net-misc/nxclient/nxclient-1.4.0-r5.ebuild
index 1da3a65e7455..8764db593cac 100644
--- a/net-misc/nxclient/nxclient-1.4.0-r5.ebuild
+++ b/net-misc/nxclient/nxclient-1.4.0-r5.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/nxclient/nxclient-1.4.0-r5.ebuild,v 1.1 2005/05/23 18:51:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.4.0-r5.ebuild,v 1.2 2006/03/21 20:37:04 agriffis Exp $
 
 inherit rpm
 
@@ -19,7 +19,6 @@ SRC_URI="http://www.nomachine.com/download/nxclient/1.4.0/RedHat-9.0/${PN}-${MY_
 DEPEND=">=media-libs/jpeg-6b-r3
 	>=sys-libs/glibc-2.3.2-r1
 	>=sys-libs/zlib-1.1.4-r1
-	virtual/x11
 	>=dev-libs/expat-1.95.6-r1
 	>=media-libs/fontconfig-2.2.0-r2
 	>=media-libs/freetype-2.1.4
@@ -28,7 +27,12 @@ DEPEND=">=media-libs/jpeg-6b-r3
 	=net-misc/nx-x11-1.4*
 	=net-misc/nxproxy-1.4*
 	net-analyzer/gnu-netcat
-	=net-misc/nxssh-1.4*"
+	=net-misc/nxssh-1.4*
+	|| ( (	x11-libs/libX11
+			x11-libs/libXext
+		)
+		virtual/x11
+	)"
 
 S="${WORKDIR}"
 
diff --git a/net-misc/nxclient/nxclient-1.5.0-r1.ebuild b/net-misc/nxclient/nxclient-1.5.0-r1.ebuild
deleted file mode 100644
index 748c8170c80f..000000000000
--- a/net-misc/nxclient/nxclient-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,80 +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/nxclient/nxclient-1.5.0-r1.ebuild,v 1.1 2005/12/15 17:20:04 agriffis Exp $
-
-inherit rpm
-
-DESCRIPTION="NXClient is a X11/VNC/NXServer client especially tuned for using remote desktops over low-bandwidth links such as the Internet"
-HOMEPAGE="http://www.nomachine.com"
-
-IUSE=""
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 -mips -ppc -sparc ~x86"
-RESTRICT="nostrip"
-
-SRC_URI="
-	amd64? ( http://web04.nomachine.com/download/1.5.0/client/nxclient-1.5.0-135.i386.tar.gz )
-	x86? ( http://web04.nomachine.com/download/1.5.0/client/nxclient-1.5.0-135.i386.rpm )"
-
-DEPEND="
-	=net-misc/nxssh-1.5*
-	net-analyzer/gnu-netcat
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-2.1.4
-	)
-	x86? (
-		media-libs/jpeg
-		sys-libs/glibc
-		sys-libs/zlib
-		virtual/x11
-		dev-libs/expat
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		x11-libs/qt
-	)"
-
-S=${WORKDIR}
-
-src_install() {
-	# rpm has usr/NX/; tarball has only NX/
-	if [[ ! -d usr ]]; then
-		mkdir usr
-		mv NX usr || die
-	fi
-
-	cp -dPR usr ${D}
-
-	# All of the libraries delivered by nxclient are available in our deps.
-	# Additionally a couple of the binaries are better installed as deps.
-	# Remove those now...
-
-	# delivered by net-misc/nxcomp
-	rm -f ${D}/usr/NX/lib/libXcomp.so*
-
-	# delivered by net-misc/nx-x11 (at some point)
-	rm -f ${D}/usr/NX/bin/nxesd
-
-	# delivered by net-misc/nxssh
-	rm -f ${D}/usr/NX/bin/nxssh
-
-	# delivered by other deps (emul-linux-x86-baselibs on amd64)
-	rm -f ${D}/usr/NX/lib/lib{crypto,jpeg,png,z}*
-
-	# make sure there are no libs left (this is to catch problems when this
-	# package is updated)
-	rmdir ${D}/usr/NX/lib || die "leftover libraries in ${D}/usr/NX/lib"
-
-	# FIXME: amd64 should deliver the desktop files too, but they don't come in
-	# the tarball, only the rpm
-	if [[ -d ${D}/usr/NX/share/applink ]]; then
-		dodir /usr/share/applnk/Internet
-		mv ${D}/usr/NX/share/applnk/"NX Client for Linux"
-			${D}/usr/share/applnk/Internet
-	fi
-
-	# Install env.d snippet to add /usr/NX/bin to the PATH
-	insinto /etc/env.d
-	doins ${FILESDIR}/1.5.0/50nxclient
-}
diff --git a/net-misc/nxclient/nxclient-1.5.0-r2.ebuild b/net-misc/nxclient/nxclient-1.5.0-r2.ebuild
index c657c1174b18..2b7069e34152 100644
--- a/net-misc/nxclient/nxclient-1.5.0-r2.ebuild
+++ b/net-misc/nxclient/nxclient-1.5.0-r2.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/nxclient/nxclient-1.5.0-r2.ebuild,v 1.2 2006/03/05 15:22:38 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-1.5.0-r2.ebuild,v 1.3 2006/03/21 20:37:04 agriffis Exp $
 
 inherit rpm
 
@@ -25,13 +25,19 @@ DEPEND="
 		media-libs/jpeg
 		sys-libs/glibc
 		sys-libs/zlib
-		virtual/x11
 		dev-libs/expat
 		media-libs/fontconfig
 		media-libs/freetype
 		media-libs/jpeg
+		media-libs/libpng
+		net-print/cups
 		x11-libs/qt
 		sys-libs/lib-compat
+		|| ( (	x11-libs/libX11
+				x11-libs/libXext
+			)
+			virtual/x11
+		)
 	)"
 
 S=${WORKDIR}
diff --git a/net-misc/nxclient/nxclient-1.5.0.ebuild b/net-misc/nxclient/nxclient-1.5.0.ebuild
deleted file mode 100644
index 300ebdc9a68f..000000000000
--- a/net-misc/nxclient/nxclient-1.5.0.ebuild
+++ /dev/null
@@ -1,80 +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/nxclient/nxclient-1.5.0.ebuild,v 1.2 2005/10/25 11:48:09 agriffis Exp $
-
-inherit rpm
-
-DESCRIPTION="NXClient is a X11/VNC/NXServer client especially tuned for using remote desktops over low-bandwidth links such as the Internet"
-HOMEPAGE="http://www.nomachine.com"
-
-IUSE=""
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-alpha ~amd64 -mips -ppc -sparc ~x86"
-RESTRICT="nostrip"
-
-SRC_URI="
-	amd64? ( http://web04.nomachine.com/download/1.5.0/client/nxclient-1.5.0-113.i386.tar.gz )
-	x86? ( http://web04.nomachine.com/download/1.5.0/client/nxclient-1.5.0-113.i386.rpm )"
-
-DEPEND="
-	=net-misc/nxssh-1.5*
-	net-analyzer/gnu-netcat
-	amd64? (
-		>=app-emulation/emul-linux-x86-baselibs-2.1.4
-	)
-	x86? (
-		media-libs/jpeg
-		sys-libs/glibc
-		sys-libs/zlib
-		virtual/x11
-		dev-libs/expat
-		media-libs/fontconfig
-		media-libs/freetype
-		media-libs/jpeg
-		x11-libs/qt
-	)"
-
-S=${WORKDIR}
-
-src_install() {
-	# rpm has usr/NX/; tarball has only NX/
-	if [[ ! -d usr ]]; then
-		mkdir usr
-		mv NX usr || die
-	fi
-
-	cp -dPR usr ${D}
-
-	# All of the libraries delivered by nxclient are available in our deps.
-	# Additionally a couple of the binaries are better installed as deps.
-	# Remove those now...
-
-	# delivered by net-misc/nxcomp
-	rm -f ${D}/usr/NX/lib/libXcomp.so*
-
-	# delivered by net-misc/nx-x11 (at some point)
-	rm -f ${D}/usr/NX/bin/nxesd
-
-	# delivered by net-misc/nxssh
-	rm -f ${D}/usr/NX/bin/nxssh
-
-	# delivered by other deps (emul-linux-x86-baselibs on amd64)
-	rm -f ${D}/usr/NX/lib/lib{crypto,jpeg,png,z}*
-
-	# make sure there are no libs left (this is to catch problems when this
-	# package is updated)
-	rmdir ${D}/usr/NX/lib || die "leftover libraries in ${D}/usr/NX/lib"
-
-	# FIXME: amd64 should deliver the desktop files too, but they don't come in
-	# the tarball, only the rpm
-	if [[ -d ${D}/usr/NX/share/applink ]]; then
-		dodir /usr/share/applnk/Internet
-		mv ${D}/usr/NX/share/applnk/"NX Client for Linux"
-			${D}/usr/share/applnk/Internet
-	fi
-
-	# Install env.d snippet to add /usr/NX/bin to the PATH
-	insinto /etc/env.d
-	doins ${FILESDIR}/1.5.0/50nxclient
-}