Update ebuild headers, metadata, dead dependencies

Package-Manager: Portage-2.3.4, Repoman-2.3.2
Manifest-Sign-Key: 00F7AB331B0F097F

20 files changed, 160 insertions, 47 deletions

diff --git a/app-eselect/eselect-nxserver/Manifest b/app-eselect/eselect-nxserver/Manifest
index cd23991..6cd270a 100644
--- a/app-eselect/eselect-nxserver/Manifest
+++ b/app-eselect/eselect-nxserver/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST nxserver.eselect-0.3.bz2 1283 SHA256 c318946b0f196e47005996901e5dec28b9b446ee0154fd6aaa3f8422d4ed2217 SHA512 c392481643cbcb81971568157c3692f2a2a802fbd4cd0aadc6371e9bced29c077c14c480f3e2cd2052927414b3092d44d5d71a665aa6f4ae8ad9cb81648da768 WHIRLPOOL 1b9b551c9a9bb03d5a3bed4cdf3824da3056f1200e2fac6ddf0eea2f04d27712a23f6fd005f87561ee51dc771698ebcd564a3a742cccfab4f42dea3d8e64e463
-EBUILD eselect-nxserver-0.3.ebuild 546 SHA256 03278602b4d8e6cdf7098aebe2677f1c6139e40b740ffbe9b9cad8de26f99a4e SHA512 7c614d964adb92d46d25fea5bd34e73f111ccc567ccc5a7fbf4c62f8fee387deb69f4e023a6fefe20cd05a76a28e3968c37f7b278558606771c1e30bc5a21fda WHIRLPOOL eabc45584c04b66a654c3a6c1011dfe64d4f1142d221195a24858181566430bfba6e6042f9d5546f10f5f6ea1087fde236590a469b0b80d1aeac353fb26a0896
+EBUILD eselect-nxserver-0.3.ebuild 539 SHA256 e40e227ae37e948da1001edaff5f74b5e4284f2d6fa31b95e76c9b7f21746876 SHA512 e069d345151fc9e91bdf40a88e703447b325f71436cd6b8c500b589054bffc3d76a220e8509b67f2ec7da4b27b46515407a2efe17989458e9b4308698f89bcba WHIRLPOOL 5f78b32d824af3291789c4d07c349b0014efdc3ef75b48eaea1a68f0da7476888756db6c2ea0b94f699d2d90fd2c60cb9cd3f5296c6cfee0e7df09350cdaecc9
 MISC ChangeLog 823 SHA256 d927b8b03777835da38b604b1683ef2bdbcc0840fa099b985c386f7db5a4736a SHA512 c7a2ef51615a07d3e0e385ec0c8b4e9e5a721659cd29fe2619667de4632a6ce12ad794b7110a715481b50313efbd4c785959f948096b771a4579734dbab3ce8f WHIRLPOOL 539c17b43447924131c30a6aaeb8e1b8f6365f8407f444b633dce63de5e3f85d72ba1984288a6bb04371ca85405675d0c8b6e2c25dd0f9121926e8400f2a607d
-MISC metadata.xml 156 SHA256 b9c2301297e0f8c82d38056e5925edc98e9da6edb15f47835a73ee0b987c6396 SHA512 b307f542d495482a88f8e7f6cca017dad2a0741b6066beccdc1b9acfa13cb7578e19d9e3495955414561fb205233ffcdb895dd6927285d31a4d033d486b8846c WHIRLPOOL aa347bda8ef66b979c0b56d18cd132b814c48bcdf275e3703af5aada4d894d417a21212aa011f3580b60dd47fb5cc6957ecd33e453513c3f155cd39f5ae7c28f
+MISC metadata.xml 252 SHA256 f09077829bd604b153aecd586b23fe39af2279d2b5871eb74391c7b7e9496404 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724 WHIRLPOOL 5da21d058640f220853befb609832550c9078b8879264a87ffb4b845b89e557ae43f04975c4e7b65531b2b843f6a6cd5b139648b72574b555e8cf6610ffd610e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE0xzR9NDgJnbExk7AAPerMxsPCX8FAljFgs9fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQz
+MUNEMUY0RDBFMDI2NzZDNEM2NEVDMDAwRjdBQjMzMUIwRjA5N0YACgkQAPerMxsP
+CX8EQw//eJ6ct7ZeUMg8pbo5Jkml9LsIjFDrHL/4Zb+bMOukmDn+xRXeV9/sdiFs
+KzFJ6fbmY0FXRnIUtT6jPG+ysyIOX8lqFmdjnovCBNJHhbxig0jIAn9PuuSkKMHk
+uZAk/mS2zGYWCWS2llI+ZrZ+qpoYTqvrWHDFbxbJNpwkzOn/RNNrueFeRfjoFPm8
+y/b4lXFqmtWxDsvrSuAdGHlHOJNUXHc/F8NL7Ms60pIlWjo/zdNNexCLMYLPalrL
+YyALMXL+Tk8zLzdKw8EGpJIJtxOUybRLu7hRUuso7tQcREAhDLKu1dLVifX8i4Tv
+aCvyRx3uWo9I427mbTIibhtdRO5FbbLTYmOGp9MWYRZzaxSi0fJ1ZU+EP7sRmV9U
+NKDqi3hVewY6T/ypUlYNeJKJfku7Lb6Fk43AiVQLdENW9y8ph/huHs7QgTfDzTnZ
+UCplD0mts1fxli9ttZQVmRgloWWMbp+JstANDm6XSEde/3Hm9P8PVOukPlYDBQGv
+rIJvGhx1Lr3FHAjBsgE4Dn9KU4+TzyxFOAqRqqnkWTX6VlhVHjI3aNnG8NFJWqHQ
+cJKhmTT70/Hh1WXzJU1DNzrKf9Lu7U4olZ+2CZw6sNZGky4hZ5kZnXg+9AEotK3V
+NoJlxaazOmIbJMjhOcyJ27Gs8RHyu/4qLnmqyAbMg63dk0QAFA4=
+=ljGN
+-----END PGP SIGNATURE-----
diff --git a/app-eselect/eselect-nxserver/eselect-nxserver-0.3.ebuild b/app-eselect/eselect-nxserver/eselect-nxserver-0.3.ebuild
index 6392ef8..1995bc3 100644
--- a/app-eselect/eselect-nxserver/eselect-nxserver-0.3.ebuild
+++ b/app-eselect/eselect-nxserver/eselect-nxserver-0.3.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=4
 
