gentoo resync : 11.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-11 16:02:49 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-11 16:02:49 +0100
commit: 88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch)
tree: d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /net-libs
parent: 4645b6f17f0da81e9fe84081fb126a37102ba153 (diff)
16 files changed, 480 insertions, 306 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a1e43f82444b..9178202ee7cd 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1ae4a01e6247..6d6391347203 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,6 +2,6 @@ DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855c
 DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
 DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
 EBUILD gnutls-3.5.15.ebuild 4109 BLAKE2B 04b4e2f396c7a9648c5515822e4899228adba373a3b51cf8e17174418c6de99384a40e2e1f255541f5bb0a0ab1c96d4556c52438ef7cb3ac7038adedec43a094 SHA512 e1f4936c0222c38a0f280bfbb86e8cdb2e4e9e4f22baddd5a8ab9c163fc0afd6f9ddb7924a42a398650bf77f7ae8d230b9e8d2713a01e53986b02d7545725547
-EBUILD gnutls-3.5.18.ebuild 4115 BLAKE2B 7f83ffb50f1aec508154e9823076e9ccef115c4a6cf3a2f36b9b3036b6e6e79720381b7c6f13ac8e1fed09d601523856dcece91932fbf9384dbb36dd1f320859 SHA512 5cde5dc117f5644e020751632d38d9eb2ea81afbb46ea805274c43913263ad36965ff63165cde4db4a9386d618e217658de157131dbebb5374d2da15290ccaaa
+EBUILD gnutls-3.5.18.ebuild 4114 BLAKE2B c8ed07eabba11d072baac64ac6a1590e64df5aaf6bf38820887e7c0cd4650ff25aab67c01d163ce550cb6f44f85c698192436732a7272503479abdd4b719cd3c SHA512 0e62f7e93d007c27ae718ae6bd24bb6692afbb8b8e9fb6ad5f1848cacf98930c522dbb6b6c98e78d6c9fd0ea7b5a9eba20ad5204b70f0adc556bec086a0a1027
 EBUILD gnutls-3.6.2.ebuild 3751 BLAKE2B 9777ce3562714525ea3442a8ede4a654e4fa80d67418a9eae8ddde910c934593b3f6c5ff33042cdefbb2d403ba4e403cd51998e2167a5b38c7ba4e367bdeea60 SHA512 d64c7e65868e2aac58ed783a415a8756c1b225bda0a4082798d52c8eb332ddd03ba5f07a9fa34c7831d975a17e0def85faa0b6f5ba9046b3ac49472d5756f96a
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
index b0ae57cb5899..cbac099a7f42 100644
--- a/net-libs/gnutls/gnutls-3.5.18.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index 0470623b55ee..126a38282d32 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -6,5 +6,5 @@ DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2
 EBUILD libgadu-1.11.4.ebuild 1299 BLAKE2B 8ae4199cdefee341d9593eec668ec6d4fe53d340863869399a866c38d22810f117ce33fd58473caa19a2c02cacd46167c34800e52279866316877abebec9814c SHA512 77fce206ce7324e7a10b6c7e1c4e49fcc3815b3c4442ff9ba1b80460fef971f487aaf6504cbeb4f2162e912f87d565f052f5e859d22806bd122cace801a969bb
 EBUILD libgadu-1.12.0.ebuild 1421 BLAKE2B fa83fb7b137cae397024abde603e8839cbfffe0e54130298eda458b1354cae08fe3b9bb875bf4179cc39fba5d4c10b92ce57b8918a07958c06331ba862207706 SHA512 1601544bbd6e29c6c134bdb7e2e94e4dafce2b845d6e5d13bdb6ab2f955b718bb90b91217c2c42460834997be3d0c216e8df4a3ea84ec0ed0ff1257aa868add0
 EBUILD libgadu-1.12.1.ebuild 1435 BLAKE2B 56ab1bc6b8f003354096b25290a17af6245331cee34dfbb676fa37f478aa03cfc6510a2f785dd84569b60cfdad63310a0004ce751753a28e1756a338128d4a7e SHA512 6a2f97e833816e212202b8e21a45fe9505371e4c1060670000fffc9ac77852baefb729dc46f2431b9e63acbc4759caebcbfdec650e84a7c0e32d8252314e8531
