gentoo resync : 06.12.2017

15 files changed, 233 insertions, 69 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index f7b70d296719..1258386a0464 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 9ac23ca373da..7efd995eaa7d 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -17,9 +17,10 @@ DIST cfengine-3.3.9.tar.gz 1256138 SHA256 54b44dd1c7a77a7ec4e4dea9542ac4d79cb689
 DIST cfengine-3.4.5.tar.gz 4671628 SHA256 542808b9f532e77d66dca19e83bdc1f995d7d0066b940a39bdd5db9a71680011 SHA512 3de95b511c03b4e4f83b13b605d4cc8185419fb7ee6b42e34faf300e5af2a755713b2f8f61305a1cd3dea02f89c09076b164469549cfc96fec09a813c7069f0f WHIRLPOOL 9e7516bfeffc1fae87eeb67f51207f056b0644a6d51e7b1da8d4f1eb27e581781af3f5f56bb98ed405909b2497eea3668df5bb78ece447dac528d7b18fdcd90f
 DIST cfengine-3.5.3.tar.gz 1542468 SHA256 0e2d13ba1d75f826bf15411912ce21075734796a35e8fb8ecf545d70d60f41e1 SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18 WHIRLPOOL 2434abd1b6228e87fb848ea013dafca7d1e62dfeaa3ddafd534d663f69eb8b84221f452f8d288571352b641efbde0d1e65f6377d74f7cfa7678267f548036c7b
 DIST cfengine-3.6.2.tar.gz 1966966 SHA256 0e0195c1998fc261d4ef2e47e9cc50b273d204bc8b221d469bb83071933c4a09 SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc WHIRLPOOL 989a7853b74848a69d4323f0e10ab05a7522132b6b52362b02d40e95a361ef85b74bef3e3263942376c3f6f4a29c3174967a3ca00fc5acef774537af14ce6352
+DIST cfengine-masterfiles-3.6.2.tar.gz 119594 SHA256 0c98e5099dc0358517d25c51173940afbeb4861bf5789a00e8068ceb23f4354d SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9 WHIRLPOOL 6cd57198d4437104add7135e251a7fcfc10132420bff2cc040817e3d5bd782f26a0a3109aef8fd4758d632cc6288f0d49d403a1be83292b51aedd2e9e47335e2
 EBUILD cfengine-2.2.10-r4.ebuild 3245 BLAKE2B 20d109c7d4c315d5d9cd3e9b06784476f365d556bcf5476e353ec62b95dfa07662aaa22c9ba6b156dd4de1b063d22d24087e65295218735c2620a0fd76cbc29c SHA512 c6879fd4efd6fa430e730fe80db44da0a19543c14a3a5dbe366343ed3ddc7067ebe6f1e33418109a2f31026540d0d6ad1bff1f11ffe27136940a9beea12943d6
 EBUILD cfengine-3.3.9.ebuild 3519 BLAKE2B 3be8e09e3e0345eec2e83aed2dee2b8a37c71d5f6b3296e4585e9755e43536d330d1cebdaf2999c42234f24f2199c24e1fe81ec72731cef8dde24f8bda667577 SHA512 34b5cfedcde9f47894146e4f528e928cb31777ca36c9951f69fc937de19d80a9c950493d8351e13406e99a1c4eeb060527d6f17597fa5f6598a7908becd0a2ed
 EBUILD cfengine-3.4.5.ebuild 3745 BLAKE2B 8bd609d245891a3139fa3e98425bc960436e6a8d95e7d31153b9fb0ce4cbd5a9886804751954dc1bd3df47942cb1d2545b1e7bbddd86488f29e8554a60643f29 SHA512 285447ad8239f57f076ebf10224e5582414be174b4f1f35644dff2f170e2032a65fa76aa2877c22fdb6681abe855492a1cd7da13409563a1d83ef21b45871e89
 EBUILD cfengine-3.5.3.ebuild 3812 BLAKE2B 70b4bc5c20970c2da13c36880cb40e6a01b7b75b0e4ce070207234575bb62285dda049805942d8ff388c5ff9db73a93655fce5a6fba9d8d7fe9ad7a153d0ee97 SHA512 d0bec07edd75d17705894a9d771feb112f7fb892cbdae8c341bac6290a82eeef5e90187fc6dc7d7f1b911c5f020d30de9b8f043d196f663805eae628701656b4