diff --git a/app-eselect/eselect-nxserver/metadata.xml b/app-eselect/eselect-nxserver/metadata.xml
index 60699f6..7d273a8 100644
--- a/app-eselect/eselect-nxserver/metadata.xml
+++ b/app-eselect/eselect-nxserver/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/metadata/md5-cache/app-eselect/eselect-nxserver-0.3 b/metadata/md5-cache/app-eselect/eselect-nxserver-0.3
index 2ba825a..3107577 100644
--- a/metadata/md5-cache/app-eselect/eselect-nxserver-0.3
+++ b/metadata/md5-cache/app-eselect/eselect-nxserver-0.3
@@ -7,4 +7,4 @@ LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3 !<net-misc/neatx-0.3.1_p59-r4
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/nxserver.eselect-0.3.bz2
-_md5_=13bac6bc8ae149857f71abfc154a2c42
+_md5_=5943592ad93e4c0c173c1991382027d1
diff --git a/metadata/md5-cache/net-misc/nxcl-0.9-r2 b/metadata/md5-cache/net-misc/nxcl-0.9-r2
index d836311..7115bb3 100644
--- a/metadata/md5-cache/net-misc/nxcl-0.9-r2
+++ b/metadata/md5-cache/net-misc/nxcl-0.9-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/freenx-client-0.9.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	f813d23e417656bf3917483643165d5a	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=c1d55ce3fe39c0fb712619797a140ae7
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	eutils	3c847a0129fed780bd709b98e426f89c	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=ee76dd1cf1af9dc698caaf5e9a37de6a
diff --git a/metadata/md5-cache/net-misc/nxsadmin-0.2.1-r1 b/metadata/md5-cache/net-misc/nxsadmin-0.2.1-r1
index c6ed028..a9aa982 100644
--- a/metadata/md5-cache/net-misc/nxsadmin-0.2.1-r1
+++ b/metadata/md5-cache/net-misc/nxsadmin-0.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-cpp/gtkmm:2.4 net-misc/nxserver-freenx
 SLOT=0
 SRC_URI=mirror://sourceforge/nxsadmin.berlios/nxsadmin-0.2.1.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5b77ef34132b3eea6323b250243ba423
+_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	libtool	48b1b9f6194d2842456514d1184ca72e	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=0e144f760ae18aa0d229e5f191d09856
diff --git a/metadata/md5-cache/net-misc/nxserver-freenx-0.7.3_p104-r7 b/metadata/md5-cache/net-misc/nxserver-freenx-0.7.3_p104-r7
index 197c9e8..d5f3dec 100644
--- a/metadata/md5-cache/net-misc/nxserver-freenx-0.7.3_p104-r7
+++ b/metadata/md5-cache/net-misc/nxserver-freenx-0.7.3_p104-r7
@@ -3,11 +3,11 @@ DEPEND=x11-misc/gccmakedep x11-misc/imake
 DESCRIPTION=Free Software Implementation of the NX Server
 EAPI=5
 HOMEPAGE=https://launchpad.net/~freenx-team
-IUSE=rdesktop vnc
+IUSE=rdp vnc
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-tcltk/expect media-fonts/font-cursor-misc media-fonts/font-misc-misc net-analyzer/gnu-netcat >=net-misc/nx-2.1.0 x11-apps/xauth x11-apps/xrdb x11-apps/sessreg virtual/awk virtual/ssh || ( x11-misc/xdialog x11-apps/xmessage ) rdesktop? ( net-misc/rdesktop ) vnc? ( x11-misc/x11vnc net-misc/tightvnc )
+RDEPEND=dev-tcltk/expect media-fonts/font-cursor-misc media-fonts/font-misc-misc net-analyzer/gnu-netcat >=net-misc/nx-2.1.0 x11-apps/xauth x11-apps/xrdb x11-apps/sessreg virtual/awk virtual/ssh || ( x11-misc/xdialog x11-apps/xmessage ) rdp? ( net-misc/rdesktop ) vnc? ( x11-misc/x11vnc )
 SLOT=0
 SRC_URI=http://ppa.launchpad.net/freenx-team/ppa/ubuntu/pool/main/f/freenx-server/freenx-server_0.7.3+teambzr104.orig.tar.gz
