Depend on openssl >=0.9.8, bug #192371

Package-Manager: portage-2.1.3.9

6 files changed, 23 insertions, 100 deletions

diff --git a/net-misc/nxclient/ChangeLog b/net-misc/nxclient/ChangeLog
index 02cd9bf7bfcc..32ab418ad050 100644
--- a/net-misc/nxclient/ChangeLog
+++ b/net-misc/nxclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxclient
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.52 2007/09/07 06:22:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/ChangeLog,v 1.53 2007/09/13 22:20:19 voyageur Exp $
+
+  13 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  nxclient-2.1.0-r1.ebuild, -nxclient-3.0.0-r2.ebuild,
+  nxclient-3.0.0-r3.ebuild:
+  Depend on >= 0.9.8 openssl
+  Thanks Adam Lassek <adam@doubleprime.net> in bug #192371
 
   07 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
   files/digest-nxclient-3.0.0-r2, Manifest:
diff --git a/net-misc/nxclient/Manifest b/net-misc/nxclient/Manifest
index 20efd8f1a13f..1542cdab1d3e 100644
--- a/net-misc/nxclient/Manifest
+++ b/net-misc/nxclient/Manifest
@@ -3,26 +3,20 @@ MD5 722d473cbcec099515ea389f2327acde files/nxwrapper 128
 RMD160 ee3e96fb8e3def2b211defac5ef6731f309f7718 files/nxwrapper 128
 SHA256 a0e4bfd47f857dd85b60b0802ba7daeb798cad3e6310aaf3582df9b233137a5a files/nxwrapper 128
 DIST nxclient-2.1.0-17.i386.tar.gz 3515342 RMD160 70c779bc4763093235ac6616863a9440936cf50f SHA1 76ce09111426cdbbea06a135c436981232f71ba2 SHA256 c087c1e528dd4272c4666a832b0a585b53fa15466b54d1dc2d60d105bea964ab
-DIST nxclient-3.0.0-73.i386.tar.gz 3865951 RMD160 fa5fa193e7f21fe4d070602f8b3edc3272e43153 SHA1 0828a95b9f955e90e517532b2da014646cc8fc42 SHA256 e6938c13bd57eb4e58a575dfcdb598418a3c7c99c38b0f6c1b6177e34a192c7c
-DIST nxclient-3.0.0-73.x86_64.tar.gz 4053737 RMD160 4fd8f52108ea1531491e70021309e077e10155e7 SHA1 b6c2db2e8cf0309e31a9d6c8fec818bdaff733bf SHA256 dd6b73029cf6c6ecf1ba94d78aee8321020bbd1d502bf2027dcc15ba8a8ae664
 DIST nxclient-3.0.0-78.i386.tar.gz 3866787 RMD160 79210a3df01081fc8bf55407a0dc6d6f8bdf0f4c SHA1 4ec018b4c0c1f11d5cc5f670bd6bd625442efca5 SHA256 92e0b8073a75854c365f5ce123c96bda30ca6f9e0bc661ba097d0dde28cff8a8
 DIST nxclient-3.0.0-78.x86_64.tar.gz 4056763 RMD160 64cf05f5a710c14e08425ae3b38809b1f8f01ffa SHA1 779ce6c5c128f0be8e8aca9a28e64d98d033ad83 SHA256 6da814d2b5d931eebe3219dbbc781290b41bff0767516c426d918c22d05e21fa