-EBUILD cfengine-3.6.2.ebuild 3796 BLAKE2B 1863527353a21fa044836fe7fa1cd2b4c170c7aec627f432657b9c098056f489bdafa164bf0b281806b5e6e418175d9478917221bd7e901f708ddb892bc6198f SHA512 11d514590740382b0b1a8fa0a5c16024a738d8b4ca5642ee9cdac0562da698236996bc836b610a257def3938166def9c0a38dbbe658b8a82d607baa49c742ca2
-MISC metadata.xml 2241 BLAKE2B d61166b3911307d0c5f14b28d53129ebe846975f977a1e94d130adc28dbfdd5539240f3048c26461642f721699494b1781270a1a2d778ead07dfadfa0ed7d6b8 SHA512 7dfd5dc90230ed92b1b44bbf06d6bbe386511339e9510db728b48a2a19c48b6e2371be245905f8254b488980235e9e0c66906f0f01d36a29d79116017f220739
+EBUILD cfengine-3.6.2.ebuild 4254 BLAKE2B 2215d2dc3d49105049e1eea181b52e22b051820f9a8c8ef8b961e2b4d2e786a97ff0ae1a6161e3e71d595499a67216affbe6cfcca745f78e0113dfc7f63cbbb3 SHA512 30d2adfe8aa0ba9e42daeff457d12d881e2d059781343da9ecb7b6a7fb5f2ce1238e8c33277179396dde2a3a310f2d36a210d770843fd8552e9b4bcc61291733
+MISC metadata.xml 2316 BLAKE2B 841e95b118a868d289099e24f2c8031dd6412220367e404ed2d67724354b90fcd82e1c74b8f70181cd79f7fbbad67be81322355029fc5015bd284c37f9c839f5 SHA512 1879e2df9ae3f23a236ab29bd6b9168b5b3ed7eaf348decd3aace7fda7691ce03f6b8352c01eaa3888a53597cf3b46985e332373d7b21545e78cfa3523b2df3c
diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild
index 025728ee43ea..75f021ada089 100644
--- a/net-misc/cfengine/cfengine-3.6.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2.ebuild
@@ -12,13 +12,14 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="An automated suite of programs for configuring and maintaining
 Unix-like computers"
 HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="http://cfengine.package-repos.s3.amazonaws.com/tarballs/${MY_P}.tar.gz -> ${MY_P}.tar.gz