-_eclasses_=eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4079caebaab64c4ceffe15fb7558a034
+_eclasses_=eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b056af4ff2290654c57748d6fd81530a
diff --git a/metadata/md5-cache/net-misc/qtnx-0.9 b/metadata/md5-cache/net-misc/qtnx-0.9
index a7837a8..be738ca 100644
--- a/metadata/md5-cache/net-misc/qtnx-0.9
+++ b/metadata/md5-cache/net-misc/qtnx-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-misc/nxcl dev-qt/qtcore:4 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~voyageur/distfiles/freenx-client-0.9.tar.bz2
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	f813d23e417656bf3917483643165d5a	multilib	3972ca401cf7dbb430df9995f5d8d580	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	qt4-r2	cb2cb5856695b300266b425da70e82d8	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a9263d4765e57af2c874de71135a5b05
+_eclasses_=base	df2aa567b3f0595aae0d0923889f7631	eutils	3c847a0129fed780bd709b98e426f89c	multilib	0236be304ee52e7f179ed2f337075515	qmake-utils	ea78a9056543346cdc8cbbd07f16c6fb	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
+_md5_=60f72dd95e5b6a1520224d574140d126
diff --git a/net-misc/nxcl/Manifest b/net-misc/nxcl/Manifest
index 70548af..f5abbf3 100644
--- a/net-misc/nxcl/Manifest
+++ b/net-misc/nxcl/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nxcl-0.9-gcc43.patch 931 SHA256 f07141589114982e4aec77dce92971037f57bf6cf8f56c481e978795c4d44bd3 SHA512 f9b1ab67e0d66d84765814322b30b6374c56aaefb9b303ff7cebfecae6a8eccf963cbc2126a33a54973c08abe38245d671d421aaca648c963a21571d056729b5 WHIRLPOOL 8fee98f7cf190a74e4d40d7c0d5e21137bec26fa11d537f38efdc83e79ebc45cebd5f82d7f5b9f9601ac61a00d7366ff0eed27a6c0f2e66994fa52f503ed7c21
 AUX nxcl-0.9-gcc47.patch 274 SHA256 5bb35a95b937d327ccbe66abcfe059a071959a498304427cff658bdcda951eed SHA512 0d3bbc658aeb118658d13fcf0bd81f7116c6ef55bf6d4d21f0a04364fd56be6d63f442f907f1d3fd06d338674f1fe0f518a8d1a2687fbaf790ee6b8b2510f663 WHIRLPOOL ac3d17add1cfc1ddd2dae01af95b0cc05157016d5fe10f76a9794506c6cbcafaca4b864cdf9aa107002a2ce8c08868bdfd62cf72755557acf5951d1916c24498
 AUX nxcl-0.9-no_nxssh.patch 11470 SHA256 a15875efae333eec432765ee4edb0d3cabfaf0d8130cd19d2ab5255cb6e9a687 SHA512 03fcc82364b6d5b6f7b1f21451456abf217c4f7b98e14418bd7ba41cc5941a1af1c1d231e164261a632f9c1a09c618ef4c545bd0c06b017cfc26d5b4d762bb57 WHIRLPOOL 0aab743ca4a38cca32b3e7c9e8bf216de0d6c586598e97e883e795504189638d789bf0745d1d6c65a78b55c5432d926acd9d57ed4da93c88086014e3fe703325
 DIST freenx-client-0.9.tar.bz2 46240 SHA256 dfc6c8dd89c26171411d8f7fa92613004eb8947ff509459151fdb03de7fe9608 SHA512 be56f594f13d0362c41391396db7d8a4807887622658c9e4a59e33e793625574dbc2a088b0c1ea28dfaa572f2d539d2a0a898459bd080609e120257845583df0 WHIRLPOOL fd15633bcf4128e89c0d74c2f94e62e13b0efbbc091407472609dff6bb7aad7183003a59272d1d0bda368374c2a7968d1b8efbba8900005e66a703a66c6e15fc
-EBUILD nxcl-0.9-r2.ebuild 1057 SHA256 06479ec49818a260c03cb47decb5d74a8d0b0827f9d5111bdde2c03d09903991 SHA512 f164673e04d694b37bf06d2b9f48360426f76e53a7db6e4154cb399c8e5a50aeed132a74ca287ab5d72569d9e474af38a4a981f10be5185e5a36718f62abea16 WHIRLPOOL b5bc90d89c478d21f7e626dee7564e52e9f4ddb9806d948157cd537fb5ee115a738e28a93f87f1193f81e4440e79395aab4adb687a1bd76583b2e9661d187184
+EBUILD nxcl-0.9-r2.ebuild 1050 SHA256 bdb2a8180262df72ad8b2de6edb041d8aedce5f120d7d1986b690bb184a78069 SHA512 b25305b02ab622174e9090321d3e096661d216384ec4e7f583c7ef83478fb64db539e6ff6eb8d2900a15494ed866d7e6763062c445ebdd8aeb58b7a9afe31c7d WHIRLPOOL f4cbe46d69a45cdfc93d1613578ac160a044721657ebcc072cf45b2a471145fb2ce603df20839acf9c4ec63ee050095a94652c8cb11e3e5ece5dee1b9b5cd149
 MISC ChangeLog 2023 SHA256 93b07559008fff84bd000f162c6610f73fd0da9b89d3d7952395c2cac3ffcf0e SHA512 940e442246b6e1f46b90b3f398fd134e98dcff8ef3068f32b20f46c53a68c40102a18a162d1f539180fa55df17c47c41a514ca30c9f2ebe5d5c68eb1207392f0 WHIRLPOOL b3702d2a8dbe59755a50b8cb5cf8ba56b7cf68e2da5a6e682644d7871d5858874e5f846d3cd75516eab510a45e01766c97dda396a73ecdfa3747312b7ad2fdde