-EBUILD nxclient-2.1.0-r1.ebuild 1819 RMD160 8d9575b21a600f4851a8c6a407049f291149a1da SHA1 0c3754de4c0c4d8b48a5b4487afdf4580e4f1c2e SHA256 4281dea0728ee044823bd3b6864fc9287a775d31f11a75ab26256df440f177a6
-MD5 5ca47b7cc23e23a77903d21a28fbcc5d nxclient-2.1.0-r1.ebuild 1819
-RMD160 8d9575b21a600f4851a8c6a407049f291149a1da nxclient-2.1.0-r1.ebuild 1819
-SHA256 4281dea0728ee044823bd3b6864fc9287a775d31f11a75ab26256df440f177a6 nxclient-2.1.0-r1.ebuild 1819
-EBUILD nxclient-3.0.0-r2.ebuild 1969 RMD160 86e5563bfe1fdbbf5f9bb480349cdb0f446bf6bc SHA1 d4bae4e8ee03b19450d40bda551d4f69c1c73b3f SHA256 70e734ea464ad366eadb8d6d5909ab1e5ebf0e325d090736df065f50a57e6893
-MD5 3516731cc6db5973a44c638941158cd8 nxclient-3.0.0-r2.ebuild 1969
-RMD160 86e5563bfe1fdbbf5f9bb480349cdb0f446bf6bc nxclient-3.0.0-r2.ebuild 1969
-SHA256 70e734ea464ad366eadb8d6d5909ab1e5ebf0e325d090736df065f50a57e6893 nxclient-3.0.0-r2.ebuild 1969
-EBUILD nxclient-3.0.0-r3.ebuild 1969 RMD160 d1a5ec5ef99ab00942095a99722f695b2ca88316 SHA1 260de0fc35a069a0420fa41a3fab5595ea943712 SHA256 3608637ca605cd480df500dd25902365d3336919798100552e0be21b4ff6a419
-MD5 dd6a1f5786e5bf8890e844c50b58f9b7 nxclient-3.0.0-r3.ebuild 1969
-RMD160 d1a5ec5ef99ab00942095a99722f695b2ca88316 nxclient-3.0.0-r3.ebuild 1969
-SHA256 3608637ca605cd480df500dd25902365d3336919798100552e0be21b4ff6a419 nxclient-3.0.0-r3.ebuild 1969
-MISC ChangeLog 8374 RMD160 217717cc7037f59a8ca021060218e745213fd9d3 SHA1 a0428aafb5cd093bec2c7ddb438b1fd1a19d60ea SHA256 58ab34bf67fda905805db220fbc850a64c41663fe51bf2ade34d8f8085e636af
-MD5 174e2618dfabe89a534baa68795318b0 ChangeLog 8374
-RMD160 217717cc7037f59a8ca021060218e745213fd9d3 ChangeLog 8374
-SHA256 58ab34bf67fda905805db220fbc850a64c41663fe51bf2ade34d8f8085e636af ChangeLog 8374
+EBUILD nxclient-2.1.0-r1.ebuild 1830 RMD160 76f8eaa44db0e578de7e7e0266583337fb9d26aa SHA1 d5e4da747d1b658f4555ffaf22db30ddd4931c29 SHA256 6d1f88280e7d2f24eb5951363dccce38eaddf6dc6e1ff4cd7ceb864302685d06
+MD5 28c11b37ced2f68cb275255771e1c216 nxclient-2.1.0-r1.ebuild 1830
+RMD160 76f8eaa44db0e578de7e7e0266583337fb9d26aa nxclient-2.1.0-r1.ebuild 1830
+SHA256 6d1f88280e7d2f24eb5951363dccce38eaddf6dc6e1ff4cd7ceb864302685d06 nxclient-2.1.0-r1.ebuild 1830
+EBUILD nxclient-3.0.0-r3.ebuild 1977 RMD160 e83182bc98d0d947ade74fcc232c61b5433d484d SHA1 265b9a60267347c9a79aa2e00d2a3d300985cb3e SHA256 66a34b982b8a1ac0de8b280e4a62d69febe803b99cfbce60d3ab758bc0f4e384
+MD5 b9cda5893d3ed9e4455ed35764a13481 nxclient-3.0.0-r3.ebuild 1977
+RMD160 e83182bc98d0d947ade74fcc232c61b5433d484d nxclient-3.0.0-r3.ebuild 1977
+SHA256 66a34b982b8a1ac0de8b280e4a62d69febe803b99cfbce60d3ab758bc0f4e384 nxclient-3.0.0-r3.ebuild 1977
+MISC ChangeLog 8601 RMD160 87b20753731938dc4843daeab07de1d4874e2319 SHA1 719d80f04867f62e7ddb8043395ad06da1e3c228 SHA256 67f23db2bc2c8fb710282dfd7665217ddceae4b9879595228407df3308e71ca0
+MD5 3c6f3da3c1a5b2c05aa09be794dd792c ChangeLog 8601
+RMD160 87b20753731938dc4843daeab07de1d4874e2319 ChangeLog 8601
+SHA256 67f23db2bc2c8fb710282dfd7665217ddceae4b9879595228407df3308e71ca0 ChangeLog 8601
 MISC metadata.xml 323 RMD160 5c60b28d4bc0e7d3120022994129867add0d1938 SHA1 0814e1fa95c7b410b0e40ec7221f45d75186d84e SHA256 3fbfa47bc46788bf3261c36eb8c18dbf19b695a3a4a3317d23ae3481f1caed63
 MD5 b14249dc3daf7907ad6c0287213227c0 metadata.xml 323
 RMD160 5c60b28d4bc0e7d3120022994129867add0d1938 metadata.xml 323
