Fixed a file collision (bug #178124)

Package-Manager: portage-2.1.2.7

3 files changed, 22 insertions, 11 deletions

diff --git a/net-misc/nxserver-2xterminalserver/ChangeLog b/net-misc/nxserver-2xterminalserver/ChangeLog
index 62668f9bae60..20dc67b132b0 100644
--- a/net-misc/nxserver-2xterminalserver/ChangeLog
+++ b/net-misc/nxserver-2xterminalserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nxserver-2xterminalserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/ChangeLog,v 1.4 2007/05/12 14:59:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/ChangeLog,v 1.5 2007/05/12 16:41:35 voyageur Exp $
+
+  12 May 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  nxserver-2xterminalserver-1.5.0.ebuild:
+  Fixed file collision with nxclient-2xterminalserver
+  Closes bug #178124
 
   12 May 2007; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml:
   Fixed maintainer in metadata.xml
diff --git a/net-misc/nxserver-2xterminalserver/Manifest b/net-misc/nxserver-2xterminalserver/Manifest
index d27d038869ba..b6be18ed20cd 100644
--- a/net-misc/nxserver-2xterminalserver/Manifest
+++ b/net-misc/nxserver-2xterminalserver/Manifest
@@ -41,14 +41,14 @@ SHA256 f521231e67fe9e9aa1cbaa82a679483b5c4cdc01aac27b02cd72d5de350edfc6 files/1.
 DIST linuxterminalserver-1.5.0-client-r21-src.tar.gz 2270147 RMD160 32fa31ee713d46e66c8a5e4aa14126995b225cfb SHA1 9295a232409b56ecb2fb4dccf81e6c05d65a7130 SHA256 70c7e3c9741b577b867e78524a1fb607aa2fae5d6f1bdda4b1a42eb9fd3d7bb3
 DIST linuxterminalserver-1.5.0-common-r21-src.tar.gz 34332949 RMD160 411291efa4bef31fbb5ff8128591514c687b9eeb SHA1 f63ed2816b13f1296db909b40ffb1c7d4cb5e109 SHA256 a6aaf7b1593d4df012ecefd1c8a6a176c0fde23cf9039401fe61f56197898555
 DIST linuxterminalserver-1.5.0-server-r21-src.tar.gz 4097853 RMD160 add7c5bcd2a4486d04c4c2b17815c4a449e2bd93 SHA1 14c2c04805889a08dfee9def45b07c3703db8d32 SHA256 79057d7fcf1fa3afd5f361eaac67d1f3d1fb339fa5a837f36eb7a6103d7662d3
-EBUILD nxserver-2xterminalserver-1.5.0.ebuild 5873 RMD160 2c7d04e8094be73e874c3ac0cf40cc65bbaf9c8b SHA1 936ffba013a6ec56e433230ebc3aac2c2056e37e SHA256 776d1f2577b80646df7a1f61b3b8c82f876e6164bed5813039f50aaac39405b8
-MD5 9ec73b5b89ec68a9f9b0741e3bf0f73d nxserver-2xterminalserver-1.5.0.ebuild 5873
-RMD160 2c7d04e8094be73e874c3ac0cf40cc65bbaf9c8b nxserver-2xterminalserver-1.5.0.ebuild 5873
-SHA256 776d1f2577b80646df7a1f61b3b8c82f876e6164bed5813039f50aaac39405b8 nxserver-2xterminalserver-1.5.0.ebuild 5873
-MISC ChangeLog 1361 RMD160 c8683679da49de5bfedd3e41ddd6754bb9a2081a SHA1 a33d78db6165b03813aa4caeae9591fb12c4e0a3 SHA256 3a510d7ef8f025c4e3151dc0e6381d53c3aaf80cc1788f9cd00d3e6e0e2d0771
-MD5 ad10a78c113c0e5264749b5dfd8ed397 ChangeLog 1361
-RMD160 c8683679da49de5bfedd3e41ddd6754bb9a2081a ChangeLog 1361
-SHA256 3a510d7ef8f025c4e3151dc0e6381d53c3aaf80cc1788f9cd00d3e6e0e2d0771 ChangeLog 1361
+EBUILD nxserver-2xterminalserver-1.5.0.ebuild 6101 RMD160 352f90c513542e19d69333e3289d555060153969 SHA1 67b1ef483dff12ab8c8c643a82f3fd6167cbe1c1 SHA256 15eab72fe0feac8184887c3d34e7597f0edbbef69b11570316c7e11ae2871b55
+MD5 5332f2b8268d4d191635675a0b404699 nxserver-2xterminalserver-1.5.0.ebuild 6101
+RMD160 352f90c513542e19d69333e3289d555060153969 nxserver-2xterminalserver-1.5.0.ebuild 6101
+SHA256 15eab72fe0feac8184887c3d34e7597f0edbbef69b11570316c7e11ae2871b55 nxserver-2xterminalserver-1.5.0.ebuild 6101
+MISC ChangeLog 1534 RMD160 84d87540de99cfe7c834552e8086326b44cdf9e2 SHA1 96378c1a9810177e653dc0c0278472e92f13b2b3 SHA256 a119889cee53f6fe69ca4660991d1b27e7723384d9659ce148fb7f5b654ba3d1
+MD5 42f051eb6ff58470783c761a51a564c4 ChangeLog 1534
+RMD160 84d87540de99cfe7c834552e8086326b44cdf9e2 ChangeLog 1534
+SHA256 a119889cee53f6fe69ca4660991d1b27e7723384d9659ce148fb7f5b654ba3d1 ChangeLog 1534
 MISC metadata.xml 246 RMD160 c08f42ab832909f7c8089ee0753f2e6409868a6b SHA1 f07065350c035c8975bc5876f7aa766b3cfe0721 SHA256 66d02cc487d0c973da93ce6d995ead7110463bd79243bf0002d5543f3daa087b
 MD5 d40572ea5b27ddf4061362fc500d30c1 metadata.xml 246
 RMD160 c08f42ab832909f7c8089ee0753f2e6409868a6b metadata.xml 246
diff --git a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
index d523fdbdf952..45ea746c02ed 100644
--- a/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild
+++ b/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.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/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild,v 1.3 2007/04/30 13:38:27 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-2xterminalserver/nxserver-2xterminalserver-1.5.0.ebuild,v 1.4 2007/05/12 16:41:35 voyageur Exp $
 
 inherit flag-o-matic eutils
 
@@ -171,7 +171,13 @@ src_install() {
 	done
 	cp ${NODE_SRC}/node-gentoo.cfg.sample ${D}/usr/NX/etc/ || die
 
-	cp -R ${S}/server/nxnode/share ${D}/usr/NX || die
+	# share/keys/server.id_dsa.key is installed with the client
+	dodir /usr/NX/share/keys
+	for x in config fonts keymaps; do
+		cp -R ${S}/server/nxnode/share/${x} ${D}/usr/NX/share/ || die
+	done
+	cp ${S}/server/nxnode/share/keys/default.id_dsa.key \
+		${D}/usr/NX/share/keys/ ||die
 	cp -R ${S}/server/nxnode/home ${D}/usr/NX || die
 	keepdir /usr/NX/var/log
 	keepdir /usr/NX/var/run