-MISC metadata.xml 226 SHA256 f1aea592384f54b7b5ff1da00f815a8a73344261227f36519694ab22f86c9433 SHA512 818fb33abbf56b8934f3d13c1c2f24f9222caddfa91f8d798650b819c74e6b0fb3ca653b0d504eceecb1cd4404317ebea3ac2726e1f8529d3b56db18c8816d79 WHIRLPOOL 5400a46962305fcc6363c12ab48cfab6a5c82420eecc7d45ded695f63f2b1a571d154d395cdacace0164843cde716c0e0c72549240cba631d1ec75cf82248ca4
+MISC metadata.xml 322 SHA256 7b2d59d1941fa0b28f2b031d6fc8e6951311544d42c3e2a2946ac1f6b66c975c SHA512 88907053e047bef135fde939db14fabf0bff951495758ee1e3cc1aafb88e113e24e15badb40905685577e435c51a9f0b1b57783708925402875849a3a2173c28 WHIRLPOOL 422d3e8d7847774b603ff3917d13a96688124f9bd1b2327c32d8ee7cf300f6ccc3207803f6f56545dc582da0a663add9a495c34eca1eb56d28d96993d3dd72ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE0xzR9NDgJnbExk7AAPerMxsPCX8FAljFgs9fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQz
+MUNEMUY0RDBFMDI2NzZDNEM2NEVDMDAwRjdBQjMzMUIwRjA5N0YACgkQAPerMxsP
+CX9vIQ//S5rJ9ZUnOyV+wE0fawVFh736PlxPz+Nytvj9aaJJi0967AtPwq5osojN
+5A0dnJ7ql7Kz1AYv6qrMnClFi8Gg0QElVLh6v8uC6f/HqX+EPDyRaeuAP8pfVyXP
+GP5pKrUZw8mY9G7GMHieBSfz/6ZkLuXw7BOCIbLDIk6R0nnjyy2B9YL3tWKoaisO
+r1ecyj1K7JN0Spuel3t3PmWqpVnXr+V7DJ/kKBejxIEtM8teic8ED2nDT/powt+d
+RmRPazvy6gpLg38/KHs2FcKWOOeeqCHmU/s8krHdV8TNqlE43QRI+Jm/9DYTeeL2
+GmU6uyn0ADjVPZF6PkhqDmOBiZxQI/L1TwhkOsEfWDD0i4/BIesD8so271gUXhKe
+iG6irCuGO0QEZKPd9e3hMhlJwiZfjfR2ALbOZFBKkYHSnNCu/9r8lSgHg8BEtTbQ
+4EV7ROXLIF5giv7Ge3c3YXVVgFdXqW3TC4xmMAY1oqSsMWb0M/ent95ZhKgr65UX
+L6jwSjFsFD8bgSs0jf4NbhDIU1f7nlhm7KmTBhNriNDI2BDI/0eweKRU4ijywvEf
+E2VnxY2gf+G9PChMr+Dp9GAGpM46tQ3sZahKvOKP7wXIhUPvJaFDi+cgxam4kBeL
+/FDPsHmJCLvdoWXET+S+dTVjSzDjepmlp2wQ2CyOhNgTjBEhO90=
+=HkuA
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxcl/metadata.xml b/net-misc/nxcl/metadata.xml
index 892acca..465aab3 100644
--- a/net-misc/nxcl/metadata.xml
+++ b/net-misc/nxcl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>A library for building NX clients</longdescription>
 </pkgmetadata>
diff --git a/net-misc/nxcl/nxcl-0.9-r2.ebuild b/net-misc/nxcl/nxcl-0.9-r2.ebuild
index 122c17b..b1a19dd 100644
--- a/net-misc/nxcl/nxcl-0.9-r2.ebuild
+++ b/net-misc/nxcl/nxcl-0.9-r2.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=4
 
diff --git a/net-misc/nxsadmin/Manifest b/net-misc/nxsadmin/Manifest
index ac3b562..88a43d6 100644
--- a/net-misc/nxsadmin/Manifest
+++ b/net-misc/nxsadmin/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST nxsadmin-0.2.1.tar.gz 303503 SHA256 31945a04ab243e4f72faa8774da2c012928cf80c37eda3779e9d8c0e2bfca70a SHA512 569ca8bd65d0d4c3c1ca6a56ad3afe80fb8637a7ee3b01236a5ef4329d11e6edfb8aa308cc1ce0ccac10eb98df359b2facaaa68a4db5f43330f7cb206a7209c1 WHIRLPOOL 2484accd41ea1c4284427eeef40025080a98b79dd5e1ffd75144bdf80dc6151aaf49a18819bb16bb255676543a8d8d73a3dd4dacae2456e5e0e67a281078a51f
-EBUILD nxsadmin-0.2.1-r1.ebuild 609 SHA256 608278529a6aadf2eee40a677c3c65aeffa8ba2f9ff8c58b0989c25c99f4c24e SHA512 cbe95abcfceadbcc5855e125d444a39ee2e5e82d864e3b5f21119e93f9f6f1ab514ad9dc56778393ecd466aed8cb740d9b02e2ffc2a0cbe42f91487843b93d89 WHIRLPOOL b3361677b9cd53ec8908515f81471b5c2ac21894e9f25860e5c2dca66c0b73972111a6a52e83811756e6b0f0dcf293d78f072f2cb317444b93cdfc75fa2dc860
+EBUILD nxsadmin-0.2.1-r1.ebuild 602 SHA256 e1d93a315afade11996cb10c6996841c76994e676c24d4644ce70a9c2522497f SHA512 3b971d57fb15600d00c5518bb2db8a313bcfa30f712d4c144831abdb36ddbaf6b6759a5fdea7e4115a7251dcdb4dfd9157d277b0efabfd1792e8ede074ad3397 WHIRLPOOL c402ac262ef29007c3207954a28060fdcfa4ef287d53439f97555f02edf6de18fedcef247a04a144bf9348e4a18be869ec7617ca1ab4f85df2aff84636f1b825
 MISC ChangeLog 805 SHA256 d8de362cfe03a2850c8071a7b87e75be9b9e154e4853f13467b29d65cc808a1a SHA512 fa32d3fce4b249a1c15b6259a7543684189021fcc79d9a783ef967c3e075db2bc4d867a74c018d781126f8db75ae62dc114769677f84b3adbca9914f2cf14807 WHIRLPOOL 0b7eaaa6fc529eb15753827208fd62b27e4500ac227b64e8b45666999076b8835037b65ffc62eff2df49c6eed0d901de4dc73b1acae400f9fc598c529865e2bb