@@ -30,9 +24,6 @@ SHA256 3fbfa47bc46788bf3261c36eb8c18dbf19b695a3a4a3317d23ae3481f1caed63 metadata
 MD5 ac18d931610bd76c1e212be228bca55a files/digest-nxclient-2.1.0-r1 271
 RMD160 a0a630ebb528d710ef584d5a74cbcb4fcefe692f files/digest-nxclient-2.1.0-r1 271
 SHA256 799ff52464cc9a6918b6d508c4acb25ebdbebccc62a2b633728e678d95aae086 files/digest-nxclient-2.1.0-r1 271
-MD5 8424696184d989b7bb29829e84c69601 files/digest-nxclient-3.0.0-r2 548
-RMD160 218525ea80607c76daa269dd878e18adabe97e0f files/digest-nxclient-3.0.0-r2 548
-SHA256 0465ab5646227fb01f106dcb15713d8e902daa37074fc6f1d7a7b05edea44700 files/digest-nxclient-3.0.0-r2 548
 MD5 62210f5616c5e5005e9b34555d1d86d0 files/digest-nxclient-3.0.0-r3 548
 RMD160 48348ceb3d039f85550692bf10ba34c99f3632f4 files/digest-nxclient-3.0.0-r3 548
 SHA256 3b98fdea46822d6ae56a0d8cbd8f8952325529975284e0b94701bd24d303c934 files/digest-nxclient-3.0.0-r3 548
