diff options
Diffstat (limited to 'net-misc')
56 files changed, 830 insertions, 971 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz Binary files differindex d3681693dd42..34cc0609426f 100644 --- a/net-misc/Manifest.gz +++ b/net-misc/Manifest.gz diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest index 0993603c335a..771035fb943b 100644 --- a/net-misc/aria2/Manifest +++ b/net-misc/aria2/Manifest @@ -1,5 +1,6 @@ AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0 AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc -EBUILD aria2-1.34.0-r1.ebuild 4415 BLAKE2B fe9c3e485d7ece90ad6c4691ad31298fbfce7709738a69e0b78e6b222168417c91eee1a4bc86e96f75ddfea607d5a5245689772e19a664a47002e0509e975a3e SHA512 1a2050c5e8ddf1da9cc24440024a1099df92788e6413dfff6359f3cc3a7b8acbe8e256d78b6c3cb7522bb5f6dd2a5437b4814a0a7ee7206b646f3f3546c1cd0e -MISC metadata.xml 1195 BLAKE2B 393ba5f1d8bc975cbf2a7f4a7deef2929e5f8f3220895628535d5c9e78bb154c2b41a11628d4bfc30475936051c8b6975d6e1146dd4af612e10307572e6c361f SHA512 54ffe27c3c623befb40e1b66df8b4a6cfe9bc1101f65d6641ddc27de686cc0df600e72650f92c89402fdc30f535462ed1f0a6561967771a8e5c0d648890a9208 +EBUILD aria2-1.34.0-r1.ebuild 4439 BLAKE2B 95ceeb794a25162f1edaf2910117f093fdb06f4afa956b14a5fe8034440edc6f0ea7a91f18434cbf083505e7effedad47fcf68ee52286c931db73b9be29085b0 SHA512 2a9d7e9c963f3f8158727bafe5fb8895981bb3e81687bdfee36c23be097b7f3d452efb8e560dfaa540aa007368e386e04162c93ca651c405cf1c68386f9a8ff9 +EBUILD aria2-1.34.0-r2.ebuild 5016 BLAKE2B 27a33ac658c9996ef9824493f5ca8db20faa24e407b32935a5f2b206a2194ec86dd0ec5bac3891f7fa137ba7b2160a37c9e7a729601e07c152f1b3c41b548435 SHA512 fa4e6fd3b7d55b894a931a6d9f73a0e8cefdcb4a117d68a52aa3b66741691da8a4f99549804173bbf04b7455eb5d704c087f547fdfbdc773eedf43ae61a45b96 +MISC metadata.xml 1442 BLAKE2B 82e8426004e56ba96a5f8766a6d04325ea3919ecfa0996da1d767dc4f4fb2b3277d1b3e4b60d369bc7636eb557af336b890c4bde0b49ee39cc3352050a112fe5 SHA512 61da3c1c3cd1535d208e7ae1930fc2af16eb2080f99c923b9bc405decb50f09cf5acfbb1e922c3eb7edbb799f359e8e9762fe2e67ec24ae542613459250c6f7b diff --git a/net-misc/aria2/aria2-1.34.0-r1.ebuild b/net-misc/aria2/aria2-1.34.0-r1.ebuild index b12d839f52e1..39d7cfca73ab 100644 --- a/net-misc/aria2/aria2-1.34.0-r1.ebuild +++ b/net-misc/aria2/aria2-1.34.0-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="A download utility with segmented downloading with BitTorrent suppo HOMEPAGE="https://aria2.github.io/" SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-2+-with-openssl-exception" KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" diff --git a/net-misc/aria2/aria2-1.34.0-r2.ebuild b/net-misc/aria2/aria2-1.34.0-r2.ebuild new file mode 100644 index 000000000000..025e6d10b737 --- /dev/null +++ b/net-misc/aria2/aria2-1.34.0-r2.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit bash-completion-r1 + +DESCRIPTION="A download utility with segmented downloading with BitTorrent support" +HOMEPAGE="https://aria2.github.io/" +SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz" + +LICENSE="GPL-2+-with-openssl-exception" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0" +IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc" + +# Crazy GnuTLS/OpenSSL/etc. logic below: +# 1. Those libraries are used for two purposes: TLS & MD. +# 2. Upstream preferences are: +# 1) gnutls [tls] +# 2) !gnutls? -> openssl [tls+md] +# 3) !openssl? -> nettle [md] +# 4) !openssl? !nettle? -> gcrypt [md] +# 5) !*? -> bundled md routines (we don't use them) +# 3. There's also gmp usage for bittorrent with nettle. +# 4. You can't really control features, just dependencies. +# (we are skipping native Apple/Windows TLS support) +# +# We map this into: +# ssl? -> openssl || (gnutls + (nettle || libgcrypt )) +# !ssl? -> nettle || libgcrypt + +CDEPEND="sys-libs/zlib:0= + adns? ( >=net-dns/c-ares-1.5.0:0= ) + jemalloc? ( dev-libs/jemalloc ) + libuv? ( >=dev-libs/libuv-1.13:0= ) + metalink? ( + libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) + !libxml2? ( dev-libs/expat:0= ) ) + sqlite? ( dev-db/sqlite:3= ) + ssh? ( net-libs/libssh2:= ) + ssl? ( + app-misc/ca-certificates + gnutls? ( + >=net-libs/gnutls-1.2.9:0= + nettle? ( + >=dev-libs/nettle-2.4:0= + bittorrent? ( + >=dev-libs/nettle-2.4:0=[gmp] + >=dev-libs/gmp-6:0= + ) + ) + !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) + ) + !gnutls? ( + dev-libs/openssl:0= + ) + ) + !ssl? ( + nettle? ( + >=dev-libs/nettle-2.4:0= + bittorrent? ( + >=dev-libs/nettle-2.4:0=[gmp] + >=dev-libs/gmp-6:0= + ) + ) + !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) + ) + tcmalloc? ( dev-util/google-perftools ) + xmlrpc? ( + libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) + !libxml2? ( dev-libs/expat:0= ) )" + +DEPEND="${CDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( >=dev-util/cppunit-1.12.0:0 )" +RDEPEND="${CDEPEND} + nls? ( virtual/libiconv virtual/libintl ) + scripts? ( dev-lang/ruby )" + +# xmlrpc has no explicit switch, it's turned out by any XML library +# so metalink implicitly forces it on +REQUIRED_USE="?? ( jemalloc tcmalloc ) + metalink? ( xmlrpc )" +RESTRICT="!test? ( test )" + +pkg_setup() { + if use scripts && ! use xmlrpc; then + ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc" + ewarn "and aria2mon scripts against the local aria2." + fi +} + +src_prepare() { + eapply "${FILESDIR}"/${P}-make_unique.patch + # https://bugs.gentoo.org/674622 (CVE-2019-3500) + eapply "${FILESDIR}"/${P}-mask-headers.patch + default + sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed" +} + +src_configure() { + local myconf=( + # threads, epoll: check for best portability + + # do not try to compile and run a test LIBXML program + --disable-xmltest + # enable the shared library + --enable-libaria2 + # zlib should always be available anyway + --with-libz + --with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" + + # optional features + $(use_enable bittorrent) + $(use_enable metalink) + $(use_enable nls) + $(use_with adns libcares) + $(use_with jemalloc) + $(use_with libuv) + $(use_with sqlite sqlite3) + $(use_with ssh libssh2) + $(use_with tcmalloc) + ) + + # See TLS/MD logic described above deps. + if use ssl && ! use gnutls; then + # 1. if ssl & !gnutls, use openssl and disable gnutls + myconf+=( --without-gnutls --with-openssl ) + else + myconf+=( + # 2. otherwise, disable openssl + --without-openssl + # 3. if ssl & gnutls, use gnutls + $(use_with ssl gnutls) + + # 4. switch between nettle & libgcrypt + $(use_with nettle libnettle) + $(use_with !nettle libgcrypt) + ) + + # 5. if bittorrent is used along with nettle, use libgmp + if use bittorrent && use nettle; then + myconf+=( --with-libgmp ) + else + myconf+=( --without-libgmp ) + fi + fi + + # metalink+xmlrpc := libxml2 / expat + # USE=(metalink || xmlrpc) + # + USE=libxml2 -> libxml2 + # + USE=-libxml2 -> expat + + if use metalink || use xmlrpc; then + myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) ) + else + myconf+=( --without-libexpat --without-libxml2 ) + fi + + # Note: + # - always enable gzip/http compression since zlib should always be available anyway + # - always enable epoll since we can assume kernel 2.6.x + # - other options for threads: solaris, pth, win32 + econf "${myconf[@]}" +} + +src_install() { + default + rm -rf "${D}"/usr/share/doc/aria2 \ + "${D}"/usr/share/doc/${PF}/README{,.html} + + dobashcomp doc/bash_completion/aria2c + use scripts && dobin doc/xmlrpc/aria2{mon,rpc} +} + +pkg_postinst() { + if use xmlrpc; then + elog "If you would like to use the additional aria2mon and aria2rpc tools," + elog "you need to have \033[1mdev-lang/ruby\033[0m installed." + fi +} diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml index e5e58f42b404..27fefc927194 100644 --- a/net-misc/aria2/metadata.xml +++ b/net-misc/aria2/metadata.xml @@ -11,10 +11,11 @@ </maintainer> <use> <flag name="bittorrent">Enable support for the bittorrent protocol.</flag> + <flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> as TLS provider (preferred). Otherwise, <pkg>dev-libs/openssl</pkg> will be used as TLS provider. Both apply only with USE=ssl.</flag> <flag name="libuv">Use <pkg>dev-libs/libuv</pkg> backend.</flag> <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of <pkg>dev-libs/expat</pkg>.</flag> - <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> and <pkg>dev-libs/gmp</pkg> for bittorrent/metalink crypto instead of <pkg>dev-libs/libgcrypt</pkg> (when <pkg>dev-libs/openssl</pkg> is not being used).</flag> <flag name="metalink">Enable support for metalink.</flag> + <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for message digests, plus <pkg>dev-libs/gmp</pkg> for bittorrent (if enabled). If this flag is disabled, <pkg>dev-libs/libgcrypt</pkg> is used instead. This flag is ignored if <pkg>dev-libs/openssl</pkg> is used.</flag> <flag name="scripts">Install additional scripts which use aria2's xmlrpc functionality.</flag> <flag name="ssh">Enable SFTP support.</flag> </use> diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 67129621b7ff..981b06f845d8 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -4,10 +4,10 @@ AUX dhcpcd-7.1.1-v6_read_overflow.patch 3359 BLAKE2B 665506fa9c9839b66e86af39ffe AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4 -DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3 DIST dhcpcd-7.2.2.tar.xz 213600 BLAKE2B ae36cc44d32c034b41f9c970fdb154ef2935b53ae9a81d76dfe8143882170cb8f4ea9c2048ebbfc2d94096061626e93d5890565192115d2953506a7d1e4ee6f2 SHA512 a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8 +DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f EBUILD dhcpcd-7.1.1-r3.ebuild 4641 BLAKE2B 4bf2bc06ab5ad509960e4730a91ac6cedebb2109ffb285cdc3381e3fcdec239e63d1ec26bb5037fbcb745e7532bfbb57673627a0165d197315da97326e8c63d0 SHA512 06fdb570c0f55e13091f6b12b014304b4e9036fb81194944fe7f53fd4809aa6376fa77e0e6d6cdec77d3649336a18363aa13ba4e921247ce20aa5ac37c688c95 -EBUILD dhcpcd-7.2.1.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 EBUILD dhcpcd-7.2.2.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 -EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 +EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6984ce73636a4ef29bf29143a1ba122b0ab31566af2730907b0e24e9ab7e2d5b61698e3c0608e84004fcedc5c218b419727aca598bb1040859b59d5e0e09ee16 SHA512 d7f5917239a1caf2bf001071eb916ff53b26fd66486ec00c8c4595b95b2ea1c77971b88027d9e3e0e4f99dddd2da5dfe6dfb8eb23417d2418fc2392cb53d9a1d +EBUILD dhcpcd-9999.ebuild 4407 BLAKE2B 6984ce73636a4ef29bf29143a1ba122b0ab31566af2730907b0e24e9ab7e2d5b61698e3c0608e84004fcedc5c218b419727aca598bb1040859b59d5e0e09ee16 SHA512 d7f5917239a1caf2bf001071eb916ff53b26fd66486ec00c8c4595b95b2ea1c77971b88027d9e3e0e4f99dddd2da5dfe6dfb8eb23417d2418fc2392cb53d9a1d MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a diff --git a/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild index 48ba26275d0c..b74ad597f96b 100644 --- a/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit systemd toolchain-funcs @@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" src_configure() { - local dev hooks=() rundir - use udev || dev="--without-dev --without-udev" - hooks=( --with-hook=ntp.conf ) - use elibc_glibc && hooks+=( --with-hook=yp.conf ) - use kernel_linux && rundir="--rundir=${EPREFIX}/run" local myeconfargs=( - --prefix="${EPREFIX}" - --libexecdir="${EPREFIX}/lib/dhcpcd" --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" --localstatedir="${EPREFIX}/var" - ${rundir} + --prefix="${EPREFIX}" + --with-hook=ntp.conf $(use_enable embedded) $(use_enable ipv6) - ${dev} + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" - ${hooks[@]} ) econf "${myeconfargs[@]}" } @@ -56,10 +52,10 @@ src_install() { } pkg_postinst() { - local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT%/}"/etc/dhcpcd.duid + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid local new_duid="${dbdir}"/duid if [[ -e "${old_old_duid}" ]] ; then # Upgrade the duid file to the new format if needed @@ -81,7 +77,7 @@ pkg_postinst() { fi old_files+=( "${old_duid}" ) fi - local old_secret="${EROOT%/}"/etc/dhcpcd.secret + local old_secret="${EROOT}"/etc/dhcpcd.secret local new_secret="${dbdir}"/secret if [[ -e "${old_secret}" ]] ; then if [[ ! -e "${new_secret}" ]] ; then @@ -112,7 +108,7 @@ pkg_postinst() { if [[ -n "${old_files[@]}" ]] ; then elog elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT%/}/etc to ${dbdir}" + elog "${EROOT}/etc to ${dbdir}" elog "and copied leases in ${dbdir} to new files with the dhcpcd-" elog "prefix dropped." elog diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 48ba26275d0c..b74ad597f96b 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit systemd toolchain-funcs @@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" src_configure() { - local dev hooks=() rundir - use udev || dev="--without-dev --without-udev" - hooks=( --with-hook=ntp.conf ) - use elibc_glibc && hooks+=( --with-hook=yp.conf ) - use kernel_linux && rundir="--rundir=${EPREFIX}/run" local myeconfargs=( - --prefix="${EPREFIX}" - --libexecdir="${EPREFIX}/lib/dhcpcd" --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" --localstatedir="${EPREFIX}/var" - ${rundir} + --prefix="${EPREFIX}" + --with-hook=ntp.conf $(use_enable embedded) $(use_enable ipv6) - ${dev} + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" - ${hooks[@]} ) econf "${myeconfargs[@]}" } @@ -56,10 +52,10 @@ src_install() { } pkg_postinst() { - local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT%/}"/etc/dhcpcd.duid + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid local new_duid="${dbdir}"/duid if [[ -e "${old_old_duid}" ]] ; then # Upgrade the duid file to the new format if needed @@ -81,7 +77,7 @@ pkg_postinst() { fi old_files+=( "${old_duid}" ) fi - local old_secret="${EROOT%/}"/etc/dhcpcd.secret + local old_secret="${EROOT}"/etc/dhcpcd.secret local new_secret="${dbdir}"/secret if [[ -e "${old_secret}" ]] ; then if [[ ! -e "${new_secret}" ]] ; then @@ -112,7 +108,7 @@ pkg_postinst() { if [[ -n "${old_files[@]}" ]] ; then elog elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT%/}/etc to ${dbdir}" + elog "${EROOT}/etc to ${dbdir}" elog "and copied leases in ${dbdir} to new files with the dhcpcd-" elog "prefix dropped." elog diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index 85f8505724d7..92dae81b4a65 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,3 +1,4 @@ +AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe0ed55703dcd08d1a64f6211ed49d974a8d95599ba30f26930cfda4e929acee9f46982debfa531a9d6c848250a9c0ff04 SHA512 7382a271c2ccf7c270102a40724abb2e505070e3062c9ab8910c45ad5e52cc6190c7b24604e5b738674beef5b032cfc59c90d33d7db0962dd63ca61722c5dfb1 DIST httpie-0.9.2.tar.gz 73153 BLAKE2B 53ca1f5dd683d68ff6416a297bb45a2827f516a64cbca7f354243e7e2f8765677798d138b949db79c2735f9f71e106af2f669e6ba58ac7e11b86d4e0ed6c9457 SHA512 5622caa2f3136137d85f91eba9b0a165ec987b696a5e001844c8ecb868d66cfc86b3f3fb3a1ac493d7603c67ca88de0e0ffc776dce855ad69364190607b4fb73 DIST httpie-0.9.3.tar.gz 73693 BLAKE2B f188a7fe5f63b39022d2a67e8f9dc2582ce8e8d4860b880b2e26403149361b999294bf0e55b41bf1773e73c0ffe81abd01c6c1e2ddaf755dfc31ab7e463b8516 SHA512 a98aa19ddcc5223133f1081ce22457d21b838b5779788a08d0b65ea80f903ab577a55e0c73b3656486eec08c3c0910d3e987aed0f117c5f9b3e005c6001000cc DIST httpie-0.9.4.tar.gz 79889 BLAKE2B 13053cb3389a03ecbd90caba85801772cba9f09a03f759d526256fc0195a31824408a02b004d3af50a1fbcaca7c02128b438ce341464825a08e4dbd5177ddf99 SHA512 eea4e0fce334d12f9438d89f87d119bc569f8042d95c87f6898b9110030674f49361bf8e119d815330aa117479557766d614510d81c42c9c3a6803c769f38b26 @@ -9,5 +10,6 @@ EBUILD httpie-0.9.3.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81a EBUILD httpie-0.9.4.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8 EBUILD httpie-0.9.9.ebuild 517 BLAKE2B d0b2031926effcd24b8d23b1dbf3ea311294dc439f56cefdb30359d82c0e727bae8cc19f37bc6681b4c61b3b715e00a7f20c8245464aefb46899395b5c9a29ad SHA512 880dfc9565f7f3791e97ebd946178e0dfcd2896e00813725f2b726d06091201b055fd759107459524c4d7ff35e6af1cc4cdf18cef2a94e23d11181a51f0fb0b9 EBUILD httpie-1.0.0.ebuild 797 BLAKE2B 8964804fd47ee2543d5bfd7557a020a5103a4f0cc1534653786baab8d2073421c6ad2ee839ac85a7e39cd2161d3008f49b6e89d32663a6232ea6c3409f30880e SHA512 51b519746529294e151c982c8b45270223310796472b91e3b42ec88decc1daa8b39ec6af34b50319176c9245aa2eadd6010913ef5800c711f9e7efb909454f70 +EBUILD httpie-1.0.2-r1.ebuild 1178 BLAKE2B 7828143ca9265e373282a7f3fbce6e9cad8245dfc870f5dfd915c125770dfd1c8005e71ce07eff5c025eb3bdbce3cacfd8288556c2c0731402f0815d3c6384f2 SHA512 14ef3bb2498ecd3c5a72d867a1c3d0caaefc2f300954af28a5ee81deb075d886e97ace96dc57e6f9361c0a06a194467fb70993036e404fc13e9d2954113a7ce1 EBUILD httpie-1.0.2.ebuild 1042 BLAKE2B 54222b437a055f9c3f89a09cc7c14a907db25014556760e2406b9c4bc187d085f791e96e4ac96de761029f6a0be68b296e41a4c2543cd462c815824e34959a81 SHA512 e89cdafdf8e9102447a32e3a6e2eaf635e80aa1f325b70e94730b901cb0491bdbf55cc0ad2ea867fac4e233f9050fb1304d5618a25cf95eba265a362fa5fa602 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb diff --git a/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch b/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch new file mode 100644 index 000000000000..212f91f41e82 --- /dev/null +++ b/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch @@ -0,0 +1,11 @@ +--- a/tests/test_ssl.py 2018-11-14 16:36:19.000000000 +0100 ++++ b/tests/test_ssl.py 2019-06-29 16:28:09.466528486 +0200 +@@ -45,7 +45,7 @@ + except ssl_errors as e: + if ssl_version == 'ssl3': + # pytest-httpbin doesn't support ssl3 +- assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e) ++ assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e) or 'handshake failure' in str(e) + else: + raise + diff --git a/net-misc/httpie/httpie-1.0.2-r1.ebuild b/net-misc/httpie/httpie-1.0.2-r1.ebuild new file mode 100644 index 000000000000..e7057e9fb651 --- /dev/null +++ b/net-misc/httpie/httpie-1.0.2-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6} ) +PYTHON_REQ_USE="ssl(+)" + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Modern command line HTTP client" +HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/" +SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] + >=dev-python/requests-2.19.1[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-httpbin[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +# Extend list of expected strings in test +PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-test_ssl.patch" ) + +python_test() { + pytest -vv || die "Tests failed with ${EPYTHON}" +} + +python_install_all() { + newbashcomp extras/httpie-completion.bash http + insinto /usr/share/fish/vendor_completions.d + newins extras/httpie-completion.fish http.fish + distutils-r1_python_install_all +} diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest index 6f00777688e4..b475f118a072 100644 --- a/net-misc/iperf/Manifest +++ b/net-misc/iperf/Manifest @@ -6,9 +6,11 @@ AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d +DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef67cbb0ce8050e30000465686466b30b699b2d8cb374be6b5a063ce220cb79e48fa8fd2257cce69cd8a90e8 SHA512 4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7 EBUILD iperf-2.0.13.ebuild 743 BLAKE2B a92d22e57d9c7717bf0c42bf5ea5bc9dd126d50afd0760fabd59df618a783d638a50feac3704b0d341b2ffb7304f9bfcb235b9a2bae892c62ad3724c4bbdae05 SHA512 e4174626f1406777c8613f1bd82528330e9560c555d6ade17ae46da75feb37c33aa4f547276b3a8cd9a9b66fce12be92e48ec2af3a4b546b4dcecc6b2453fa61 EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 8fed944e9f1e47b14d0ea2f462fd8003393f4c0b47640d6937293130599a6d33a38ba86069e20ef5fc09cdf2429130153eaab7a88e69ff44ffe11cd06f618c06 SHA512 b1cc22a9d741dbce419c724af8462f199f02738c9c78b55b2305a5f3d051d0d64a8a3e369cfa1bffd6c7b251274423683508e57f1c67843eeeca331032f51399 EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c993bd71558c85327c292d8b302839b8c83e4814d37c30a567f2ca65570112cbdc9e2025ba48db78414c940cca1322f9 SHA512 c2f68699b11ac215a5819242435dfbe4df964f83c2b864d592b0795ec9506ada2ac7e41abefeaa152fee1138ed9ea0c13d3f200b403dff35b1b3eb70351a2122 EBUILD iperf-3.6.ebuild 996 BLAKE2B dd68b976f0bd58179a934c33f07591633f85a6509ea24e7fa80a6f79191c40257784bf47325a0b4b88df061a8f84e29f55e8b53d314518a73fe42627fe766a00 SHA512 d070a0944b3a3a3c1085b457944ed0417ab8a65a571dd92f43132d527c1f6a8fd14d967188768766f84d7e8eedfbdca0195dac3a07d25945bd99c357d71af359 -EBUILD iperf-3.99999.99999.ebuild 801 BLAKE2B 765ba8ce4ef65d758d9e2e810e9c9751f114c50aa982e9fb0e4f51715e1c59e812f543411ac2e501daff0d7c7f754370aa9b2931fbe8715c1ce5466c4310bfc9 SHA512 19be0032e7db5ff49aa0087317c183dcb629b97c3a27b7250501ca5cf8580053b6a6aa90a80506e35076e870faddb27e0c4f99581c9ece028e296a594310b405 -MISC metadata.xml 469 BLAKE2B b85e0e29a4d36b1dc3757d9388aa8d4f563596c59a239694ca23a4863068e11c96b2ea72c71c9539c164be36698649f88666f0b3ddbf723f8c0d324721b1aee9 SHA512 5a153502b0b521fd82c5e096c80be2de09e2cfb17e638fe1a265e9cecb3eed109b4973541d0f326e7a181cb6b9051314478fac1087b476d712a954b848c53580 +EBUILD iperf-3.7.ebuild 953 BLAKE2B 30d7abc4c2ad9c667323c0fe8073bae77bc0071827e3eab301a7f986fb76d08204bb50bb6c99793c5c827034794ab181bd8c37d2c97a69633aa365adf1a2cd2d SHA512 aa817ef5584a9914151bffb399a77eec290b8e171596dfc424b0a962cde13e1dbba45695ef50c7dd6c00edbfeef40ba1cf0c53f077da4a177d0f7527e719b752 +EBUILD iperf-3.99999.99999.ebuild 803 BLAKE2B 586514d1fb209fccbd940bca4a5e37c0c4e12778f6caf493e959a2acc7bf86c979f4f0b2f47b963446208aa681b900fb5d044a4ff2c827f21a796b79c7b1e052 SHA512 96794cbc42db4da3b6e8bcc8e700f9809f0992f399d1efcbdba304090943321815b83180360eb2286877ce769873a28b51c13025ad4c129a590f3eedea054826 +MISC metadata.xml 483 BLAKE2B 4ea7f7c86966199a3bfc78cb2f8312696a0aab08f97d03f84eafe1c418d849bc69ad5bf89d07125d47677436f666748e09820f119b5ca77e5f8e10d4d97b40a3 SHA512 0d0792352d95821b0d603f0628fca7e447ba9c9b1eb9fc119d58d45de1970dc4dc512a132867eb6bcab3725e1b724594f807461dc2fccfd8308bd2043196ce22 diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild new file mode 100644 index 000000000000..9b5ce32eaae2 --- /dev/null +++ b/net-misc/iperf/iperf-3.7.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools eutils + +DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool" +HOMEPAGE="https://github.com/esnet/iperf/" +SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="3" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint" +IUSE="libressl profiling sctp static-libs" + +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sctp? ( net-misc/lksctp-tools ) +" +RDEPEND="${DEPEND}" +S=${WORKDIR}/${P/_/} + +src_configure() { + use sctp || export ac_cv_header_netinet_sctp_h=no + econf \ + $(use_enable profiling) \ + $(use_enable static-libs static) +} + +src_install() { + default + newconfd "${FILESDIR}"/iperf.confd iperf3 + newinitd "${FILESDIR}"/iperf3.initd iperf3 + prune_libtool_files +} diff --git a/net-misc/iperf/iperf-3.99999.99999.ebuild b/net-misc/iperf/iperf-3.99999.99999.ebuild index 27de50197b1e..5dc516b75b6c 100644 --- a/net-misc/iperf/iperf-3.99999.99999.ebuild +++ b/net-misc/iperf/iperf-3.99999.99999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,18 +13,19 @@ SLOT="3" KEYWORDS="" IUSE="libressl profiling sctp static-libs" -DEPEND="!libressl? ( dev-libs/openssl:0= ) +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) - sctp? ( net-misc/lksctp-tools )" + sctp? ( net-misc/lksctp-tools ) +" RDEPEND="${DEPEND}" - S=${WORKDIR}/${P/_/} src_configure() { use sctp || export ac_cv_header_netinet_sctp_h=no econf \ - $(use_enable static-libs static) \ - $(use_enable profiling) + $(use_enable profiling) \ + $(use_enable static-libs static) } src_install() { diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml index f3c92356707b..344d7ddf0bf3 100644 --- a/net-misc/iperf/metadata.xml +++ b/net-misc/iperf/metadata.xml @@ -10,6 +10,6 @@ <remote-id type="sourceforge">iperf</remote-id> </upstream> <use> -<flag name='profiling'>Create a profiled iperf3 binary</flag> +<flag name='profiling'>Install profiled iperf3 binary iperf3_profile</flag> </use> </pkgmetadata> diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 51571a4acb0b..e30caff7b87b 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,6 +1,7 @@ AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d +AUX iputils-20190515-fix-setcap.patch 1706 BLAKE2B e90392bfe79201cbf88e2c6356b9f24d014e845cd65b29d66532dcabc8672df7f47e2bde0d6f267c4aff63f55bd4949ac91ab9d411c71c183586cbe47d6064f9 SHA512 769111d6bfd124d37125554993ea8c47dde2f6d917226597af9521db92fc31417b48648945bffb54f11201f230cb46d820f5a1ded027e1ee8e781d935841507b AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476 @@ -8,6 +9,6 @@ DIST iputils-20190515.tar.gz 403228 BLAKE2B cebe2460ac4da5471a9b8e655bed1c1640f6 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2 EBUILD iputils-20180629.ebuild 3968 BLAKE2B 34a3f150c222ae7e39771337309a79db140b83f04c6c363a19111c1698ea136e7afcd3c348793e2b51fe0e3d353268cf7bc46a53815568c0bbf8b45ce200b1d9 SHA512 701b6b4fa3fcce5fe59ca72011143bd36744658ed94f15b6cad411115029701efe63798e6e61191d8819daa624a603807509299b9b54e9e46e67dc2c01f1574c -EBUILD iputils-20190515.ebuild 4868 BLAKE2B 26eb7037439ff9747d0bdfe0616d6373c09b5eacafd8c98cb659d88de8ce904931ec51ae81672ce3663807966acbffa6c0254db7d8ace62e45859d5c96ac8701 SHA512 598a5f21bd2418eda8b2cb0c5d45ab2dfb82f4b9695530a4e32f42072e57b0da9188df175aeaf93f206949a2771d76d77e2ecb2b67fdca181cdac86b66ff7f90 +EBUILD iputils-20190515.ebuild 4916 BLAKE2B c432eba2ed92debe453da5433a91c471cc4efda6ce8540820658421f07fde827a11f9f4efe281c60e9e83741a2823eda1a2bf6354c9d8c3b4be2f75a6e442e66 SHA512 2235ff71f13c2b8be707d2f14f7077adc315b080b6d38dc09d9299f7a398aaf0e7b9f72b7e44a207654619adc9fbf8ac590d2bdcba74c37d3bb1d0273a4e9ac2 EBUILD iputils-99999999.ebuild 4875 BLAKE2B da3098c6ec01c92e7e4b773188a70d020c43c37f6f9c1428c13f99a166589716e339eb3adabc4675c2a3b3e0840423f3eb47672ef431f13c848e4b4a218a3080 SHA512 0cbc2050d94d55a775d5d5ef8263e19b7016bce9c924ff4b5aed74bbd9ae0ee29079b3f536107f71683341ccee6044631ef3212ee01b26076e034c759d23974b MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e diff --git a/net-misc/iputils/files/iputils-20190515-fix-setcap.patch b/net-misc/iputils/files/iputils-20190515-fix-setcap.patch new file mode 100644 index 000000000000..6e9c7c6a8354 --- /dev/null +++ b/net-misc/iputils/files/iputils-20190515-fix-setcap.patch @@ -0,0 +1,67 @@ +From 473be6467f995865244e7e68b2fa587a4ee79551 Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Thu, 16 May 2019 09:44:27 +0000 +Subject: [PATCH] build-sys: Make setcap really optional + +The setcap dependency is marked as optional but meson.build depends on +setcap.path(): + +meson.build:246:7: ERROR: add_install_script args must be strings +--- + meson.build | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 8af9e18..95c778a 100644 +--- a/meson.build ++++ b/meson.build +@@ -221,10 +221,13 @@ config_h = configure_file( + setcap = find_program('setcap', '/usr/sbin/setcap', '/sbin/setcap', required : false) + if get_option('NO_SETCAP_OR_SUID') + perm_type = 'none' ++ setcap_path = '/dev/null' + elif cap_dep.found() and setcap.found() + perm_type = 'caps' ++ setcap_path = setcap.path() + else + perm_type = 'setuid' ++ setcap_path = '/dev/null' + endif + + ############################################################ +@@ -243,7 +246,7 @@ if build_ping == true + join_paths(get_option('prefix'), get_option('bindir')), + 'ping', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + +@@ -263,7 +266,7 @@ if build_traceroute6 == true + join_paths(get_option('prefix'), get_option('bindir')), + 'traceroute6', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + +@@ -276,7 +279,7 @@ if build_clockdiff == true + join_paths(get_option('prefix'), get_option('bindir')), + 'clockdiff', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + +@@ -306,7 +309,7 @@ if build_arping == true + join_paths(get_option('prefix'), get_option('bindir')), + 'arping', + perm_type, +- setcap.path() ++ setcap_path + ) + endif + diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild index ff6506c4be4d..fab32c416ff0 100644 --- a/net-misc/iputils/iputils-20190515.ebuild +++ b/net-misc/iputils/iputils-20190515.ebuild @@ -71,7 +71,9 @@ fi [ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}" -PATCHES=() +PATCHES=( + "${FILESDIR}"/${PN}-20190515-fix-setcap.patch +) src_prepare() { use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch ) diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest index 693e9584759b..14e8340ff418 100644 --- a/net-misc/kafka-bin/Manifest +++ b/net-misc/kafka-bin/Manifest @@ -5,9 +5,13 @@ DIST kafka_2.12-2.0.1.tgz 49446678 BLAKE2B 6d4aa6bd015cb42492364893c3f8ee01b2ce0 DIST kafka_2.12-2.1.0.tgz 55201623 BLAKE2B 3c0b0ce65b65dc005fe4e0e8a3c03d9047e9028fcbcdb840bcddbbabf59d02589057c250073836f779f335523e701f2c4c48d50e3580e5168fb5be1ad730ea83 SHA512 05a07e928c439b1084a6b3f6835f067f9636ac47f9473dcaaf7040d339cbd0a4561b7478531b237aa69e27f50fe3a2e7f4d0f2ba99a6422592a89ecf1187fa25 DIST kafka_2.12-2.1.1.tgz 55351618 BLAKE2B a102fa24883ab5d3110aec1367e40c0ed0a437ca776e2532dbddb8a79c6288b8334c30b48072da8b58c693fc765106b6dcd03b6baebf66708021305a2dff2acf SHA512 a2e8168e8de6b45e8fca1f2883f0744d3c5a939b70d8a47a5428b72188501d4c2fc11bc35759f2392680d4e8ecf2fa9d0e518e77fd28393afba22194ad018b10 DIST kafka_2.12-2.2.0.tgz 57028557 BLAKE2B d71a84a308961fc78ad51c9831ef3a45f95380f143df2c961ea79603ba7c2471d0b0ae15853df86904d90dfc82cd2d2a52c03371391f534a4bf10bcd05d314ba SHA512 63fdcd05b857a096d2e72804253590bd086e4f3046fbfa546f186602e48f54712ed6de2a346a5b05d5335870bf5268fcb2bfd3ef9c4f4bbea379091a79604556 +DIST kafka_2.12-2.2.1.tgz 57054917 BLAKE2B fb69ef12f7480b8b47e511cc9325b622dc1fcc6a265bacfdf1ac03d34ad8f5a3b3242c41386214519423bce1e18d8a90f2e7034e26681fe637c823d0a73f69bb SHA512 b8d828f06dfe59e34c4cfa20c57c8c8b43374f1e7c09f12dfa5433534a380bfe09a6de90fb86a4403939a87ab9c665e2369143c138c71391b01bbb9b384e7ac5 +DIST kafka_2.12-2.3.0.tgz 57215197 BLAKE2B 91400bed0860633523d60f4b00e47eb18b27f67abca24547d680d08213c10e0de126bf39f790ae16e704446811e9d25d78ed940cf3ae07fff8e2045cd05a89f1 SHA512 a5ed591ab304a1f16f7fd64183871e38aabf814a2c1ca86bb3d064c83e85a6463d3c55f4d707a29fc3d7994dd7ba1f790b5a6219c6dffdf472afd99cee37892e EBUILD kafka-bin-1.1.1.ebuild 1447 BLAKE2B 3aac5189f8f62444b55204f42759f6aa9f131f5c9ddedbd0c67fd0e907182bad3ead1a11410cde18b2097d5ed79db894dd1cd72e6a7140175295ec5e84445b5e SHA512 6fb6d16f1a574c38c9e5027169826bcafc6ec5d8462e57001e000b0d5a3965f9ff496f0190b325781cfefea74d277569eb9b72cbda98c915c8c60e5894f8d917 EBUILD kafka-bin-2.0.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.1.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.1.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 EBUILD kafka-bin-2.2.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 +EBUILD kafka-bin-2.2.1.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 +EBUILD kafka-bin-2.3.0.ebuild 1457 BLAKE2B c7fc8d065c41c06321baa29e04851d7d29354ebcba4f0ed5a778d011602aec9561c04483b3bdb2c4f9fc3817e1f8db57c341eb8628b9ea355cb29e99867f454a SHA512 b0354a1f117f2c436d49dfd41ddc143189f4982ebe4b9f9c70c7887cd3d5ad8aea561332331a9c7c516201e8dea12597cf4ec067899b8a936eb0e8807944eec0 MISC metadata.xml 311 BLAKE2B 9fa7db32894e010ccdfb89bae2807b359d0e82ee6937427b6bdbce2554a02367b6e66b689fd7f74ba05e3a701bf4cfd7bdc20b15a96b645b03d6ecc34826fbd0 SHA512 9221b0e14820c3217378e26fe5bb82d03fca4ff3c98cb3fe5a95d688df8b7c792f8a97bfdb0f47874dc36b13dce3bae1a14db073586bde3a46e2fda434859af6 diff --git a/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild b/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild new file mode 100644 index 000000000000..0f799f94c22c --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-2.2.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils user + +DESCRIPTION="A high-throughput distributed messaging system" +HOMEPAGE="http://kafka.apache.org/" + +# pick recommended scala version +SCALA_VERSION=2.12 +MY_PN="kafka" +MY_P="${MY_PN}_${SCALA_VERSION}-${PV}" +SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz" + +RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="internal-zookeeper" + +RDEPEND="virtual/jre:1.8" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +pkg_setup() { + enewgroup kafka + enewuser kafka -1 /bin/sh /var/lib/kafka kafka +} + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + eapply_user +} + +src_install() { + insinto /etc/kafka + doins config/zookeeper.properties config/server.properties + if use "internal-zookeeper"; then + keepdir /var/lib/kafka/zookeeper + newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper" + fi + + keepdir /var/lib/kafka + fowners -R kafka:kafka /var/lib/kafka + + keepdir /var/log/kafka + fowners -R kafka:kafka /var/log/kafka + + newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}" + + dodir "${INSTALL_DIR}" + cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die + keepdir "${INSTALL_DIR}/logs" + fowners -R kafka:kafka "${INSTALL_DIR}" +} diff --git a/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild b/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild new file mode 100644 index 000000000000..0f799f94c22c --- /dev/null +++ b/net-misc/kafka-bin/kafka-bin-2.3.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils user + +DESCRIPTION="A high-throughput distributed messaging system" +HOMEPAGE="http://kafka.apache.org/" + +# pick recommended scala version +SCALA_VERSION=2.12 +MY_PN="kafka" +MY_P="${MY_PN}_${SCALA_VERSION}-${PV}" +SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz" + +RESTRICT="mirror" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="internal-zookeeper" + +RDEPEND="virtual/jre:1.8" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR="/opt/${MY_PN}" + +pkg_setup() { + enewgroup kafka + enewuser kafka -1 /bin/sh /var/lib/kafka kafka +} + +src_prepare() { + sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die + sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die + eapply_user +} + +src_install() { + insinto /etc/kafka + doins config/zookeeper.properties config/server.properties + if use "internal-zookeeper"; then + keepdir /var/lib/kafka/zookeeper + newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper" + fi + + keepdir /var/lib/kafka + fowners -R kafka:kafka /var/lib/kafka + + keepdir /var/log/kafka + fowners -R kafka:kafka /var/log/kafka + + newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}" + + dodir "${INSTALL_DIR}" + cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die + keepdir "${INSTALL_DIR}/logs" + fowners -R kafka:kafka "${INSTALL_DIR}" +} diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 53556fa9bdec..5a392a1abf91 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -8,5 +8,5 @@ AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0 EBUILD memcached-1.5.14.ebuild 2912 BLAKE2B c0fd78c76871cb26f9c8375d9b22d6073f6f81d8daedca76b0398de33fd1d2665dcdbcbddbacba4419747e16b3a379dcdefc1da99167826d68f6829e04072846 SHA512 795f3933d27879e5102773a7527b129a1de60a61f4c53acae02d5229fc37efe8cc2e0055e1cd829a958e4f7681d9b0785090c04a8ed2f261a4253ccdccf99bc8 -EBUILD memcached-1.5.16.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251 +EBUILD memcached-1.5.16.ebuild 2920 BLAKE2B 44a9e54f77974921a4550308dff727bce9b1924514770e3526f710c5b1b1c8cb9b422c0f53dda5d7e6b67f75173c3624117871ecd12fa06f290e05b0dfa59628 SHA512 cd45d05190af8eb23017b52ff00a01909f35003c58d1591857d47ba6ccd445885595262ddc02f0a251621c6270fa81f684c59e953949a994d85f066e91fc0f54 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 diff --git a/net-misc/memcached/memcached-1.5.16.ebuild b/net-misc/memcached/memcached-1.5.16.ebuild index 8d046a22030e..c1fd0fcba788 100644 --- a/net-misc/memcached/memcached-1.5.16.ebuild +++ b/net-misc/memcached/memcached-1.5.16.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later RDEPEND=">=dev-libs/libevent-1.4:= diff --git a/net-misc/mindterm/Manifest b/net-misc/mindterm/Manifest deleted file mode 100644 index cc857ecc3085..000000000000 --- a/net-misc/mindterm/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mindterm_3.4-src.zip 1224973 BLAKE2B fb42de3cf163cff2ee4b4912a519e16eac92f011be25c63186d06ead0b442309eb0b6d59a9806c9c7b0485114aaf02f368ee82acbbdccc17b7749a530d6e24aa SHA512 6c274aea32622517f07010d496f97010a0a7e17fd769a85e928ea0794b20daddb785a5cf4fc954dd2f6e863bc3f90422714392f995d040f4cf3f1230fb14cb07 -EBUILD mindterm-3.4.ebuild 1294 BLAKE2B 0afa23092a625a02ff22b68d34870a066c73006d49d7a4c4e8fe914480bdeaced98e719841772f4a239c8b4f21bbe8d3187d21cc707a5571b3716b2b1859cc0e SHA512 2bb7eb5348490ec012e5812216e06948d1176f148ca5f99d7552692731dc740aab6a8d0362a1f2d07e999f6f3d27a1715c219b19ee70614d0654eb72706e4183 -MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/net-misc/mindterm/metadata.xml b/net-misc/mindterm/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/net-misc/mindterm/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> -</pkgmetadata> diff --git a/net-misc/mindterm/mindterm-3.4.ebuild b/net-misc/mindterm/mindterm-3.4.ebuild deleted file mode 100644 index c91cec036d8a..000000000000 --- a/net-misc/mindterm/mindterm-3.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" -JAVA_PKG_IUSE="doc test examples" -inherit eutils java-pkg-2 java-ant-2 - -MY_P=${P/-/_} - -DESCRIPTION="A Java SSH Client" -HOMEPAGE="http://www.appgate.com/products/80_MindTerm/" -SRC_URI="http://www.appgate.com/downloads/MindTerm-${PV}/${MY_P}-src.zip" - -LICENSE="mindterm" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -# Don't even compile -RESTRICT="test mirror bindist" - -COMMON_DEP="dev-java/jzlib:0" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEP}" - -S=${WORKDIR}/${MY_P} - -JAVA_PKG_FILTER_COMPILER="jikes" -EANT_BUILD_TARGET="mindterm.jar lite" -EANT_DOC_TARGET="doc" -EANT_GENTOO_CLASSPATH="jzlib" -JAVA_ANT_CLASSPATH_TAGS+=" javadoc" - -src_prepare() { - java-pkg-2_src_prepare - java-ant_rewrite-classpath - rm -vr com/jcraft || die "Failed to remove bundled jcraft" -} - -src_test() { - ANT_TASKS="ant-junit" eant test \ - -Dgentoo.classpath="$(java-pkg_getjars jzlib,junit):mindterm.jar" -} - -src_install() { - java-pkg_dojar *.jar - - java-pkg_dolauncher ${PN} --main com.mindbright.application.MindTerm - - dodoc README.txt RELEASE_NOTES.txt CHANGES || die - use doc && java-pkg_dojavadoc javadoc - use examples && java-pkg_doexamples "${S}/examples/" -} diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest index 7f4087d664a8..681637225e40 100644 --- a/net-misc/miniupnpd/Manifest +++ b/net-misc/miniupnpd/Manifest @@ -1,5 +1,10 @@ AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b +AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771 +AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856 DIST miniupnpd-2.1.20190502.tar.gz 236052 BLAKE2B 9f2f81769d72fad2191969e0e80b4d2e70619d5674fe6b4ef9f4306e09ac4737577a2146bc04ec9960df092252abe3c9a57e32d5d893a763b85863d1c4892045 SHA512 6423cef89b5af62b6b6a120a3cd13a0e7755d609b33de8f1671f7f9160fb1b5e68b0ebd3f8b7b5758cf05a1c58b416cde253e37bc5ba0bb423c14b5fb44599f1 +DIST miniupnpd-2.1.20190625.tar.gz 240120 BLAKE2B c6cf6b549a1c0c4a411d9487a3dae348d8a37767b9590d29ea763177d876ceb6f521bb7662452e2dff813354fc52f862bcc830079b3ff8af8185de6ee2771e8f SHA512 3b9a14f24c7e753cc71b84622bfbbc0db4a5b5e0fd602ef1129b89b1c729e754c51f5c29b4bf8d1cc37a16f77b33f04cf3f3540afe1ac529105cb91f45fa92c8 EBUILD miniupnpd-2.1.20190502.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722 -MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69 +EBUILD miniupnpd-2.1.20190625-r1.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d +EBUILD miniupnpd-2.1.20190625.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722 +MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8 diff --git a/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 new file mode 100644 index 000000000000..656ab8ec00a9 --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-conf.d-r2 @@ -0,0 +1,16 @@ +# /etc/conf.d/miniupnpd: Configuration for miniupnpd init script + +# extra arguments to be passed to the command +#extra_args="" + +# the location of the configuration file +#config_file="/etc/miniupnpd/miniupnpd.conf" + +# enable manipulating iptables on start/stop +iptables_scripts=1 + +# enable manipulating ip6tables on start/stop +ip6tables_scripts=1 + +# enable manipulating nftables on start/stop (for USE=nftables) +nftables_scripts=1 diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d-r2 b/net-misc/miniupnpd/files/miniupnpd-init.d-r2 new file mode 100644 index 000000000000..e23c7a819951 --- /dev/null +++ b/net-misc/miniupnpd/files/miniupnpd-init.d-r2 @@ -0,0 +1,45 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/miniupnpd" +: "${config_file:=/etc/miniupnpd/miniupnpd.conf}" +command_args="-f ${config_file:-/etc/miniupnpd/miniupnpd.conf} ${extra_args}" +: "${pidfile:=/var/run/miniupnpd.pid}" + +depend() { + need net + use iptables ip6tables minissdpd +} + +start_pre() { + local retval=0 + + if [ -n "${iptables_scripts}" ]; then + /etc/miniupnpd/iptables_init.sh || retval=${?} + fi + if [ -n "${ip6tables_scripts}" ]; then + /etc/miniupnpd/ip6tables_init.sh || retval=${?} + fi + if [ -n "${nftables_scripts}" ]; then + /etc/miniupnpd/nft_init.sh || retval=${?} + fi + + return ${retval} +} + +stop_post() { + local retval=0 + + if [ -n "${iptables_scripts}" ]; then + /etc/miniupnpd/iptables_removeall.sh + fi + if [ -n "${ip6tables_scripts}" ]; then + /etc/miniupnpd/ip6tables_removeall.sh + fi + if [ -n "${nftables_scripts}" ]; then + /etc/miniupnpd/nft_removeall.sh + fi + + return ${retval} +} diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml index 1b672f18d768..5f2aabe1313d 100644 --- a/net-misc/miniupnpd/metadata.xml +++ b/net-misc/miniupnpd/metadata.xml @@ -15,6 +15,7 @@ <use> <flag name="leasefile">Enable lease file.</flag> <flag name="igd2">Build for IGDv2 instead of an IGDv1</flag> + <flag name="nftables">Use <pkg>net-firewall/nftables</pkg> rather than <pkg>net-firewall/iptables</pkg>.</flag> <flag name="pcp-peer">Enable support for PCP-PEER to allow NAT-PMP clients to mangle their packets.</flag> <flag name="portinuse">Check if a port is in use before allowing a NAT-PMP client to map it.</flag> <flag name="strict">Be more strict regarding compliance with UPnP specifications.</flag> diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild new file mode 100644 index 000000000000..07c804f35640 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict" + +RDEPEND=" + dev-libs/gmp:0= + sys-apps/util-linux:= + dev-libs/openssl:0= + !nftables? ( + >=net-firewall/iptables-1.4.6:0=[ipv6?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + ) + nftables? ( + net-firewall/nftables + net-libs/libnftnl:= + net-libs/libmnl:= + )" +DEPEND="${RDEPEND} + sys-apps/lsb-release" + +src_prepare() { + default + + # Prevent overriding CFLAGS. + sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die + + mv "Makefile.linux$(usex nftables _nft '')" Makefile || die + + # Prevent gzipping manpage. + sed -i -e '/gzip/d' Makefile || die +} + +src_configure() { + local -a opts + opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + ) + + emake CONFIG_OPTIONS="${opts[*]}" config.h +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + local confd_seds=() + if use nftables; then + confd_seds+=( -e 's/^iptables_scripts=/#&/' ) + else + confd_seds+=( -e 's/^nftables_scripts=/#&/' ) + fi + if ! use ipv6 || use nftables; then + confd_seds+=( -e 's/^ip6tables_scripts=/#&/' ) + fi + + newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN} + newconfd - ${PN} < <(sed "${confd_seds[@]}" \ + "${FILESDIR}"/${PN}-conf.d-r2 || die) +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild new file mode 100644 index 000000000000..673b340fb090 --- /dev/null +++ b/net-misc/miniupnpd/miniupnpd-2.1.20190625.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="MiniUPnP IGD Daemon" +HOMEPAGE="http://miniupnp.free.fr/" +SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict" + +RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?] + net-libs/libnfnetlink:= + net-libs/libmnl:= + dev-libs/gmp:0= + sys-apps/util-linux:= + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + sys-apps/lsb-release" + +src_prepare() { + default + mv Makefile.linux Makefile || die + + # Prevent gzipping manpage. + sed -i -e '/gzip/d' Makefile || die +} + +src_configure() { + local -a opts + opts=( + --vendorcfg + $(usex igd2 '--igd2' '') + $(usex ipv6 '--ipv6' '') + $(usex leasefile '--leasefile' '') + $(usex portinuse '--portinuse' '') + $(usex pcp-peer '--pcp-peer' '') + $(usex strict '--strict' '') + ) + + emake CONFIG_OPTIONS="${opts[*]}" config.h +} + +src_compile() { + # By default, it builds a bunch of unittests that are missing wrapper + # scripts in the tarball + emake CC="$(tc-getCC)" STRIP=true miniupnpd +} + +src_install() { + emake PREFIX="${ED}" STRIP=true install + + newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN} + newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN} +} + +pkg_postinst() { + elog "Please correct the external interface in the top of the two" + elog "scripts in /etc/miniupnpd and edit the config file in there too" +} diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest index ca3237ba4b0e..0d14f0ee85ba 100644 --- a/net-misc/mobile-broadband-provider-info/Manifest +++ b/net-misc/mobile-broadband-provider-info/Manifest @@ -2,6 +2,6 @@ DIST mobile-broadband-provider-info-20170310.tar.xz 85016 BLAKE2B a43312e1772fc5 DIST mobile-broadband-provider-info-20190116.tar.xz 85904 BLAKE2B e41ca1914c8b9c47f52f5b65cbfef577814269a23c5777fb1caf582cfc1c0c9a5125f51907748de8516b8aa3a8cf3fb044c8521d305161b206cc75f06e791764 SHA512 82cbf2c4523bc941d7cbfb1f552057d8259fcccbf95d02a6d43d315136050928ae5a8cf85f9900196214b803bb087446e28254d148af6b004225518f07aa9d23 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a EBUILD mobile-broadband-provider-info-20170310.ebuild 462 BLAKE2B fe682e0d76f4fd4a394388b40036b5a9923d0a4fc664218424f50ea0a619e1464789d1f013a87bc63d97528b9f21e803af771af7217c714e88f5e4c2e142226b SHA512 ecec2bcf1de8a1fe7a1cde63cb3905555c6611ce55ef3a78f4c2d2e62a8761dcd9599cf486567859b2eb3b46fa095597df9d42055361dedd362fce9ac16f1da4 -EBUILD mobile-broadband-provider-info-20190116.ebuild 462 BLAKE2B 82b8b7ff1721d05527e4350b08823591b301c51eb296788c8c5d84b8c0574bf942b254b7eb6bff969b13801f17d59d808d15f06da540ceed0766029a24de92f0 SHA512 1028bf93526bbed477835c33d42185ce5e6d7737a14422d1df75b98b2b483b513f2743097f387d93e2183740f209592e069e09fd1984deed857eb7a84b761340 +EBUILD mobile-broadband-provider-info-20190116.ebuild 461 BLAKE2B de72807866379f9eaabc59247630b621b49b2e3895e0dbff927650ce9a33e6767c53efb3fe5cf8de377eac134ab00ab916ace2115ab35402bfb96ff1971429bc SHA512 d71a1f4fb4db90b8be5d5ebe898d47053d24aa449093152cea5151b38afce7e5ee960d6533e8dad0a084298325e9a94d6818ff2fde394fd93a8b8036156e9488 EBUILD mobile-broadband-provider-info-20190618.ebuild 451 BLAKE2B c8f4bfd36aa1e660190dea24bbb42c5280c15f625f79863f0b03e29df6b8f8afa65d3aac08f1c6be1a0e9326d9a3425512d9e319ffdeefaa2a826d8bcef84649 SHA512 2c61b42043cc65a04e98453338ea16b38acebab94fed8ffbcc91abdbabf067948dc8e4d3bcd21288f21c5ff4d6adc29906b7ba92c8261885923a89051d13621a MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild index 595cc35b8ca4..88967bf8f582 100644 --- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild +++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190116.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband" LICENSE="CC-PD" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86" IUSE="test" DEPEND=" diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest index 4c369dfb98f3..477f60a421eb 100644 --- a/net-misc/ncp/Manifest +++ b/net-misc/ncp/Manifest @@ -1,4 +1,3 @@ DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8 EBUILD ncp-1.2.4-r1.ebuild 843 BLAKE2B d42afa30ebcb9b390ff02b964f66353cd00ece303168645ccb4dd2ab85339e66b968b496fa8fd230b38da87c877a2e0f39085a333f7371686cc9ae6a861cbaad SHA512 3cb657dd0c5eba849d352eccb6b880df6660c854e98883b7ba1f9c054d677fcbd1ff812001cbc138893369dc5f5b57a352ad17d0fcd6ae1a9295291665af4186 -EBUILD ncp-1.2.4.ebuild 853 BLAKE2B 24aec6cd73be1471ef9ca3a7f9da8cf0e6a11cd78ed4eebb6390d9edabe66ddbc62825410e5996c850a41aac639055f167416af8b17f464ccc078b59d1d3b796 SHA512 b7495762fa68ceb0927159dd65f000fc062fdfdcc5f50f1333ce68e43ce4e32db899e16d538b74bcf366a3deff49e1e73ec796e6df41ba8ebc1e544b94849316 MISC metadata.xml 698 BLAKE2B 4e878fa6c8542b522a34bd256345a93060d5b64fc539f59dc5db207680dab597fba92beb7361bd002afca64dd291c2ba1053a435cc2b1ad35bba878a81d00bec SHA512 deb18945b820f2332812f851dd4d1a40dddca5fd04541987746d2c3a9d75a25792ce8fb1931e8c87010a73f820165155172d2aeb2d2d702cc95a3a1b8e34b169 diff --git a/net-misc/ncp/ncp-1.2.4.ebuild b/net-misc/ncp/ncp-1.2.4.ebuild deleted file mode 100644 index 12a07aed2c18..000000000000 --- a/net-misc/ncp/ncp-1.2.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="utility for copying files in a LAN (npoll, npush)" -HOMEPAGE="http://www.fefe.de/ncp/" -SRC_URI="http://dl.fefe.de/${P}.tar.bz2" - -LICENSE="public-domain" # mail from author, bug 446540 -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="diet" - -RDEPEND="" -DEPEND=">=dev-libs/libowfat-0.28-r1 - diet? ( dev-libs/dietlibc )" - -src_prepare() { - rm Makefile || die - sed -e '/^ncp:/,+5s:strip:#strip:' \ - -i GNUmakefile || die -} - -src_compile() { - emake \ - CC="$(use diet && echo "diet -Os ")$(tc-getCC)" \ - CFLAGS="${CFLAGS} -I/usr/include/libowfat" \ - LDFLAGS="${LDFLAGS}" \ - STRIP="#" -} - -src_install() { - dobin ${PN} - dosym ${PN} /usr/bin/npoll - dosym ${PN} /usr/bin/npush - - doman ncp.1 npush.1 - dodoc NEWS -} diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest index 479937b969cd..7699dd49ede6 100644 --- a/net-misc/openvswitch/Manifest +++ b/net-misc/openvswitch/Manifest @@ -2,27 +2,17 @@ AUX 0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch 3129 BLAKE2B AUX openvswitch.tmpfiles 40 BLAKE2B df482f24d2c48d54b6cabb1f0a37fcb193c9da71d9ae2eab0dd9a15209462e118a7160411d6d0cdb10f1721f0a86b689dd9c286325ed965ac1a510ae0af791a1 SHA512 020aaa9599b853d75a612f7bbd4ef8ea024908f283afe5c727f5d2a1f3a5a98634f82d840b3ebf886b9a82e9c60c237ced2fb13057bc7bb9ab5c449e11b51997 AUX ovs-delete-transient-ports.service 272 BLAKE2B 4ee3767f84b4f47fe0d01aa9aaff35c9ca2be5afa6ba0f595d37ab0cdb4ccbdd7abcfb2a9c91a04d7820d1819f7757c7de569dd62cdc6c76cf533c27908f3471 SHA512 045f9c59275c555eb83c15e7cc0af4db3e9cd834385b4bbca35f5863e8432a0cf2038d10b8a55ad90a180b386a4bd0962ddcc401b4f3cf55b7e398e0683cc0f8 AUX ovs-vswitchd-r1 436 BLAKE2B 3660edee0906e3bd7fb1715601eb08567fba2ccb20a9b25b7ef250f130737d903acd187b35cb487a4141396ef3b7746d296ab613477b7fe907f1c6bb4c3da85d SHA512 7a98f85251a7b60d93a28ade482669537585fc05265cc51eb61e283739537df980230bd5f9dccfdb60772afe3f0bf2493eed9a25b289c7ef37d998e8ca5ec4df -AUX ovs-vswitchd-r2.service 905 BLAKE2B 4474acd22956b21b6c89133c12013bb22ac2a19f759e2236a09b497a649ade6ea8db270f9a599931d622784109e71cce8ce9b09cef6ccfa6b938a31308eff7d5 SHA512 21e5a20bf469496f96afa13a5517393c1a55c09ae4cad57cb285a816f328ada190161210009e221acea47d0a038212e04ded7bb3f8235e6d6578ad283df7f0f5 AUX ovs-vswitchd-r3.service 904 BLAKE2B 1a9880154a7628c57838a7d0fcf60d3734f35bef36fcaf6e396da92a35fa80a056bb1122d218f0331cc3382c13433672471dba7d7e711fd4f2ced4803b5623fa SHA512 408b52e74dab747bf83c66e43515868eaddb24de6e914c7ed201425cdc24c731b3d705cf9abf2cfc30c2499b77f2795b72d11f31bcfc3237cca0ad13ca17fc63 AUX ovs-vswitchd.confd-r2 188 BLAKE2B b38ed709f5d59caed9146df078c26b08d85178e7dd783ecc1f431721a23732fdacad77886ab4387ab94121eebca267b1d628f5a3e2f8c95e11f90b8a260a80c6 SHA512 b1afe4a4095ea78e7a58c69a26c0eac6e944594702364d81766944f7470cdbac09922286b8a8f926aad8ff2e14ee6b5311188d2dc22ea2d8bb9cf28034157135 AUX ovs-vswitchd.service 393 BLAKE2B 6ca53819e5bda787eeefcf94f76749621da3462f2f92ccd70de35ba407b4dd74b29552b609871d77f85ccca764640555167b40b97d6585b80bf3bbfcb1ae242c SHA512 74d2ba9b76ad29dbb75e9b3321e1e714140a1c9bf9f5176c8418b025ffdb9c14d9f532709835c163c7256b4c81d69b522fcbc12d6bd9399283c8bd45b94cd7f2 -AUX ovs-vswitchd_conf 164 BLAKE2B 89cad03c930c21e3f83a40a27a3ae011ff5be50af74b589a3313d4f4964d7931f0186c9e8a543468e08cd69c1d03f018060840d6c32f072e678b68839cc75968 SHA512 2e65f8658b6120e30849a8b3b0268d7776635c36bdd77920537355fc1883f306d3df5c78d2a5fefffdcf76b093b126f9d315c1595cd0ab643ac5f000c8b4f439 AUX ovsdb-server-r1 855 BLAKE2B 894b2bd417ad1e8113a0288db59af133e5b705deac982b01fcc9266c7c0387423a1897d55cd70651c3a0407461c641455869ceefe330cc1880abc2cf79516de6 SHA512 fa51b2a661c1bdd345adf58c2b0e4c4c68bb4ed4ce78dc6e195ba9fe662fa451753664c72f56d755cfa682d0c9accd283dc501aee3c4ba58238f44df1ddaf5a5 -AUX ovsdb-server-r2.service 1012 BLAKE2B b3d1d6373341d499d4e6c17b8b786de6a7861b46ed2cc76e526f0a196755408cff909a119862702e94dfd3171eae646f9f807a7b5c1be88e608938c3eff9d057 SHA512 da0deb44efabf3acd144b65bd0e32f1b4a6e6594e0e71eadcd0f98012d998c7bf21785b2bcb6b6f1cf1887836908ec7667161c31c1d827d8e865e95ebba8a591 AUX ovsdb-server-r3.service 813 BLAKE2B ba16534aaf407121f56e1ffc711dcc87b4c5ee07cc12f74e1d8ca2b7e85fefede4100154ef2031470b68fe5085539984b6b38b8c518fa38a8eb19d8af3a24c1c SHA512 ed3137fb0b26be82f311aa9a56855d91bb113a64fd43ecde8d97979354edffe26ee7712eac91c96b19e56c35a5b4ef2c68acfe5c3c0c0cd21e35745fde41574e AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab42fa1c93b079901777bc0e7fca0847427affc5a069e9041297369364f9aa28869f63a463e3646f70f47fd SHA512 cb9196ebdb7f16eca4182172a079027dc2c28f366d0a4f9251480b20172758cb581cd91b9a0f2a3dde95742455bec9ef96aa584305f17bdc97b3de7d4c99aa19 AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa AUX ovsdb-server_conf2 584 BLAKE2B ac54fe7f3b593dce07f051874e4ebc59ab2872fcc994e55464f8ab74135498613f9a3bb38366babeae909ae8179be87c1168a069f427d4310f220afbb58d12da SHA512 0878963eef09a3933fcdb66e7ce1ab66131ce3ee1af5d403456e0f44d763e96ff90460d9013cea9a3eb0630d60a6b8aed04aeee6789882842975df2e86bc0b9e AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7 -DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216 -DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44 DIST openvswitch-2.10.2.tar.gz 7561889 BLAKE2B a53dd7db7dcab5098af81671cb265861d3af79cce53436d75e0c3d8a38ce408a142f99b936a66c8bf0f3b317970ad8c1ef84bacc2e573e9b8c21b70aab1de485 SHA512 fd64ae814d85d3002d655a330268cfd6be79db6f954c132d3bfafc7dac23533918b642d0ed454e760f5820804bdff64f73ee8c36afc25a6810ef4c7aab748ba1 DIST openvswitch-2.11.1.tar.gz 7682693 BLAKE2B f25a537d9ad4051db0049f7ba8442564fdc890035ce3984e1754b9dd916e0b78bea133331b5f4bc3a85d8b8a902ab210703feb0b7cce279803f642f9ee9f87bf SHA512 de016a1acfbae34d2062f4ac23b9b0782016fef4c0575b2714435380439f19613881173fb2c876afe86317a5c0327908704e540322d80f9f7da9f59bea7b1789 -DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7 -EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B c9de21a5bba881e69a2741419ea0435fe74e8080407bbd31b0dbddc80c406c3329d925f7dfb641896982adcbd6140f32fb097386f46b82e5afc0838ac9b62a59 SHA512 12e6e28f65c7d69acfe7d881c1c1ca38d506e50d28428f15606f776649cc7c2e32dccdceeecd46e13c6af8f85f0797cf929915c4a8c8050e9e59e8def729fe66 -EBUILD openvswitch-2.10.1-r1.ebuild 4461 BLAKE2B 9d229b86adf3261b3761f0c92e3a41839dbaec4fdf6c35939fcb5915b0232c87dd2a25bc78b04b37729a2a9d3adfae7195a6666d5b043d77f418f31af76add62 SHA512 c660b92275b577385952c24f817fdb8dfe110158f49dd2cd62506a8252cc5181f0f43c76236287a7c8f53601e33fe5d3d5eb0e46f95fc0ee7d00f7a92d598a75 -EBUILD openvswitch-2.10.1.ebuild 4263 BLAKE2B a6e844947f481d7beaf79172d90f09f52770514d5e203b10548783efccfcc791465a75a4d4796889f8f0ba53f74a6beb21a9d8478dc7f4ec25f2ec6e8a5ae09d SHA512 3cbc185a839a30d48262552b7d2ab8604353a3c2c12fdf42b3f558c1521d58dadb2e465494a0babd03fe0a7c435215916c30df996842e5ac15e63d0188d50270 -EBUILD openvswitch-2.10.2.ebuild 4461 BLAKE2B ce73d782dcd586facd60189ec0b6c459b96fff110e56dee1f447fb608534d5410bcfae158d8c6d2f87fd7f279e586207ee594763cd462f6902253b61c7759060 SHA512 befd11f9f14266ca500ae649a61357eedbba502dec865102fccfa05be2989675345d0da771024822150d967ba0ff64ef5dd7e4b4017a4c8831b459c680336f39 -EBUILD openvswitch-2.11.1-r1.ebuild 4541 BLAKE2B 12599af7675b2f4d7bbc09875f90b752561aed6cd05093b4de43f659e2fbf86978a8ed9cefebc46bddd57e065efebc8dea3bd1a9130e012203bece86292603bb SHA512 8838b8938115a019fbcf4933bd2586fceb21494ece22ccadafaae79e21825add2e489e3e99df541f097736f1ad34facb07fcf2186f6ef9d9f195efc8b5dd98e3 -EBUILD openvswitch-2.8.1.ebuild 4446 BLAKE2B 68da5d17271fe0c59d7a6820836c56f39a35d7c151a84108f594eaaef3edf7838d80d3dd6c7d521cea09d692cfb89c00ad9eb2d58045167a21b22cacfac54724 SHA512 21edf1a60d31999eff602af6ec6fc8141a55c266d2076f8dc2a4aacb632dad0ea47375834048084642989b02a0f2f1dbce4ab4baef7e4afc37844f88528e1cd9 +EBUILD openvswitch-2.10.2.ebuild 4459 BLAKE2B 9dd0a6b338507389561fcae0a4b148d61c9876583510bd4535d1b6a30c4564e6434ad523c94481324ea95727c4b6455fed9b22e0ee046484b4768dc68bedba1f SHA512 faa0d0606ad4d59f84b0052f2c2ebb4e5148937ecc4249b782a298167a2ce2b57958405fbafe9f6302436c4336e4d68242176091b375f778e0246242901acdfa +EBUILD openvswitch-2.11.1-r1.ebuild 4543 BLAKE2B 389e7ab9fa4d25992a31b70b9f15eade2e29d88a330679ca19fed007b968f14273060615310ede9a3c935b42bc3b09ef120db3790b02b92767db0a191c6384ed SHA512 923b46e9759ea8bc53d91388e175903cd0930d36b0ce9a884a58b0efaa55bc95efe197c323f2bee8ef1a5ffec62dbe7b227e0e9f5d446b62ebec81be6f8a04eb MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r2.service b/net-misc/openvswitch/files/ovs-vswitchd-r2.service deleted file mode 100644 index 3092fdaaa669..000000000000 --- a/net-misc/openvswitch/files/ovs-vswitchd-r2.service +++ /dev/null @@ -1,26 +0,0 @@ -[Unit] -Description=Open vSwitch Daemon -Documentation=man:ovs-vswitchd -Wants=network.target -Before=network.target network.service -Requires=ovsdb-server.service -After=ovsdb-server.service network-pre.target systemd-udev-settle.service -ReloadPropagatedFrom=ovsdb-server.service -AssertPathIsReadWrite=/var/run/openvswitch/db.sock - -[Service] -Type=forking -Restart=on-failure -Environment=HOME=/var/run/openvswitch -EnvironmentFile=-/run/openvswitch/useropts -EnvironmentFile=-/etc/conf.d/ovs-vswitchd -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ - --no-ovsdb-server --no-monitor --system-id=random \ - ${OVSUSER} start $OPTIONS -ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop -ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \ - --no-monitor --system-id=random ${OVSUSER} restart $OPTIONS -TimeoutSec=300 - -[Install] -WantedBy=multi-user.target diff --git a/net-misc/openvswitch/files/ovs-vswitchd_conf b/net-misc/openvswitch/files/ovs-vswitchd_conf deleted file mode 100644 index c9eadb41862b..000000000000 --- a/net-misc/openvswitch/files/ovs-vswitchd_conf +++ /dev/null @@ -1,6 +0,0 @@ - -# Connection string for the configuration database (usually a unix socket) -DATABASE="unix:/var/run/openvswitch/db.sock" - -# Additional options -OPTIONS="--mlockall" diff --git a/net-misc/openvswitch/files/ovsdb-server-r2.service b/net-misc/openvswitch/files/ovsdb-server-r2.service deleted file mode 100644 index 5ff6f9044660..000000000000 --- a/net-misc/openvswitch/files/ovsdb-server-r2.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=Open vSwitch Database Unit -Documentation=man:ovsdb-server -After=syslog.target network-pre.target -Before=network.target network.service -Wants=ovs-delete-transient-ports.service - -[Service] -Type=forking -Restart=on-failure -EnvironmentFile=-/etc/conf.d/ovsdb-server -ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch -ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi' -EnvironmentFile=-/run/openvswitch/useropts -ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ - --no-ovs-vswitchd --no-monitor --system-id=random \ - ${OVSUSER} \ - start $OPTIONS -ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop -ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ - ${OVSUSER} \ - --no-monitor restart $OPTIONS -RuntimeDirectory=openvswitch -RuntimeDirectoryMode=0755 diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild deleted file mode 100644 index 7d1e0be6561a..000000000000 --- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit autotools eutils linux-info linux-mod python-r1 systemd versionator - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="https://www.openvswitch.org" -SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="debug modules monitor +ssl" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-2.9.2[${PYTHON_USEDEP}] - || ( - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - ) - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - -CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" -MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" -BUILD_TARGETS="all" - -pkg_setup() { - if use modules ; then - CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" - # docs state 4.17.x code states 4.15.x - kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" - linux-mod_pkg_setup - else - CONFIG_CHECK+=" ~OPENVSWITCH" - linux-info_pkg_setup - fi -} - -src_prepare() { - # Never build kernelmodules, doing this manually - sed -i \ - -e '/^SUBDIRS/d' \ - datapath/Makefile.in || die "sed failed" - eautoreconf - default -} - -src_configure() { - set_arch_to_kernel - # monitor is statically enabled for bug 596206 - # use monitor || export ovs_cv_python="no" - # pyside is staticly disabled - export ovs_cv_pyuic4="no" - - local linux_config - use modules && linux_config="--with-linux=${KV_OUT_DIR}" - - econf ${linux_config} \ - --with-rundir=/var/run/openvswitch \ - --with-logdir=/var/log/openvswitch \ - --with-pkidir=/etc/ssl/openvswitch \ - --with-dbdir=/var/lib/openvswitch \ - $(use_enable ssl) \ - $(use_enable !debug ndebug) -} - -src_compile() { - default - - use modules && linux-mod_src_compile -} - -src_install() { - default - - local SCRIPT - if use monitor; then - for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" - python_foreach_impl python_doscript utilities/"${SCRIPT}" - done - rm -r "${ED%/}"/usr/share/openvswitch/python || die - fi - - keepdir /var/{lib,log}/openvswitch - keepdir /etc/ssl/openvswitch - fperms 0750 /etc/ssl/openvswitch - - rm -rf "${ED%/}"/var/run || die - - newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server - newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd - newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server - newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd - - systemd_newunit "${FILESDIR}/ovsdb-server-r2.service" ovsdb-server.service - systemd_newunit "${FILESDIR}/ovs-vswitchd-r2.service" ovs-vswitchd.service - systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service - systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf - - insinto /etc/logrotate.d - newins rhel/etc_logrotate.d_openvswitch openvswitch - - use modules && linux-mod_src_install -} - -pkg_postinst() { - use modules && linux-mod_pkg_postinst - - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.9.0 ${pv} ; then - ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" - ewarn " /etc/openvswitch" - ewarn "to" - ewarn " /var/lib/openvswitch" - ewarn "Please copy/move the database manually before running the schema upgrade." - ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" - fi - done - - # only needed on non-systemd, but helps anyway - elog "Use the following command to create an initial database for ovsdb-server:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "(will create a database in /var/lib/openvswitch/conf.db)" - elog "or to convert the database to the current schema after upgrading." -} - -pkg_config() { - local db="${EROOT%/}"/var/lib/openvswitch/conf.db - if [[ -e "${db}" ]] ; then - einfo "Database '${db}' already exists, doing schema migration..." - einfo "(if the migration fails, make sure that ovsdb-server is not running)" - ovsdb-tool convert "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" - else - einfo "Creating new database '${db}'..." - ovsdb-tool create "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" - fi -} diff --git a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild deleted file mode 100644 index 35f6bd871b8f..000000000000 --- a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit autotools eutils linux-info linux-mod python-r1 systemd - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="https://www.openvswitch.org" -SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug modules monitor +ssl" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] - || ( - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - ) - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" -DEPEND="${RDEPEND} - sys-apps/util-linux[caps] - virtual/pkgconfig" - -PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - -CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" -MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" -BUILD_TARGETS="all" - -pkg_setup() { - if use modules ; then - CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" - # docs state 4.17.x code states 4.15.x - kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" - linux-mod_pkg_setup - else - CONFIG_CHECK+=" ~OPENVSWITCH" - linux-info_pkg_setup - fi -} - -src_prepare() { - # Never build kernelmodules, doing this manually - sed -i \ - -e '/^SUBDIRS/d' \ - datapath/Makefile.in || die "sed failed" - eautoreconf - default -} - -src_configure() { - set_arch_to_kernel - # monitor is statically enabled for bug 596206 - # use monitor || export ovs_cv_python="no" - # pyside is staticly disabled - export ovs_cv_pyuic4="no" - - # flake8 is primarily a style guide tool, running it as part of the tests - # in Gentoo does not make much sense, only breaks them: bug 607280 - export ovs_cv_flake8="no" - - local linux_config - use modules && linux_config="--with-linux=${KV_OUT_DIR}" - - econf ${linux_config} \ - --with-rundir=/var/run/openvswitch \ - --with-logdir=/var/log/openvswitch \ - --with-pkidir=/etc/ssl/openvswitch \ - --with-dbdir=/var/lib/openvswitch \ - $(use_enable ssl) \ - $(use_enable !debug ndebug) -} - -src_compile() { - default - - use modules && linux-mod_src_compile -} - -src_install() { - default - - local SCRIPT - if use monitor; then - for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" - python_foreach_impl python_doscript utilities/"${SCRIPT}" - done - rm -r "${ED%/}"/usr/share/openvswitch/python || die - fi - - keepdir /var/{lib,log}/openvswitch - keepdir /etc/ssl/openvswitch - fperms 0750 /etc/ssl/openvswitch - - rm -rf "${ED%/}"/var/run || die - - newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server - newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd - newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server - newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd - - systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service - systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service - systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service - systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf - - insinto /etc/logrotate.d - newins rhel/etc_logrotate.d_openvswitch openvswitch - - use modules && linux-mod_src_install -} - -pkg_postinst() { - use modules && linux-mod_pkg_postinst - - # only needed on non-systemd, but helps anyway - elog "Use the following command to create an initial database for ovsdb-server:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "(will create a database in /var/lib/openvswitch/conf.db)" - elog "or to convert the database to the current schema after upgrading." -} - -pkg_config() { - local db="${EROOT%/}"/var/lib/openvswitch/conf.db - if [[ -e "${db}" ]] ; then - einfo "Database '${db}' already exists, doing schema migration..." - einfo "(if the migration fails, make sure that ovsdb-server is not running)" - ovsdb-tool convert "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" - else - einfo "Creating new database '${db}'..." - ovsdb-tool create "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" - fi -} diff --git a/net-misc/openvswitch/openvswitch-2.10.1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild deleted file mode 100644 index 103c6c1bafb5..000000000000 --- a/net-misc/openvswitch/openvswitch-2.10.1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit autotools eutils linux-info linux-mod python-r1 systemd - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="https://www.openvswitch.org" -SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug modules monitor +ssl" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-2.10.0[${PYTHON_USEDEP}] - || ( - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - ) - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - -CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" -MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" -BUILD_TARGETS="all" - -pkg_setup() { - if use modules ; then - CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" - # docs state 4.17.x code states 4.15.x - kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" - linux-mod_pkg_setup - else - CONFIG_CHECK+=" ~OPENVSWITCH" - linux-info_pkg_setup - fi -} - -src_prepare() { - # Never build kernelmodules, doing this manually - sed -i \ - -e '/^SUBDIRS/d' \ - datapath/Makefile.in || die "sed failed" - eautoreconf - default -} - -src_configure() { - set_arch_to_kernel - # monitor is statically enabled for bug 596206 - # use monitor || export ovs_cv_python="no" - # pyside is staticly disabled - export ovs_cv_pyuic4="no" - - local linux_config - use modules && linux_config="--with-linux=${KV_OUT_DIR}" - - econf ${linux_config} \ - --with-rundir=/var/run/openvswitch \ - --with-logdir=/var/log/openvswitch \ - --with-pkidir=/etc/ssl/openvswitch \ - --with-dbdir=/var/lib/openvswitch \ - $(use_enable ssl) \ - $(use_enable !debug ndebug) -} - -src_compile() { - default - - use modules && linux-mod_src_compile -} - -src_install() { - default - - local SCRIPT - if use monitor; then - for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" - python_foreach_impl python_doscript utilities/"${SCRIPT}" - done - rm -r "${ED%/}"/usr/share/openvswitch/python || die - fi - - keepdir /var/{lib,log}/openvswitch - keepdir /etc/ssl/openvswitch - fperms 0750 /etc/ssl/openvswitch - - rm -rf "${ED%/}"/var/run || die - - newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server - newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd - newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server - newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd - - systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service - systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service - systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service - systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf - - insinto /etc/logrotate.d - newins rhel/etc_logrotate.d_openvswitch openvswitch - - use modules && linux-mod_src_install -} - -pkg_postinst() { - use modules && linux-mod_pkg_postinst - - # only needed on non-systemd, but helps anyway - elog "Use the following command to create an initial database for ovsdb-server:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "(will create a database in /var/lib/openvswitch/conf.db)" - elog "or to convert the database to the current schema after upgrading." -} - -pkg_config() { - local db="${EROOT%/}"/var/lib/openvswitch/conf.db - if [[ -e "${db}" ]] ; then - einfo "Database '${db}' already exists, doing schema migration..." - einfo "(if the migration fails, make sure that ovsdb-server is not running)" - ovsdb-tool convert "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" - else - einfo "Creating new database '${db}'..." - ovsdb-tool create "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" - fi -} diff --git a/net-misc/openvswitch/openvswitch-2.10.2.ebuild b/net-misc/openvswitch/openvswitch-2.10.2.ebuild index 9fa8277073f0..0dfc87fec2a1 100644 --- a/net-misc/openvswitch/openvswitch-2.10.2.ebuild +++ b/net-misc/openvswitch/openvswitch-2.10.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index f2304f6ae354..aa2097f58cc1 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" LICENSE="Apache-2.0 GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="debug modules monitor +ssl" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -32,8 +32,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=" - ${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch - ${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch + "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" + "${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch" " CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild deleted file mode 100644 index 2e0d26d9fb98..000000000000 --- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit autotools eutils linux-info linux-mod python-r1 systemd versionator - -DESCRIPTION="Production quality, multilayer virtual switch" -HOMEPAGE="https://www.openvswitch.org" -SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="debug modules monitor +ssl" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ssl? ( dev-libs/openssl:0= ) - ${PYTHON_DEPS} - ~dev-python/ovs-2.7.2[${PYTHON_USEDEP}] - || ( - dev-python/twisted[conch,${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - ) - dev-python/zope-interface[${PYTHON_USEDEP}] - debug? ( dev-lang/perl )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" - -CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" -MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" -BUILD_TARGETS="all" - -pkg_setup() { - if use modules ; then - CONFIG_CHECK+=" ~!OPENVSWITCH" - kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules" - kernel_is le 4 12 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules" - linux-mod_pkg_setup - else - CONFIG_CHECK+=" ~OPENVSWITCH" - linux-info_pkg_setup - fi -} - -src_prepare() { - # Never build kernelmodules, doing this manually - sed -i \ - -e '/^SUBDIRS/d' \ - datapath/Makefile.in || die "sed failed" - eautoreconf - default -} - -src_configure() { - set_arch_to_kernel - # monitor is statically enabled for bug 596206 - # use monitor || export ovs_cv_python="no" - # pyside is staticly disabled - export ovs_cv_pyuic4="no" - - local linux_config - use modules && linux_config="--with-linux=${KV_OUT_DIR}" - - econf ${linux_config} \ - --with-rundir=/var/run/openvswitch \ - --with-logdir=/var/log/openvswitch \ - --with-pkidir=/etc/ssl/openvswitch \ - --with-dbdir=/var/lib/openvswitch \ - $(use_enable ssl) \ - $(use_enable !debug ndebug) -} - -src_compile() { - default - - use modules && linux-mod_src_compile -} - -src_install() { - default - - local SCRIPT - if use monitor; then - for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do - sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" - python_foreach_impl python_doscript utilities/"${SCRIPT}" - done - rm -r "${ED%/}"/usr/share/openvswitch/python || die - fi - - keepdir /var/{lib,log}/openvswitch - keepdir /etc/ssl/openvswitch - fperms 0750 /etc/ssl/openvswitch - - rm -rf "${ED%/}"/var/run || die - - newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server - newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd - newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server - newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd - - systemd_dounit "${FILESDIR}/ovsdb-server.service" - systemd_dounit "${FILESDIR}/ovs-vswitchd.service" - systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf - - insinto /etc/logrotate.d - newins rhel/etc_logrotate.d_openvswitch openvswitch - - use modules && linux-mod_src_install -} - -pkg_postinst() { - use modules && linux-mod_pkg_postinst - - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.9.0 ${pv} ; then - ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from" - ewarn " /etc/openvswitch" - ewarn "to" - ewarn " /var/lib/openvswitch" - ewarn "Please copy/move the database manually before running the schema upgrade." - ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch" - fi - done - - elog "Use the following command to create an initial database for ovsdb-server:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "(will create a database in /var/lib/openvswitch/conf.db)" - elog "or to convert the database to the current schema after upgrading." -} - -pkg_config() { - local db="${EROOT%/}"/var/lib/openvswitch/conf.db - if [[ -e "${db}" ]] ; then - einfo "Database '${db}' already exists, doing schema migration..." - einfo "(if the migration fails, make sure that ovsdb-server is not running)" - ovsdb-tool convert "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed" - else - einfo "Creating new database '${db}'..." - ovsdb-tool create "${db}" \ - "${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed" - fi -} diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest index be032dd518c0..012b30b2e9f9 100644 --- a/net-misc/r8168/Manifest +++ b/net-misc/r8168/Manifest @@ -1,6 +1,6 @@ AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563 -DIST r8168-8.047.01.tar.bz2 108629 BLAKE2B 35f92226726f5310edee0d0c62e5a257dd5963394ab0c0b1ce542efed3ac3b5788387f262f1426f1bc75e6bb1eb1d23a79e2b2114d0a5a60a6beb58844e2e318 SHA512 88957fb8dcfff123331b69319f4d719e6550a0a581a1079fd216c0ab346ee1bec8c3a1197c2daf9b0454f614f458606a597f0635e677627cf7bac13485b59b03 +DIST r8168-8.047.02.tar.bz2 108923 BLAKE2B 9503d70f44d5d729662ececf93b5a98d06734e8fb262b7b3dd8307c992ff64dd4d7b20d428cca2674d739df9b2fa0b7249bf7679cbe018526879e99b7ac26f5d SHA512 6689c18c7c32f7f9b5798b4d9b2103734363094eef45e2880167e00169b86822ca1f6de4c9ca0352f0a0fa721bf228be2ccdaa512b02c321073985ffd441b0d0 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629 -EBUILD r8168-8.047.01.ebuild 920 BLAKE2B dab9ae702be8ab8a3831cd5bffa59cc50568a39fac3151808fbc13ec35c8b3564b13a952784361ebb4a02f12de3464ae8b8a03b125706bb01f27bd77d0bec7ba SHA512 6fa701e698809e092cec6f333218b01afcad37e593de77b4875c5f22af3ac38013569ba8280954bee6c1618b55d004a27c0707aa424f1e9e37b4edeb108479c5 +EBUILD r8168-8.047.02.ebuild 920 BLAKE2B dab9ae702be8ab8a3831cd5bffa59cc50568a39fac3151808fbc13ec35c8b3564b13a952784361ebb4a02f12de3464ae8b8a03b125706bb01f27bd77d0bec7ba SHA512 6fa701e698809e092cec6f333218b01afcad37e593de77b4875c5f22af3ac38013569ba8280954bee6c1618b55d004a27c0707aa424f1e9e37b4edeb108479c5 MISC metadata.xml 484 BLAKE2B d2e95cf281876ff9ac28d8c35fb696b4a813d40abbe84756f7cb83f6b6c495f89d6cbb3490ef7813eb0bc3b60ee31bfb00c14b6f4a351c7e14e207537cccd0f5 SHA512 7abfc4933b44ad4365a455892cc10ef3797827f87db77e8b8349e19f6d77922bf9c3c094e5f5c29694bc240e43ac72e88daf3acc3ed8d63ffd4b90554fe9e67e diff --git a/net-misc/r8168/r8168-8.047.01.ebuild b/net-misc/r8168/r8168-8.047.02.ebuild index 5d05429e616c..5d05429e616c 100644 --- a/net-misc/r8168/r8168-8.047.01.ebuild +++ b/net-misc/r8168/r8168-8.047.02.ebuild diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest index c312e243b9c1..98fcfff47abf 100644 --- a/net-misc/smb4k/Manifest +++ b/net-misc/smb4k/Manifest @@ -1,8 +1,5 @@ -AUX smb4k-3.0.0-fix-mount-readwrite-shares.patch 4702 BLAKE2B 762b5023d8249b5c35f53ac34d6b779b8464384d08957c3c8ee1f3bfb9ab78d052f0570e47a2338296ef4a70c02ebe93fd7822b480c51325639f7eb4bbae52e7 SHA512 1c6ec72764ea682b6a3e97c857eb86e497f02cb2e525cd92baab3249cb967d836f6aa52a00c41bec2da6349eb7855b8f1911cec8a98ed6cb1e4356fa33720bfb DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7 -DIST smb4k-3.0.0.tar.xz 3825920 BLAKE2B 5439caa8f02fc93cd2065384e2b502abdca328fd186cb10ac0837d7eb289a2d62bedd81439a6d5b0e815edfb7fe168fcb70f0e645f3bae2d39a391d0688487f6 SHA512 b32a7151adb46b93e2c245136752435d3842e135baeb2b44343287d2eaf9f2aa5622a28b19df7d821390a35994f3ce204fdf20aeeac6ad67e9eb3b144ee22e33 DIST smb4k-3.0.1.tar.xz 3826160 BLAKE2B e42d761d67ae6b25e75fc673eb18838607dc36d5c76d4cba63257d09c2e138fcc3b1e3600163188117a020327645b7fe320d4a25f7455f2585cdbcf567e3d941 SHA512 de61d7dc2f63657056d721ac5ef5c12e8c8393b674163c2888a63a58f5779b0efcc47c2acaee782979c4bd9abc008eb457b6fce31d085b3e80c0970a195528b9 EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db -EBUILD smb4k-3.0.0-r1.ebuild 1709 BLAKE2B d29e564e1db91c9ffe2b0c0fc2dd19661e5c7ee697be1b7bf1ffc5ef9790ebb6ba44ef8a02c57a0e746cc7b802d2402bda054896676958b50550227e8e5c06dc SHA512 b0bb163c2f74ae280813c82031ce1fb3766bb74c582ad4e5c55699b8fd68003339e6d64b049ac47c5acebea5d67e2b68cb3ba0bf6ba2fb38ddbc1dfc3e581ff8 EBUILD smb4k-3.0.1.ebuild 1643 BLAKE2B c977bbcb606b4509d691854a575462f110f1e25874c95de5d1cab1e0cb04e36f29022eafd8b3f0d5f3ddafc915a2d73349bd3929374b731e10397157fa2c389d SHA512 9c065df4523b52a4a3f7bcc99c5e0e9071894adf5ffd0942ed1f55eab1bdfcb0a59a215402da0b440e6bab7210358497496458f62cdcd4b4d3f04e135f160a17 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711 diff --git a/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch deleted file mode 100644 index 84d50b75b463..000000000000 --- a/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 886af393dab0f6efe0f8bafc03522f25c15e0ba6 Mon Sep 17 00:00:00 2001 -From: Alexander Reinholdt <alexander.reinholdt@kdemail.net> -Date: Thu, 13 Jun 2019 20:57:38 +0200 -Subject: It was reported that Smb4K mounts shares read-only that were - previously accessible read-write. It turns out that the default for the "CIFS - Unix extensions" setting were not chosen very carefully. This commit changes - the default values back, so that mounting should work again as expected. - -(cherry picked from commit d3b89af5410ea8d4cb5f34921d48fdda486990f2) ---- - core/smb4kmountsettings_linux.kcfg | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/core/smb4kmountsettings_linux.kcfg b/core/smb4kmountsettings_linux.kcfg -index 4ad329c..7e046dd 100644 ---- a/core/smb4kmountsettings_linux.kcfg -+++ b/core/smb4kmountsettings_linux.kcfg -@@ -11,12 +11,12 @@ - <entry name="CifsUnixExtensionsSupport" type="Bool"> - <label>All or most of the servers support the CIFS Unix extensions</label> - <whatsthis>Most versions of Samba support the CIFS Unix or POSIX extensions. For these servers, some options are not needed, because the right values are negotiated during the mount process. For other servers, you might want to uncheck this option, so that predefined values can be passed to the server. Please note that if your computer is located in a Windows dominated network neighborhood with only a few Samba servers, you can safely uncheck this option and define custom options for the Samba servers.</whatsthis> -- <default>true</default> -+ <default>false</default> - </entry> - <entry name="UseUserId" type="Bool"> - <label>User ID:</label> - <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis> -- <default>false</default> -+ <default>true</default> - </entry> - <entry name="UserId" type="String"> - <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis> -@@ -25,7 +25,7 @@ - <entry name="UseGroupId" type="Bool"> - <label>Group ID:</label> - <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis> -- <default>false</default> -+ <default>true</default> - </entry> - <entry name="GroupId" type="String"> - <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis> -@@ -34,7 +34,7 @@ - <entry name="UseFileMode" type="Bool"> - <label>File mode:</label> - <whatsthis>This is the file mode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis> -- <default>false</default> -+ <default>true</default> - </entry> - <entry name="FileMode" type="String"> - <whatsthis>This is the filemode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis> -@@ -43,7 +43,7 @@ - <entry name="UseDirectoryMode" type="Bool"> - <label>Directory mode:</label> - <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis> -- <default>false</default> -+ <default>true</default> - </entry> - <entry name="DirectoryMode" type="String"> - <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis> --- -cgit v1.1 diff --git a/net-misc/smb4k/smb4k-3.0.0-r1.ebuild b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild deleted file mode 100644 index fd64fcc60aab..000000000000 --- a/net-misc/smb4k/smb4k-3.0.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Advanced network neighborhood browser" -HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -IUSE="plasma" - -DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qttest) - $(add_qt_dep qtwidgets) - net-fs/samba[cups] -" -RDEPEND="${DEPEND} - plasma? ( - $(add_frameworks_dep plasma) - $(add_qt_dep qtquickcontrols2) - ) -" - -PATCHES=( "${FILESDIR}/${P}-fix-mount-readwrite-shares.patch" ) - -src_configure(){ - local mycmakeargs=( - -DINSTALL_PLASMOID=$(usex plasma) - ) - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - elog "Users of Samba 4.7 and above please note that for the time being," - elog "the following setting has to be added to or changed in the [global]" - elog "section of the smb.conf file:" - elog - elog "[global]" - elog "client max protocol = NT1" -} diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 6503f250b622..a73493fc5abb 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,6 +1,8 @@ DIST streamlink-0.14.2.tar.gz 643695 BLAKE2B ea28daac32903738206226bce85a4615338b6039be1e4cce18325e977112c3301d6e6ed90d1210f4f362c898397fd980c136a98d8a0d5ff7ee2b6c5cf077f2c6 SHA512 0d9f1db32915392f9d29bcfb40743058352a924435a8ee77f1218c108e937204e88041c908d2f93546beaa70e18db62c961ea31fbdd85c5e7e4315a18118e276 DIST streamlink-1.0.0.tar.gz 674393 BLAKE2B 091272bae71f1e89cf14872578091a01f9d05ee372d4b9379e672280735c6800a33ae198bf019fbb3e970aa060ef059e5106e1be3a20602874be6206b6303bf6 SHA512 22ba96ac0ec27fe923b99898c45548df88ed3dda3bcbcb10b55fea145e20731eb8aa3a90212a5863b4ef5a7387d4bcf3d09d447ea2789762a8cf5eaa87f263d7 +DIST streamlink-1.1.1.tar.gz 681973 BLAKE2B a027074e7346ee1758f86456d0d3180bdb3cdbe9be7da232971fe6ece0d0723afa963bff67cef410757d85f7dc356f2a409ad3e84075c03328bbfa995fce796d SHA512 e493e7775eff84b7c70e60606296c71058b0c4ea25920ab6b2efa09cf45765c4b23287258729b60622e57594e7458a320e47301c1821b7211d49f366c73998cd EBUILD streamlink-0.14.2-r1.ebuild 1866 BLAKE2B 758a98d241d23ae7cebc684b6c4bba32a299367d8bfd2da00303fda8801cc7de12cb29f8651c31f44e998f9acd6afdb4f1e030a909af373202ddf0971dc48667 SHA512 4bad5f11c62c873c446c65974a8c29cb91137fdab9fbe0ce7c29004d45d6780f11a8691603da1649b4b17d89da9ce172074d67e2313ebbfcbe932703c3ffe7cb EBUILD streamlink-1.0.0.ebuild 2016 BLAKE2B 3df677b3d26216be7928269cca8b8d3b53d28ede18617e1ddce56874a405bde328e87c2168f09526a06160f8ff1f23f0109f166421bdb0e7299a4d06e2a40540 SHA512 977a6cf86917f9cd0025da1e39d8dd25b5870e88dcb8a6585caa70d8bdeaf102c24cd9b80d5aafcd1c21fc04f39358f9580a85838ebdfc5fdcebca01601bf1a2 +EBUILD streamlink-1.1.1.ebuild 2016 BLAKE2B 3df677b3d26216be7928269cca8b8d3b53d28ede18617e1ddce56874a405bde328e87c2168f09526a06160f8ff1f23f0109f166421bdb0e7299a4d06e2a40540 SHA512 977a6cf86917f9cd0025da1e39d8dd25b5870e88dcb8a6585caa70d8bdeaf102c24cd9b80d5aafcd1c21fc04f39358f9580a85838ebdfc5fdcebca01601bf1a2 EBUILD streamlink-9999.ebuild 1539 BLAKE2B 2609504dfce4ba218fcdcccc25618cd569d5f056e97d9c482d7132cc7dd226fb2a566372abe654aaaa33d698b88b527fa32ed98880f3b49a0807321648018837 SHA512 126ef095ca4affcca4bde3bb54070c9ce28b6371cfae1a28ea31986daed5a389bdeebf20a3392d7aca0e34f2355ef804ad9848711aa7ba4dfa84f67db4ebca29 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672 diff --git a/net-misc/streamlink/streamlink-1.1.1.ebuild b/net-misc/streamlink/streamlink-1.1.1.ebuild new file mode 100644 index 000000000000..667a5f466f57 --- /dev/null +++ b/net-misc/streamlink/streamlink-1.1.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_REQ_USE='xml(+),threads(+)' +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" + +KEYWORDS="~amd64 ~x86" +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +IUSE="doc test" + +# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too +RDEPEND=" + virtual/python-futures[${PYTHON_USEDEP}] + virtual/python-singledispatch[${PYTHON_USEDEP}] + >dev-python/requests-2.21.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.23[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + dev-python/websocket-client[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/backports-shutil_which[${PYTHON_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/backports-shutil_get_terminal_size[${PYTHON_USEDEP}]' 'python2*') + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + ) + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/freezegun[${PYTHON_USEDEP}] + )" +RDEPEND="${RDEPEND} + media-video/rtmpdump + virtual/ffmpeg +" + +python_configure_all() { + # Avoid iso-639, iso3166 dependencies since we use pycountry. + export STREAMLINK_USE_PYCOUNTRY=1 +} + +python_compile_all() { + use doc && emake -C docs html man +} + +python_test() { + esetup.py test +} + +python_install_all() { + if use doc; then + local HTML_DOCS=( docs/_build/html/. ) + doman docs/_build/man/* + fi + distutils-r1_python_install_all +} diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index d79b4575d4f8..1c030b755bc8 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,6 +1,6 @@ -DIST youtube-dl-2019.06.08.tar.gz 3169571 BLAKE2B 4603e19e80921b12526575bd13a0b43ff98d871e7a40415dd5b09bb2a0b720ffd60f4d54eecbf44b7144146a6f64d9692a1aaa42c06e4944f5a5a00667c411c3 SHA512 6758d629ff0b56ed6589d024f29761cbe4678154316a370090d6eca62611791b79b8662a70c54e333362db0495131935d47bcbfcb40ae6dcf1cc0c8808790799 DIST youtube-dl-2019.06.21.tar.gz 3169975 BLAKE2B c8867638147e45f5f1137b89b0259301b717a2249ac96143f70dc3b0b6850f887cf402e8e5e22249afaef40409a2f1c4137051553f5750633f3dc79d42967b59 SHA512 b116f1b636b616e7bd2f5f3d8bbec3b9acebc956f2864391392cfa8bd2af91faa97603d528a13abb6e69ac861582d296870579469e4c6f4f4816dc674e0c27bb -EBUILD youtube-dl-2019.06.08.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c -EBUILD youtube-dl-2019.06.21.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5 +DIST youtube-dl-2019.06.27.tar.gz 3170966 BLAKE2B f105f246e0f3e7edac2ada6685475d0b35cb3bcba39e36dbccbddf58d5103c25d93c6fe0ec8cf3fb64d35d53ab12283450184a414f551b1937c4547f2b441c4e SHA512 f59f6633b5f516736403e48f21e29684447fd12424d94423b7acca6809e9531ecf2922eec528ba7e8d9b7c62d12201c3194fccce95121ef4fc5430a8f64d4e6c +EBUILD youtube-dl-2019.06.21.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c +EBUILD youtube-dl-2019.06.27.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5 EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27 diff --git a/net-misc/youtube-dl/youtube-dl-2019.06.21.ebuild b/net-misc/youtube-dl/youtube-dl-2019.06.21.ebuild index a8b1afbfc11a..4d80cb2b49ed 100644 --- a/net-misc/youtube-dl/youtube-dl-2019.06.21.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2019.06.21.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/" SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" LICENSE="public-domain" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" RESTRICT="test" SLOT="0" DEPEND=" diff --git a/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild b/net-misc/youtube-dl/youtube-dl-2019.06.27.ebuild index 4d80cb2b49ed..a8b1afbfc11a 100644 --- a/net-misc/youtube-dl/youtube-dl-2019.06.08.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2019.06.27.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://rg3.github.com/youtube-dl/" SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" LICENSE="public-domain" -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" RESTRICT="test" SLOT="0" DEPEND=" |