-MISC metadata.xml 360 SHA256 eacec9169edda2cf43dae5f5862550c3dd23592cfd09c557b734d11eb1783ad0 SHA512 bd3e8f8d61cac579d345a1fe23ce31b840871e2863dec66150c544f91cd961ce810b1edd0b8eee3f64e6d98756846dae2f571126ce8f0c4e722c0a9bc739f3b4 WHIRLPOOL 21b41dec153aac965901410749ee5a1811f84aa954d2b6d567f793b47ee02c80b54ae432e207b440df47d319a6cffc3b89875736f4948ba8e07c2a3bc712b180
+MISC metadata.xml 357 SHA256 18248eec30e0940f090f33cb4351e8bdaf19b723b1249ae5e3452dba3ba28914 SHA512 74e3b5f881abc5ac1bb1089e074f72b0c7665363f9332353a98e0e0fed7fabfa236066b352dbf3b71a0942da21cf3006a3ac344c10ef5937a8c4b42c8d5541cd WHIRLPOOL 95e94057d92653633ba36b827513d5682052b94e779035877abaca7872cde9838254fd9ebd2b4ebedb72e88497edf8c4e055a014c8de44d9a7af14671187fd73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE0xzR9NDgJnbExk7AAPerMxsPCX8FAljFgs9fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQz
+MUNEMUY0RDBFMDI2NzZDNEM2NEVDMDAwRjdBQjMzMUIwRjA5N0YACgkQAPerMxsP
+CX9Hbg//W0xvDRHAV6/NVCnELraIdu7ryHT57dmVW8sg0TulzRUG11hMiDk2/Mu0
+cB9kdcfoyTyMZAYFN/U3l5vejrpskh/sa9Re4hdc2B38snDb6S7Wgbd+0ZAlvcPq
+h0yMJ0Cmo5AS9CO55+rzigo92E5fv2xeKYDSPyJSbxh3FT+wz2WDLzdWdh8zk8yk
+lpDeV60y4eyJ7h55iWgJjhvNH/O/e3rD3dR7/KxVXjkB7UiHZZDMTSUIgBmTJYFD
+B16NFLV2lTwNa48ZveFeVGfx+Bp88BdSd/dSyI+7f71DuCZDjxQV1dh8C4x815OT
+tNwnza0IE2ATiz3GRgDo+nfZdKhvKN0rCDi2Y3MWmT/qzv6x9glqvDvtrLYypTTx
+JzJV6/LbC3NdEAZZ1KCxJf5wqncRwki1WYqx7QQlZ57BPuLKO8Dgm0WZsELW8NOy
+v96SjVwhUf3KZZLsHMjIFPp43nNSeGfgOp2ghSaDH8ziGko43F0ORMLiSDlMkWEB
+G6Bk5VWpmBqcHxvIZ4FHYoX4LzbZJbbFlzuL46WtUTMlDCU55mqFhMN3qzWJWDI/
+yjhHHxKjI3xKU0Pf4JVoKao1Ojj9duefcqV67NGv6TfH77cO6oTMEuxt7ZOEz0IF
+OdqfnEML4BDojnXWJzQsa4W9w3osn5Gs90KYZptrlrJ+4O5Hn+M=
+=P6b1
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxsadmin/metadata.xml b/net-misc/nxsadmin/metadata.xml
index a44ad2b..ea6d8f1 100644
--- a/net-misc/nxsadmin/metadata.xml
+++ b/net-misc/nxsadmin/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
diff --git a/net-misc/nxsadmin/nxsadmin-0.2.1-r1.ebuild b/net-misc/nxsadmin/nxsadmin-0.2.1-r1.ebuild
index ae146f3..56c415a 100644
--- a/net-misc/nxsadmin/nxsadmin-0.2.1-r1.ebuild
+++ b/net-misc/nxsadmin/nxsadmin-0.2.1-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index c220cb2..b0f2b2b 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nxserver-freenx-0.7.2-cups.patch 1312 SHA256 50d0ae81b1bf86aecb0eec82920db481633ae0181dfe2894ac1b10faf5b8644d SHA512 bda533189e2e220cc45c0f672eef2b68f0ad7d2d85463e6deccd812fbe3356765b4d141db73fc213c2cc306c9b54fbb7ec2ffbf3fac8f9f606517fc01568de07 WHIRLPOOL 93bcee5a30311bfa309bb9ee57e2c3acf2397c3710079dd73622f4c7eeb8f069fe08dea6a125343ae0828e454a9e19553829f821bfa2b6cb4400a365608a2149
 AUX nxserver-freenx-0.7.3_p102-cflags.patch 925 SHA256 ca99ad30acaf356ece570ebbc0ca4e52e40590533173bc028872dffc1055066b SHA512 68abce1023fabcbbf0f6bdbb78d00c80134e12d83ab5e7ead2bfae8c5d6611482e1123ec7f09efb3b9953bb0aea011cc515d43f647f2aff56e3b2be38301f314 WHIRLPOOL 9ed350eb44274d511cc2118287da294f5b66ea9a3aff01a768eb5c9c83039fda6045eec6ebbf5067cc1bd9eadb0f10a68a263f01811080ebf0f154416b551118
 AUX nxserver-freenx-0.7.3_p104-jobserver_fix.patch 828 SHA256 99e0840b1ce4f2c56cfdbf823166737b609e437fb8ca26212f521126d6326cdc SHA512 dca1eec96a249c1239d0f50122492d5251aba2d966810f8a140e778e202195aa8c61575ef5923c4c8bc4fdbb6cf887840800806694b2086b08035187ba4915ab WHIRLPOOL 6fda416e9c09d74d63acf15eacb6673e8ea15d2bf66d4df0e3fb633209580d8eb9329dc947c5cc0d65752d7a74d7740ce4db86abae6507a779ea284f2c6ec88f