-EBUILD libgadu-1.12.2.ebuild 1394 BLAKE2B e2e8383b2c5ca54cdc9773c3400c1a4111e7788ba9102c2b8cb6f5837952cf16f949b4ad9358dde1162a14ed80d59a3e1d481604902335ed76d114ef5d24ff65 SHA512 180cb5fbf375ecf8979906b28cd561d4dd3e800aadc4ae53de01c99fd72c90e9f28d2eee10d7555fed11ebbcdf68661af6062f6f23e818930699ea065998222b
+EBUILD libgadu-1.12.2.ebuild 1393 BLAKE2B ae6c1bc6c49b3d2e5c0800ba0bf72240141154830a15b3dc609a64c91b0ffa04d4c33f5dc0052d8bee443b27d39b852d72e7878768541838f6616fd99b2d20ce SHA512 944b3d1f2f70ef67e154415edaec6c044bd777771473de7d1b464a7ad51622e7ac7665e1bfaab053729fe77b7ae9f9ee1286ee5139577211d3096ddac2332f74
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/libgadu-1.12.2.ebuild b/net-libs/libgadu/libgadu-1.12.2.ebuild
index 6864f7ad5739..eda0ca3fa582 100644
--- a/net-libs/libgadu/libgadu-1.12.2.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 36ea3df445d9..2ca22993d67b 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,10 +1,8 @@
 AUX libnfsidmap-0.19-getgrouplist.patch 3459 BLAKE2B bf58f1234c9b306643698250c0d5cc9ad4290a22582e18af09b91d9c9d7b49cffc959c77758ab1c7d1af0be9401cef2c0f5c1127aceb9a175738236dfb6e0d58 SHA512 a778620b51158b07b7224ca010ba199feba85af7fc087bde65cfb8d2660bd7646c08d303a39d2af525b3a449694a60c3c35fe3b696cb0354b5d74423240a9e8d
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
-DIST libnfsidmap-0.24.tar.gz 328720 BLAKE2B 4b33a589b9d4b47530d2044a0912481dfda770de86f7aa90e80771f2df4b555857535a7f162a485b68c9b1d48be563d246e128fa3ca1e3c79d9bf0af69b8401d SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.24.ebuild 1072 BLAKE2B cbc056d0eaa632b3692b21d6062f5538ffda57035d2683c49808b4922f14da1e8673dd0301fe9452a70341046aa6d2a513d04947827f9b9d49a2313aa13e3687 SHA512 1de6d7598472c57587b95c46c0b2093438227efdc85800d340c85f32f05b2f4fe91b30c46c04fa735c8a222c47f2a0f0342624a296fad0f0abccdaaaf3d0432e
-EBUILD libnfsidmap-0.25-r1.ebuild 1226 BLAKE2B 41cd41db66786ab6f39d78ecb31520b965c63993db3dda43a8c3602cf8de2241e7b229a2ce341f7a69a2a007d5e3d870bcf6bc6e10914602ba1b0ce09e067156 SHA512 87af244b1bb1d2d83a13cdfb7c9cd0b0eff322a4490562f51037eb39ab4b91e06137265985567a3c3fd343092de68fe8494c0554b070bccac292b2f8a37e0d0b
+EBUILD libnfsidmap-0.25-r1.ebuild 1222 BLAKE2B 330ac209ea2c836320d71cb91738cf140a2207664c469c0470fb8e7d37b8690b2075cb67c727019a738a3d33cdf1ed79f956e7d1abd781787a79602472549e90 SHA512 aad280f52fa485aedbc4fd0856f57367bf25aa8888aeea550d2683230154671d963b6645f972d48c0e9d20c1560a07d51a4eecb2d6ae442f55ea4de71fbf1f8b
 EBUILD libnfsidmap-0.27.ebuild 1357 BLAKE2B 5e976922f305b8549331aff8d74a48dc5546d20deba68c7196e3773c8272b3964e72f31fcfd358def163ddaca53eac6cbb9d28ad137dadf4c33f2e5bc4b423aa SHA512 192121cc99c8240f1a9e66d5d4ed6bb2bac743a324c58c115d5b7ee2aeb610f488d105c27055d072b4268bdea43be00c94d8dadf71a7af7ba9cb8776772fb239
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
deleted file mode 100644
index 6cf4e36fb64a..000000000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	!<net-fs/nfs-utils-1.2.2
-	!net-fs/idmapd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
-	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable ldap)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	insinto /etc
-	doins idmapd.conf || die
-
-	# remove useless files
-	rm -f "${D}"/usr/lib*/libnfsidmap/*.{a,la}
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-}
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index e4e6136dd054..97ca93fae281 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 02ec7fccc83d..4d6778863ff2 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -3,10 +3,12 @@ DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe6
 DIST nghttp2-1.30.0.tar.xz 1545352 BLAKE2B 0d52f973a63632dc1ad235f1b535c24053a8dde52dfbda957c3e40548b4de5db5975639140f207cd9ffe564b6151ed6d97de45ff070eb2cfa3d6b41f52254430 SHA512 4b79f46947777627f0a9e1384ec51ac70e273aef6d46d322aa448731726b8ca606e73dcb171170bbe91fce93c28170ff04e11da56ee90fa28d642e7bc37b50be
 DIST nghttp2-1.31.0.tar.xz 1545800 BLAKE2B c0b8130abe7eb16e977cb8d480505d74c41986f15733da2005b1772b4030082c1c0c2e9a0576aae3e88922fc7b17ad9658e916641c3ddb816b45cc0e202b5bf4 SHA512 00342b0517eb9e1044eced4649488d7ad35694e0a1303c4cba2d2be897fb86c5c70f1a5a157799d5c0cf448a6b983f2a2a57ee2bdb5ec762876647f9303446ca
 DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
+DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
 EBUILD nghttp2-1.19.0.ebuild 1811 BLAKE2B 7931aa1b1477275b7efb6f174bbcd5a7c18ef6df4d69d4097d4b199d9debe43a9de9a4ef3ffee66d7bd7b7895289fddb69707a69e6eb3da49210109b5d87ea39 SHA512 5ed6ebd9d727a4803878bade7f3abd7fdf61b53ce7e04259e3c07290fd48f8a26a4b61d64aa533afa9eaaf37d4c7a7376e9f37b6bbc04637e61d6d07f603857b
 EBUILD nghttp2-1.29.0.ebuild 1852 BLAKE2B d1b38bd11741cd70e153c933b961b049eec102edc439d3c5c40425458878cbad8cc2e3e64f55019fe5694ac1229cec52de99e3e2f599b27dbef08e7e61f1db78 SHA512 b15473ec7490b351612a14d2593e92a3d17322e7e8c8dbda7064c4da055326a2c5b68de17ae0da85d91d937a3d8942ea0c46cb7d95224c19bd9a322b802405fc
 EBUILD nghttp2-1.30.0.ebuild 1860 BLAKE2B 1921255023f5cf1ed11003ff073094c50427849fe965440ad361a86515f75d11825b04097d4c4728a7f3158f60b94a3cdf086297c2c54f68ba25699be7dca7d7 SHA512 b3a7e529a1c7d303e47d8440a673f5ec9a72f111c5473f3a7c5cb22610ca007d260d626a6f480ae1d9cbffece42cb7ecdb21535714ef74dd1f8d087e829026c1
 EBUILD nghttp2-1.31.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
 EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B ee44e10fadc1aa2d28b71aa4618122fe84483c92aad7fbd005cfc48235d9ec68b13bb16bd2f82ec71189aeebe1c120575f80511ab357e8e0d415e0f512095608 SHA512 074f50c5e04fd301e0f4e79e21c6c720b336bf982d5bbbef4d241d124721fcb648f5ef1d9cfa7fd89c98ff45449b45a8f6fa668be9137814f1002bc06a91d874
+EBUILD nghttp2-1.32.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
 EBUILD nghttp2-9999.ebuild 1934 BLAKE2B 091fa366b740f254c371d075bf24dc126f8d86f66315816b16b3c4c0177c9d2fff66d4ba916adbc203bb2d92ca6a070e80d58d6a4f30cea6bc8fa71eb3718616 SHA512 7e157bcc44e80ca78a85fe1b0e97b293646a30aedbfe7d918f5e16b96d061e9303636053675021af5ca97f84f38fabe0e54c63348f40fe9a52b00e20b0717c4d
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.32.0.ebuild b/net-libs/nghttp2/nghttp2-1.32.0.ebuild
new file mode 100644
index 000000000000..ffeb54eded23
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.32.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: Add python support.
+
+EAPI=6
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
+	hpack-tools? ( >=dev-libs/jansson-2.5 )
+	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	utils? (
+		${SSL_DEPEND}
+		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
+		net-dns/c-ares:=[${MULTILIB_USEDEP}]
+	)
+	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
+		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 12dfd2346335..15b1f305983d 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,18 +1,22 @@
 AUX gentoo-global-npm-config.patch 1511 BLAKE2B da2b127df9ac9babc87c1930272244e7f89ac1931543fa524e13fb3c53d2b5a9cbdf0d93dc0cae207822dee3c8f71e2a12fca3d608f6de8589ad2c0064f0855b SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f
 DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
 DIST node-v10.0.0.tar.xz 19248896 BLAKE2B 3ab8313e44d57a2f04442d23311a4d824a9d0b89c7d3ee06042f843ce0bde39e59c1ef2eb0d77cde4c46d649b074cf08d1109c91b0914c23b048c75f29e79727 SHA512 9d686da290f84c5fdab39cce08161787661b4df1e3e37bd242e5f5f3ff8285b6bca3ada16e155fcf0fbb9ec8ca8736dc7d02788cee2d66f6fab87c1a29048f4e
+DIST node-v10.1.0.tar.xz 19363748 BLAKE2B 931349d204764472706f44473b2ea0e1399dad84d0595cecfc2cbd71670df25f05c2c2ac77e4c18852f523d5b0cf853ca83739fc96a46e1f5e76ae51cab006c9 SHA512 f98da47849de8a50d9986d0176c39914f3993e579a3d482153cb0fceb64d7c79443fd230a80946361008e4fac58b7b99292c906961fb57ef14ccecfd1da07156
 DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
 DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
 DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
 DIST node-v6.14.1.tar.xz 15758180 BLAKE2B 63db5d1f73cc16f5c73012953799193cbd58da3aa92d3d48c5419d4e5c4e9126a2eb45b7e27e7396269deeca7836cac62c5f89e5d23b695a3455305739d5df90 SHA512 c1f725c76bfad914d8d607e1d0bddbb6cb75a99adcf781d12291830bc41610ede346a5ab29648d16ad8bb3031dade89f7f4e16708083b5fcda2def965f0c7d21
+DIST node-v6.14.2.tar.xz 15842896 BLAKE2B 8cbfdc6b865d003612cce1be9d9bab2d1e0a85e4a7d05b093dbd075cd659ccf834de3107d568a3d2d9273ac848ee02afd5c4c83789d9021f32654af82ccc5373 SHA512 0390febbc8abbfb8f9da72489bd90af71fa71c52bbac8f156017c66cb6fd505b52173f5626b75bcf10be22315ef0774b4c93369089e91688ec9567cc7405c6d3
 DIST node-v8.11.1.tar.xz 18279516 BLAKE2B b06f31571c93455d16899e3ba57d1e5835951be7a644fafbfcac9cce1bf33ed8ca47929e0a5d0df72034a6c2b967c578e3c78a2ed27ba85e41c4af1de2307293 SHA512 0ca0dead15a1623ece7f972d420dec623141a795ddd984c32ce7e92ae32ead97bb0153ebd8c1c249b91a1bd6efcef7fb313105455f66d4d181473153c4e0736f
 DIST node-v9.11.1.tar.xz 18500884 BLAKE2B ac086b59144ed7393a7c0293616c1ef2b149e23ac67ba8ccf324c2c1f97b18435889e4fb2f1c205834e3309728853dcdbf34d00cc319a10bfed7cbea9fdf01e3 SHA512 6e5ed333ebb678c08fca8f567708874a50bd9311e326196bf86ca77db3046dd196b50208bcffb7f3435f0c031d47dff5471465c840be12903f3c683802000a1e
 EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
-EBUILD nodejs-10.0.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93
+EBUILD nodejs-10.0.0.ebuild 6333 BLAKE2B 5ca8e721fa5bfbf5c7bb4602de9e15228de138cde1ae522b673cfc61f601c9019e1988b472566172eb13471c91c0941b4d1d42db79d52f64a3be820322c77a7c SHA512 91492cd5bc82b5b454aa418b6b176ca6ad6417a7edd032c68f0c36cae4f7799d2da62791835656d5ba7487f1eb9f663f7347bd2b73c1fb1efd5fa2c732626e55
+EBUILD nodejs-10.1.0.ebuild 6333 BLAKE2B 552ecbfaf9e2c973d3673ebd93df67821c55ba41896fbeeda4386572f8a33a23a39ead9ff04b449c1224bef3f6fd212c94cbb6f08f4b55bae8db6ea78245b005 SHA512 6d43a12494acea5d298517d41dc93abb3b863020fecf0696aee6b4cfa7147696807eeaeaa90ea3e538563bc6311e052ff0682df708be4945d3ab744d7124fe93
 EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
 EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
 EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
 EBUILD nodejs-6.14.1.ebuild 6170 BLAKE2B f8f9b6ead741f993da24c760daa48a7a5ac9415a9fec05c313257cd02c9f86ba03b4c15d7e2d0ef18dd1ad1e23b5d5152edb794756dd356368ac2fb534b68148 SHA512 c49be4f51d5fcace57544a7ab35ceac10870cee4e8341b9fb7303b2b030e21b65d3d158a854fe52b5d6813a5bf15cf5cc6c5dff254c2824c6fe8c8bc826aa634
+EBUILD nodejs-6.14.2.ebuild 6171 BLAKE2B 7946e4fcd461d071fcdb81c1642d0eb6d812e5660aa308ca3bf78501aaf9cc9430f9be3a806e371c9216774a545507759faefcb30ff4861a91fc05915b4d9601 SHA512 3e77ce77a4d9453d36eb252834ed056751c8805d4e89e47448bc1bdeeb41732a8d380eb8b4c1d13254ce14ff37bd586ecf381a5878901528b5a50de777056f6a
 EBUILD nodejs-8.11.1.ebuild 6348 BLAKE2B dd10b95ed52f83175d16c6a68c9daa39f38f8e839d2f181c8a4fb0f64715561c68cff6e704aedc186af3b657dd87b4b05f29ae7c01ef1b1a31d1799a7a66dd2d SHA512 09fc1df3c4cdeafc27dd63836f30f62c81144ec70ef09acd8ebd0e093a07c413c368c47ab6657c9fc290bf59abe72062e2f92b7f6782ffdd49e80d2036936a9f
 EBUILD nodejs-9.11.1.ebuild 6334 BLAKE2B 51236f25ddb70527867a9ceb89d77872627db453f74c909d0a9a57457b4814322731c9e5d6f93f9f5b37945bd35bcdda924834e22ce19c1eaf97df3873488ade SHA512 45035c68b6202f9aabd12be127674b89811e0192dcc5604969b27b85a4662a2219dfa6e507d40d7fb5f8e9643c49e755f19ba686fc611e83e1165e03fdb1c566
 EBUILD nodejs-99999999.ebuild 6267 BLAKE2B 2858d03713127b51e3897909454354ee34f3ba11273972cf62cad065faa3a571bb1d17c7353ecc3487e9e8809bae45caa9898a05bf7c1871b13cc6bc7d7668ac SHA512 8a8f375e96f33b6c85f7c188b488586c4193708b9d3618e4f83d3f562bfd55baf8034b61b15b8e003611c6209787339adfd07358237b70250de376b1612d0a06
diff --git a/net-libs/nodejs/nodejs-10.0.0.ebuild b/net-libs/nodejs/nodejs-10.0.0.ebuild
index 6ef2faad5c3a..f2952fc37161 100644
--- a/net-libs/nodejs/nodejs-10.0.0.ebuild
+++ b/net-libs/nodejs/nodejs-10.0.0.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/libuv-1.19.2:=
+	>=dev-libs/libuv-1.20.2:=
 	>=net-libs/http-parser-2.8.0:=
 	>=net-libs/nghttp2-1.29.0
 	sys-libs/zlib
diff --git a/net-libs/nodejs/nodejs-10.1.0.ebuild b/net-libs/nodejs/nodejs-10.1.0.ebuild
new file mode 100644
index 000000000000..6ef2faad5c3a
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.1.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.19.2:=
+	>=net-libs/http-parser-2.8.0:=
+	>=net-libs/nghttp2-1.29.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-61.1:= )
+	ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-6.14.2.ebuild b/net-libs/nodejs/nodejs-6.14.2.ebuild
new file mode 100644
index 000000000000..d00288db71c6
--- /dev/null
+++ b/net-libs/nodejs/nodejs-6.14.2.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.16.1:=
+	>=net-libs/http-parser-2.7.0:=
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-58.2:= )
+	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myarch=""
+	local myconf=( --shared-libuv --shared-http-parser --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		--without-dtrace \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/telepathy-logger-qt/Manifest b/net-libs/telepathy-logger-qt/Manifest
index dc9cda3a045b..274b0a66193d 100644
--- a/net-libs/telepathy-logger-qt/Manifest
+++ b/net-libs/telepathy-logger-qt/Manifest
@@ -1,4 +1,3 @@
-AUX telepathy-logger-qt-15.04.0-cmake-3.9.patch 10869 BLAKE2B cddc033ae014691a161c1c7445af0618bb68e83ab37197b337c2991499134592d7316370e5182b04b280065ad8cff66dcdc4ccd9e5b37c6ee24a314db05a2ec7 SHA512 0475b66dfd81cba40b61380aa4eaf9c6c570e9a86850445fef028461a40a72e51896a3f8500ac22e02ed6a5521938b40bf5335e86d25184e5f4da0794a2e631d
 DIST telepathy-logger-qt-17.08.0.tar.xz 94184 BLAKE2B ead0598c1f2f2786e026af15ef1424347b9ec9ac7d78b1e90943a8e39db1833f76353b9b9c767470fcbf635438fbcbcc52c9b969318341128f66b8b9ad5eb14a SHA512 1768509b61d83cdd39adf8abd74f71d0c9ae757411e08017c6788fe50962b57768a8fdc9fbba75f5968bb22849ff619e790323806d29ae63066e41cc5f22c366
 EBUILD telepathy-logger-qt-17.08.0.ebuild 712 BLAKE2B 91e523f0e8c752acaafe928ed181ad9fdb1a19b788be356c53716e552605f486c934abb32ea553aea9d645000d9e9d754ebc4f67a38bb1a9d0f439cec51eed35 SHA512 0273a7c2cc1bc6f12ac7aa2980f96781a7df6f503ffd8024b248f11c3f0b1782c1c677ce8a05c3eab6a6f9c39821e28dd04bcef07a3d7ed177e1a3333a2a782d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch b/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch
deleted file mode 100644
index 84d66851a221..000000000000
--- a/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake
---- a/cmake/modules/TpQtMacros.cmake
-+++ b/cmake/modules/TpQtMacros.cmake
-@@ -128,15 +128,15 @@
-   FOREACH(_currentArg ${ARGN})
-     IF ("${_currentArg}" STREQUAL "DEPENDS")
-       SET(_TPQT_DOING_DEPENDS TRUE)
--    ELSE ("${_currentArg}" STREQUAL "DEPENDS")
-+    ELSE ()
-       IF(_TPQT_DOING_DEPENDS)
-         LIST(APPEND ${_tpqt_depends} "${_currentArg}")
--      ELSE(_TPQT_DOING_DEPENDS)
-+      ELSE()
-         LIST(APPEND ${_tpqt_other} "${_currentArg}")
--      ENDIF(_TPQT_DOING_DEPENDS)
--    ENDIF ("${_currentArg}" STREQUAL "DEPENDS")
--  ENDFOREACH(_currentArg)
--ENDMACRO (TPQT_EXTRACT_DEPENDS)
-+      ENDIF()
-+    ENDIF ()
-+  ENDFOREACH()
-+ENDMACRO ()
- 
- # helper function to set up a moc rule
- FUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS infile outfile moc_flags moc_options)
-@@ -151,54 +151,54 @@
-     GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH)
-     IF(_moc_outfile_dir)
-       SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir})
--    ENDIF(_moc_outfile_dir)
-+    ENDIF()
-     SET (_moc_parameters_file ${outfile}_parameters)
-     SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
-     FILE (REMOVE ${_moc_parameters_file})
-     FOREACH(arg ${_moc_parameters})
-       FILE (APPEND ${_moc_parameters_file} "${arg}\n")
--    ENDFOREACH(arg)
-+    ENDFOREACH()
-     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-                        COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters
-                        DEPENDS ${infile}
-                        ${_moc_working_dir}
-                        VERBATIM)
--  ELSE (WIN32)
-+  ELSE ()
-     ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
-                        COMMAND ${QT_MOC_EXECUTABLE}
-                        ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
-                        DEPENDS ${infile})
--  ENDIF (WIN32)
-+  ENDIF ()
- 
-   add_custom_target(moc-${_moc_outfile_name} DEPENDS ${outfile})
-   add_dependencies(moc-${_moc_outfile_name} ${ARGN})
--ENDFUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS)
-+ENDFUNCTION ()
- 
- # add the -i option to QT_GENERATE_MOC
- function(TPQT_GENERATE_MOC_I infile outfile)
-     qt5_get_moc_flags(moc_flags)
-     get_filename_component(abs_infile ${infile} ABSOLUTE)
--    qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
-+    qt_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i")
-     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
--endfunction(TPQT_GENERATE_MOC_I)
-+endfunction()
- 
- # same as tpqt_generate_moc_i, but lets the caller specify a list of targets which the mocs should depend on
- function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile)
-     qt5_get_moc_flags(moc_flags)
-     get_filename_component(abs_infile ${infile} ABSOLUTE)
-     tpqt_create_moc_command_target_deps(${abs_infile} ${outfile} "${moc_flags}" "-i" ${ARGN})
-     set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE)  # dont run automoc on this file
--endfunction(TPQT_GENERATE_MOC_I_TARGET_DEPS)
-+endfunction()
- 
- # generates mocs for the passed list. The list should be added to the target's sources
- function(tpqt_generate_mocs)
-     file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/_gen" )
-     foreach(moc_src ${ARGN})
-         string(REPLACE ".h" ".moc.hpp" generated_file ${moc_src})
-         tpqt_generate_moc_i(${CMAKE_CURRENT_SOURCE_DIR}/${moc_src} ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file})
-         set_property(SOURCE ${moc_src} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file})
--    endforeach(moc_src ${ARGN})
--endfunction(tpqt_generate_mocs)
-+    endforeach()
-+endfunction()
- 
- function(tpqt_client_generator spec group pretty_include namespace)
-     tpqt_extract_depends(client_generator_args client_generator_depends ${ARGN})
-@@ -223,18 +223,20 @@
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 
-         DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
--                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
-+                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml)
-     add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp)
-     add_dependencies(all-generated-sources generate_cli-${spec}-body)
- 
-     if (client_generator_depends)
-         add_dependencies(generate_cli-${spec}-body ${client_generator_depends})
--    endif (client_generator_depends)
-+    endif ()
- 
-     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h
-                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp
-                        "generate_cli-${spec}-body")
--endfunction(tpqt_client_generator spec group pretty_include namespace)
-+endfunction()
- 
- function(tpqt_future_client_generator spec namespace)
-     tpqt_extract_depends(future_client_generator_args future_client_generator_depends ${ARGN})
-@@ -259,18 +261,20 @@
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 
-         DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
--                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py)
-+                ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-spec.xml
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.xml)
-     add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp)
-     add_dependencies(all-generated-sources generate_future-${spec}-body)
- 
-     if (future_client_generator_depends)
-         add_dependencies(generate_future-${spec}-body ${future_client_generator_depends})
--    endif (future_client_generator_depends)
-+    endif ()
- 
-     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
-                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.moc.hpp
-                        "generate_future-${spec}-body")
--endfunction(tpqt_future_client_generator spec namespace)
-+endfunction()
- 
- function(tpqt_service_generator spec group pretty_include namespace)
-     tpqt_extract_depends(service_generator_args service_generator_depends ${ARGN})
-@@ -294,18 +298,20 @@
-         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- 
-         DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py
--                ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py)
-+                ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml
-+                ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-svc-${spec}.xml)
-     add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp)
-     add_dependencies(all-generated-service-sources generate_service-${spec}-body)
- 
-     if (service_generator_depends)
-         add_dependencies(generate_service-${spec}-body ${service_generator_depends})
--    endif (service_generator_depends)
-+    endif ()
- 
-     tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h
-                        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.moc.hpp
-                        "generate_service-${spec}-body")
--endfunction(tpqt_service_generator spec group pretty_include namespace)
-+endfunction()
- 
- # This function is used for generating CM in various examples
- function(tpqt_generate_manager_file MANAGER_FILE OUTPUT_FILENAME DEPEND_FILENAME)
-@@ -324,7 +330,7 @@
- 
-     set_source_files_properties(${DEPEND_FILENAME}
-                                 PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/param-spec-struct.h)
--endfunction(tpqt_generate_manager_file MANAGER_FILE)
-+endfunction()
- 
- function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
-     tpqt_extract_depends(xincludator_gen_args xincludator_gen_depends ${ARGN})
-@@ -346,8 +352,8 @@
- 
-     if (xincludator_gen_depends)
-         add_dependencies(${_TARGET_NAME} ${xincludator_gen_depends})
--    endif (xincludator_gen_depends)
--endfunction(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE)
-+    endif ()
-+endfunction()
- 
- function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
-     tpqt_extract_depends(constants_gen_args constants_gen_depends ${ARGN})
-@@ -371,8 +377,8 @@
- 
-     if (constants_gen_depends)
-         add_dependencies(${_TARGET_NAME} ${constants_gen_depends})
--    endif (constants_gen_depends)
--endfunction (tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE)
-+    endif ()
-+endfunction ()
- 
- function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
-     tpqt_extract_depends(types_gen_args types_gen_depends ${ARGN})
-@@ -398,8 +404,8 @@
- 
-     if (types_gen_depends)
-         add_dependencies(${_TARGET_NAME} ${types_gen_depends})
--    endif (types_gen_depends)
--endfunction(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE)
-+    endif ()
-+endfunction()
- 
- macro(tpqt_add_generic_unit_test _fancyName _name)
-     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
-@@ -410,7 +416,7 @@
- 
-     # Valgrind and Callgrind targets
-     _tpqt_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
--endmacro(tpqt_add_generic_unit_test _fancyName _name)
-+endmacro()
- 
- macro(tpqt_add_dbus_unit_test _fancyName _name)
-     tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp)
-@@ -422,7 +428,7 @@
- 
-     # Valgrind and Callgrind targets
-     _tpqt_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name})
--endmacro(tpqt_add_dbus_unit_test _fancyName _name)
-+endmacro()
- 
- macro(_tpqt_add_check_targets _fancyName _name _runnerScript)
-     set_tests_properties(${_fancyName}
-@@ -474,20 +480,20 @@
-         COMMENT
-             "Running callgrind on test \"${_fancyName}\"")
-     add_dependencies(check-callgrind check-callgrind-${_fancyName})
--endmacro(_tpqt_add_check_targets _fancyName _name)
-+endmacro()
- 
- function(tpqt_setup_dbus_test_environment)
-     file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh "
- ${test_environment}
- sh ${CMAKE_SOURCE_DIR}/tools/with-session-bus.sh \\
-     --config-file=${CMAKE_BINARY_DIR}/tests/dbus-1/session.conf -- $@
- ")
--endfunction(tpqt_setup_dbus_test_environment)
-+endfunction()
- 
- macro(make_install_path_absolute out in)
-     if (IS_ABSOLUTE "${in}")
-         set(${out} "${in}")
--    else (IS_ABSOLUTE "${in}")
-+    else ()
-         set(${out} "\${TELEPATHY_QT${QT_VERSION_MAJOR}_INSTALL_DIR}/${in}")
--    endif (IS_ABSOLUTE "${in}")
--endmacro(make_install_path_absolute out in)
-+    endif ()
-+endmacro()
-
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-11 16:02:49 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-11 16:02:49 +0100
commit	88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch)
tree	d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /net-libs
parent	4645b6f17f0da81e9fe84081fb126a37102ba153 (diff)