diff --git a/net-misc/nxclient/files/digest-nxclient-3.0.0-r2 b/net-misc/nxclient/files/digest-nxclient-3.0.0-r2
deleted file mode 100644
index b54042772d77..000000000000
--- a/net-misc/nxclient/files/digest-nxclient-3.0.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 28575a363488b12fff188ff8a1d7cd65 nxclient-3.0.0-73.i386.tar.gz 3865951
-RMD160 fa5fa193e7f21fe4d070602f8b3edc3272e43153 nxclient-3.0.0-73.i386.tar.gz 3865951
-SHA256 e6938c13bd57eb4e58a575dfcdb598418a3c7c99c38b0f6c1b6177e34a192c7c nxclient-3.0.0-73.i386.tar.gz 3865951
-MD5 acbfbbd508a44062ee6afa8ad1348554 nxclient-3.0.0-73.x86_64.tar.gz 4053737
-RMD160 4fd8f52108ea1531491e70021309e077e10155e7 nxclient-3.0.0-73.x86_64.tar.gz 4053737
-SHA256 dd6b73029cf6c6ecf1ba94d78aee8321020bbd1d502bf2027dcc15ba8a8ae664 nxclient-3.0.0-73.x86_64.tar.gz 4053737
diff --git a/net-misc/nxclient/nxclient-2.1.0-r1.ebuild b/net-misc/nxclient/nxclient-2.1.0-r1.ebuild
index 5c7860ad1e55..14b150f69da3 100644
--- a/net-misc/nxclient/nxclient-2.1.0-r1.ebuild
+++ b/net-misc/nxclient/nxclient-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-2.1.0-r1.ebuild,v 1.5 2007/07/03 11:18:39 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-2.1.0-r1.ebuild,v 1.6 2007/09/13 22:20:19 voyageur Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ RESTRICT="strip"
 DEPEND=""
 RDEPEND="
 	x86? ( dev-libs/expat
-		dev-libs/openssl
+		>=dev-libs/openssl-0.9.8
 		media-libs/audiofile
 		media-libs/jpeg
 		media-libs/libpng
diff --git a/net-misc/nxclient/nxclient-3.0.0-r2.ebuild b/net-misc/nxclient/nxclient-3.0.0-r2.ebuild
deleted file mode 100644
index 1b0da87aabb4..000000000000
--- a/net-misc/nxclient/nxclient-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-3.0.0-r2.ebuild,v 1.3 2007/09/06 17:15:24 voyageur Exp $
-
-inherit eutils
-
-MY_PV="${PV}-73"
-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/"
-SRC_URI="amd64? ( http://64.34.161.181/download/${PV}/Linux/nxclient-${MY_PV}.x86_64.tar.gz )
-	x86? ( http://64.34.161.181/download/${PV}/Linux/nxclient-${MY_PV}.i386.tar.gz )"
-LICENSE="nomachine"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="dev-libs/expat
-	dev-libs/openssl
-	media-libs/audiofile
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/freetype
-	media-libs/fontconfig
-	net-print/cups
-	x11-libs/libXft
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXrender
-	x11-libs/libXau
-	x11-libs/libXext
-	sys-libs/zlib
-	!net-misc/nxclient-2xterminalserver"
-
-S=${WORKDIR}/NX
-
-src_install()
-{
-	# we install nxclient into /usr/NX, to make sure it doesn't clash
-	# with libraries installed for FreeNX
-
-	for x in nxclient nxesd nxkill nxprint nxservice nxssh ; do
-		into /usr/NX
-		dobin bin/$x
-		into /usr
-		make_wrapper $x ./$x /usr/NX/bin /usr/NX/lib || die
-	done
-
-	dodir /usr/NX/lib
-	cp -P lib/libXcompsh.so* lib/libXcomp.so* ${D}/usr/NX/lib
-
-	dodir /usr/NX/share
-	cp -R share ${D}/usr/NX
-
-	# Add icons/desktop entries (missing in the tarball)
-	cd share/icons
-	for size in *; do
-		dodir /usr/share/icons/hicolor/${size}/apps
-		for icon in admin desktop icon wizard; do
-			dosym /usr/NX/share/icons/${size}/nxclient-${icon}.png \
-				/usr/share/icons/hicolor/${size}/apps
-			done
-		done
-	make_desktop_entry "nxclient" "NX Client" nxclient-icon
-	make_desktop_entry "nxclient -admin" "NX Session Administrator" nxclient-admin
-	make_desktop_entry "nxclient -wizard" "NX Connection Wizard" nxclient-wizard
-}
diff --git a/net-misc/nxclient/nxclient-3.0.0-r3.ebuild b/net-misc/nxclient/nxclient-3.0.0-r3.ebuild
index d98b3b006388..c6a18cf34eb6 100644
--- a/net-misc/nxclient/nxclient-3.0.0-r3.ebuild
+++ b/net-misc/nxclient/nxclient-3.0.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-3.0.0-r3.ebuild,v 1.1 2007/09/06 15:03:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxclient/nxclient-3.0.0-r3.ebuild,v 1.2 2007/09/13 22:20:19 voyageur Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ RESTRICT="strip"
 
 DEPEND=""
 RDEPEND="dev-libs/expat
-	dev-libs/openssl
+	>=dev-libs/openssl-0.9.8
 	media-libs/audiofile
 	media-libs/jpeg
 	media-libs/libpng