@@ -8,6 +11,25 @@ AUX nxserver-freenx-0.7.3_p104-pam_ssh.patch 441 SHA256 854d17b3656ac2382d84b32e
 AUX nxserver-freenx-0.7.3_p104-r7-QA-fixes.patch 1190 SHA256 1a6327bb595a2734377254e4c82d33090ab47d47fbb3b4e91267c020ba8ee594 SHA512 7148edfb31effd1a5bf2a76e46a2d746e060a9f40d98cd76ef5a7fda92608ab641f359c0d28fbf9f53f1488be693b3b4405acd61b6bc1ffbbabfd0a07c593991 WHIRLPOOL d20af3b7119d7c89c70af861a2ed1f2aa0daa2675f4ce004b7798a6308eedd9685fef27a8391c6112c5f0f10fa9745d0b743e07830275955d59018a9ba04379d
 AUX nxserver.init 568 SHA256 eda452183da56f6ef5730f1f9e7c968c462b2d3ad31c58ed6100d90c7533c4f2 SHA512 adca8d9eca173e64c426bc7bb2df63f8b22111c6ba560b7a8a2f51ee9738eb7f33976bd26a3c9685c44d7faaeca8874d547605c77aa14663fb122ab00408fc3c WHIRLPOOL f84430aabee263c5c2662ff77e0e053ac0159c702f7ac2c0e1e683f5187f07ecb3269c5b235c7ffa8984d21c4ea0b641553b26cc328665d650bcfe2bcbaea5ba
 DIST freenx-server_0.7.3+teambzr104.orig.tar.gz 118242 SHA256 0d8b8ea883d67551f40c6e1c3a4a280d5bd663f27147a054e879c58b31873c71 SHA512 1e4f64cc2b9e8a38b8796c950418e89fae77d9acbbd57af00e2d3aea3ae86aa6a9cbc42c8b0bed9ff9ba8687f3ec1e252b4b3a6bb74e495840e5698092163627 WHIRLPOOL d3ac5ef7c05480e4bad336904b24333fdc30fc86a717c4e722c0fc64ee7883be747d3f4d54a9cdf044ccefd9598ac243a2ce96f7a360bfec48171c4e975115ea
-EBUILD nxserver-freenx-0.7.3_p104-r7.ebuild 3507 SHA256 368a0c2ccfe8a98fee247fb37d84ea2ab2ec21897f59b12aceee1700c1e8a9b6 SHA512 e9b86daa35829b2869a325d139cf9dc7f69c018e59547bdab976f05c3fbb61551eb8185bb47886354484380a72fb8317fabd06d2e9606e6893c40687083153b7 WHIRLPOOL cf1661c7398213902862d3b22b4cff73925456b03ecdb4ccb30aee57c9e06feb77a88612df51affd66edd2c853f947672581efbe6bc96ed9b33f5361baa1aef1
+EBUILD nxserver-freenx-0.7.3_p104-r7.ebuild 3466 SHA256 ba2e4c4015b11d58ce2f9b7fde94285de1181d30708b217652f3ad5da4982ff5 SHA512 e9ae24192218a01f59525cc5baf060dbd56e9af73a7c8488c103395d25b9144554929998e99907dbd23a3c92264a14de491cb3798f4076f1830fe3fd461300b3 WHIRLPOOL 1157d3387ab216a771ed924eb3d646498833a2bf81dfb30080e8deac70a6d987460dc0a89ca3944923c8680958d1386764680232bb7fe74b2e07fa7d0f693420
 MISC ChangeLog 20008 SHA256 1461188f9cab18736dcd3aa33232984a8c64c98239fe866e61a4a1d89e0df828 SHA512 90cfae86ec5f946ffd99551e6d0bed07d18c7a8e11aecd7eb5aedcc1cba672ed0f124c7c0e8812f4be8c1fd0266bf73a06d43376d112f33df28f54e29e9719cf WHIRLPOOL 1558c9a8efbb95412e0b59abf523e8c1672933f927f7699e69285ee048f31c31ef610be406995ca8e96db36d1c7d80aa8ce41951b87e37ed9da10f8d5e651a25