+	masterfiles? ( http://cfengine.package-repos.s3.amazonaws.com/tarballs/masterfiles-${MY_PV}.tar.gz -> ${PN}-masterfiles-${MY_PV}.tar.gz )"
 
 LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="acl examples libvirt mysql postgres +qdbm selinux tokyocabinet vim-syntax xml"
+IUSE="acl examples libvirt mysql masterfiles postgres +qdbm selinux tokyocabinet vim-syntax xml"
 
 DEPEND="acl? ( virtual/acl )
 	mysql? ( virtual/mysql )
@@ -44,6 +45,13 @@ src_prepare() {
 	eautoreconf
 }
 
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	if use masterfiles; then
+		unpack ${PN}-masterfiles-${MY_PV}.tar.gz
+	fi
+}
+
 src_configure() {
 	# Enforce /var/cfengine for historical compatibility
 
@@ -97,6 +105,14 @@ src_install() {
 	for bin in promises agent monitord serverd execd runagent key; do
 		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
 	done
+
+	if use masterfiles; then
+		insinto /var/cfengine
+		doins -r "${WORKDIR}/masterfiles"
+	fi
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT=/var/cfengine/masterfiles' >"${ED}/etc/env.d/99${PN}" || die
 }
 
 pkg_postinst() {
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index fb9078d2d2d0..86fa96098b09 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -13,6 +13,7 @@
 	<use>
 		<flag name="html">Install HTML documentation</flag>
 		<flag name="libvirt">Enable support for virtual machine management through <pkg>app-emulation/libvirt</pkg></flag>
+		<flag name="masterfiles">Install the Masterfiles Policy Framework</flag>
 		<flag name="qdbm">Use <pkg>dev-db/qdbm</pkg> as database backend</flag>
 		<flag name="tests">Install test files</flag>
 		<flag name="tokyocabinet">Use <pkg>dev-db/tokyocabinet</pkg> as database backend</flag>
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index b67cd58ab315..769d4f88bf4f 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -2,7 +2,7 @@ AUX gerbera-1.0.0.confd 531 BLAKE2B 712304e55ec4f2be59fdfb7a03f8a52e173f44e6903e
 AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a8bb3958ff7096d95c96b225f679ceb3ffe306bb1b3a03c2300fa433c4edffd9cdd79fb2fac3ee2aa5621fc SHA512 5a4c44d71e7bb4f1e9be2de61ab831d6b8871ab432ed31b58799957e7812e23c382f81c32062c0db44712287643e495fd66e1fa214676df3e0b18d7e1bb2f23d
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
-DIST gerbera-1.1.0.tar.gz 1308827 SHA256 225247e94983d24d50c0877cd7c9ef1e013091f2ec43fac7e2a3c3b82c11d5bd SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b WHIRLPOOL 876625f2669dd32dd67e88bc60ca98e216f6bf01f3729d8a629e42f6871c69f53dbc62fdce9b9ea98aecc77a5f4fe1da17530586227546c6929ae762c9ecb49a
-EBUILD gerbera-1.1.0-r1.ebuild 2560 BLAKE2B 9ab7d569e78b6a84c3a7904bf5c07a96324ea7af3fb89b8e8d596883e5acba3a6ce216345d09fb8715a3106ba1ea34b4364cef5e19cbb282d2d3c5609f5cfcc0 SHA512 614e5686ddae454103444bdfdf562dbec1a1260ba78b4f93dfe78d2045a40754ec0a8f4acc0b9b006dbc9b6af97625e9eb1fb3d745dd5a3cb17094a2eccd22c2
+DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
+EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
 EBUILD gerbera-9999.ebuild 2508 BLAKE2B e283d466b40434f1613ff0677ea80de1c80b000812a02c8cda6a879b2a8df61f5dbec72527a72383c92e03756adfaf7f60b8ec347b514d53b571b26bdaeb63f5 SHA512 053d702146225c24421d8d83466121996997917a7bd2dd462304ad6fbe488b6fd03a609712dd46e9bd8a4ec803702323ae0e3fc508b84a71757bfe6966ff7963
 MISC metadata.xml 1154 BLAKE2B 460042ab99add3291902174f2e8623505be246a191cec1792afed2c385ea47c2ba42c5bf3dd01aca0ee9d73c192bff5e501b8f7c46652e2378ae4f1574750f27 SHA512 3048a14a5414888be83baade4f1961161cd07097aa9574cd60225d54001d35df4bac8855c10ca529595baa82fd6137b310f64aff79af3057495b16fcd6cfd558
diff --git a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
index f9521cc5691e..efac2f23345f 100644
--- a/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.1.0-r1.ebuild
@@ -25,7 +25,7 @@ IUSE="curl debug +exif +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic
 
 DEPEND="
 	!!net-misc/mediatomb
-	net-libs/libupnp:1.8[ipv6,reuseaddr]
+	<=net-libs/libupnp-1.8.2:1.8[ipv6,reuseaddr]
 	>=dev-db/sqlite-3
 	dev-libs/expat
 	mysql? ( virtual/mysql )
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 0c8793f6ea8a..dacb3bc2ed2a 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -3,6 +3,6 @@ AUX networkmanager-openvpn-1.8.0-user_cert.patch 1037 BLAKE2B 4034034aa8c983d6a3
 DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 SHA256 ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 WHIRLPOOL 75669197a378d775eef26e6a69e764578d5628b2d8a6f11bf08b93e60a2e823b8138827e2456b37d8296def2c074362d0d4bc28b8e56389f5a826bcbdf19b502
 DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
 EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 BLAKE2B 23cfbb7e850d57957aa93fa71df13ba3454dfdc92ab100d04036cfa58fcce1b573d0635b453a6d12597ff42f20de30dc95599b68966172d44834dfd23caf6ddc SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33
-EBUILD networkmanager-openvpn-1.8.0-r1.ebuild 1444 BLAKE2B 358fb5fcf2769e8086d7dfe5735ae084b635952b7978acff160e53e62c9cc341321fbc2bb0a5f8b32840f952f5f3fdf43db90136087cfdd5b4e14aa16399b5e3 SHA512 ca059cdd1977e1ad0c505e84a34dc5658aa8196b9af775983991c71704b2c01e1010838293d90f7710e754174352fecc0586488503ea7c6b8ac434d1a5354a96
+EBUILD networkmanager-openvpn-1.8.0-r1.ebuild 1442 BLAKE2B fe7fe98d03e869b1e1c643300c44bfa6514b6a2d487362477eed8204fe91c250f80e96822b8b487dfb0ee76c371c503723f51923f6e55acff4f39a288ebd5732 SHA512 7b769a310afa02e0a4aed20d3ff43fff4e67c452ecf325dfd0a25ad938c6d4e9f1e5d8873a150c66d0277aa88b5018a9c15307ab43095302a8e98781f7a89f20
 EBUILD networkmanager-openvpn-1.8.0.ebuild 1239 BLAKE2B a7b4a022a382f1c79a7fc174950834d8637daa5af6a4e70546b21ffec59bd3b571092fc6ab420d11223aa27a1964145c001d6bb4b059101605540f7a984ea075 SHA512 68094ec0ee4d0094560a49e8c6abc41675f78edcdb72cf1f88b4945ef0a6a32c81f42560952b83b19e9e5106c9d7f366b0c3162e8ebadca2694f1351b4ad30a8
 MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
index 1c70636fe182..5674bfcef671 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/ptpd/Manifest b/net-misc/ptpd/Manifest
index 7d4a03dd3a6b..023c8da7aa7c 100644
--- a/net-misc/ptpd/Manifest
+++ b/net-misc/ptpd/Manifest
@@ -3,5 +3,4 @@ AUX ptpd2.rc 1372 BLAKE2B 071dce26d1343050b212312381a07af6b24d4923d715e4b7c4e065
 AUX ptpd2.service 228 BLAKE2B 89bb7a7b4352f9905032ca7efc778cc220282df8389f1da4f60af653cc71b2bc15d08c73730f326c9311f97ebeff2602b73cdbd55683a2d69cb57d0a63a28a47 SHA512 72d609c9b803921b55cc0528aafa5cbbff0b7ed2f1267fa5f06e410ec640295642717928bbf38c849f632d157132f01f60a8bad826428b846d8248bac27e932a
 DIST ptpd-2.3.1.tar.gz 884161 SHA256 267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2 SHA512 25c128ce1920ae2c1469e986bfa5d5b8ebca04ec14b838fb8232b36e0a1ef94646507e1b25034846d11cf0f71d7e2da983b9f6408f8fcfc608904ecfec2a15c4 WHIRLPOOL dfc107c0011db56b1e943bf9ac794c51631e0320e8ae19c5db2d67af55cd15a73e2e71117abca0db787896ea0366987eee29d91f15eea336c96be7093accfd6b
 EBUILD ptpd-2.3.1-r1.ebuild 1358 BLAKE2B bbd67fb82dabd88f2f0885df34dea7e4a26406a86c5329aa72fa66f93327a842eeb7b0c20aa6f5874157e4acc461ffe1fd1befa37825ed96f7ee331c6985854e SHA512 157ebd631b8066ce73f1d1bc8133e23dea20fcf34585e219c59a792ff90d0b80be4fd74bed2d30e0f256c99e5f24ac2a861fba14f69904ad899330b32dcafc97
-EBUILD ptpd-2.3.1.ebuild 1273 BLAKE2B 441c88828ed3f6f25c7d906d50a8d40eb8196eea64cf14d1184edc9a6a027f8b62eca9679be64e8ce37f1a76c727991c1279532373aebae5a3b933fe47a23b01 SHA512 d4fd3b4a44e0fd2462ede9035968c18787771fcc9ef80093a42f43da13bc7757ca00aaae02016efb79d0f63aa7293af5ebc29563d154b92d5e51cc6dd01a91f2
 MISC metadata.xml 988 BLAKE2B 25f10292189622b3e50d058fc2faadd46959bab489a65a77f4bf4b4d5b8c98ec86e4b54e987b87dab497d4fd39c2c786b743987166ada6d9c4a61e15a5960a1b SHA512 a96ee23e21b8230c4756022e5678df1f72c61576b0aae1de04c10328417f64535129ed4a10beb7545c7316e36b9fe658e8c5ced5f28177ff84b106caf525ec06
diff --git a/net-misc/ptpd/ptpd-2.3.1.ebuild b/net-misc/ptpd/ptpd-2.3.1.ebuild
deleted file mode 100644
index 3fcbbbc2a23e..000000000000
--- a/net-misc/ptpd/ptpd-2.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic systemd
-
-DESCRIPTION="Precision Time Protocol daemon"
-HOMEPAGE="https://github.com/ptpd/ptpd"
-
-SRC_URI="https://github.com/ptpd/ptpd/archive/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug experimental ntp +pcap snmp slave-only +statistics"
-RDEPEND="
-	pcap? ( net-libs/libpcap )
-	snmp? ( net-analyzer/net-snmp )"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-	ntp? ( net-misc/ntp )"
-
-S=${WORKDIR}/ptpd-${P}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	econf \
-		--enable-daemon \
-		$(use_enable snmp) \
-		$(use_enable experimental experimental-options) \
-		$(use_enable statistics) \
-		$(use_enable debug runtime-debug) \
-		$(use_enable pcap) \
-		$(use_enable slave-only)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	insinto /etc
-	newins "src/ptpd2.conf.minimal" ptpd2.conf
-
-	newinitd "${FILESDIR}/ptpd2.rc" ptpd2
-	newconfd "${FILESDIR}/ptpd2.confd" ptpd2
-
-	systemd_dounit "${FILESDIR}/ptpd2.service"
-}
-
-pkg_postinst() {
-	elog "Do not forget to setup correct network interface."
-	elog "Change the config file /etc/ptpd2.conf to suit your needs."
-}
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index cfe3d989e2cd..9856075fa25f 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -15,5 +15,5 @@ DIST ht-20040304-classless-bgp.patch 1581 BLAKE2B 64df9a86c235c4f6d35be0f19fe1b0
 DIST quagga-1.2.1.tar.gz 2922514 BLAKE2B ab0a59c1162bb4ac8ba3a75c015a433e2022bc35cd2a4678dbc7c80510f8c687d944b5e2bac03e9d3362bdb20badb2c17228dfd4172eebc6c87b24b2be2276e4 SHA512 ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
 DIST quagga-1.2.2.tar.gz 2986142 BLAKE2B 2c2326e015ed4ce7364a960b56108bbd04c184b7cd78dca0cac528cd2869e65e6efbd40c303ce2b6eb29eed809e8b384baa36329b365ae6799a5b25fa21daa4c SHA512 861f6524bcdc01d1a895762bf1904744c12ae4dfc7c3583ecb7e55b3978c98187bde76df0ff85093c744139be9d5cf324fec75b5ba86cf1fdbce70d923710d14
 EBUILD quagga-1.2.1.ebuild 3679 BLAKE2B c71ad696b777ddec0bdfcee4fbb142fc7c55aa7b3d676d1caf56515915aa0fef6d8c825da864c23a685d02f977b0cb9b6eec5335c2a952facaad136ec7efef2e SHA512 c17c0b0d74088b0dd05ca2c3a7fddc471ff5b1fcbb888b94c0117d73f4e74842e21e832923a050cef3fb3666fbba4d20d1a13b0a75836a902fc4b1a1da60d516
-EBUILD quagga-1.2.2.ebuild 3646 BLAKE2B b19200bcd8dacfdcf3687f4d9314877aee51227205dc8212ea323fe0f364a9654977d194ff15bd95c3fefe7beae846c64b034cfe59f424ce638474a6b6e01b2a SHA512 d83d37e25766cb9dbad1c3865d80f77cc250d414568337c0c29ef2f364eb0e1198338e90453672e2160dd872ad2e95d42e0cdd89d7ee0b4b4ba4e787d18548e1
+EBUILD quagga-1.2.2.ebuild 3645 BLAKE2B 5392140a76201fa470df9cc295312418b395c334ef41e9bf1661b6bcfff8272153442e6c9648aee96db3784643882121999b7d94cae3b885ec00cd150d26d824 SHA512 5b1022887faff8be5c2a945b31fe08a8979348d47bb44f5a07b507e51b258511b23478389f5e07705a47ebe0ceeb6e67f5164a68a0ce6fceb9fbc31a7c9a38fe
 MISC metadata.xml 2375 BLAKE2B c3bb85308f39337c4bfe74dc7f373dbf3999fa38ee800d63b543f00771d580f52db69005227f778105209b703e1fa7e1ce88e4a6549f5fc673e8defcce4cd97b SHA512 77ae3e9edac846d80a8b9bf2cc6c7582bffbf9b43cffc0649dfdd1f3dcf528ebf0c99ebd70c4fe27c524f98ba453798de7f320d50f7b76287623b8ac8265a6db
diff --git a/net-misc/quagga/quagga-1.2.2.ebuild b/net-misc/quagga/quagga-1.2.2.ebuild
index db05f0525756..930fded18e75 100644
--- a/net-misc/quagga/quagga-1.2.2.ebuild
+++ b/net-misc/quagga/quagga-1.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~s390 ~sparc x86"
 
 IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline snmp tcp-zebra"
 
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 359d07a55b8e..82a6397694c0 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,8 +1,11 @@
+AUX java-utf8.patch 653 BLAKE2B 7254ce7a2629c74a8a6a460bf3e4f83fddd242eb1043a691618dfb22eae5aa6cdf7e50ed81a6c754714dac5238a64a6db96a4e8c71753d1c87abf25ef4e7e85b SHA512 e6c8638858019865348c3920146249de12b91917f23258c0f667b630d778e555c5cbaca8543624d67fc369f1a4b80e11ffa22153803895327221b12527cfd76f
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
 AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8
 AUX xserver119.patch 3681 BLAKE2B 04a4bac19c1e7463b916647e92017ea14af4a9e1140db229383d574381a24f30e68042b6b383fdf18cb0dee90b4d535183121076a6638fb8454222013dae85a8 SHA512 531c3b99c5402a66f95ed5743dd37ae9de493cd9bb2e63b39afdd2d536ae438b3c5e2618226f070adc62e41b169837ae7a3302b7bb131b181361a7b142a9e93f
 DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
 DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
+DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
+EBUILD tigervnc-1.8.0-r1.ebuild 4579 BLAKE2B 2100ceaed621bf414fa0a906ce425a30be56a8f946f82b8dd10b94b314a575670c88fa95902d5182cb7fb253b6399cd8e26441526b31b13f5fe34a9c08ce712a SHA512 57e1233a4e19d556bd86886dd62fcfc53b966a3fa45cfbc311618db3d31ca01d3216cd6af03c52293c277856e271a09a337a68207ec2d5b5e0e25b800453995b
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 671 BLAKE2B 6c11feefea25aaeea974f4cc73eaf39d9303f4755bfe4515afc069490a6d742e4299f9dd70189ddf45ff04ed1a346fa0857f09092fe016b2db1a1b8bd70f2372 SHA512 e2416162e344db1025f15b89754c6f84f9b69217b86abe15bb6d048ae80bcc0a84df6943ada53c71f6bc6236f13f7add3e5f03a9e52cc61da060a391b8a69a44
diff --git a/net-misc/tigervnc/files/java-utf8.patch b/net-misc/tigervnc/files/java-utf8.patch
new file mode 100644
index 000000000000..71bd4503b777
--- /dev/null
+++ b/net-misc/tigervnc/files/java-utf8.patch
@@ -0,0 +1,11 @@
+--- a/java/CMakeLists.txt	2017-10-25 22:26:12.920787580 +0900
++++ b/java/CMakeLists.txt	2017-10-25 22:27:21.423007891 +0900
+@@ -9,7 +9,7 @@ find_package(Java)
+
+ set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
+
+-set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
++set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
+ set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
+   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
+ message(STATUS "Java compiler flags = ${JAVACFLAGS}")
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..745ac50ae663
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
+
+XSERVER_VERSION="1.19.5"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
+
+CDEPEND="virtual/jpeg:0
+	sys-libs/zlib
+	>=x11-libs/libXtst-1.0.99.2
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( virtual/pam )
+	server? (
+		dev-lang/perl
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXfont-1.4.2
+		>=x11-libs/libxkbfile-1.0.4
+		x11-libs/libXrender
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+	)"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( >=virtual/jre-1.5:* )"
+
+DEPEND="${CDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xproto-7.0.31
+	x11-libs/libXfont2
+	nls? ( sys-devel/gettext )
+	java? ( >=virtual/jdk-1.5 )
+	server?	(
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-proto/bigreqsproto-1.1.0
+		>=x11-proto/compositeproto-0.4
+		>=x11-proto/damageproto-1.1
+		>=x11-proto/fixesproto-5.0
+		>=x11-proto/fontsproto-2.1.3
+		>=x11-proto/glproto-1.4.17
+		>=x11-proto/randrproto-1.4.0
+		>=x11-proto/renderproto-0.11
+		>=x11-proto/resourceproto-1.2.0
+		>=x11-proto/scrnsaverproto-1.1
+		>=x11-proto/videoproto-2.2.2
+		>=x11-proto/xcmiscproto-1.2.0
+		>=x11-proto/xineramaproto-1.1.3
+		>=x11-libs/xtrans-1.3.3
+		>=x11-proto/dri2proto-2.8
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	"${WORKDIR}"/patches/030_manpages.patch
+	"${WORKDIR}"/patches/055_xstartup.patch
+	"${FILESDIR}"/java-utf8.patch
+)
+
+src_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake-utils_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply "${FILESDIR}/xserver119.patch"
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use arm || use hppa && append-flags "-fPIC"
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake-utils_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			--disable-dri3 \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-silent-rules \
+			--disable-static \
+			--disable-tslib \
+			--disable-unit-tests \
+			--disable-xephyr \
+			--disable-xinerama \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--disable-unit-tests
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+			composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		if use systemd; then
+			systemd_douserunit contrib/systemd/user/vncserver@.service
+		else
+			newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		fi
+	else
+		local f
+		cd "${ED}" || die
+		for f in vncserver x0vncserver vncconfig; do
+			rm usr/bin/$f || die
+			rm usr/share/man/man1/$f.1 || die
+		done
+	fi
+}