diff options
Diffstat (limited to 'net-libs')
30 files changed, 815 insertions, 320 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz Binary files differindex 67f7f66dd09a..97d320f467e3 100644 --- a/net-libs/Manifest.gz +++ b/net-libs/Manifest.gz diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest index e28f222727c1..dfc6cfd3a3ee 100644 --- a/net-libs/c-client/Manifest +++ b/net-libs/c-client/Manifest @@ -1,8 +1,9 @@ AUX c-client-2006k_GENTOO_Makefile.patch 2441 BLAKE2B 51ef084f0f6a61129762331330b3a8b5ef25e46db4300ed275cba402843ed70f2d853d1a7f1dddbd4077880be941afce01675607d37f6a2905e096738f78c4a6 SHA512 35b9dd0737986e466dfbfc5388827b09934b32a9a7922bba3d7b4a4bd40dcaf2985a7f2d5bd3e884ad8d33c61eaabdc7f797d6af450b3f85cd0dacec764233e0 AUX c-client-2006k_GENTOO_amd64-so-fix.patch 665 BLAKE2B 51d4ace2843c4cc448a5b6d6d365cdc8861e5229334827f1de20db8083a64d0b8ec1f54f1768aad29ae284e62db7d512dbf898cd08f8abeda18a456de5b1f351 SHA512 213f06e133704ed2bb9fc6900edb7a4505bf6965409ecf76502bf9cafdf7c981bca552479f8ffaa1a355d2f1c1c08dbe0453fa5bce06590f6627d0e622c70879 AUX c-client-2007f-ldflags.patch 1652 BLAKE2B 622c3c1f10e4a4500fbf008073e5e9131ad9d5f42e4b524063087c5b3d35ed91acaaef0fad8b05041002e812e25ab0444b1ca06187164e519d27e9be415df21d SHA512 d30d523ffe8ac704278d3bb8cf03219d5cefc9eff0280495effbfd759062e45ae7df9b53a147cf0b8f9751657c5909de7cff316726569821c2fb2fc6eb8300c7 +AUX c-client-2007f-openssl-1.1.patch 2857 BLAKE2B 748933d521a99409234e62cfee1c98ecae803452e30d5c8e6149c3744084174751253b2e58ee83259aaad3fd24bf15bd901e509c84792f12d4ad350f26939a32 SHA512 45ef128f1fcda303ab163ffe9b21e319d7dbd6c60940d8f65996feab81235d5f652e24c340b0cdc8a3d9ae1ad1b0d8f8e55e64668d26d135fb06717adea4c7d4 AUX c-client-2007f-topal.patch 1078 BLAKE2B 5224ac12119e25c3208865bf1904a21c9d4bd880b685bea1389cc32a30764e8673606085f2d58ec12532618807d61257e02ed2d9b178014c8ba78f9defba1f72 SHA512 f81914d9d0acf92625d2a4956aa82e9639bc36ab12c608dafb8137afe619f6acc5d9647d05a1827bfe27b21c9dd774bd458c8cfa2e5c2e449ed956daed674b00 DIST c-client-2007f-chappa-115-all.patch.gz 30571 BLAKE2B 707ec7718f764d5fea4142a4e0c4dd561d0a387cb72fea16de656a01bc21a0b30600dc121c8af090b76188d0131852ca6f3d40b9bba8745696faed5a79fb8c59 SHA512 f44489ec38aa6a3dc682872a6857154254c23352db81ee380dfdfad39743234d97a8bcc07a74459f7532efe2fc073cf7d9c078433e11a95de19beeb387ff8b65 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae -EBUILD c-client-2007f-r6.ebuild 4539 BLAKE2B 4e1027e0177ecc72dda2b9fc4d178e4ee51c9faf9785c35a6b844c0f7fb5028ada27506fbe2fa364453a072b549e811f0bc9db7bf9b79b5fb22d1b2f9cdd153d SHA512 58106409125a1c4d7c27d90d6bad559219682b0d941c5284084daaee214b78e09a3cdb14c32f8c35d315de0f5ff9b55db3f26348a1b5ce5b6de5c22c7e9dda22 +EBUILD c-client-2007f-r6.ebuild 4608 BLAKE2B ba7ad0312cec1a783acb0a4528e49ab43c011e791a4664ee46b52fb028c6e68f55bd89839dd4f26860b9cbedd3c002d6c1713d56e33a064558c40525cd272a10 SHA512 599b88e2428ab26ddec011882f9e62a76bf016218d6d26ac6a9f8274da0511da9d4a2889801cdf9c82aa989e0bfd2aa6413d0b0bb0f72ae327df89619aa2d727 MISC metadata.xml 557 BLAKE2B 44505412653c4f93aeeb3391e48b6f8922e83f29af6486f25621619804c510df783b51f327a8b986bedadfbe5ff4809d9c03a148fbab0fd0eca60f7d740c0fb3 SHA512 fa7558b3e834e008688e4bf3c854e5813a27b908f685267e4ff5fe6a41f9beef9a2689156857039e0a13cbcf94fecd1dff4e0a75e70afc1bd5d81421bbac36de diff --git a/net-libs/c-client/c-client-2007f-r6.ebuild b/net-libs/c-client/c-client-2007f-r6.ebuild index 6f539a984877..4135436c43f7 100644 --- a/net-libs/c-client/c-client-2007f-r6.ebuild +++ b/net-libs/c-client/c-client-2007f-r6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit flag-o-matic eutils libtool toolchain-funcs multilib +inherit flag-o-matic libtool toolchain-funcs multilib MY_PN=imap MY_P="${MY_PN}-${PV}" @@ -30,9 +30,28 @@ DEPEND="${RDEPEND} kernel_linux? ( pam? ( >=sys-libs/pam-0.72 ) ) " +PATCHES=( + # Apply a patch to only build the stuff we need for c-client + "${FILESDIR}/${PN}-2006k_GENTOO_Makefile.patch" + + # Apply patch to add the compilation of a .so for PHP + # This was previously conditional, but is more widely useful. + "${FILESDIR}/${PN}-2006k_GENTOO_amd64-so-fix.patch" + + # Respect LDFLAGS + "${FILESDIR}/${PN}-2007f-ldflags.patch" + + # openssl-1.1 build fix #647616 + "${FILESDIR}/${PN}-2007f-openssl-1.1.patch" +) + src_prepare() { + use topal && PATCHES+=( "${FILESDIR}/${P}-topal.patch" ) + default + use chappa && eapply -p2 "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch" + # Tarball packed with bad file perms chmod -R u+rwX,go-w . || die "failed to fix permissions" @@ -60,28 +79,16 @@ src_prepare() { -i src/osdep/unix/Makefile \ || die "failed to fix the FreeBSD ACTIVEFILE path in the Makefile" - # Apply a patch to only build the stuff we need for c-client - eapply "${FILESDIR}/${PN}-2006k_GENTOO_Makefile.patch" - - # Apply patch to add the compilation of a .so for PHP - # This was previously conditional, but is more widely useful. - eapply "${FILESDIR}/${PN}-2006k_GENTOO_amd64-so-fix.patch" - # Remove the pesky checks about SSL stuff sed -e '/read.*exit/d' -i Makefile \ || die "failed to disable SSL warning in the Makefile" - # Respect LDFLAGS - eapply "${FILESDIR}/${PN}-2007f-ldflags.patch" sed -e "s:CC=cc:CC=$(tc-getCC):" \ -e "s:ARRC=ar:ARRC=$(tc-getAR):" \ -e "s:RANLIB=ranlib:RANLIB=$(tc-getRANLIB):" \ -i src/osdep/unix/Makefile \ || die "failed to fix build flags support in the Makefile" - use topal && eapply "${FILESDIR}/${P}-topal.patch" - use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz" - elibtoolize } diff --git a/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch b/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch new file mode 100644 index 000000000000..918f0bd3fbd5 --- /dev/null +++ b/net-libs/c-client/files/c-client-2007f-openssl-1.1.patch @@ -0,0 +1,66 @@ +diff -Nru a/src/osdep/unix/ssl_unix.c b/src/osdep/unix/ssl_unix.c +--- a/src/osdep/unix/ssl_unix.c 2011-07-23 02:20:10.000000000 +0200 ++++ b/src/osdep/unix/ssl_unix.c 2018-09-22 09:34:26.492765776 +0200 +@@ -59,7 +59,7 @@ + static SSLSTREAM *ssl_start(TCPSTREAM *tstream,char *host,unsigned long flags); + static char *ssl_start_work (SSLSTREAM *stream,char *host,unsigned long flags); + static int ssl_open_verify (int ok,X509_STORE_CTX *ctx); +-static char *ssl_validate_cert (X509 *cert,char *host); ++static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj); + static long ssl_compare_hostnames (unsigned char *s,unsigned char *pat); + static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size, + long *contd); +@@ -210,6 +210,7 @@ + BIO *bio; + X509 *cert; + unsigned long sl,tl; ++ char cert_subj[250]; + char *s,*t,*err,tmp[MAILTMPLEN]; + sslcertificatequery_t scq = + (sslcertificatequery_t) mail_parameters (NIL,GET_SSLCERTIFICATEQUERY,NIL); +@@ -266,13 +267,17 @@ + if (SSL_write (stream->con,"",0) < 0) + return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; + /* need to validate host names? */ +- if (!(flags & NET_NOVALIDATECERT) && +- (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), +- host))) { +- /* application callback */ +- if (scq) return (*scq) (err,host,cert ? cert->name : "???") ? NIL : ""; +- /* error message to return via mm_log() */ +- sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); ++ if (!(flags & NET_NOVALIDATECERT)) { ++ cert_subj[0] = '\0'; ++ cert = SSL_get_peer_certificate(stream->con); ++ if (cert) ++ X509_NAME_oneline(X509_get_subject_name(cert), cert_subj, sizeof(cert_subj)); ++ err = ssl_validate_cert (cert, host, cert_subj); ++ if (err) ++ /* application callback */ ++ if (scq) return (*scq) (err,host,cert ? cert_subj : "???") ? NIL : ""; ++ /* error message to return via mm_log() */ ++ sprintf (tmp,"*%.128s: %.255s",err,cert ? cert_subj : "???"); + return ssl_last_error = cpystr (tmp); + } + return NIL; +@@ -313,7 +318,7 @@ + * Returns: NIL if validated, else string of error message + */ + +-static char *ssl_validate_cert (X509 *cert,char *host) ++static char *ssl_validate_cert (X509 *cert,char *host, char *cert_subj) + { + int i,n; + char *s,*t,*ret; +@@ -322,9 +327,9 @@ + /* make sure have a certificate */ + if (!cert) ret = "No certificate from server"; + /* and that it has a name */ +- else if (!cert->name) ret = "No name in certificate"; ++ else if (cert_subj[0] == '\0') ret = "No name in certificate"; + /* locate CN */ +- else if (s = strstr (cert->name,"/CN=")) { ++ else if (s = strstr (cert_subj,"/CN=")) { + if (t = strchr (s += 4,'/')) *t = '\0'; + /* host name matches pattern? */ + ret = ssl_compare_hostnames (host,s) ? NIL : diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest index 5d8a61149e04..366e682de0ad 100644 --- a/net-libs/grpc/Manifest +++ b/net-libs/grpc/Manifest @@ -10,12 +10,14 @@ AUX 0008-grpc-1.12.1-allow-system-cares.patch 2049 BLAKE2B 4f7e352f3efca21cbc918 AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec598a67247dbd064efd03cea660444ecb3afe3095e2b7c1c67b2e83423762ad1580636039e27004fe34c8ff0c3bdc9862a3c54 SHA512 dfdafec8efc8fc0f4bbcdcbb036fb7ee746c917c8dfe18338dbd20be40efe8e1b3fe77c6f66f0b050f6d078aaff81a78477980b63ad81288cae474af8c723420 AUX grpc-1.14.2-gcc8-fixes.patch 4258 BLAKE2B 211847b5f493076ecdc13eef9567f5f088dfb1f0e1b7c61b69b6daeaeafa638262aea525063ac5a4612e12cb378d1231d30eb1ed86d781b6ee43b20d4fb68353 SHA512 20279e231042fa01ad0dffbfd731e2ea17d9ff4240a21204f672f88a4dca7302f1e8a4f4dbffbb4a5c2d321f47f735ef0411a2e2a44472494b518741a044ac4f AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c +AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462005a0add69abf463e93f7d414360135d399dea3f7cbb282150f1e03a6e2df33ad9965327392aed32d76c2875f976c3 SHA512 ad46c4187604212d628004cc783a69d95e4378e83e2673fd99265f2929a000429a269abdb98936ad5611fe9d99df581ff5f122f51661227d13d9e7145ee0a40c DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49 DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962 DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254 DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356 DIST grpc-1.14.2.tar.gz 13891112 BLAKE2B 2d8baa2d248fb9e319ac6f1a9cb1eb0c4f7ce20cfaa51254cb6d43db8d101fd4df03779b24e52a2cd00d7e14a415d928d51039c31cdde2c3272feee664861ea1 SHA512 1fca05a01fcae3bcaa8aeb57fb8e4a69d92d4d4d42e0612e9a7b3652a3f4e1b006a7559aea95cadae614479f4ac6ed14876b81fca0365967d246a5b7888a8385 DIST grpc-1.15.0.tar.gz 14084394 BLAKE2B 133460868f347eb4bba6e761c2ad7d826017de4b3c52aafe1850a8a8811afb0a6ff3c084b5ff645556d0f14c7c60db89a9cb5dddfc9827b2ca2b32af09ecf43f SHA512 2a958d93bf737e074216b121bc8e65c9c5151e6f8cfd5a3e9f826413d2734fdcdbd5659482c8d0b2a5e9a4ae537f5c1dfb58ee8ecf844ec95fe46659fb937e06 +DIST grpc-1.16.0.tar.gz 14442543 BLAKE2B bceddb5cc9b3439523523f16e0a34b45ddcd1b4bfc00556639b6d0ea84b886c7a9b3204b73605181d76997b42ba1a3ec3ccb95f43a0396a5cb96c7ea7644a800 SHA512 af088500bb7055f91a856efc91a718f3363a3047bc568e6419dc5776037d9a20493772b34d75a78225fb6bfc339da6493881c6744f3f98607bf9d3c7f91bfb75 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 EBUILD grpc-1.12.0.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282 @@ -24,4 +26,5 @@ EBUILD grpc-1.13.0-r1.ebuild 4368 BLAKE2B 349d192044bd3faef859aaeb4b6d5dcf466c5f EBUILD grpc-1.13.1.ebuild 4381 BLAKE2B 49dd3565bb52ae69ff98e90bc74a241082835bd48e280b048f92be0947184b3870a242761c7adca42679cd0549254a9cf8b79ca6d99af8aa1d403b1ed88fb3b0 SHA512 a428bc0e88112227b9526d0bb431b9f0eb4fef2cfd8dcfae1c9df6cb6b3949423533dc08d37202e9822889139a6f41256b6530a8d95bd3f88b3102d1a22254ed EBUILD grpc-1.14.2.ebuild 4484 BLAKE2B c0f9955324ad0eb424d222c087dc44a02db8ef2e247fcd8f38001b43abbd22768fb67ada639621656b40d2ac3d9a4661bb1fa4bc7da96d757502b4aa7ec9c79b SHA512 93d275734afa05b8cf6f89e6da44702ee5dffdec8da4c9cdbeae3d73cfd1e2c154c656bb3d0dc87201f07b2edcf64e9d4a0ae4d990f0fe40cdf17e84eada62d4 EBUILD grpc-1.15.0.ebuild 4479 BLAKE2B b5df046963596a10c1f5abb586342082cdc0e580b5ae9c0a954268f9d778f11c33ec8665cfc25649083a3436cef3c4f971ae41fb909f129f1b237addb7868e17 SHA512 d3a9f8577b02f682f6fda677fc3471ea10bf2a9f2eefe13f7cd7e9848389a9f58cd2562b00ba38ac82ee176ec3418f4a469ffcd12995b53df513ca7b69c09fba +EBUILD grpc-1.16.0.ebuild 2262 BLAKE2B ac0c4adcceeae649ab001cbba3cbfaba41ef6f2adbdd390f9529a903b22e2cbe2fc80ffd5ee733b4d861b5357fa8464ffbb5ef492f87677a0b0073144350fd02 SHA512 f566a24204dd62fc652ec02fc1c2feb95119004070559986f1abfb527dd535308d60da643fd4ae611ddf1492a5e5de5d80820f11284ac7432f7ded2fd41e62e4 MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95 diff --git a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch new file mode 100644 index 000000000000..0afd8254dec0 --- /dev/null +++ b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch @@ -0,0 +1,46 @@ +From 807a938a576ec52bc8c971100b2da26b059d9347 Mon Sep 17 00:00:00 2001 +From: Tobias Jungel <tobias.jungel@gmail.com> +Date: Wed, 22 Aug 2018 21:14:46 +0200 +Subject: [PATCH 1/2] mitigate gcc8 -Werror=ignored-qualifiers + +--- + src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc +index 53932bcb7f5..4b1862735d6 100644 +--- a/src/core/ext/transport/chttp2/transport/flow_control.cc ++++ b/src/core/ext/transport/chttp2/transport/flow_control.cc +@@ -190,7 +190,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t, + uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { + FlowControlTrace trace("t updt sent", this, nullptr); + const uint32_t target_announced_window = +- static_cast<const uint32_t>(target_window()); ++ static_cast<uint32_t>(target_window()); + if ((writing_anyway || announced_window_ <= target_announced_window / 2) && + announced_window_ != target_announced_window) { + const uint32_t announce = static_cast<uint32_t> GPR_CLAMP( + +From 5a03e7f10145c6591f313055907a9cf26ccb9234 Mon Sep 17 00:00:00 2001 +From: Tobias Jungel <tobias.jungel@gmail.com> +Date: Wed, 22 Aug 2018 21:17:01 +0200 +Subject: [PATCH 2/2] mitigate gcc8 -Werror=stringop-truncation + +--- + .../client_channel/lb_policy/grpclb/load_balancer_api.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +index f24281a5bfb..8c064214729 100644 +--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc ++++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc +@@ -68,7 +68,8 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) { + req->has_initial_request = true; + req->initial_request.has_name = true; + strncpy(req->initial_request.name, lb_service_name, +- GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH); ++ GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1); ++ req->initial_request.name[GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1] = '\0'; + return req; + } + diff --git a/net-libs/grpc/grpc-1.16.0.ebuild b/net-libs/grpc/grpc-1.16.0.ebuild new file mode 100644 index 000000000000..31caf4ced501 --- /dev/null +++ b/net-libs/grpc/grpc-1.16.0.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +MY_PV="${PV//_pre/-pre}" + +DESCRIPTION="Modern open source high performance RPC framework" +HOMEPAGE="http://www.grpc.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples doc systemtap static-libs" + +RDEPEND=" + >=dev-libs/openssl-1.0.2:0=[-bindist] + dev-libs/protobuf:= + dev-util/google-perftools + net-dns/c-ares:= + sys-libs/zlib:= + systemtap? ( dev-util/systemtap ) +" + +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch" + "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch" + "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch" + "${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch" + "${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch" +) + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir" + default +} + +src_compile() { + tc-export CC CXX PKG_CONFIG + + emake \ + V=1 \ + prefix=/usr \ + INSTALL_LIBDIR="$(get_libdir)" \ + AR="$(tc-getAR)" \ + AROPTS="rcs" \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LD="${CC}" \ + LDXX="${CXX}" \ + STRIP=/bin/true \ + HOST_CC="$(tc-getBUILD_CC)" \ + HOST_CXX="$(tc-getBUILD_CXX)" \ + HOST_LD="$(tc-getBUILD_CC)" \ + HOST_LDXX="$(tc-getBUILD_CXX)" \ + HOST_AR="$(tc-getBUILD_AR)" \ + HAS_SYSTEMTAP="$(usex systemtap true false)" +} + +src_install() { + emake \ + prefix="${D}"/usr \ + INSTALL_LIBDIR="$(get_libdir)" \ + STRIP=/bin/true \ + install + + use static-libs || find "${ED}" -name '*.a' -delete + + if use examples; then + find examples -name '.gitignore' -delete || die + dodoc -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + + if use doc; then + find doc -name '.gitignore' -delete || die + local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. ) + fi + + einstalldocs +} + +pkg_postinst() { + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${v}" -lt 1.16.0; then + ewarn "python bindings and tools moved to separate independent packages" + ewarn "check dev-python/grpcio and dev-python/grpcio-tools" + fi + done + +} diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest index f8c2d183771d..1df18491b08a 100644 --- a/net-libs/libbitcoinconsensus/Manifest +++ b/net-libs/libbitcoinconsensus/Manifest @@ -1,7 +1,4 @@ -DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 -DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d -EBUILD libbitcoinconsensus-0.15.1.ebuild 2388 BLAKE2B af9dec58358b370c37b770d6a0762af2940f45aa4f8ba723df2ca8f605dc87672a5134c3c773f5c83103efb4df1e0c9efeb8487a584f37b2063e35510bac0e3a SHA512 fbf7381d56add2aaf0b62016f981efbac71031ecf266a6044f0742d86e30054e01c592e276a0c1e1c66f52f99c642a29fd91757cd39ec9905d85aeb4fe726124 EBUILD libbitcoinconsensus-0.16.3.ebuild 2339 BLAKE2B 297cd6c0adafbb99a5b3da6f8a34171fc32b72de86800a4c0f1401906d25e62db6cf7d9f2446dfe2db7d18e7c776fa5fe738d95cc55f21ef1a12124e869dba4d SHA512 a412a06ed2725a8b86adb5b9c245c3b041a2e3fc38c8a4104c8f808aa7877c0343a9159efdb5f4021f13ecd6a923480332fc7150b7acd6b595353d40deb21b59 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665 diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild deleted file mode 100644 index 4d57c19020c9..000000000000 --- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2010-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -MyPV="${PV/_/}" -MyPN="bitcoin" -MyP="${MyPN}-${MyPV}" -BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58" -KNOTS_PV="${PV}.knots20171111" -KNOTS_P="${MyPN}-${KNOTS_PV}" - -IUSE="+asm knots libressl" - -DESCRIPTION="Bitcoin Core consensus library" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" - -SRC_URI=" - https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz - https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" -CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/" -KNOTS_DESC="https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] -" -DEPEND="${RDEPEND}" - -DOCS=( doc/bips.md doc/release-notes.md doc/shared-libraries.md ) - -S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - einfo "You are building ${PN} from Bitcoin Knots." - einfo "For more information, see ${KNOTS_DESC}" - else - einfo "You are building ${PN} from Bitcoin Core." - einfo "For more information, see ${CORE_DESC}" - fi -} - -KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; } - -src_prepare() { - eapply "$(KNOTS_PATCH syslibs)" - - if use knots; then - eapply "$(KNOTS_PATCH f)" - eapply "$(KNOTS_PATCH branding)" - eapply "$(KNOTS_PATCH ts)" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - $(use_enable asm experimental-asm) - --without-qtdbus - --without-libevent - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --with-libs - --disable-util-cli - --disable-util-tx - --disable-bench - --without-daemon - --without-gui - --disable-ccache - --disable-static - --with-system-libsecp256k1 - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest index 1dc1ea2548b2..2506525e4860 100644 --- a/net-libs/libesmtp/Manifest +++ b/net-libs/libesmtp/Manifest @@ -1,4 +1,6 @@ +AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda -EBUILD libesmtp-1.0.6-r1.ebuild 967 BLAKE2B ad3127d5148c2a087c85b3c7c003b0067650bd832b4efd59d6637da19ac6cb6d942f08934e0f6a1479c54b8e19f107d9416551daf5647e8076153314fbce62df SHA512 000ae3c5e86225865e21068eac31f5786c7b64399b167c96fb9b909cfe2d592f9e80358f4888ae0a5e614acfad035f2f3bbaede773db9e325b32565fc13b0d7f -EBUILD libesmtp-1.0.6-r2.ebuild 1045 BLAKE2B 543b5f75e6bdc1f43615ae34a5baa6239497a85eb17a78d35b3ade9d5c2788c4d826f56c6e50fb8871319b4a5783fe27fd96d96e86ffc4dd5a370cc1372d08d3 SHA512 b936f522eebadc5cd006ba739d9cebe058114c111d3741f1397de914841beb9e89a31d3f92348bac16b20c94cd32d14aa0cecd59e03fa717e73ce9f0e12134ce +EBUILD libesmtp-1.0.6-r1.ebuild 952 BLAKE2B 28f2aeed294b3cb4889f1ffe69fdb62e23bf407a06f2da55eae6abe9e51c9b9dd5a4c08468779fe6191b0cade572ac8297c9860faa9dd4da84ce7733bf8dbd12 SHA512 7d460a12bd2c8c6c6b359deba3869ea728a0a63ce5043f7a31c79338cdb2d7ee1d1a2d6ae6dae55c3caec44d5df302851c2a61280fb2755dde10953e028362a1 +EBUILD libesmtp-1.0.6-r2.ebuild 1030 BLAKE2B b0c0419d01edcbf57c676580c98715697960afdfa1c2c7c66ccca711a157d98958fa27e6e20d6d400140ebbb4bb9c91d780f631f71c797a0b9d9815240486150 SHA512 36c4b424a7f0c96407ec1f98cd1467c6a926e79f44b83c93aff5a4641c58e0e9b143e08073be95b796df309b949deb59aeb34a9f65d3d7112839e0df0788d7d5 +EBUILD libesmtp-1.0.6-r3.ebuild 1090 BLAKE2B f9251bd0e7947538d93de0c8daa3a4252d23a1fe0f8bb91bded6fc68b714a23487614564f80d1446a0c2e68e3f06211ee5fab63d2ad63f0e67cb2e590db20435 SHA512 2e353aac3a3ca122389173b468b1f20be85850f6a37fceb518f1753ba46079c003f1d0675ceb72b1dc990855a5c1a1322c0826bd5ab9ebd52e42a262dca34953 MISC metadata.xml 321 BLAKE2B 1ae39c4ae4110288b2f520ebd08ed7e2cdffe363abd1e4b45d783f36b6129ab9eddc96c3d929df93bce046189b2d33602391a40161a1603169f01aa02f072a35 SHA512 3c6ccf3306108819ea43dde5d404399d51249b4e87a9f70eca92939d31cf5e9136fb1ddc7db19022b9fab70ff768e4b962b8eed5b68acfb7edd05ec8355c3a5e diff --git a/net-libs/libesmtp/files/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch b/net-libs/libesmtp/files/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch new file mode 100644 index 000000000000..bc3e3f356848 --- /dev/null +++ b/net-libs/libesmtp/files/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch @@ -0,0 +1,72 @@ +diff --git a/configure.ac b/configure.ac +index 556f220..2c0693d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -303,7 +303,7 @@ if test x$with_openssl != xno ; then + ) + fi + if test x$with_openssl != xno ; then +- AC_CHECK_LIB(ssl, SSL_library_init, [ ++ AC_CHECK_LIB(ssl, SSL_new, [ + with_openssl=yes + LIBS="-lssl -lcrypto $LIBS" + ], [ +diff --git a/smtp-tls.c b/smtp-tls.c +index 9a66806..cfc6589 100644 +--- a/smtp-tls.c ++++ b/smtp-tls.c +@@ -57,6 +57,7 @@ static void *ctx_password_cb_arg; + #ifdef USE_PTHREADS + #include <pthread.h> + static pthread_mutex_t starttls_mutex = PTHREAD_MUTEX_INITIALIZER; ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + static pthread_mutex_t *openssl_mutex; + + static void +@@ -70,6 +71,7 @@ openssl_mutexcb (int mode, int n, + pthread_mutex_unlock (&openssl_mutex[n]); + } + #endif ++#endif + + static int + starttls_init (void) +@@ -77,6 +79,10 @@ starttls_init (void) + if (tls_init) + return 1; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 ++ /* starting from OpenSSL 1.1.0, OpenSSL uses a new threading API and does its own locking */ ++ /* also initialization has been reworked and is done automatically */ ++ /* so there's not much to do here any more */ + #ifdef USE_PTHREADS + /* Set up mutexes for the OpenSSL library */ + if (openssl_mutex == NULL) +@@ -94,9 +100,10 @@ starttls_init (void) + CRYPTO_set_locking_callback (openssl_mutexcb); + } + #endif +- tls_init = 1; + SSL_load_error_strings (); + SSL_library_init (); ++#endif ++ tls_init = 1; + return 1; + } + +@@ -201,7 +208,15 @@ starttls_create_ctx (smtp_session_t session) + 3207. Servers typically support SSL as well as TLS because some + versions of Netscape do not support TLS. I am assuming that all + currently deployed servers correctly support TLS. */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + ctx = SSL_CTX_new (TLSv1_client_method ()); ++#else ++ ctx = SSL_CTX_new (TLS_client_method ()); ++ if (!SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION)) { ++ /* FIXME: set an error code AND free the allocated ctx */ ++ return NULL; ++ } ++#endif + + /* Load our keys and certificates. To avoid messing with configuration + variables etc, use fixed paths for the certificate store. These are diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild index 37f67a7a3a35..ea11090f93fa 100644 --- a/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild +++ b/net-libs/libesmtp/libesmtp-1.0.6-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit libtool DESCRIPTION="lib that implements the client side of the SMTP protocol" -HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/" -SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2" +HOMEPAGE="http://brianstafford.info/libesmtp/" +SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 GPL-2" SLOT="0" diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild index 94e06e2dc463..f019d160ae51 100644 --- a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild +++ b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit libtool DESCRIPTION="lib that implements the client side of the SMTP protocol" -HOMEPAGE="http://www.stafford.uklinux.net/libesmtp/" -SRC_URI="http://www.stafford.uklinux.net/${PN}/${P}.tar.bz2" +HOMEPAGE="http://brianstafford.info/libesmtp/" +SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 GPL-2" SLOT="0" diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild new file mode 100644 index 000000000000..c0d28b116e78 --- /dev/null +++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="lib that implements the client side of the SMTP protocol" +HOMEPAGE="http://brianstafford.info/libesmtp/" +SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="debug libressl ntlm ssl static-libs threads" + +RDEPEND=" + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + )" +DEPEND="${RDEPEND}" +DOCS=( AUTHORS ChangeLog NEWS Notes README TODO ) +PATCHES=( + "${FILESDIR}/${P}-openssl-1.1-api-compatibility.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-dependency-tracking \ + $(use_enable static-libs static) \ + --enable-all \ + $(use_enable ntlm) \ + $(use_enable threads pthreads) \ + $(use_enable debug) \ + $(use_with ssl openssl) +} + +src_install() { + default + insinto /usr/share/doc/${PF}/xml + doins doc/api.xml +} diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest index 5c47dd57ec2f..2b09e38b4c1e 100644 --- a/net-libs/libupnp/Manifest +++ b/net-libs/libupnp/Manifest @@ -1,11 +1,13 @@ AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb -DIST libupnp-1.6.24.tar.bz2 721962 BLAKE2B ac878b30ce073999ac85d5f16ddd8299275674698f95726250d62369bfc2d3e9e57d172db46a6961144b45f80e0e38ce26ac22f7862e7dfdade90f2eb20f83cb SHA512 91ebe5cf1f9d5d1015f82250d82297afd2d67475cba442e435821a87a41774c56f326469e84d8c10a2fcd00c38be1c3c08af85a397db2b592fb0aad1b38f8084 +DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f DIST libupnp-1.8.2.tar.gz 1379953 BLAKE2B 472851bfd25530ead4c113657f0e30cf7a3a1a4c88b86864676a2b7096817c1780718710a9535068904901c21d70d92fb267f295e88531e3eeef7d9a0cee58f3 SHA512 026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511 DIST libupnp-1.8.3.tar.gz 1382278 BLAKE2B 65774d46633d81fcc810f01339e0eac5d7c7313f69c1a467e6c0bbb26eeee03fdb4d8330f46e86346737cc17c1c953ef26045526bc9fe438f7e917928a3a3d0e SHA512 592a719614492ee1dad3630e5de2dca1dbe369faa3c87ba20fb939334c9d24f9dc869a457f5903cd28c5f7662145d1db4eeb512ee93b47adad4fc9b7d9171507 +DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb EBUILD libupnp-1.6.21.ebuild 1055 BLAKE2B 5d99da65caf585e6e7905f8259f2e51afabcc5c31ad2bd97898cb3d7300e11966fc794829ea48defa2d5bba1d9dffff24129ddc885f55a7f2dbc21e9d91b61d7 SHA512 f2c5bb67af69945c261e8ccce5b0f247e585505924df9c0ad7785dca7febce2a69e1b1e529664530adc9070a8f72b708f6b793904fe325bb836a9c2c261c12f8 -EBUILD libupnp-1.6.24.ebuild 1063 BLAKE2B 5c2594a273294a9cdae93791ae6091b508200680dc0acc645e29908526ae5e257cadd5707a9e2714aaef536d350465063b41bd37d1bc40b8a4386994dfa727a3 SHA512 f0bdabea95e6d138c44747741c136a3baff104e33177495a49c5b2919413d987003cf4c35cdef3e28c932917db2378b6cc31c4ebe439dd5f5b7cc61a3605fda4 +EBUILD libupnp-1.6.25.ebuild 1060 BLAKE2B c729c01a2101d6d765da7ce04117746fd2da2b8b0bcd938e008d9c0aa6a51bfb0bb7e89889f74c76d74fbb4d9ed6eb0d3bfe1f998aad553b6e4a2bd15e590eb4 SHA512 7f6ed27ae13faaa69916cb2b37937cc7d5155317cb8c2099b22062ed971a31b246f6b35f7fc4a9e7fc4cca97c61043bf8e0b9a82ce4b16f1fdd0780ee5fe3ee1 EBUILD libupnp-1.8.2.ebuild 1716 BLAKE2B a7a63be7eef83a56f8e6e1313d3d8368541d8282cb367834ebdf5854d46a38d723c23b8eabcbe568591af2adcd199a4170c08b6f0404f7e5c1349a1edf95a99c SHA512 2ea16eccfb1e22f4d4f306dd9b5301b2fbf5b913a4e9ac142b7a7412c83e3621f0ad22a74107886e8cef7d58e5353796c478dafad7ac666050f1ca9cf08e55bc EBUILD libupnp-1.8.3-r1.ebuild 1773 BLAKE2B 27ae00ecd8c1d01663b071f658dfb42b8eb6bca42087d6774c6139c56095014bd6713fe460eb391bce9e61ce2136c608b368c012e3292f3dd3d28d3525db69bb SHA512 36dc05b2d47a2f8b587cc424dad8d443d3a351ef2ee7d993b16f849f0126008b18b6babebbebe0dacd413f17146932bc4a92bf88b2ba9a7dc84a75ee0c28a83d +EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739 diff --git a/net-libs/libupnp/libupnp-1.6.24.ebuild b/net-libs/libupnp/libupnp-1.6.25.ebuild index e9fff2d786a0..165473d3a932 100644 --- a/net-libs/libupnp/libupnp-1.6.24.ebuild +++ b/net-libs/libupnp/libupnp-1.6.25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/net-libs/libupnp/libupnp-1.8.4.ebuild b/net-libs/libupnp/libupnp-1.8.4.ebuild new file mode 100644 index 000000000000..a1fc1c7d0280 --- /dev/null +++ b/net-libs/libupnp/libupnp-1.8.4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils flag-o-matic autotools vcs-snapshot + +DESCRIPTION="An Portable Open Source UPnP Development Kit" +HOMEPAGE="http://pupnp.sourceforge.net/" +SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="1.8" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs" + +DOCS="ChangeLog" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.21-cflags.patch +) + +src_prepare() { + default + + # fix tests + chmod +x ixml/test/test_document.sh || die + + eautoreconf +} + +src_configure() { + use x86-fbsd && append-flags -O1 + # w/o docdir to avoid sandbox violations + econf $(use_enable debug) \ + $(use_enable blocking-tcp blocking-tcp-connections) \ + $(use_enable ipv6) \ + $(use_enable reuseaddr) \ + $(use_enable static-libs static) \ + $(use_enable samples) +} + +src_install () { + default + + use static-libs || prune_libtool_files + + # Slot samples + if $(use samples); then + for bin in combo ctrlpt device ; do + newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}" + done + fi + + # Slot includes + cd "${D}/usr/include" || die + mv upnp "upnp-${SLOT}" || die + + # Slot pkgconfig + cd "${D}/usr/$(get_libdir)/pkgconfig" || die + mv libupnp.pc "libupnp-${SLOT}.pc" || die + sed -i -e "s#/upnp#/upnp-${SLOT}#" \ + -e "s#lupnp#lupnp-${SLOT}#" \ + -e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die + + # Slot symlinks + cd "${D}/usr/$(get_libdir)" || die + mv libupnp.so "libupnp-${SLOT}.so" || die + mv libixml.so "libixml-${SLOT}.so" || die +} diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 69d7fcbe36d1..78bcb9512c4b 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -5,6 +5,7 @@ DIST node-v10.10.0.tar.xz 19960760 BLAKE2B dc16e2afba4be727c5169ac5cd77324e0e8d7 DIST node-v10.11.0.tar.xz 20144576 BLAKE2B 956d940554748f420589adab0f14bd6fcc6a4781cdecd537abd6eb9aa43e9cf754ef009b20d416f1ef4c9a01ef91a27a59a8c080c1c0a49a59388f75713d6286 SHA512 00a678a829de9b836e77dd0806799029b657cf000369ca653540d7e1b82c3895da43dbbfe4d3c2b3b2b1e711bf55b3835a351fad18affdd0c25dcceea8e3406c DIST node-v10.12.0.tar.xz 20185168 BLAKE2B 1a827ed08222900ef196921a57d64466fc558412bb27a26759553686c69d59d8e6686394a484156d254a01030077b09c9abfec87a7716aee06dbe9937a861efd SHA512 3b59bbe7b795e7a85520f6b4691806d8939d26cc2a5e5d22e6406d3d373ee7758da225bd25b6f6b71b105e3d7ef4c58220bfa5e558afd0cd873fbd7d6ba9efc4 DIST node-v10.9.0.tar.xz 19987812 BLAKE2B 4a5bd257cd527500b691b15d177bde53158b5e46e710ffeaa45224bae821cfaffdf59f24ad6bdc822cf468b90c1a4422a2f82d29e1d4b2dc0f838e3e0ab5b4ac SHA512 19c7366b4c9d1e255b5ac56e974ff86b9ca87c363534b467ecc3c59e170b891e86c479a2bcda6647c6df686b018caaedea84270e848b93a4f1c80ff04af12461 +DIST node-v11.0.0.tar.xz 20142548 BLAKE2B 97fc14392c449abde0c2b4ef27f020ac215747a5cca327b07ed735dd9867a01f1a64bfa19a62758111b0fbdca92b5536c15d7946bf968b5c3eab9c0b55f7dd26 SHA512 232243f37a8344775b2e0302601ec23310a8915e0913dc0cb0133df75cb7aad315ca0a6d039f8f9e6ae0d9f98aa8049532d80d470cf9ea0e309f8183be870000 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 @@ -16,6 +17,7 @@ EBUILD nodejs-10.10.0.ebuild 6353 BLAKE2B fdb46cd02319dff1cce1b3c19523998da5b7d6 EBUILD nodejs-10.11.0.ebuild 6353 BLAKE2B 844b108d90a89a4fc70e1294b3e1efc4181a3555787a3446806ed62b79685a07544184da74face287074af67d2ec8abb9b1a91f3d0370b0d48d7185d1b7015ed SHA512 606e610f800ce9792d689fc813fdc09270ced425b4e76e07e8767853c33041f69d5cfa117976cf583c2bb811cfabf9ab2f86a287ed25b8bff9af4618bcd92660 EBUILD nodejs-10.12.0.ebuild 6414 BLAKE2B 8f684f966fbc4e4a01a11dfae5bdd8ffd67ddbf896c229cc885e08e7b6360d07e3f3bc4eeee7086bde006d1098714c7077b777fc01d67383edfa37ffefebf147 SHA512 4e5782138680633590896771b5f548952a8b2f7665d0040d00bb37779616c44e3740bc808ed5a51114bcdd7b51d70a35183a1febf78eeaf53680137ecccd84b7 EBUILD nodejs-10.9.0.ebuild 6353 BLAKE2B 7eb578378be767b686b216346f8f138dc26fe1e50308dc39d6a7add18fe2d8e51f7020b38b70b9aca0844d3523c08b052f513b22adb73bd0a2663893ae596380 SHA512 b09ab8e4c6248dc7512a5ad06bc53f551c71c3ba32ccd4cbca58e451aac432d6000f9686d7e45ffcb9363c5e49d16412c38b9508d12546b8cea626d39f20bc97 +EBUILD nodejs-11.0.0.ebuild 6414 BLAKE2B 61fc56531db35943990d97f4accc37f8b469ab6948de7e4759d90e0fc875148769853d1d2dc2935f5538cd7c45f3576f9d274232552821b34bbe845d3ec19c01 SHA512 2b4c09b4c2961bc4803fa673a0a03fee0e6225fd81ef552061f75de9b8d142b0f3fd1df24da61c526fc1ec81e7873cb282a535e8d6fd83fc2d7b4f6eb9a692eb EBUILD nodejs-4.8.7.ebuild 4424 BLAKE2B fa72291c5b44ce0ba1a592b329be2cd9afa3539bf8419be567c457ef223d4ef3db32ae612795da32345c69bb8b141c350b312989df2869fea37e5ecd5afe44bd SHA512 461f777fac4899b55829edc55961ac021cbe6569fcec87bdb842c8a8b3db117ef74b0ec1e1ff01264f74ee71153e6a771d94d9bbea8fee753c1ea53b8c26dc9e EBUILD nodejs-4.9.1.ebuild 4425 BLAKE2B c5167cf5f59209054cac22f49fd60803001d39949caf1be2f1c49356726884ec5e853be95eee3173548c1d6668aadc0b1f470c44b95150d959fcd33638614f63 SHA512 23280279876f8e8fa37e764bac0f9049b2fc32d1c405a5d5dc8136e92dac1b896c82944b713fdc99daa35806f814ef15f2b63debeb8bc5a2bccf6b8099c8c31e EBUILD nodejs-6.11.5.ebuild 6079 BLAKE2B cae909f4065caf36f168acee12b6fd5a9a2c6fc1c612ae78d8ae2470043a75fbe4be1c0c7975c9d5e3546d334b55ea6d3644320eee952eb17b852e8417db5cbf SHA512 2a78ae710fe19eefc05f47b98ed7a3fd0d0ab84430ffbfd30e3134f0dc9ca80d811f9caa47e61fc99a840b589d05f3b7393e7495b70f36b982637504abf984d5 diff --git a/net-libs/nodejs/nodejs-11.0.0.ebuild b/net-libs/nodejs/nodejs-11.0.0.ebuild new file mode 100644 index 000000000000..e032286ea2d7 --- /dev/null +++ b/net-libs/nodejs/nodejs-11.0.0.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2018 Gentoo Authors +# 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 ) + npm? ( ssl ) +" + +RDEPEND=" + >=dev-libs/libuv-1.23.2:= + >=net-libs/http-parser-2.8.0:= + >=net-libs/nghttp2-1.34.0 + sys-libs/zlib + icu? ( >=dev-libs/icu-62.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}"/${PN}-10.3.0-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}'/" 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 + docinto html + dodoc -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 + + mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die +} + +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/ntirpc/Manifest b/net-libs/ntirpc/Manifest index c11025ce8086..ace04817f1d9 100644 --- a/net-libs/ntirpc/Manifest +++ b/net-libs/ntirpc/Manifest @@ -1,5 +1,7 @@ DIST ntirpc-1.6.1.tar.gz 397485 BLAKE2B 2dcc4c3a14eff55b4db52f297b65a48d5dff46ef4b1659912c65ca9104958cca02d542bb3b72f2ce63993414c5d53bb9716b1b1d4ce4b335735ee99da77f3770 SHA512 d176fbe71f1f66e5ee477c1ec2722b77742d36d67856eb4029f1b01474b08349171779a9943c0039d2a30e05debc9ab389d92ea137eabb4d7737fc91e47b0b24 DIST ntirpc-1.7.0.tar.gz 373195 BLAKE2B 5cfb6c16d1fa3569d37a6b8f51990dd18e713aaaf0f6e6309c36fb8b0bdb6fa0dfcfa81f0e9e185c18dac5b6d422bd9d1b796b245b3dfa519b0f53300ce5c725 SHA512 84fdf62b8a72bcf1b90854536df3c1e3f06c58858d7a2403ee6c085f8585a5d389921a2feb9e0f27ef238dea3a36a9c94b66ea582f290168a8ed21405a452723 +DIST ntirpc-1.7.1.tar.gz 373327 BLAKE2B 55d71932e35b844e382409593b5dead30246d0cbaa27d3d49ad94d09435acb8abb34b945ba90ab7ba9733a955b4184ad839ba202aa82f97eeecbcc502cb88bf0 SHA512 9a98d83db94b4775940584cd08a1105b79263412d44309f91d1e86c609e6d56a482ac239efaaa73ccc1c2f4cabb8b597ccb8931514f33b8b2fd5c2a11b731106 EBUILD ntirpc-1.6.1.ebuild 745 BLAKE2B 6e27521646f75937f2133353f0cee42c9197ce40691275ecb09f17f4807992318f16549bf0cea56af7bb6b37a793de213ef99921454aa0602cb6265d21c7523d SHA512 63fddc3d67d9ec404c9d3bb6f7187a61973558997e5e5cd81692b2516d32dbdf0705d530647748b671ccbf78004f0e761f93e8874d8a56509fcbb460cc671595 EBUILD ntirpc-1.7.0.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd +EBUILD ntirpc-1.7.1.ebuild 742 BLAKE2B 6c65b2bb30cde7ee1d36fffaaa93fa4ab7afed246d90de97e3410847e0680bddc27a61e30af8cbfd3000d1ce320dc4a179a2d235fda183c36e20d61589341e67 SHA512 8d3a8a5131dea9db88ab3d7a34957478f44e8e628cf176419840fda945c4de02ddfad777c4f3095839b83a8021bd73c05722ab255f78b64525b79ab2dda611dd MISC metadata.xml 427 BLAKE2B ffd3f6c32d343557e17c17eb78cff8a0a14f93a2298cf607169ebbc1d618cbe30df849c6f3b8dc4b34d7e1a17920e9d0b1483523d4b2b2ff481068c0de5a8317 SHA512 99f5af46839fbf52e5217cf831a7a95fa3f5d501d61ff63488aa7989e0ec98151b2f94607a39f879e0e5b0ba79bc732ee7224a9e4196ff9a40fa13253ece0b0c diff --git a/net-libs/ntirpc/ntirpc-1.7.1.ebuild b/net-libs/ntirpc/ntirpc-1.7.1.ebuild new file mode 100644 index 000000000000..07720adb2490 --- /dev/null +++ b/net-libs/ntirpc/ntirpc-1.7.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-multilib + +DESCRIPTION="Transport Independent RPC library for nfs-ganesha" +HOMEPAGE="https://github.com/nfs-ganesha/ntirpc" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gssapi rdma" + +# Since the GSS option only controls some extra files to be enabled, +# there's nothing to list in the depend string for it. +RDEPEND="app-crypt/mit-krb5 + net-libs/libnsl + rdma? ( sys-fabric/librdmacm )" +DEPEND="${RDEPEND}" + +multilib_src_configure() { + local mycmakeargs=( + -DUSE_GSS="$(usex gssapi)" + -DUSE_RPC_RDMA="$(usex rdma)" + ) + cmake-utils_src_configure +} diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest index 4e691a2118fb..8717c24c6306 100644 --- a/net-libs/qxmpp/Manifest +++ b/net-libs/qxmpp/Manifest @@ -1,4 +1,4 @@ DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71 EBUILD qxmpp-0.9.3-r2.ebuild 1815 BLAKE2B 7e800dcaad27d3d876a07b41dbba5dfd2f27c506c8a95f0c75b42778054a25b584828756437309787fe0b585868e433e4cce764b8ce8325c044ba6218d4f0fdc SHA512 69a64ff108de9d7d0b70bc5f21d18c1bcc0c2949a701ba5b89eef13412fa4f85c7084ae3c6f3f70e814cb9aaeb027bfbf5afdd83c2ed7f43e40652f3766092b3 -EBUILD qxmpp-9999.ebuild 1770 BLAKE2B 8d0527aae9d208fd4272fbcde1dd3594a20a061233fc397cf602908aa938b687889888be6c9c0633376bdb35ad17b62e54e80542d5d7f71f7bcabfcfc9c756be SHA512 82826b15736b6f8b05ffe41dce048ca56ee321d6b2ea2bf9ed58908260091ce1f963d5ab3a4c3e1d7496991d926088bfe1030245d10eb7abf4cd0da6358fed8a +EBUILD qxmpp-9999.ebuild 1346 BLAKE2B 706db83d1c49524069d421e26fae37d49ce6221ed88a225e5a8b9ceec792c51523326d21661b4d7a1fd022d85e0483ef71175fdfcf5191928c90efe25524c7f0 SHA512 7df917d3cb6138af27d7717a2ec98f701f1a00e067b33dcda0eaaf808851800cb6800390f60edfe64af0fcd66a06195426a892a4173d7060c4a4a91cae38d63e MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426 diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild index 6bc4e3d83103..a6fb6f67b142 100644 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ b/net-libs/qxmpp/qxmpp-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp" -inherit git-r3 qmake-utils +inherit git-r3 cmake-utils DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" @@ -25,50 +25,38 @@ RDEPEND=" vpx? ( media-libs/libvpx:= ) " DEPEND="${RDEPEND} + dev-util/cmake test? ( dev-qt/qttest:5 ) + doc? ( app-doc/doxygen ) " src_prepare() { - default + # requires network connection, bug #623708 + sed -e "/qxmppiceconnection/d" \ + -i tests/CMakeLists.txt || die "failed to drop single test" - if ! use doc; then - sed -e '/SUBDIRS/s/doc//' \ - -e '/INSTALLS/d' \ - -i qxmpp.pro || die "failed to remove docs" - fi - if ! use test; then - sed -e '/SUBDIRS/s/tests//' \ - -i qxmpp.pro || die "failed to remove tests" - else - # requires network connection, bug #623708 - sed -e "/qxmppiceconnection/d" \ - -i tests/tests.pro || die "failed to drop single test" - fi - # There is no point in building examples. Also, they require dev-qt/qtgui - sed -e '/SUBDIRS/s/examples//' \ - -i qxmpp.pro || die "sed for removing examples failed" + cmake-utils_src_prepare } src_configure() { - eqmake5 "${S}"/qxmpp.pro \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="$(get_libdir)" \ - QXMPP_USE_OPUS=$(usex opus 1 '') \ - QXMPP_USE_SPEEX=$(usex speex 1 '') \ - QXMPP_USE_THEORA=$(usex theora 1 '') \ - QXMPP_USE_VPX=$(usex vpx 1 '') + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=$(usex test) + -DWITH_OPUS=$(usex opus) + -DWITH_SPEEX=$(usex speex) + -DWITH_THEORA=$(usex theora) + -DWITH_VPX=$(usex vpx) + ) + + cmake-utils_src_configure } src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs + cmake-utils_src_install + if use doc; then # Use proper path for documentation mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed" fi } - -src_test() { - MAKEOPTS="-j1" # random tests fail otherwise - default_src_test -} diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest index 446bea82d054..b8961ce0de7f 100644 --- a/net-libs/tox/Manifest +++ b/net-libs/tox/Manifest @@ -4,11 +4,9 @@ AUX tox-bootstrapd.conf 2171 BLAKE2B 25021453c2be24bad5ff8e5484c41ebf0c2487f326e AUX tox-bootstrapd.service 365 BLAKE2B f17891d280007180811414f85f1f8a4defd85436410113f11cffd60dd14a02cd24a0637c347a75ea11322c050e4030702e9f95f02810705aef512df6558e66d5 SHA512 d565430c53b91343d57b6db573884c9f11aaf8bbddfd70bf3a46a6dede91c01ab8f1371ae052b4dd529cc521bef28924069fc7f4bc3d610c01cbd6d6569707f8 DIST c-toxcore-0.1.10.tar.gz 820090 BLAKE2B 071e530db2dd6ca387a6cd88f1145515ab8741017626fcb744fdc9940263b6c2604b456b6d1357bc78be5e33b544ecf882e608bc7b4a4227d44c5507e5dbad56 SHA512 428fee2d811d0b6d5d005f082aa06f95765794b1a8bc77ec4411bb9ec9085b99675535b88db50f5ad7313850a0bb3c54c4e2e8d8864cea7c0c7d81be9879b157 DIST c-toxcore-0.2.5.tar.gz 482160 BLAKE2B b56511d9cf7bd3a9d2b9177b33bdbf60ac571f6c95d7ee26e6ecae7c9395d8cdd4f6650025f8b727ad9b825b304c4555efaee0f17d60a26bc5bf599905ec27ab SHA512 a425a106054f29533b43b14cb8916706d04158d91b66cdada0e9e007aebd3f68a253b8519a75ca94bffba3adc57362b4e7c44e9356fce416f081a7eda6a61e18 -DIST tox-0.1.6.tar.lz 314837 BLAKE2B 087a6f5d5ef55709b5f6188d661d556326bb3e6eac33e55f9faf598d433e33dabbd983ab452e948bff97f82cdc336e0fd48d3f0a6ec57551914884a809b9118d SHA512 57ed7cee2c621c57e24f5ab36d68d99414d9820cdb3e8b7c4390818222f9d885f352f9cf76c8eb522c238bebc7d420bcf3cdd5f6ab65b9801aadbd225765166c -DIST tox-0_pre20160904.tar.gz 395495 BLAKE2B d59358c5ff904b17e9c5297a0ce2aff39777f8dd4bfeba1e5e78a284a5016921794d0e0699f91a99f53428809a859ce959e17b4ae9fffdd691005c377834057d SHA512 c0da52ac908141e97e96510a05431cbfb4b9aae81faf4c136c95e21b90a23e3bbe6db88303e48c0f4f3c74ca954229787564b7aa41bfb462afb0d8f8430cdaa1 +DIST c-toxcore-0.2.8.tar.gz 502907 BLAKE2B 0ca2c861b3cd982b471fac5cf8bdacd21c3248118846cc17e51f33ba04cf3da12a64578744e47daa27bb8613762a6f562eb550f0b7af05a66696412f6d0a6360 SHA512 a23a87a74fe97091b00ea76676a22578ed1e2426ac777146bb6efc984f1bfd3fff0d7fb149691155b8e2db56e1e088a1884536e5b717ff5c45a87b437f275735 EBUILD tox-0.1.10.ebuild 2214 BLAKE2B 5d2003fadd0af8870610f10f0f5f1ff310de209e9efe83606ea781cba75f38033eed23edfd03b3b2f2291e48c95387949dd35600c76a850d1f6590d98ef5441f SHA512 c57222375a9135a00053ad05567658ab5c108015733e23b2aeb89e4ef93a835e3df3db9b65d3f01dddc38336d97bca366a4e1972c7d44471cf6a47c3913cebc4 -EBUILD tox-0.1.6.ebuild 2250 BLAKE2B e4fdb58e9a9861eaf3420e05228d2dcfb213ea2ed839562394cac6207afe3a97947ff34c8c31c9c737669758d49a9f757eb03fe99da98ed134d4d96a90dd5f7b SHA512 3566194ff9f4afc1ccb95cce44ecc47b13c3ad1b0ee8eecd6acbfd4e122deed63342ccd23eda9202070aba9f59e21328e610d454a2209edc3d513d54ed2963c1 EBUILD tox-0.2.5.ebuild 2087 BLAKE2B 0518bf2d70a2390bfc92397c864f54c9612d0346dd0752a7b8c6259242518b2c57d4df3cc17b34ed7b6780d76bdb7e1f2e347fe4fe379f0975fbb079aac02ff6 SHA512 574c84ed7ccbeb7480ad7f2140d4ca1e703f44be05f60c24a7aeb5a1c843798017a9615905e7ab619bb1af7a70b179a53523a606f9e22b370a5c723664afe6f8 -EBUILD tox-0_pre20160904.ebuild 2237 BLAKE2B fbdd8f30956ad73dcd398468e537260e0597c8b6f1a6f3d75987167b1b16da38a0c3e9b1159d25e6f58b4ecbcb4d99dc63870c71cb6c3d2dcd4d9863efeb452a SHA512 123f25a734fbd69c6d48d594359264b1ddfe9ad2423ebf8bf5f768e352e38b9d59d3be42932d6709340900fcc45131d5496bf0f474ea9ed70753a3d97c841543 +EBUILD tox-0.2.8.ebuild 2757 BLAKE2B 6b95692af1fb7b3aa1ecba363536769a7466c3b0110bb2ce1b0f885767d6d624b7cda900ac891cbf3dcd9b3552b7a99db1523688ace5641ea5799b08ebfcb1c9 SHA512 8bbc00c73c02246985712429187095765677e08f1161438987fe38a26165c45c5dc1bd71acca27001040f6337ad4a307f350bf8efc6b83e56b02d739ff2168a0 EBUILD tox-9999.ebuild 1794 BLAKE2B ec371c542ac51f12bda1b26e59716a766d1e7824d3203288064c3fda280d891c2429a7b7e0c26b840981187bdb0568103bd012bcd1e676a3c3878e42a209e9cd SHA512 b3a45120acc50594bb2f66dc4dc13f638e5cda5500f666a1b68ce2e0fd53637dfd36530a2eac370da01b4bb4e86cc7a7ac7750194ee5f31de22a116256ef7756 -MISC metadata.xml 731 BLAKE2B 7c279eba74cd218439392afee1509adcdc022a54a87545f98fb1b9fadecd31efc383a1fd6e44bcf2db53ae82b3cfdf4fb2d14d427d94699278ff978250510b0e SHA512 952aaa54d9b72cae58e6ac6852435a7394fee3805d5772c223dc48757066d457efa1094682f2afa5056ef782a8c2ab61b45e724f1cf80f33643a57152f75a8b0 +MISC metadata.xml 934 BLAKE2B 65fb020f4e90f8cdd707add853106090ccd4196c072ca894de568016c95b4e2e35ec778cfee5a93fcbed0b8775d47710802c3565f1497f813e5c728f50db44ed SHA512 e84aee8e455301ab196b591ebc2eddfb11bd5a06e6309d6a22383236ad0b8718f8791f1725387e3049e1ba82c02a2a8b986dd4fb5e1a5e63979443c6ad935b5d diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml index 0dc9808e046b..99359c3fc50a 100644 --- a/net-libs/tox/metadata.xml +++ b/net-libs/tox/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>JoMull01@protonmail.com</email> + <name>Josiah Mullins</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="av">Adds support for audio and video.</flag> <flag name="no-log">Log level: 0 (no debug info logged)</flag> diff --git a/net-libs/tox/tox-0.1.6.ebuild b/net-libs/tox/tox-0.1.6.ebuild deleted file mode 100644 index 6f3d6ba59e87..000000000000 --- a/net-libs/tox/tox-0.1.6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools systemd unpacker user - -DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" -HOMEPAGE="https://tox.chat" -SRC_URI="https://github.com/TokTok/c-toxcore/releases/download/v${PV}/c-toxcore-v${PV}.tar.lz -> ${P}.tar.lz" - -LICENSE="GPL-3+" -SLOT="0/0.1" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+av daemon log-debug log-error log-info log-trace log-warn +no-log ntox static-libs test" - -REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )" - -RDEPEND=" - av? ( media-libs/libvpx:= - media-libs/opus ) - daemon? ( dev-libs/libconfig ) - ntox? ( sys-libs/ncurses:0= ) - >=dev-libs/libsodium-0.6.1:=[asm,urandom]" -DEPEND="${RDEPEND} - $(unpacker_src_uri_depends) - test? ( dev-libs/check ) - virtual/pkgconfig" - -S=${WORKDIR} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(usex log-trace "--enable-logging --with-log-level=TRACE" "") \ - $(usex log-debug "--enable-logging --with-log-level=DEBUG" "") \ - $(usex log-info "--enable-logging --with-log-level=INFO" "") \ - $(usex log-warn "--enable-logging --with-log-level=WARNING" "") \ - $(usex log-error "--enable-logging --with-log-level=ERROR" "") \ - $(use_enable av) \ - $(use_enable test tests) \ - $(use_enable ntox) \ - $(use_enable daemon) \ - $(use_enable static-libs static) -} - -src_install() { - default - if use daemon; then - newinitd "${FILESDIR}"/initd tox-dht-daemon - newconfd "${FILESDIR}"/confd tox-dht-daemon - insinto /etc - doins "${FILESDIR}"/tox-bootstrapd.conf - systemd_dounit "${FILESDIR}"/tox-bootstrapd.service - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if use daemon; then - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then - ewarn "Backwards compatability with the bootstrap daemon might have been" - ewarn "broken a while ago. To resolve this issue, REMOVE the following files:" - ewarn " ${EROOT%/}/var/lib/tox-dht-bootstrap/key" - ewarn " ${EROOT%/}/etc/tox-bootstrapd.conf" - ewarn " ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid" - ewarn "Then just re-emerge net-libs/tox" - fi - fi -} diff --git a/net-libs/tox/tox-0.2.8.ebuild b/net-libs/tox/tox-0.2.8.ebuild new file mode 100644 index 000000000000..d10d777179d7 --- /dev/null +++ b/net-libs/tox/tox-0.2.8.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils systemd user + +MY_P="c-toxcore-${PV}" +DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" +HOMEPAGE="https://tox.chat" +SRC_URI="https://github.com/TokTok/c-toxcore/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0/0.2" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+av daemon ipv6 no-log log-trace log-debug log-info log-warn +log-error static-libs test" + +REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )" + +RDEPEND=" + av? ( media-libs/libvpx:= + media-libs/opus ) + daemon? ( dev-libs/libconfig ) + >=dev-libs/libsodium-0.6.1:=[asm,urandom,-minimal]" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + cmake-utils_src_prepare + #remove faulty tests + for testname in bootstrap lan_discovery save_compatibility tcp_relay; do + sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die + done +} + +src_configure() { + local mycmakeargs=( + -DBUILD_TOXAV=$(usex av) + -DMUST_BUILD_TOXAV=$(usex av) + -DBOOTSTRAP_DAEMON=$(usex daemon) + -DENABLE_STATIC=$(usex static-libs) + -DENABLE_SHARED=ON + -DBUILD_AV_TEST=$(usex test) + -DUSE_IPV6=$(usex test && usex ipv6) + ) + if use test; then + mycmakeargs+=(-DTEST_TIMEOUT_SECONDS=120) + fi + if use no-log; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="") + einfo "logging disable" + elif use log-trace; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="TRACE") + einfo "Trace logging enabled" + elif use log-debug; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="DEBUG") + einfo "debug logging enabled" + elif use log-info; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="INFO") + einfo "info logging enabled" + elif use log-warn; then + mycmakeargs+=(-DMIN_LOGGER_LEVEL="WARNING") + einfo "warning logging enabled" + else + mycmakeargs+=(-DMIN_LOGGER_LEVEL="ERROR") + einfo "error logging enabled" + fi + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + if use daemon; then + newinitd "${FILESDIR}"/initd tox-dht-daemon + newconfd "${FILESDIR}"/confd tox-dht-daemon + insinto /etc + doins "${FILESDIR}"/tox-bootstrapd.conf + systemd_dounit "${FILESDIR}"/tox-bootstrapd.service + fi +} + +pkg_postinst() { + if use daemon; then + enewgroup tox + enewuser tox -1 -1 -1 tox + if [[ -f ${EROOT%/}/var/lib/tox-dht-bootstrap/key ]]; then + ewarn "Backwards compatability with the bootstrap daemon might have been" + ewarn "broken a while ago. To resolve this issue, REMOVE the following files:" + ewarn " ${EROOT%/}/var/lib/tox-dht-bootstrap/key" + ewarn " ${EROOT%/}/etc/tox-bootstrapd.conf" + ewarn " ${EROOT%/}/run/tox-dht-bootstrap/tox-dht-bootstrap.pid" + ewarn "Then just re-emerge net-libs/tox" + fi + fi +} diff --git a/net-libs/tox/tox-0_pre20160904.ebuild b/net-libs/tox/tox-0_pre20160904.ebuild deleted file mode 100644 index ee3124095514..000000000000 --- a/net-libs/tox/tox-0_pre20160904.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools systemd user vcs-snapshot - -DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" -HOMEPAGE="https://tox.chat" -EGIT_COMMIT="755f084e8720b349026c85afbad58954cb7ff1d4" -SRC_URI="https://github.com/irungentoo/toxcore/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0/0.0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="+av daemon log-debug log-error log-info log-trace log-warn +no-log ntox static-libs test" - -REQUIRED_USE="^^ ( no-log log-trace log-debug log-info log-warn log-error )" - -RDEPEND=" - av? ( media-libs/libvpx:= - media-libs/opus ) - daemon? ( dev-libs/libconfig ) - ntox? ( sys-libs/ncurses:0= ) - >=dev-libs/libsodium-0.6.1:=[asm,urandom]" -DEPEND="${RDEPEND} - test? ( dev-libs/check ) - virtual/pkgconfig" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(usex log-trace "--enable-logging --with-log-level=TRACE" "") \ - $(usex log-debug "--enable-logging --with-log-level=DEBUG" "") \ - $(usex log-info "--enable-logging --with-log-level=INFO" "") \ - $(usex log-warn "--enable-logging --with-log-level=WARNING" "") \ - $(usex log-error "--enable-logging --with-log-level=ERROR" "") \ - $(use_enable av) \ - $(use_enable test tests) \ - $(use_enable ntox) \ - $(use_enable daemon) \ - $(use_enable static-libs static) -} - -src_install() { - default - if use daemon; then - newinitd "${FILESDIR}"/initd tox-dht-daemon - newconfd "${FILESDIR}"/confd tox-dht-daemon - insinto /etc - doins "${FILESDIR}"/tox-bootstrapd.conf - systemd_dounit "${FILESDIR}"/tox-bootstrapd.service - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - if use daemon; then - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - if [[ -f ${EROOT}var/lib/tox-dht-bootstrap/key ]]; then - ewarn "Backwards compatability with the bootstrap daemon might have been" - ewarn "broken a while ago. To resolve this issue, REMOVE the following files:" - ewarn " ${EROOT}var/lib/tox-dht-bootstrap/key" - ewarn " ${EROOT}etc/tox-bootstrapd.conf" - ewarn " ${EROOT}run/tox-dht-bootstrap/tox-dht-bootstrap.pid" - ewarn "Then just re-emerge net-libs/tox" - fi - fi -} diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 759333caaf68..cf1ecbce695f 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -1,3 +1,3 @@ DIST webkitgtk-2.22.2.tar.xz 16769120 BLAKE2B 19b226e657a324ab0efcfdcda3b22bc21a3b1cae29325f89ebd555dfb45d02d23f495ebf3817cb4c5e662c813b8d75754e0051d84afb84ea1347bf25a321e5d0 SHA512 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756 -EBUILD webkit-gtk-2.22.2.ebuild 7897 BLAKE2B 41f73330349d83b62f2dae73fda624561ae0ad0f15462051dc50216bc4306981832d14030c78527beb8ed50bad3ce92892e24745d85e5409356f95f520a7b6fc SHA512 a43489a7166d8ae74a35bafa423b268c7ab9276854ef179a7f4cbe891125ecbe57b5b2e8d9c92f50cc08c765fe3cfedecf5b7107596443990c63e5e7e4cbd6bf +EBUILD webkit-gtk-2.22.2.ebuild 8125 BLAKE2B 0997d124840b3a57d57b685c98b87ff38f6999c632faeb81297713e48f0f5bde97a876b2ba68effab319111c979b474fed5e7c1204926005b6216770bcccca95 SHA512 b05263a65622920e6d16df475bc413314ea80d7afcf3c7beaba0ce7ff257fc364582729d915cdbb9cfbfd110a10d68efb61912e998115b6a96abd2cc6886e5b0 MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e diff --git a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild index 71766f4371b4..4b4d6c0314c3 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.22.2.ebuild @@ -39,6 +39,7 @@ RESTRICT="test" # Dependencies found at Source/cmake/OptionsGTK.cmake # Various compile-time optionals for gtk+-3.22.0 - ensure it # Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) +# TODO: Raise gst-plugins-opus dep to 1.14.4-r1 once we can, and eventually drop the blocker from epiphany; or remove the dep when older than -opus-1.14.4-r1 is not available anymore RDEPEND=" >=x11-libs/cairo-1.10.2:=[X?] >=media-libs/fontconfig-2.8.0:1.0 @@ -69,6 +70,7 @@ RDEPEND=" gstreamer? ( >=media-libs/gstreamer-1.8.3:1.0 >=media-libs/gst-plugins-base-1.8.3:1.0 + >=media-plugins/gst-plugins-opus-1.8.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[egl?,gles2?,opengl?] ) X? ( |