-MISC metadata.xml 354 SHA256 669f69acc4e36a17ca5ef253bda457dca5d27d7d434127badec4efa7311e4472 SHA512 d0f094df2325db88e8be577ac385647cf3a151c7a941af6598f5cb64b0dcc9358f8dbce2f70e66570a320a0d07e48b7c40a637dce60b5bdde21039163f89f342 WHIRLPOOL 7efee69890af895135f2714e49b37bad63be2c7f984c56e7198038e959d38c507c15059edbeb624b77ccf4495555cad77ccb5f223a0ac8e134e58cc32f1b272b
+MISC metadata.xml 445 SHA256 fd303a2fbd820835da907273c39477fc864e58eb68dc16fbedee5f1669b26976 SHA512 1ba1d2d123867773e53a74673b06c0b4da6a80d908354fa1bc12aefe57c1c17372d6515615aa55e5dfa3da31cf2fd3517913916e6e6d78289a42a98b983e6f68 WHIRLPOOL 69c066e3c720237eb09b496bcfee70f11187999d27da0bf0a04af28f55d6791fcb3f210de3049ea28691c09b054bca32274739c894aa30b23277b6cbe5c10ea8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE0xzR9NDgJnbExk7AAPerMxsPCX8FAljFgtBfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQz
+MUNEMUY0RDBFMDI2NzZDNEM2NEVDMDAwRjdBQjMzMUIwRjA5N0YACgkQAPerMxsP
+CX+wOg//RvjuBHP6YkLGaMm59cCThcjgiA9MrwyvW8YayvgsuPm1fTVzqyUhXvAW
+0l90lsiX026t4segRle6nUa85pGc6HeHkTgziOlI7UYNJBw5bhSJstuE923TEkvV
+OTCcWRONNK2xaIA/kr/vwpDSV9kWlk0HWTEyI3reAg6W+xCoOSYcxPFFrseZVKQG
+hcCazOhYvo1Orc9f9CiIen6kM4DMyOfoBb26E4rbBcJG0EKn+NCUp7wXSHT5bxrN
+qRGmVqS8XgJz0KQ+b1bgap933vRRRQCaAjSUSN/4JfidxVGoknUtHAYne2HoIxL6
+D2D44dbW8QOxd7OyicNZIb/FIRCShtYO0u/h74f1J5ZefF1sg3jlu+t/Bt0bQ/sO
+eeV00yykbLtMkh3uvZ7MRGqVp6evLPNvzJI35ZBoAubHtEcHMZE7KZgZ3AopJXAc
+V4tw718g5Go4Iz4DsZjocLlAqZJIALjnYGSyPMgV6YGRMWy3x34auPekdNwS9VL4
+aTOahSI5IbGS6DYoZR5ur+md8zVIpzGap1m5J/44gqmfz2Sz50R2iMQN5xJP8uTe
+0PUQ6gGBE29n6X1NL7Wo+5km6rCCzlTXKNPt2U60Jq3UFNTPCb03FCElqeUbt/3G
+GfFvFhH2k7q1uAP35SFbb2SqfDxZnpjdjQbsPTjsSBXzLIoD2rU=
+=XfsV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/nxserver-freenx/metadata.xml b/net-misc/nxserver-freenx/metadata.xml
index ed2ab70..f8ff2fe 100644
--- a/net-misc/nxserver-freenx/metadata.xml
+++ b/net-misc/nxserver-freenx/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>nx</herd>
-  <longdescription>
-  NXServer is an X11/VNC/NXServer proxy server especially tuned for using remote
-  desktops over low-bandwidth links such as the Internet, WANS, and wireless
-</longdescription>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+NXServer is an X11/VNC/NXServer proxy server especially tuned for using remote
+desktops over low-bandwidth links such as the Internet, WANS, and wireless
+	</longdescription>
 </pkgmetadata>
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild
index 3e05565..5c2e349 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.7.3_p104-r7.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
@@ -18,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="rdesktop vnc"
+IUSE="rdp vnc"
 
 DEPEND="x11-misc/gccmakedep
 	x11-misc/imake"
@@ -37,11 +36,8 @@ RDEPEND="dev-tcltk/expect
 		x11-misc/xdialog
 		x11-apps/xmessage
 		)
-	rdesktop? ( net-misc/rdesktop )
-	vnc? (
-		x11-misc/x11vnc
-		net-misc/tightvnc
-		)"
+	rdp? ( net-misc/rdesktop )
+	vnc? ( x11-misc/x11vnc )"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/net-misc/qtnx/Manifest b/net-misc/qtnx/Manifest
index 0d7be88..82eafea 100644
--- a/net-misc/qtnx/Manifest
+++ b/net-misc/qtnx/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST freenx-client-0.9.tar.bz2 46240 SHA256 dfc6c8dd89c26171411d8f7fa92613004eb8947ff509459151fdb03de7fe9608 SHA512 be56f594f13d0362c41391396db7d8a4807887622658c9e4a59e33e793625574dbc2a088b0c1ea28dfaa572f2d539d2a0a898459bd080609e120257845583df0 WHIRLPOOL fd15633bcf4128e89c0d74c2f94e62e13b0efbbc091407472609dff6bb7aad7183003a59272d1d0bda368374c2a7968d1b8efbba8900005e66a703a66c6e15fc
-EBUILD qtnx-0.9.ebuild 689 SHA256 07aad2c0fcb6829399c030ff9545e6b44fa30d8523626f9311830bca961d9ae3 SHA512 1c1c12e305b48139c10f2f7c58cf73b7c8beff3460c7264124a7bcceeaa496e7557dc53389b4b083758dfd9d91af4c09a4e2e22609d8b938b03a7c8eb9cb087b WHIRLPOOL 38c02da216f84f164351eaf7093df1accc2b12a53b4c68640a583034c6b1e0f5754ee79061eabfd76fb5a95ef85aaff302a706093b13585ea6dffbf71be28781
+EBUILD qtnx-0.9.ebuild 682 SHA256 28f10bfb8c985a45f9f75dad632a2db9e9e829bac1b53550d5228c572c7760b8 SHA512 f53e0bb25289da3344eb30bb712fea17c69521c750fc277ddcc6d9b473e3c4bf50cf330f5935f35379bde7f613edadf3c5d29ab5630b2e02908780f1dc11cd03 WHIRLPOOL e1f3ced616fe2cdc04856af6511a2c22739b898868998824b8daa4470f102036369c6fea7be00be8fbca6faf66b18a76ecc380fb0b52e40c9b71e00e0974f7d0
 MISC ChangeLog 1175 SHA256 a7c4525bd89df07efabd13a45569992f90068e5a0fd05e9ee7b7d7d14e264709 SHA512 56f2a0eb03eed1d675da0e3fee4f2f8a524e0e8b8641338b780a5ef54fb54326173a2581a2f3fc45f83f9d9149039802ec5c2811c412d87cefcb031dd9d8fa82 WHIRLPOOL 25648b6854bcb25b793592c99e3425c46332aea692bdc054cc8edf9eb66ce7426e77e68666e686b8bf60e626f9ad1b926c6e7cbf67c170fdece83a2909069bfb
-MISC metadata.xml 224 SHA256 837a7a5b7fc01e7ff828ae2d0fa9c6838e7fa3ae73be7a96d8497464a9e489d2 SHA512 ae84dde2f3fdb32e415a300df6ef5ea880e7f84b1849251674b613adcebd01e0a0a4d361cf891df31bcbf5e68644f109fcc60182b2507f69371e5da6cffe0ba8 WHIRLPOOL b3b4b51479e5279db391403cb1f58d95cd136270f04d609e92e3adeee11a670b41f35beb93037250c5c7e684002ab9d0a26bb57117f99dccaf4474a90d976ca7
+MISC metadata.xml 320 SHA256 5a3c3eeb040d59a3d41a10824e4b48129443ccb0d38cea8248ca60b69bc09c5c SHA512 d8113ce522fa74d38333de7838588a4a739463e9ddaec9184e4027d3cc89486bf1a54f705dc89a06a72a279ccfb6ecf3d7367d52777155b91d173c9354cdc5ee WHIRLPOOL 7740cc2fcf6f500316d3c585fe1f69bb021703efa4b7fb77a228d7f892a16165807e58a686a5e31b5ea92e0779d40de1faee4cc9e0e194bd91f84207afb0b1bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQKTBAEBCAB9FiEE0xzR9NDgJnbExk7AAPerMxsPCX8FAljFgtBfFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEQz
+MUNEMUY0RDBFMDI2NzZDNEM2NEVDMDAwRjdBQjMzMUIwRjA5N0YACgkQAPerMxsP
+CX/Gcw/7BDiM1ClHEWgpnnMrnD8DRj2NkNgHtm3+9e177xvdxFgBx+qqHdtbfEt3
+xHNhsS/G5PfwI+56KQAAW7oBxLxfnzb4YD6tZphy9PqMDZ0W0SHKGq/HoxJlKN0B
+ABAVaVM9VyDNnmsUllCFnBbBn51Yn0A4RrUjUuuJ6ktHGB6XF+qhwwGa4JrEm6nW
+fr+87yHIpcTk2IUyuQQy35EHF82riF0OPfNEVY70293/Gu6YU0Ag6wqPFQ9WndUQ
+mZpwovghthmP+G86b+LrRCQLA+isSorM3K2IE+m/HjJnjnh73X5k3SD4plb1zt8d
+lUVWWfvDSrccPQUNXXSeN5B8R6wEvgjhGbf0AWBohjfFvrn4d3OYCKPTLDfKw+bK
+nPdHbM6pOc57nxbyvrA7cpa8Hbz8I5A9b5ZlGn2MonoXbwlpqM762TukjiAdYi7M
+fm8l3i0xilipdUksootKWYcRRNHjDi37bOvCBH31WSeIX7K654M8OrNWV+ezt9H7
+OHczAbGU4ijfrmWltUdcFcN0QUQ5oWuv0wDTdj8rULvweAd6jD7JyUbHDfIxtgh5
+S4PudmNWlkOvYipxw/JyE8y4vVvJA1H3iudGXLREnTrW0BNFIWPe/ShtImLy6uQ6
+Y3fJS0F9EVm5oehqGuPHf68w3JmqO1fk5uxKy0nIK0kUCpV+T5w=
+=PXAt
+-----END PGP SIGNATURE-----
diff --git a/net-misc/qtnx/metadata.xml b/net-misc/qtnx/metadata.xml
index f4751cd..fcf1d00 100644
--- a/net-misc/qtnx/metadata.xml
+++ b/net-misc/qtnx/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>nx</herd>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 	<longdescription>A Qt-based NX client using nxcl</longdescription>
 </pkgmetadata>
diff --git a/net-misc/qtnx/qtnx-0.9.ebuild b/net-misc/qtnx/qtnx-0.9.ebuild
index 0ec5ccd..da7f068 100644
--- a/net-misc/qtnx/qtnx-0.9.ebuild
+++ b/net-misc/qtnx/qtnx-0.9.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="4"
 inherit qt4-r2