summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin60885 -> 60717 bytes
-rw-r--r--net-misc/asterisk-core-sounds/Manifest2
-rw-r--r--net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild2
-rw-r--r--net-misc/asterisk-extra-sounds/Manifest2
-rw-r--r--net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild2
-rw-r--r--net-misc/asterisk-moh-opsound/Manifest2
-rw-r--r--net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild2
-rw-r--r--net-misc/asterisk/Manifest6
-rw-r--r--net-misc/asterisk/asterisk-11.25.1.ebuild2
-rw-r--r--net-misc/asterisk/asterisk-11.25.3.ebuild2
-rw-r--r--net-misc/asterisk/asterisk-13.19.0-r1.ebuild2
-rw-r--r--net-misc/bird/Manifest2
-rw-r--r--net-misc/bird/bird-1.6.3-r1.ebuild2
-rw-r--r--net-misc/crossbar/Manifest2
-rw-r--r--net-misc/crossbar/crossbar-18.3.1.ebuild168
-rw-r--r--net-misc/curl/Manifest2
-rw-r--r--net-misc/curl/curl-7.59.0.ebuild249
-rw-r--r--net-misc/dhcp/Manifest10
-rw-r--r--net-misc/dhcp/dhcp-4.3.4.ebuild264
-rw-r--r--net-misc/dhcp/dhcp-4.3.5.ebuild263
-rw-r--r--net-misc/dhcp/dhcp-4.3.6-r1.ebuild263
-rw-r--r--net-misc/dhcp/dhcp-4.3.6_p1.ebuild4
-rw-r--r--net-misc/dhcp/dhcp-4.4.1.ebuild2
-rw-r--r--net-misc/dhcpcd/Manifest2
-rw-r--r--net-misc/dhcpcd/dhcpcd-6.11.5.ebuild2
-rw-r--r--net-misc/electrum/Manifest3
-rw-r--r--net-misc/electrum/electrum-3.1.1.ebuild174
-rw-r--r--net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch12
-rw-r--r--net-misc/eventd/Manifest4
-rw-r--r--net-misc/eventd/eventd-0.24.1.ebuild (renamed from net-misc/eventd/eventd-0.24.0.ebuild)4
-rw-r--r--net-misc/freerdp/Manifest3
-rw-r--r--net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch49
-rw-r--r--net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild (renamed from net-misc/freerdp/freerdp-2.0.0_rc1.ebuild)3
-rw-r--r--net-misc/iputils/Manifest10
-rw-r--r--net-misc/iputils/iputils-20151218.ebuild4
-rw-r--r--net-misc/iputils/iputils-20160308.ebuild4
-rw-r--r--net-misc/iputils/iputils-20161105.ebuild4
-rw-r--r--net-misc/iputils/iputils-20171016_pre.ebuild2
-rw-r--r--net-misc/iputils/iputils-99999999.ebuild4
-rw-r--r--net-misc/lksctp-tools/Manifest2
-rw-r--r--net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild2
-rw-r--r--net-misc/memcached/Manifest6
-rw-r--r--net-misc/memcached/memcached-1.4.39.ebuild2
-rw-r--r--net-misc/memcached/memcached-1.5.2.ebuild2
-rw-r--r--net-misc/memcached/memcached-1.5.6.ebuild2
-rw-r--r--net-misc/mico/Manifest6
-rw-r--r--net-misc/mico/mico-2.3.13-r11.ebuild (renamed from net-misc/mico/mico-2.3.13-r10.ebuild)14
-rw-r--r--net-misc/mico/mico-2.3.13-r8.ebuild142
-rw-r--r--net-misc/mico/mico-2.3.13-r9.ebuild152
-rw-r--r--net-misc/mico/mico-9999.ebuild14
-rw-r--r--net-misc/netkit-bootparamd/Manifest2
-rw-r--r--net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild2
-rw-r--r--net-misc/ntp/Manifest2
-rw-r--r--net-misc/ntp/ntp-4.2.8_p11.ebuild2
-rw-r--r--net-misc/nx/Manifest2
-rw-r--r--net-misc/nx/nx-3.5.99.16.ebuild113
-rw-r--r--net-misc/oidentd/Manifest9
-rw-r--r--net-misc/oidentd/files/oidentd-2.2.2-confd4
-rw-r--r--net-misc/oidentd/files/oidentd.service-r19
-rw-r--r--net-misc/oidentd/files/oidentd_at.service-r17
-rw-r--r--net-misc/oidentd/metadata.xml2
-rw-r--r--net-misc/oidentd/oidentd-2.0.8-r6.ebuild4
-rw-r--r--net-misc/oidentd/oidentd-2.2.2.ebuild52
-rw-r--r--net-misc/openssh/Manifest3
-rw-r--r--net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch44
-rw-r--r--net-misc/openssh/openssh-7.6_p1-r5.ebuild5
-rw-r--r--net-misc/openvswitch/Manifest2
-rw-r--r--net-misc/openvswitch/openvswitch-2.6.1.ebuild155
-rw-r--r--net-misc/socat/Manifest4
-rw-r--r--net-misc/socat/socat-1.7.3.1.ebuild52
-rw-r--r--net-misc/socat/socat-1.7.3.2.ebuild2
-rw-r--r--net-misc/ubridge/Manifest3
-rw-r--r--net-misc/ubridge/metadata.xml9
-rw-r--r--net-misc/ubridge/ubridge-0.9.14.ebuild43
-rw-r--r--net-misc/youtube-dl/Manifest4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2018.03.14.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2018.02.26.ebuild)0
76 files changed, 971 insertions, 1448 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b6f1215c3d31..00c6420bbdc8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index b33fb935b051..1391f5389258 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -71,5 +71,5 @@ DIST asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz 8460881 BLAKE2B f9c6b4ead0a31cac
DIST asterisk-core-sounds-ru-wav-1.4.21.tar.gz 16446330 BLAKE2B 8c09a8b49f9de856eda58c22bc86a24d91727e19f2a1fdd33c6428ed769df492a5e7e1c93d680b06db4ee293a7a3031b786f128fb917e6f326b57fa0d9d87233 SHA512 951a7b156cf7f92e9640f6704bd12013d73d688aaaff8ab18d15ea0c99f10fa0386e12b65c086a02536d8cd68c372c686e4485cff3afc4f40933d14bdb41e109
DIST asterisk-core-sounds-ru-wav-1.4.22.tar.gz 16591836 BLAKE2B 95b16e2680753c2b141f6e5a5b12f06e87d6e2c998d941b9ea8d3e1229d8efa511b59a2aa5d00ad4f39ef0acc69953e933878cf60763c3f3daecf8497150bf41 SHA512 1f8484da7975bd91b38d8354ec84110892c42b44d2a0cbcd9a2d5a3756e56e0446d388e0e9343be8c3561c4a02cf55cd135d86051db5b4d232575ae4c4b60d1b
EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
-EBUILD asterisk-core-sounds-1.4.22.ebuild 1863 BLAKE2B 0ce9f5c00b125c829c050a76d21ffc641b56ac77ba922574e3d48dce70b36c98bd42d441ab70cf3de4211922c5ffc65259e83fda4334bd4157386f2c452b8a45 SHA512 59f5867216f793ea1f4eb9fca3256c7e1ec6c0c21b19e17ad9507f6ed07aeb51d22aaf317f8867905e0ada4d6c88312acab15727902ee99f0bf60920cab6904e
+EBUILD asterisk-core-sounds-1.4.22.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
MISC metadata.xml 846 BLAKE2B 581e9e2325c925ddc9bffcdb3d545e2dc5d862a06bf79875eccda7d18412e24dcf3ac4c3293474225a38189dd534030a5d5095dec992dd52c0798b4287a6a921 SHA512 d09b435f10066acf15bb1b6c2454e4a207e7604eae199958bfc9de6f130f4f3380af5b3d95d686cc20dfabe38b58f9c3dc308517b63f8ff6675779b97ef471d2
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
index ce1d059fd250..a748f38a57bf 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
@@ -25,7 +25,7 @@ done
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
DEPEND=">=net-misc/asterisk-1.4"
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 7fd277005533..5505e2517123 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -16,5 +16,5 @@ DIST asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz 7128320 BLAKE2B cfc9b2fb2734d
DIST asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz 48517491 BLAKE2B 80b6e4da30b5e2c65c48c81bfa44cd14bff3eb19fbb3d6385dbe7fbca7e39a881154f6c1fa839360874c65f6e4916ef9574006041ef0f68ee9245c7340d1e46e SHA512 f8b0a1eebd93fdda707846dc73d30418462a07572962cbe822eb11ed5c2ce7741b185b0e4abd05c47d0c2c53e817c47b3c493d94e92e50848c7a270e87e9a586
DIST asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz 11818928 BLAKE2B e6669c4b041e96fda7beed7de4af3ad876c28419e639b4d45797c00272ac03fb71ce23cd584aca480e203e37585a1e793e42514f83341a745e4111ed49bdba54 SHA512 34ba851729186250a3fc459b685c0a4d475e32820e4a49b3a1b2c038e0252a71a0637e1bfd67e0bd4960cb90ec24f8cb28435a049fcc91f7b3ed4f0f1009b0ab
DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
-EBUILD asterisk-extra-sounds-1.4.11.ebuild 1786 BLAKE2B 75eba6eaa8701dc7d11027224cc111caa59012d2f3bfdce7c4589e407aafd284785a9596f65fa75ad19134188909c34ab4e62c7bdc34e27918fa8b469f885195 SHA512 eb48446e4aa8aac3a001aea9c251800dec0114f3a03b08cac37ae82d9af11b04001b96e4dda64647a6f012b2dff3c0216f4f588fd3176c9d6d2281e6bf6ac57d
+EBUILD asterisk-extra-sounds-1.4.11.ebuild 1774 BLAKE2B 89035b1a80f2c875a761f6b093bac2a3fa2dc772cba2c622b923855267b5ba144be8cafd3d80f7d09bbdcf596e13ddc441f9b92deb7a07aad89da488f4236a83 SHA512 595e254f5a7982ce4e605c14dd4185795ec8c5104699512192282c4c8d5c59ae4a446e1a29cc94e50654e87b02ae4310caf146dde4aded264c9c831d50bd557d
MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
index 7f2584c7fa43..a95de07b5c81 100644
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
@@ -20,7 +20,7 @@ done
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
DEPEND=">=net-misc/asterisk-1.4"
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index 1899339831ea..5d54bbad5f4e 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,5 +7,5 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
-EBUILD asterisk-moh-opsound-2.03.ebuild 1134 BLAKE2B 1e73c30b0141a6b8da504e01bf0b413fab7d1e769a8f2ee0dc84848917b36d53a2358e0a84378b8434a08f4f6661569eb4235a66d2fb288156f3fdae4497900b SHA512 b4bc5e31baa221296e3fee4d784578433f4f9a73407554d030bd9a7836a378b86c3a3d3248dffd3b113c3bf6dab6361138502f70674b467fee2e24133af5d2c2
+EBUILD asterisk-moh-opsound-2.03.ebuild 1122 BLAKE2B 2c49003234b8b7ffd710439afa02d76f1e7c5cc0bc0419728cba6ef2364cabab0bac43ec1ec8333549513cb23336f032e073fbd5783e9bb503fcd919f0e9b9b9 SHA512 c3439287224612fa84b10af29c0591eeac9642c6769f821fd395eaf4be9fdc4ba047f8fc3b2fe8de1539f30395f86badf4a1dcc368ab71cb6e36666cfa11901b
MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
index c53e54ad337f..539efbedde7e 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
@@ -15,7 +15,7 @@ done
IUSE="${CODECS}"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
DEPEND=">=net-misc/asterisk-1.4"
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 9a56f8d9bf2a..05ac76bcd943 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -20,9 +20,9 @@ DIST asterisk-13.19.2.tar.gz 32991960 BLAKE2B 3b1f731fb68e2d455bfc76e863a8abbd89
DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 BLAKE2B 788b923300324241d0272b2533cbad5b18189fa46f0ed620256aadb2a840880dccb66f839edc323e90c46bb3748127caeb59b84b017722491c52e6f5f6dcd8f0 SHA512 6fdb245e37074f124f4725c25a1547c872f6216eb1d37faeda8ed7c5e4dc87424e9c1ba20bb34722165027692916bde4c8bfc816ac5c89710972bb3f51bd1b75
DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
-EBUILD asterisk-11.25.1.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
-EBUILD asterisk-11.25.3.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
+EBUILD asterisk-11.25.1.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
+EBUILD asterisk-11.25.3.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
EBUILD asterisk-13.17.2.ebuild 9724 BLAKE2B 51e9c924c2dadd043c5c259a9ccb6a6041e4d2ac3b477dee4c41a3db57f821494d24e30970cd18bbe20abd0112e5c5f8787e41fcc8483ffd66c0418eca446974 SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e
-EBUILD asterisk-13.19.0-r1.ebuild 9716 BLAKE2B 88137d10fad82bb8b81312eb39c896bb598359a908623f3df4440d6971b05ecf496ff5b9d05bb8c0fc098cfda58e870d3c2c972dbd366bea1b4a2f0f9b1ee25a SHA512 8914dde356784fb1bca8f5aed9abe87b34b590da07ce2f7a8bb372d26f0c00266fc7142edcdecb8c6112bd58691a52101469167708696f4639d5261f7195e67d
+EBUILD asterisk-13.19.0-r1.ebuild 9715 BLAKE2B fe7475546c2ddf5adf4228ef38ce3944acf66d7537aefb1926072b28126b26e7c1e7dba8b95a30529dc598e84ca6823bbd961035c70dcc7e6e92b6e7274f258d SHA512 2b173fba18d6233628ef7db7fc797063ac0d9f584289b74a82d8b33722bcece400eafc50025648227cf2dd98aa09072d095aec4bbd362bc42b65f1f9d1e98d7d
EBUILD asterisk-13.19.2.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-11.25.1.ebuild b/net-misc/asterisk/asterisk-11.25.1.ebuild
index 5733b5cc4eab..75bca5529286 100644
--- a/net-misc/asterisk/asterisk-11.25.1.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
IUSE_VOICEMAIL_STORAGE="
+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
index 5733b5cc4eab..75bca5529286 100644
--- a/net-misc/asterisk/asterisk-11.25.3.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 x86"
IUSE_VOICEMAIL_STORAGE="
+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
index ac2f2b5f6ecd..7d2ba52cdc0e 100644
--- a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE_VOICEMAIL_STORAGE="
+voicemail_storage_file
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 6e465615c6d8..3f3b367115c1 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,6 +1,6 @@
AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-EBUILD bird-1.6.3-r1.ebuild 1267 BLAKE2B 5ccf27da7c9039b6596eb0404e798ad5593c5844f690df66300721a136b9c9c4813804ef0d7f90dc2d027ca21e0926c35f899e7b5be512442a5fd0ed09513336 SHA512 e2c23c2431aa391dddb17d3ff52500bb2503d378fd522cfd3053165b15439ba27a09974c3d3055ed043a98aa807576c7a02472c2d6a86ee86cf8bc82cc9fa120
+EBUILD bird-1.6.3-r1.ebuild 1274 BLAKE2B b73fbb570a5a579faba135796fa5a65b1e701bab3d4d8869bd65c4b31dd3b8e9d3a128f918267b6dd1df9b7e4c24d166182619e52eabd7021132ef1d937fc125 SHA512 0ca858013e7abff7ec60f2089c9926e5acb6364e042c960f9d33ab232594bb7d2414df798c3e22ea1c2dd464585fbfd8b67d8551289503685d6bd747db1c2080
EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.6.3-r1.ebuild b/net-misc/bird/bird-1.6.3-r1.ebuild
index 07a2f35e3070..3bfce423950f 100644
--- a/net-misc/bird/bird-1.6.3-r1.ebuild
+++ b/net-misc/bird/bird-1.6.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+client debug ipv6"
RDEPEND="client? ( sys-libs/ncurses )
diff --git a/net-misc/crossbar/Manifest b/net-misc/crossbar/Manifest
index 276ecee61704..60c44a5a34a4 100644
--- a/net-misc/crossbar/Manifest
+++ b/net-misc/crossbar/Manifest
@@ -7,8 +7,10 @@ DIST crossbar-17.12.1.tar.gz 736982 BLAKE2B bd2af652d376bf8ffe6cc23b0a798bb905ce
DIST crossbar-17.6.1.post3.tar.gz 725054 BLAKE2B 1c60ae9a29f9d2831dd219c30751c65c07639810c24ea27f35c1fb27fd55c6b97f225e9fef9bbb00c79233a52a5e7ae6f4a61020c028f697e3fbdec1ada41980 SHA512 c3efac2c7f7a41e6544eb98057afb249908453d6ddfb81c514f0705ed967374d50f844fe1a80395652b81a7c23abc90a03a0d6c88287f10cbfe99e64cb70919d
DIST crossbar-17.8.1.tar.gz 1545668 BLAKE2B 812a4b423bf663386255332de2ab90afb4f0a44d205a193d71523e7fa0aba2bf1644b2136200c6ae4b1639de2764b7139ee6081a5167b21abc2bdec6400c5a60 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32
DIST crossbar-17.9.1.tar.gz 730753 BLAKE2B 8fb93b017b6af8264aa828a6353d1c6f5fd7f224797504f67f77b5cf2759ada5f9609eb6815da96afadfc2bae90acb2837be19ed0896e1a8ce37ff384fcea367 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563
+DIST crossbar-18.3.1.tar.gz 736736 BLAKE2B 546a7d4ff173928179eeff86aef50e3517067e6aede145a5185e891fe749e0e2c507b577ea3be8f416c5894e8c43db42d8ceaabbdc64823b305219c2f6277ff4 SHA512 cb85ba44054c59eecb751896c5f0d793ccc8990c9d00733de546512b7e500a90ef4042d49ec6f648ec3677687950fbee62208c9bbb6692de65df4f238a2414dc
EBUILD crossbar-17.12.1.ebuild 6395 BLAKE2B 2a13a9a82ca3310fe6f09470e86c6dbe553461d5acc32243ad37e9a53d50e80991269df3e5212b958d71bf1ab5a2332240467889e595cbd89b46cfbaef19b8ba SHA512 53a2d820d44ece26b1e829ede44cd57ce44745e8a7ca6ef96422b152a7afcbe15a4083457c8cd598ab8489fa968803a8c40457db1511e115cdb31d13cdf8c15b
EBUILD crossbar-17.6.1_p3-r1.ebuild 6035 BLAKE2B 39abc853f66fd6a8fbf5c948b9d7f79ed23c535ed9cf567f6d720d40eb3da1994e990112d847f2423d80fd5febde538e5a5320d56f427f9d8efa828807a4db57 SHA512 1d1b77f2774ce292744ad2475970fc8e14e07e2a8ecf5fe2452af1b59fd40b99a1ff035757435bfd4a192688d7a2005ce1f7e3087e9f7c34a312760a53fcacc3
EBUILD crossbar-17.8.1.ebuild 6442 BLAKE2B aafef7a28631b9b4176e4e06509daef26bfa69f0f0359bc0605d156eaa0feed8415b4fc4cc2803fbeba9957c0ef96f5e8a8e34ffe1c23af825a685ca049037ef SHA512 bcb29637b0171887e4b6088449b7ddc6cb7fdc4f072b9fbe0dbe4fe76b65f5ab87d03def949864650fe7a2397b5f99a0306a13b86e8bd607c3d0a25a77a42a13
EBUILD crossbar-17.9.1.ebuild 6392 BLAKE2B de6a91d336ccc9f731247ab580efcb95b65dcca63e3523e4ed5c545987801246a8853ea42544e834c23525ea3dd74b1b2a0b31b2bb7d754e5a2b826b2b240141 SHA512 50af397430d523c69880a16ea37ca0c412927109532f04e10c0a7743ad0b06b1200cbc13a33b45f2965c4558539d124c58a12dfda09110ea310de034dd7abd63
+EBUILD crossbar-18.3.1.ebuild 6337 BLAKE2B 9dbba00431507fbfa0477b9736586fa357e0d0bdbb46d971be480bc49ff1ce842d79da8312be5524e11180791899c41fd1578cf723ac03ddbb76b9e12ce309f1 SHA512 a9d2b73e7a5bd1ed28e069209e72931f6b7f66199755317616ed378851ad689cc83b3d11efdb64bf719f6d00686a3e77933dc6b481e3421b03a60cfbdd63f4c9
MISC metadata.xml 861 BLAKE2B acef636c9c51de3530425dcf3ab31afe8300c3fcbe1615d374c52610647086324887e2fb97b7a2fc9aeae73c48f5742b67ee9190abab5b01f3f7e762ae286851 SHA512 90ce37e4764583a09f90e99c7010de5c1f2abff6837cef4255eee5d83f7d9de2f641812700fa180cdb0e0511d401cb1e160a721600efabc787fc2a32ac0b83bc
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
new file mode 100644
index 000000000000..f651f274fa6d
--- /dev/null
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit user systemd distutils-r1
+
+MY_PV="${PV}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Crossbar.io - The Unified Application Router for the twisted framework"
+HOMEPAGE="http://crossbar.io/ https://github.com/crossbario/crossbar https://pypi.python.org/pypi/crossbar"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/attrs-17.2.0[${PYTHON_USEDEP}]
+ >=dev-python/autobahn-18.3.1[${PYTHON_USEDEP}]
+ >=dev-python/bitstring-3.1.5[${PYTHON_USEDEP}]
+ >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/click-6.7[${PYTHON_USEDEP}]
+ >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
+ >=dev-python/hyper-h2-3.0.1[${PYTHON_USEDEP}]
+ =dev-python/idna-2.5[${PYTHON_USEDEP}]
+ >=dev-python/incremental-17.5.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.18[${PYTHON_USEDEP}]' python2_7)
+ >=dev-python/jinja-2.9.6[${PYTHON_USEDEP}]
+ >=dev-python/lmdb-0.92[${PYTHON_USEDEP}]
+ >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+ >=dev-python/priority-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.2.2[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-modules-0.0.9[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+ >=dev-python/pytrie-0.3[${PYTHON_USEDEP}]
+ >=dev-python/py-ubjson-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/pynacl-1.1.2[${PYTHON_USEDEP}]
+ >=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+ >=dev-python/sdnotify-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/service_identity-17.0.0[${PYTHON_USEDEP}]
+ >=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+ >=dev-python/shutilwhich-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/treq-17.3.1[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+ >=dev-python/txaio-2.9.0[${PYTHON_USEDEP}]
+ >=dev-python/u-msgpack-2.4.1[${PYTHON_USEDEP}]
+ >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}]
+ >=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+ >=dev-python/txtorcon-0.19.3[${PYTHON_USEDEP}]
+"
+DEPEND="
+ !dev-python/crossbar
+ >=dev-python/setuptools-36.0.1[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.5.0[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+DOCS=(
+ README.rst LICENSE-FOR-API LICENSE COPYRIGHT
+)
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+ # don't install the copyright, license... let dodoc do it
+ sed -e "s/^ data_files=.*//" -i setup.py || die
+
+ # remove these py2 deps from setuptools install_requires
+ # it is not filtered out for >=py3.4 and results in test fails
+ sed -e "s/^ipaddress.*//" -i requirements-min.txt || die
+ sed -e "s/^enum34.*//" -i requirements-min.txt || die
+
+ distutils-r1_python_prepare_all
+}
+
+pkg_setup() {
+ enewuser crossbar
+}
+
+python_test() {
+ pushd "${TEST_DIR}" > /dev/null || die
+ /usr/bin/trial crossbar || die "Tests failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ keepdir /var/lib/crossbar
+ insinto /var/lib/crossbar
+ doins "${FILESDIR}/config.json.sample"
+
+ newconfd "${FILESDIR}/confd" crossbar
+ newinitd "${FILESDIR}/initd" crossbar
+}
+
+pkg_posinst() {
+ einfo "For exapmle configurations and scripts"
+ einfo "See: https://github.com/crossbario/crossbar-examples"
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn
+ ewarn "Starting with crossbar-18.3.1 the tor service capability and dependency are now built-in"
+ ewarn "Starting with net-misc/crossbar-17.6.1_p3-r1, more than one instance of crossbar"
+ ewarn "can be run simultaneously. Note that \"BASEDIR\" in the crossbar conf.d/crossbar file"
+ ewarn "is the common base directory for all instances. If you are migrating from an older"
+ ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+ ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+ ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+ ewarn " ln --symbolic --relative /etc/init.d/crossbar /etc/init.d/crossbar.myinstance"
+ ewarn " rc-update add crossbar.myinstance default"
+ ewarn " /etc/init.d/crossbar.myinstance start"
+ ewarn "Systems using systemd can do the following:"
+ ewarn " systemctl enable crossbar@myinstance.service"
+ ewarn " systemctl enable crossbar.target"
+ ewarn " systemctl start crossbar.target"
+ fi
+}
+
+pkg_config() {
+ local crossbar_path="/var/lib/crossbar"
+ local log_path="/var/log/crossbar"
+ einfo "This will prepare a new crossbar instance in ${crossbar_path}."
+ einfo "Press Control-C to abort."
+
+ einfo "Enter the name for the new instance: "
+ read instance_name
+ [[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+ local instance_path="${crossbar_path}/${instance_name}"
+ local instance_log_path="${log_path}/${instance_name}"
+
+ if [[ -e "${instance_path}" ]]; then
+ eerror "The instance with the specified name already exists:"
+ eerror "${instance_path}"
+ die "Instance already exists"
+ fi
+
+ if [[ ! -d "${instance_path}" ]]; then
+ mkdir --parents "${instance_path}" || die "Unable to create directory ${crossbar_path}"
+ fi
+ chown --recursive crossbar "${instance_path}" || die "Setting permissions for instance failed"
+ cp "${crossbar_path}/config.json.sample" "${instance_path}/config.json" \
+ || die "Moving sample configuration failed"
+ ln --symbolic --relative "/etc/init.d/crossbar" "/etc/init.d/crossbar.${instance_name}" \
+ || die "Unable to create link to init file"
+
+ if [[ ! -d "${instance_log_path}" ]]; then
+ mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+ fi
+ ln --symbolic --relative "${instance_log_path}/node.log" "${instance_path}/node.log" \
+ || die "Unable to create link to log file"
+
+ einfo "Successfully created a crossbar instance at ${instance_path}."
+ einfo "To change the default settings edit the config.json file in this directory."
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 7bed63f27f04..88851d795e7b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,7 +3,9 @@ AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5
AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
DIST curl-7.58.0.tar.bz2 2891868 BLAKE2B d13efab3e3e677804c0821257958eb6f4260234e3d939092e7de862a12ab84500aa50073e37610774b3be9e5a2910c3ba703a716296d31f799916c3046dc214b SHA512 853b945fbfe87e8dcf2186d8cc6609681b9ed3727f9f075bb434d5df07dcccc633fdf30795f6d5956e3355a5cf94a3780e4a3603b08cbd0368e44103de27085b
+DIST curl-7.59.0.tar.bz2 2904158 BLAKE2B c44d9985a19cb7b1e273f868181b0017c7b00683c195fd2c6696b9976e3c6a80d8b80490379c2dce653a9b2d698d1be33fce71a0e61844f38c12c44594909c35 SHA512 9b5586f443a3c9fed947debce86861a8dea0fbf59bf8838cfd72a0884f13073630cf9d369b5535a059d122decd738c652705567752517f5cb11148cc16f693fb
EBUILD curl-7.57.0-r1.ebuild 7234 BLAKE2B 9ddf61766ebc6378b9b86446b4dd761630cb7a24a1293a3552d57e360c26d85ec38ac311f66bca6eb6c041f8922e91a587768c5417411842d5bd7850ebd73a9c SHA512 164351baedae507342aa4182882e7122be03964e3355c8e087a425f7c3595cc34dcb4303e781dbfb2576f02623595a1f5399f8dccb462759b1cb2593bf449e3e
EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8
EBUILD curl-7.58.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b
+EBUILD curl-7.59.0.ebuild 7232 BLAKE2B 783ac0525e23a528f3d89cbf69a8767b254f366939fc29097a89dac228494953015d79d946d94412048dee531c33849220b027c3218d42606721bd90f6bf19ae SHA512 6ed7c0df24055d11196223aed8ecbe663a44ef4b949af4541e16be0c8540a52b25f2a0b18979374f6c660013b9b8990996b0d0102093123a9a9219e79ee7361f
MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.59.0.ebuild b/net-misc/curl/curl-7.59.0.ebuild
new file mode 100644
index 000000000000..b0fde15454a2
--- /dev/null
+++ b/net-misc/curl/curl-7.59.0.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ brotli? ( app-arch/brotli:= )
+ ssl? (
+ curl_ssl_axtls? (
+ net-libs/axtls:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_gnutls? (
+ net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+ dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_libressl? (
+ dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_mbedtls? (
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_openssl? (
+ dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_nss? (
+ dev-libs/nss:0[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ )
+ http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+ idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+ adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+ rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+ ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+# rtmp? (
+# media-video/rtmpdump
+# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+# )
+
+# ssl providers to be added:
+# fbopenssl $(use_with spnego)
+
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? (
+ sys-apps/diffutils
+ dev-lang/perl
+ )"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+ curl_ssl_winssl? ( elibc_Winnt )
+ threads? ( !adns )
+ ssl? (
+ ^^ (
+ curl_ssl_axtls
+ curl_ssl_gnutls
+ curl_ssl_libressl
+ curl_ssl_mbedtls
+ curl_ssl_nss
+ curl_ssl_openssl
+ curl_ssl_winssl
+ )
+ )"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+ docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/curl-config
+)
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+ eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+ eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+ sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+ eapply_user
+ eprefixify curl-config.in
+ eautoreconf
+
+ if [[ ${CHOST} == *-darwin17 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=637252
+ sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+ configure || die
+ fi
+}
+
+multilib_src_configure() {
+ # We make use of the fact that later flags override earlier ones
+ # So start with all ssl providers off until proven otherwise
+ local myconf=()
+ myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+ myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
+ if use ssl ; then
+ if use curl_ssl_axtls; then
+ einfo "SSL provided by axtls"
+ myconf+=( --with-axtls )
+ elif use curl_ssl_gnutls; then
+ einfo "SSL provided by gnutls"
+ myconf+=( --with-gnutls --with-nettle )
+ elif use curl_ssl_libressl; then
+ einfo "SSL provided by LibreSSL"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ elif use curl_ssl_mbedtls; then
+ einfo "SSL provided by mbedtls"
+ myconf+=( --with-mbedtls )
+ elif use curl_ssl_nss; then
+ einfo "SSL provided by nss"
+ myconf+=( --with-nss )
+ elif use curl_ssl_openssl; then
+ einfo "SSL provided by openssl"
+ myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+ elif use curl_ssl_winssl; then
+ einfo "SSL provided by Windows"
+ myconf+=( --with-winssl )
+ else
+ eerror "We can't be here because of REQUIRED_USE."
+ fi
+ else
+ einfo "SSL disabled"
+ fi
+
+ # These configuration options are organized alphabetically
+ # within each category. This should make it easier if we
+ # ever decide to make any of them contingent on USE flags:
+ # 1) protocols first. To see them all do
+ # 'grep SUPPORT_PROTOCOLS configure.ac'
+ # 2) --enable/disable options second.
+ # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+ # 3) --with/without options third.
+ # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-crypto-auth \
+ --enable-dict \
+ --enable-file \
+ --enable-ftp \
+ --enable-gopher \
+ --enable-http \
+ --enable-imap \
+ $(use_enable ldap) \
+ $(use_enable ldap ldaps) \
+ --disable-ntlm-wb \
+ --enable-pop3 \
+ --enable-rt \
+ --enable-rtsp \
+ $(use_enable samba smb) \
+ $(use_with ssh libssh2) \
+ --enable-smtp \
+ --enable-telnet \
+ --enable-tftp \
+ --enable-tls-srp \
+ $(use_enable adns ares) \
+ --enable-cookies \
+ --enable-hidden-symbols \
+ $(use_enable ipv6) \
+ --enable-largefile \
+ --without-libpsl \
+ --enable-manual \
+ --enable-proxy \
+ --disable-sspi \
+ $(use_enable static-libs static) \
+ $(use_enable threads threaded-resolver) \
+ $(use_enable threads pthreads) \
+ --disable-versioned-symbols \
+ --without-cyassl \
+ --without-darwinssl \
+ $(use_with idn libidn2) \
+ $(use_with kerberos gssapi "${EPREFIX}"/usr) \
+ $(use_with metalink libmetalink) \
+ $(use_with http2 nghttp2) \
+ $(use_with rtmp librtmp) \
+ $(use_with brotli) \
+ --without-spnego \
+ --without-winidn \
+ --with-zlib \
+ "${myconf[@]}"
+
+ if ! multilib_is_native_abi; then
+ # avoid building the client
+ sed -i -e '/SUBDIRS/s:src::' Makefile || die
+ sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+ fi
+
+ # Fix up the pkg-config file to be more robust.
+ # https://github.com/curl/curl/issues/864
+ local priv=() libs=()
+ # We always enable zlib.
+ libs+=( "-lz" )
+ priv+=( "zlib" )
+ if use http2; then
+ libs+=( "-lnghttp2" )
+ priv+=( "libnghttp2" )
+ fi
+ if use curl_ssl_openssl; then
+ libs+=( "-lssl" "-lcrypto" )
+ priv+=( "openssl" )
+ fi
+ grep -q Requires.private libcurl.pc && die "need to update ebuild"
+ libs=$(printf '|%s' "${libs[@]}")
+ sed -i -r \
+ -e "/^Libs.private/s:(${libs#|})( |$)::g" \
+ libcurl.pc || die
+ echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 31cc6cae4a59..439ffd50c1d6 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -32,14 +32,8 @@ AUX dhcrelay4.service.conf 105 BLAKE2B 52ad8018d2b6fd47b5d752a6e6626a8fa6c1d21fa
AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd53dc30a25aad02f5332f538bc9d6ca65b5d388ff83f0ee30358d56cefa440fe7f5b8a6678521ba6b SHA512 40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9
AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
-DIST dhcp-4.3.4.tar.gz 9302513 BLAKE2B eb7fb7d7d46d5a706b4f22b4add98619709f7ac1ecf8244564f043fd56adb6e2f54a0e01b573abcd7e054a82f74279c8134802380ee2d02c1cab1118d48a4965 SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
-DIST dhcp-4.3.5.tar.gz 10075147 BLAKE2B ffce896cfafe17a412030d0a1cb4a92323be175ecbb35061fe0538ed13a9f91d604daed89b5f282c92ef161944e9f18557545d95c9fbbd29e1f6a31485ef3b11 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0
DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
-DIST dhcp-4.3.6.tar.gz 10182593 BLAKE2B 2b6324c63446a5cbded9a7cdd4455b6c880aabd282dfd19d44fe2fafe684a991b4afa87ec04ee3fc131437c8efdddbe2777d70586c2e8b2b4319e786325dc398 SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
-EBUILD dhcp-4.3.4.ebuild 7914 BLAKE2B f6f94a7af0aa70428d5fa6e51ab8ac79f25fc25f094694d0ab278398c52c6021d8efe5fa1e524751ba8eb3db214e97660146175ab6e2d91bbaa234a619266087 SHA512 434a6523ec0e3f56889c71be0ab919c4282f3843badc4c8a08aba6634175eabfa4b9921602dfce7147a44f5dc215060fe335b7bec1435364cafe159a6e23bc95
-EBUILD dhcp-4.3.5.ebuild 7884 BLAKE2B 6ef306e4226389e05c904c74866918952ef16cf1caa2f4d23030aadcdbd259b8bbccb33df10daffce498fae9a189f1f8a6821a8746333d315bd2273c0cca6ed3 SHA512 d52d3ec0e9b046c29994af0af0cbd5bdc63cf040c7a4f8920d5f9f59d82223882df2cc6fa319d00a40d6b28b1938656587d9066942470fe0fdb812e732137a78
-EBUILD dhcp-4.3.6-r1.ebuild 7823 BLAKE2B a28cef0d32954b13e1f6a963e419616c656f1c8cc97451db95d922a13a86eec908cef6858f9b6a080ad94c437211ef639fb016d4d52e040f5fdd9e5bd3868bab SHA512 f9e6247ba9ec67c5f8a93f8eae87dbfde8e9754bf621eb48d7641fb42d0ca6bffa66ae7d36bd984c168bab7293e3d73b7d119b96e1d0889181cf2c64b912d522
-EBUILD dhcp-4.3.6_p1.ebuild 7815 BLAKE2B c6696256fdf95f9081c13fa4ef9b2abceb0d0a3668242039eab11379a6e4397e875ca855e81bcdb1702dc5c5a034f70536ca62dd6029a52e6dadbb3d48f55e28 SHA512 5cfa4f5bfc7a9ef9d841b9de9581612e82bf6fe56ccf074c623ed8acfccb370e3073fcaa57602fa554a50e0dc9e0267ae3dbc566a2ed7f7aa0a54e72d5fa2465
-EBUILD dhcp-4.4.1.ebuild 7926 BLAKE2B e0531baad9de9fa0ee437744ef35a7a747f29b8bfd490822b0c195423e7e57495e45bda40d59dbc16275b9723c43068d07c612e47c3e0753cf0952efcf9751fa SHA512 1952f93d33bb5e4c7f9c8bb7ebef4cbb1b279315435f8404405e824714c9c1ee1a469f7bd36732564f5b540a895539960e29b24160ef8acb729441835990f3f2
+EBUILD dhcp-4.3.6_p1.ebuild 7815 BLAKE2B 16aac3ec35aada27508873e22e49435ddf30cbf02fd853e2382323068e3b7d20a43e08241f94ba3a0c308b9e9abfbb7ea3d9728f1bb3556c70ec68a085b5a33c SHA512 a52eb5396db0ed1fedd6b7b86ccc2d762973eebfda13a35cd99f4b7815d62144398c35d025d2a043ed390d257310804adfe7acf02268617d3592a9a71cc7f256
+EBUILD dhcp-4.4.1.ebuild 7927 BLAKE2B d59c3bc1bffab0dd9f2065082a06b22f455910475d1d415482d12819cf2fead427c5946658ea58f70eedd3cecc271477e89b46d53a21f1f859f09d46ec1097c7 SHA512 2e223ac06d25a7f9dddd04b664c744479f1b0d8f20f46f807da0ff5e2885bce57e64f0f940be9e38e794d64ab2181caa6e3dd2f7c5b28ca717286ff8b170118b
MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild
deleted file mode 100644
index 862b888b1444..000000000000
--- a/net-misc/dhcp/dhcp-4.3.4.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-PATCHES=(
- # Gentoo patches - these will probably never be accepted upstream
- # Fix some permission issues
- "${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
- # Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.3.4-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.3.1-dhclient-resolvconf.patch"
-
- # Stop downing the interface on Linux as that breaks link daemons
- # such as wpa_supplicant and netplug
- "${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
-
- # Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
- "${FILESDIR}/${PN}-4.2.2-nogateway.patch" #265531
- "${FILESDIR}/${PN}-4.2.4-quieter-ping.patch" #296921
- "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
- "${FILESDIR}/${PN}-4.2.5-iproute2-path.patch" #480636
- "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
- "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
- -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<client\>::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild
deleted file mode 100644
index c496d7f5f165..000000000000
--- a/net-misc/dhcp/dhcp-4.3.5.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-PATCHES=(
- # Gentoo patches - these will probably never be accepted upstream
- # Fix some permission issues
- "${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
- # Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.3.4-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.3.1-dhclient-resolvconf.patch"
-
- # Stop downing the interface on Linux as that breaks link daemons
- # such as wpa_supplicant and netplug
- "${FILESDIR}/${PN}-3.0.3-dhclient-no-down.patch"
-
- # Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
- "${FILESDIR}/${PN}-4.2.2-nogateway.patch" #265531
- "${FILESDIR}/${PN}-4.2.4-quieter-ping.patch" #296921
- "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
- "${FILESDIR}/${PN}-4.2.5-iproute2-path.patch" #480636
- "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
- "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
- -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<client\>::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client || die
- cp doc/ja_JP.eucJP/dhcp* common || die
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -r doc/ja_JP.eucJP || die
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/ || die
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild b/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
deleted file mode 100644
index 9e73d36618c6..000000000000
--- a/net-misc/dhcp/dhcp-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-PATCHES=(
- # Gentoo patches - these will probably never be accepted upstream
- # Fix some permission issues
- "${FILESDIR}/${PN}-3.0-fix-perms.patch"
-
- # Enable dhclient to equery NTP servers
- "${FILESDIR}/${PN}-4.3.6-dhclient-ntp.patch"
- "${FILESDIR}/${PN}-4.3.6-dhclient-resolvconf.patch"
-
- # Enable dhclient to get extra configuration from stdin
- "${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
- "${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
- "${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
- "${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
- "${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
- "${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
- "${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
- "${FILESDIR}/${PN}-4.3.6-lmdb-removal.patch" #628598
-)
-
-src_prepare() {
- default
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
- -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<client\>::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client || die
- cp doc/ja_JP.eucJP/dhcp* common || die
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -r doc/ja_JP.eucJP || die
-
- # make the bind build work
- binddir="${S}/bind"
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
- cd bind-*/ || die
- eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- local myeconfargs=(
- --enable-paranoia
- --enable-early-chroot
- --sysconfdir=${e}
- $(use_enable ipv6 dhcpv6)
- $(use_with ldap)
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
- )
- econf "${myeconfargs[@]}"
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- docinto html
- dodoc doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index 865f6c35067d..b8dc4ed2b868 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
DEPEND="
@@ -30,7 +30,7 @@ DEPEND="
ldap? (
net-nds/openldap
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)"
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 358e3c1f12a2..b092a1229505 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -30,7 +30,7 @@ DEPEND="
ldap? (
net-nds/openldap
ssl? (
- !libressl? ( dev-libs/openssl:0 )
+ !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 767cb63bddbe..761673f676b1 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,7 +6,7 @@ DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6
DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676ba8cbfdb4b1ba29ffe1bff2d18be40369c1f8804bc01988bb30b89ee1030ea95ddb48fbfc04ca06372b317d9d SHA512 f2ab1fcb2dad0c93da757c15d0b772b40cc15c8e59161d91684f06961cf7b515473d7c3fc5973b7755ac525e6851abdf8a5f27760bb5d28fe17e90ff0feaf904
DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
-EBUILD dhcpcd-6.11.5.ebuild 3284 BLAKE2B 545975e52cc574935fadb61fe76cad6c80160497daca9043b936b0a8336c7be86b53f1a15d9612843dcf54939199beecc1246ad46d4d6eefc9da77933a6e538a SHA512 6ae7aec0c5896dd071a283f60ffd619db5aaec2e2e73d0e34bdbafa305277f38ee47ad53f474036914de45e6d528b99097965be62309e6f509d6f3cfb2bfd5aa
+EBUILD dhcpcd-6.11.5.ebuild 3283 BLAKE2B 076c24a2f93e8690512aa99a456127c451d8698a1afa215774627c0a807e7138c33f5470eff2b9bd8025f9a2dc022b9649782d31add8113859ca29c1fba8e625 SHA512 da6c981fd5f6d41642af69b1af8cdd040bbeaba44b00c20cea07664b331649c960fa988a1991c611542bc7f3571d3bb2c83af9dde90ea64d2e88bd0efa294c76
EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
EBUILD dhcpcd-7.0.1.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
index 9148380d1b61..820c1d56874f 100644
--- a/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-6.11.5.ebuild
@@ -10,7 +10,7 @@ else
MY_P="${MY_P/_beta/-beta}"
MY_P="${MY_P/_rc/-rc}"
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 437bc2022e7d..17eb22635af5 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,6 +1,9 @@
AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
+AUX 3.1.1-pip-optional-pkgs.patch 473 BLAKE2B 35784d786735b277b9efd906c35f6dc843971c948590fd00f875591208076429860f7cc1c4dacfd54a78cc64daa13c071857f6745b9da3154fd72f8abcfa5b12 SHA512 6c90bd44f440a18a8b70c0f398d5e132164e1738524771b4e35bd5c80a0ec03b311f11afcb717a1bda6103fbabc6268f5fbeb987beeb9c3bd6a313745cb429c5
DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
+DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
EBUILD electrum-3.0.5.ebuild 4313 BLAKE2B 21a41f162be364235d5f4c57c0d55dc9c32df268877048d97985bdd565d3711708f503e59bdf6d38a5cdedbdd191c7c6e0cfeb5a89613155e770de84d3d92d0c SHA512 6ec934d1438b9853e05a7f011d672f02e6542176496c9f5965a188d20dfda409577abfcfef00cbf46bb95b9aeeece89fc9982de0508135d8b4891ca97e0aa7ad
EBUILD electrum-3.0.6.ebuild 4280 BLAKE2B 994a3247356194c4cd81260c9c18768eb4401666ecaaafea617d4cace28607648ea1dc613b38b0c377d3c4e73087eb61144b9de24f4e7f515410178b08a243b9 SHA512 c4858d54e9acc243291a534af582da363dceed332ee719aa5167651ef21f5b2e9ddd13f23749b6608be1d2cb0df0233b8f1a6836eeacc2d6430c8209e359c9ec
+EBUILD electrum-3.1.1.ebuild 4321 BLAKE2B f1c45a4501ed148c2019ee94b6778886042158f02b021ae1958bc984ac133923c1c6f83ddd5392196df13180efad47364e876f9dcd1b96b1469c8068d27c868f SHA512 0105d9b8197e5597cb9861d673ca373aa450cd3fb80d4e471ff581e5f4e496e8ad754de54dc386a8c23c3c848e55d9715eeedbe8402d811eb99a127dbd2a0d16
MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-3.1.1.ebuild b/net-misc/electrum/electrum-3.1.1.ebuild
new file mode 100644
index 000000000000..957704e0775f
--- /dev/null
+++ b/net-misc/electrum/electrum-3.1.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+ # Map all except pt_* and zh_* to their generic codes
+ case $1 in
+ pt_*|zh_*) echo ${1/_/-} ;;
+ *) echo ${1%%_*} ;;
+ esac
+}
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+ IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+ || ( cli ncurses qt5 )
+ audio_modem? ( qt5 )
+ cosign? ( qt5 )
+ digitalbitbox? ( qt5 )
+ email? ( qt5 )
+ greenaddress_it? ( qt5 )
+ qrcode? ( qt5 )
+ sync? ( qt5 )
+ trustedcoin_com? ( qt5 )
+ vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/ecdsa[${PYTHON_USEDEP}]
+ dev-python/jsonrpclib[${PYTHON_USEDEP}]
+ dev-python/pbkdf2[${PYTHON_USEDEP}]
+ dev-python/pyaes[${PYTHON_USEDEP}]
+ dev-python/PySocks[${PYTHON_USEDEP}]
+ dev-python/qrcode[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/tlslite[${PYTHON_USEDEP}]
+ || (
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ )
+ virtual/python-dnspython[${PYTHON_USEDEP}]
+ qrcode? ( media-gfx/zbar[v4l] )
+ qt5? (
+ dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+ )
+ ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+ eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+ eapply "${FILESDIR}/3.1.1-pip-optional-pkgs.patch"
+
+ # Prevent icon from being installed in the wrong location
+ sed -i '/icons/d' setup.py || die
+
+ # Remove unrequested localization files:
+ local lang
+ for lang in ${MY_LANGS}; do
+ use l10n_$(my_langs_to_l10n ${lang}) && continue
+ rm -r "lib/locale/${lang}" || die
+ done
+
+ local wordlist=
+ for wordlist in \
+ $(usex l10n_ja '' japanese) \
+ $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+ $(usex l10n_es '' spanish) \
+ $(usex l10n_zh-CN '' chinese_simplified) \
+ ; do
+ rm -f "lib/wordlist/${wordlist}.txt" || die
+ sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+ done
+
+ # Remove unrequested GUI implementations:
+ local gui setup_py_gui
+ for gui in \
+ $(usex cli '' stdio) \
+ kivy \
+ $(usex qt5 '' qt ) \
+ $(usex ncurses '' text ) \
+ ; do
+ rm gui/"${gui}"* -r || die
+ done
+
+ # And install requested ones...
+ for gui in \
+ $(usex qt5 qt '') \
+ ; do
+ setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+ done
+
+ sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+ local bestgui
+ if use qt5; then
+ bestgui=qt
+ elif use ncurses; then
+ bestgui=text
+ else
+ bestgui=stdio
+ fi
+ sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+ local plugin
+ # trezor requires python trezorlib module
+ # keepkey requires trezor
+ for plugin in \
+ $(usex audio_modem '' audio_modem ) \
+ $(usex cosign '' cosigner_pool ) \
+ $(usex digitalbitbox '' digitalbitbox ) \
+ $(usex email '' email_requests ) \
+ $(usex greenaddress_it '' greenaddress_instant ) \
+ hw_wallet \
+ ledger \
+ keepkey \
+ $(usex sync '' labels ) \
+ trezor \
+ $(usex trustedcoin_com '' trustedcoin ) \
+ $(usex vkb '' virtualkeyboard ) \
+ ; do
+ rm -r plugins/"${plugin}"* || die
+ sed -i "/${plugin}/d" setup.py || die
+ done
+
+ eapply_user
+
+ distutils-r1_src_prepare
+}
+
+src_install() {
+ doicon -s 128 icons/${PN}.png
+ distutils-r1_src_install
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..d8d8a1355f25
--- /dev/null
+++ b/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch
@@ -0,0 +1,12 @@
+diff -Naur Electrum-3.1.1.orig/setup.py Electrum-3.1.1/setup.py
+--- Electrum-3.1.1.orig/setup.py 2018-03-12 13:25:11.000000000 -0400
++++ Electrum-3.1.1/setup.py 2018-03-17 17:49:54.481961514 -0400
+@@ -86,8 +86,3 @@
+ url="https://electrum.org",
+ long_description="""Lightweight Bitcoin Wallet"""
+ )
+-
+-# Optional modules (not required to run Electrum)
+-import pip
+-opt_modules = requirements_hw + ['pycryptodomex']
+-[ pip.main(['install', m]) for m in opt_modules ]
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index cce4f244cd11..105fb857df61 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,5 +1,5 @@
DIST eventd-0.21.0.tar.xz 392080 BLAKE2B 14d01d46e07e650f392abca53716c1fd5a5d70f05fe006e8a230d38be610e36ee0369742d258b46697376317be4ff6a071166a45528ef2840159a1024057d6cc SHA512 5907d453c493c9f2332df506037027ef7df021b1e29a6773cf8bb5c32c7a301b65ca55d3e3ea40982d3e48b837738c97b5420309a45a550f409d8912636d1dae
-DIST eventd-0.24.0.tar.xz 184140 BLAKE2B 496b91b595d391ab056298b63a75df7be1a7362b960308d24bd950fefa2084d3b1eb04fb45f25cca11116d922ecb835b3f8545e7b3c5099261bc9872a157098f SHA512 204383140a0b6baf23ba148b525de7bcb90bdedd3be9e6cd7e8ce4222a689cd6cdeae8e29afa612afe3fbf8cec68f9bbdff74e826a04ff892e51d6fd4bba2cf2
+DIST eventd-0.24.1.tar.xz 184276 BLAKE2B cd14506d7f539bd6076540c713c7957d52db1fb3a4a09ad52d2b1d4ab4b3d3c31c8245063a85efcef1abbc127fa534c15db1b297f9f651ac113b3723842f76f2 SHA512 c99a42364796cf7421bbb3c8b0d0810e1933b226c8bc4f74240d276d40bd9b96aae5d6016b8da92435222572fd1bf04441a63039f14162702f87aa0bdd4d67ed
EBUILD eventd-0.21.0.ebuild 2966 BLAKE2B e6d82d1078f3bb0e6fecca2ae8a7809cd0a71744eda832f59b2516adaebbc9b8b88bb5ae3b9b1f644540ca9b773c6d33d79fc0e8805a613cea1f2363dfcdcdad SHA512 c01234e76c5d57a059da82843a3cfd33c088723432e4964a23440c7ab5276755a7e159a23bf10a736e999e7c0566a8d87dd751b58b7112cf19b5abebe5e032a1
-EBUILD eventd-0.24.0.ebuild 3277 BLAKE2B b89368449b3e37775087a3770a42612d43081ab796eebd2d202fa699b6ec0dedcb760a2523cc71b1762314b455b875008a84e0a00d3e316ca91c4c2a9c518668 SHA512 49c196f7763013a002ef5d478ee6d1c17e4b54207151d62f57ccb69d1f8d79f10761a1b36660cf6cfc66b337f16cd375d74976e0cbe9a8c10473fb3bf3c77fe2
+EBUILD eventd-0.24.1.ebuild 3177 BLAKE2B ea39b2cd49d1844241a971ffcb983f7313c638f243dfcc27a31f0a77ef53b181ab20c8d308000fd52af89534a3bacceef1c98ca1b23348f703783b2176bafef6 SHA512 f12e2fde8ec56245287f6c2475d99b999661b30b6b5dd72012fe287516061d995ec6345dd0785528f05dd5fd058dc629d54757557c5e0e63bf90161184a61888
MISC metadata.xml 1106 BLAKE2B 659cbf6ddc00f8b32c3d4f028f461579bce6388ea62198575863e596207d791a7048a01cd5d8be1b6b8bdbcaa281cd14f5c2c65566e9dfe716524d3075a75455 SHA512 24381bc7069e34eeeb10e3e5c967da13f155ca2a785d04f144f658c97f8734f16fc2f72fa57874b7da4495b24eced2d2607b0f3f8b52bc9d124da29a11c4f254
diff --git a/net-misc/eventd/eventd-0.24.0.ebuild b/net-misc/eventd/eventd-0.24.1.ebuild
index 4580e0a092fb..b981fafccea5 100644
--- a/net-misc/eventd/eventd-0.24.0.ebuild
+++ b/net-misc/eventd/eventd-0.24.1.ebuild
@@ -111,9 +111,7 @@ src_configure() {
}
src_test() {
- # Drop LC_NUMERIC=C on next verbump.
- # https://github.com/sardemff7/eventd/issues/39
- LC_NUMERIC=C EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
+ EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
}
pkg_postinst() {
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index a150b0108428..f5c3981ba4f9 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,5 +1,6 @@
AUX 1.2.1-gstreamer.patch 3675 BLAKE2B 7e9ead69d46288a96e060451ed17e445e0feb27886d248e761b9bb0a2f25ba4b2c266e3cf9fd5a91429e3ea38cf78dec94c4a8b4fc6e2e2e23e8eeea3c718206 SHA512 758675e9f9292acc9877c37e240c8144a2e4f2f0440f9a75b64895f0f8514bb991cab4295250107b85df2058f07988c93f399690c8e06dbcfcb023d9dfde921e
AUX 2.0.0-rc0-libressl.patch 3404 BLAKE2B 0365d3235e939917d4bc53ae4561d2085c4b7a99b8c585eddb8e5dea26a5038ea0a7f09b7ce1571516a4ce9e93b29113f2d35a1ff535a9a40a484352867bcb23 SHA512 b7b1018da4469de6c688e5894b200ec6846090e7e04ccd3e8e38b6f500832e75ffb30eef84845628eb26ed9ca64a4768dfd5c6a2f44d1fd13ad58b60074be21b
+AUX 2.0.0-rc1-CredSSP-protocol-version.patch 1474 BLAKE2B de37ed627f146807b6aa1a61c766d2909fe056ce0da5e5012d1a6503c6c92a5fc5ba03f82edaa4259d16e55bf8556eb7b9758663b672c5eae17b82034a441693 SHA512 c25f07d162817de0666bf9cfa296580c74b19b3326e1a009123dcf133fb67a876d3bcc99c23b09e96e3072f2811bec236f619b9eec0189b31dcb1e51c8ea1102
AUX 2.0.0-rc1-libressl.patch 1196 BLAKE2B 73d75cb75f2ec3b7e4fe8a4f410f76ec69be4bae256dbed641796000a023c9f9516ec0815d3bdf968fab0fb92a12a8756221afd528280074aa7e96a8b39e8827 SHA512 e1404580a644253ef681a51c187fd8a3e983aa406276bf8420af7b5bdff2a42446e6ebd3c922d08fe0481ad1f7edf1a648d4be6eaa0fb6f2be4af8fd27aad7e0
AUX freerdp-Fix-gstreamer-1.0-detection.patch 989 BLAKE2B 97989faf7984ed4b2f5720e45c590fb2f7751b6ebb18b244bf4e328d46856fc954020842aba49af75ac4bc2759f34687d95177ae8d7d7dfdef64a09f024f8315 SHA512 50fb859ce7dfb2af89efe5f40f0cf318da3fd32503b51e133e296420bde16bbc090f0aa10f6df09dce5ff9769e79fcabc1535f89413d962b7b06f6461dfcfb77
AUX freerdp-armfp.patch 2930 BLAKE2B 33f324a88bcaa0f5340e9becdbc4c50589d8ecbc57c2f74da471b1b472e3b9895b8d26884df2b7d559c1b51b7e1d49450e710587d8b9a529755501af67e3c25f SHA512 57dd03e82b822fed95a5379aa79ada99910ef6c2a9cfaab1dc721181f76aa249d839576d31aa83e3568a37abc5b81a3ff8c5c2d0d15e6a5e457d254660581a48
@@ -9,6 +10,6 @@ DIST FreeRDP-2.0.0-rc1.tar.gz 6530403 BLAKE2B 5e276c3d1153f04512dba4bf09807751ca
DIST freerdp-1.2.1_pre20150326.tar.gz 6146857 BLAKE2B 8ead05b89e129ba09b046f545073d128ca1d44dac7248c23bc543094f0fd23f336c890367945e7fce4def98c4ce1e01c4e5a970e92f3d4f74d08daf3cf0a8c6a SHA512 ca1499d56ecb9c9bc624de2ecc976eb9633b795050ac01e16fcc9e0a8951d274cc63644a0e2b830e75f66de894f6a22274864fd20a9351834f6d664874e65ec8
EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 BLAKE2B fe5e87301c14a9f29b33ca4994abd5deeded6938631ed184139d452b49b98b957f03c57e709a4df6cda2627a773e6cc0bb7699bcba522aba7aa8548b4cafade9 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900
EBUILD freerdp-2.0.0_rc0.ebuild 2907 BLAKE2B 1c4ff670b1e7db50ca56af231ce54a080095f8fce142bcb96cabf2908ff71ff11159e691a7e21fab5fd7e436f28ad644af6f710958c92a1908b77dfc7deb9407 SHA512 dc9b9e146822c84ed51e2221f10ba500ec51392f21f9d75fa3c10f1408c6f3fc266fdbc5f11bbf5dde566699e0e01ffd7bb0e85c072baa774e2933338fd2e9f2
-EBUILD freerdp-2.0.0_rc1.ebuild 2840 BLAKE2B 8d24bc59910e217d7e7629931dfc8f96cdacac922fbb37948dd0174906e7d090135f7774db668764c676fc5492ae88632bc2ebdccac8ded24126c9d93359b541 SHA512 f89c3b2b7715c895b461de05980af62e7ffdb42b7760d74945b34c425cc00585eb41adfb2b05360f4726c37c0515f6bedef727b229170714b80ca8308a6d4ae4
+EBUILD freerdp-2.0.0_rc1-r1.ebuild 2896 BLAKE2B 9e23ff99f648b5af06ac5851315d044d2b2196b024452c8188881caa5cf6b35aedf097f155e12b88a28b93de704db6b3052fbfb65fc6e3d2944b47b323d1d847 SHA512 80907e233d8886bf3bada13a450d73d29960dc2af534cc34f09ebb1c5e38765f94f8f4d83d3c20757fc59556641c8e4bae15d646dea7f4b93edb9611c934d7ca
EBUILD freerdp-9999.ebuild 2673 BLAKE2B 45d40ab23761f6a45ec71031c748984830d37e799eee88c0eb2a90a7924f2d9f6b5f658d7965e55f94e53438a0555a0f8129f72d81480687987e630de8ec03b5 SHA512 adb751e529563f540bd97d03a2c32a6b99d4f1a7ca6e2c8facd6e5b2333651291d3b18f234c21f36d349c14516e26feb38fee394aa21fb282e2c9d23f686541b
MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
new file mode 100644
index 000000000000..59887f698ec9
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc1-CredSSP-protocol-version.patch
@@ -0,0 +1,49 @@
+From 088c3940d9b488e8a83b9cefaa7271f955d1971c Mon Sep 17 00:00:00 2001
+From: Bernhard Miklautz <bernhard.miklautz@thincast.com>
+Date: Wed, 14 Mar 2018 13:39:23 +0100
+Subject: [PATCH] fix nla: don't use server version
+
+FreeRDP currently only supports CredSSP protocol version 3. However the
+current implementation always sent back the version received by the
+server indicating that this version was supported.
+With recent windows updates applied the protocol changed and this approach
+doesn't work anymore (see
+https://msdn.microsoft.com/en-us/library/mt752485.aspx for protocol changes).
+
+With this fix FreeRDP always sends version 3 as supported version.
+
+Credit goes to @mfleisz.
+
+Fixes #4449
+---
+ libfreerdp/core/nla.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libfreerdp/core/nla.c b/libfreerdp/core/nla.c
+index 47e087062..8a69f2f6e 100644
+--- a/libfreerdp/core/nla.c
++++ b/libfreerdp/core/nla.c
+@@ -1663,15 +1663,19 @@ BOOL nla_send(rdpNla* nla)
+ static int nla_decode_ts_request(rdpNla* nla, wStream* s)
+ {
+ int length;
++ UINT32 version = 0;
+
+ /* TSRequest */
+ if (!ber_read_sequence_tag(s, &length) ||
+ !ber_read_contextual_tag(s, 0, &length, TRUE) ||
+- !ber_read_integer(s, &nla->version))
++ !ber_read_integer(s, &version))
+ {
+ return -1;
+ }
+
++ if (version < nla->version)
++ nla->version = version;
++
+ /* [1] negoTokens (NegoData) */
+ if (ber_read_contextual_tag(s, 1, &length, TRUE) != FALSE)
+ {
+--
+2.16.2
+
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild
index c8a6ae3b610d..6a24709e340a 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -90,6 +90,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/2.0.0-rc1-libressl.patch"
+ "${FILESDIR}/2.0.0-rc1-CredSSP-protocol-version.patch"
)
src_configure() {
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 9b9931a47f1f..27f6126f8cdb 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -29,9 +29,9 @@ DIST iputils-s20160308-manpages.tar.xz 22684 BLAKE2B 4c9a8278640b55ffce0cbb929b8
DIST iputils-s20161105-manpages.tar.xz 22660 BLAKE2B ae764e66ebbd3e77a0583b7191532a0d8774fc5713c239f00f35c624868a9d6ea8507175153f1025ffb01d854d96ba3c542006d3966119e4fd021899ec114ad1 SHA512 10cf22e1c2bf4ab90818e2120638d250ccefd65f19545cc9662537a31ab525089309b505759a347f09f1439800e291d7fa22f38bdec5460d41bd40f323412279
EBUILD iputils-20121221-r1.ebuild 2806 BLAKE2B 81d72aff91bdd3f87e3ba82bf4c40f9c87025ce9ee2cdb74f0ebbfe5d7a60fbab3cd0a32068d543ecb044dc9d7f763ee08cab39a335f1e46d5b64342833a7744 SHA512 2779c0a778c877c9c57a0bf35f79ab5cf042aff5ebe3bcc76170135ccf602f9b44afc6823951fc86938fb1bc112482e4cd4eb7e1bc0151b5a31c599168535856
EBUILD iputils-20121221-r2.ebuild 4051 BLAKE2B 05bb4832d99c0c065b5caffb695929c91542d89661ebdb9e597e6750b260c1efda1a289be0a731833f143bcd2f280bd9bf7b44daef2ef236bb4966e07714983c SHA512 0fa5bc1c56b41b38b277bfeaf1abdf47fa1f3e477bdc051fa6124c81c173810cdda69a826f1aa1920e0405b19d751fb9d1212040a3c64f3d628b0435ad370c27
-EBUILD iputils-20151218.ebuild 3977 BLAKE2B 1b51c297b6231fcc7edac3c28ffd5347263ed8cb8fa30aca729c9bf85d301b290123b99b82c9abb279e80f8a39c4721987fb3c1cbd5a3a286cc3708f9f25aa2e SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0
-EBUILD iputils-20160308.ebuild 3838 BLAKE2B 62aa96ba316885c62f9716a6ae488c349bb0b530a81f2b8497c70d92d235034b3556ed2256c588a979cd198de8d11665b6c1d83ac59cabce0a22ba25ab4f33cf SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08
-EBUILD iputils-20161105.ebuild 3870 BLAKE2B 800dd0dacaf970aed7a2d21d2f3931be41d0e2469dc7a2b9cd1fc1c3c58266759669cf393d0832ad1e27a8e550960bc6f7ede6fd0967f8b2c83526e004dd25ff SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611
-EBUILD iputils-20171016_pre.ebuild 4080 BLAKE2B 3b60caad435cec54f1eec3f635021137971581b0e89d10fa97a179a415cb62869a50638390ff908d031ed58e0d65939c163f3a6ce78585b2a9e868519d3468f8 SHA512 2b130bb0695841e5c7a1858fc708b7e8094de56278aa9a25cc9dcb7119f589ebeba7335621fe271ec3405c6a054f20e29a92aa459cfbbfc2457065050ed05cdd
-EBUILD iputils-99999999.ebuild 3905 BLAKE2B eee7bf20dc61ad938df5535fafbb197f94e0a1de5dd1e514d981bff627ec285f456e3f2b28e5a587ad763d206236cd0f72e61d9039100a5a3e030d4cc3159f5a SHA512 a7f056364c5394b6b9845930ba721492f1d8a4dc2a0231fbca9b5cdae14d8fa5d2f47460a85d2c6189c4f4288c26798b4c475c515cd441ed80114c510b82a437
+EBUILD iputils-20151218.ebuild 3978 BLAKE2B 8807530ff225015572c8c7c058c47226f6f1071a5dd8e49b511681c7e75c225c4d8be72451c10ffeff1e19e03b368e92ebf3b4fb2bd17385886288ff9b4e6987 SHA512 615defa0483e9a35bf3abe67f332a3b24353ecd53bafbe8b7e45ddf1f72b7072af153deaecf636c9c735a479a98d54776c1cd085c44d5240f9b5fb92d43c8d7b
+EBUILD iputils-20160308.ebuild 3839 BLAKE2B 88fd40a916daa326e2251411b53c549a09e44f5bab8cd9953ab3d0620894297afdb8667173cd8fbcf86d4a52ee63ad96aebafc3d735e50bad0354d4978386be2 SHA512 79a29a57830234493dad8ecd7d9c84e0654ccae11731d1c7119751a5e2f3867fd60c787fee33b333b3b94e6f2bbe03c55852c1abdd13ef9c89a2c96ed3366cd1
+EBUILD iputils-20161105.ebuild 3871 BLAKE2B e6f89efa90125312d980687dda83694906dcdd22f31171ad29452ce706079faa9b383284634064e45ac15483b616cfdf8eeeb4b4b129f53e3f9c32d1c0d3b7f1 SHA512 6b4e5ec940b44759015cb2011330be1898bc3a5228e295958ac4529b28b376b047a065a36c8d52f61f91c3666fda60dd8ab603267e772c64b76c92d024779755
+EBUILD iputils-20171016_pre.ebuild 4081 BLAKE2B a69c23852a6ace9986534da61288fee447d0b50e90ddf5bc05293ac8ebe1d4f97e409e7fdb7c8c2d7d8889a0a948f6f849d34665e13dd0b7c051d9bd0e7cfb76 SHA512 9df0e7c539f684643bddd441d90113caa877c1f7ab8113efd592178322b665b0142a409d4598b762c447956a15f0e0b47d651f5e7607817951d14629af3e023b
+EBUILD iputils-99999999.ebuild 3906 BLAKE2B 66717e31c585baeef10103195b123ab874b72b71f43d47abbc90c34c8e2794617281f1f70aaf2df0d224c87ba1acd24067ef8515069016d1332baf4c9f4f3a65 SHA512 d9a7f662644e65b8170fc8aa4642bee1f93d96772e011354054100f58b0d5b7d628d914ca136acdf5bd01728c2d532cef2b96d60f78bda66ae5aed14746396cd
MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20151218.ebuild b/net-misc/iputils/iputils-20151218.ebuild
index 175a6c8feeae..5fa872444895 100644
--- a/net-misc/iputils/iputils-20151218.ebuild
+++ b/net-misc/iputils/iputils-20151218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -30,7 +30,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
ipv6? ( ssl? (
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
!gcrypt? (
- !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
diff --git a/net-misc/iputils/iputils-20160308.ebuild b/net-misc/iputils/iputils-20160308.ebuild
index b9e06d386f8c..44e4b8cef396 100644
--- a/net-misc/iputils/iputils-20160308.ebuild
+++ b/net-misc/iputils/iputils-20160308.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -33,7 +33,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( dev-libs/nettle[static-libs(+)] )
openssl? (
- !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
diff --git a/net-misc/iputils/iputils-20161105.ebuild b/net-misc/iputils/iputils-20161105.ebuild
index 1714b54c3e39..729a49fd3eb6 100644
--- a/net-misc/iputils/iputils-20161105.ebuild
+++ b/net-misc/iputils/iputils-20161105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -33,7 +33,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( dev-libs/nettle[static-libs(+)] )
openssl? (
- !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
index 7d8c90d80483..8d339c898ed2 100644
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -40,7 +40,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( dev-libs/nettle[static-libs(+)] )
openssl? (
- !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 84d809667e59..e56a7e5363f9 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# For released versions, we precompile the man/html pages and store
@@ -35,7 +35,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
nettle? ( dev-libs/nettle[static-libs(+)] )
openssl? (
- !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index 2721fe49819a..96ac976b3661 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -5,5 +5,5 @@ DIST lksctp-tools-1.0.16.tar.gz 565446 BLAKE2B 2eff562809f24b76b8f129698c8fef30f
DIST lksctp-tools-1.0.17.tar.gz 795762 BLAKE2B a37b653b1f9effd039c5241669c767d8b0918bf4790d9f017c70eefd4ce1efdbe5d76f6e88e15ddf214308267ee62a6004d2af781ad720ef847e8d99ae5a55f6 SHA512 055719130b7dda4da9cf002dcd5f1fb3d8cf75300a99365976e087b2b6971b4ccd357f95b515a44e37874af161f7b7f9b42c60191aff938d18fada5a49aa44c4
EBUILD lksctp-tools-1.0.13.ebuild 1325 BLAKE2B 2abb94d04bc857ce825ac73d11aa3eb0edf212f2665734e154196ffe7a420dbf50aac450de9b50710df6fadcb56e1b59a7f0f0c7e21fd41746e3be892908d35d SHA512 056d22e86c97ebab6a4b782ac069a18df5f3f023188e064ed0c600859dcb4c2a5eda9dd87e1caa0b733da3f40887afd02ab8c3835a745ea03b83567154de5586
EBUILD lksctp-tools-1.0.16.ebuild 1262 BLAKE2B 5a1d23239b5a9db76cad9c1cb9004d70ac5bf0cdb7c5bfc6f40fae6a369668bda47943020d3412277540d73cc9cabf30eb4cad7eca2908070b05d7ee423a01ff SHA512 895d27b5a9250d835f9327ae66d45c05a0c714dc85c227c767bc255b7139f8beb46469c1201b293b482074722bee68a5f6d71648b9d91f85c1d5da67297edb5f
-EBUILD lksctp-tools-1.0.17.ebuild 1265 BLAKE2B 6a3c73ed3eb77d1b9371427c3e23ba9be45c07d4429bd08a980db5e71811d3d96d17744e593f11e5ee461002414285149deb0fcc48cf5bf74aec619ffff828ce SHA512 342b8826bde54dd765ce31dfb1d3943f17344d0c9aad768d82fadeedac5aac1411326be5962cbc44c2340113e005073efcc43c9b6d97f72b21d10965951c2bd0
+EBUILD lksctp-tools-1.0.17.ebuild 1263 BLAKE2B ada8fe2b37fd85be221b2decdc6cbd42d8ffc3b0f25bbc724e756de738939e65c83e8d3947189c47d66b7a16df27ecedcc7e146c53b2cf0c0896f26e3a029ce5 SHA512 de2f66b8118c31dc1d374b2234d562e6c693a18436813dd514c7f57512db0efd17a0f99425ef2e7442e22774c5fab3db89a0ef6a4a04df6d29067b7907312be9
MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
index 6f608c2c2173..b9ec79677984 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lksctp/${P}.tar.gz"
LICENSE="|| ( GPL-2+ LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="kernel_linux static-libs"
# This is only supposed to work with Linux to begin with.
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 8f36d9c7c963..966285e86043 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -11,8 +11,8 @@ DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff3
DIST memcached-1.5.5.tar.gz 449297 BLAKE2B c4c5f35a83b858942292ee7dcf613ad954214e68ddfbd79afc9b71543227ee08279b5a7d1beb5da5f9b4f5ae6c9670979eba6259eb299510b80abcbfa29e362f SHA512 38883600398b5d9378bb57508ed94b80ed2c4ef0e2610e328a60bcb79268f85c67c99159993040b36eac964138822862fa78f62c649560abc4818233b1b2f3d0
DIST memcached-1.5.6.tar.gz 452038 BLAKE2B 357197c06a3211a7f2fcd90a3895f0ed3a56bc4e5b685e2dbe605cd9bbab676759b9707c9cedaeec9dbc59dddca92a7e6152cf5f4324ec66edbf7425bd7a7209 SHA512 b8bb3b69358a476c6f11f42e89565dd0261cba3f1eaa6b0999dba7c2cb2d7c5e9ca24dedc6b7fd46ec78e40e52d66fe4694ebafd6bbd4557d25d66757d9024a4
EBUILD memcached-1.4.33.ebuild 2612 BLAKE2B 8e651b8e98e4afb33ec2c6000b644be2b1394790c8b417ffea52d5c470ab36c6ab71f393800a0d743b9ad6dfe60af124707eba05b30d045fa1899465387193f2 SHA512 f7adb04376c90de335cd8faaf8e98a6fd3169ed8d039781080e11676a3b07ed945ff01cc8f85405efb51813391025f75378da2313aaef9f58c3105a509e93568
-EBUILD memcached-1.4.39.ebuild 2874 BLAKE2B b60878901f27e675361fbd99cce16cb29961ee5ae7a741bd94dd63fe5328d9787f8f48f1f509c7eac763969725bdd28a59ab7e220931c5a779c78edb7275647f SHA512 8bad575b3917d919ede30eaf5e19e45cf8ac717a104fe3789716fbd308c813be685175dc103d24ceeb46252ee51d3280250173bb2711daff7275454d19633502
-EBUILD memcached-1.5.2.ebuild 2883 BLAKE2B e2af9f55c4ccba675ec3abdd5312134d37f353a009ba2d99cc4ce6aad2d6e6bc16161f9a2e1610a8455074ba95b4864c06b1d77cb8edcfb27ced7d8f379afdd2 SHA512 08a70dd85f3748fc7c1c1d30a80388b104096f17932026604fc7d00d6f8b22c0d3db32948f25db65159f7ba3c57c0de722114e492561b401e8095c987defa39f
+EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
+EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
EBUILD memcached-1.5.5.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
-EBUILD memcached-1.5.6.ebuild 2935 BLAKE2B ee062015766a5e68287ff9227a64b3936d2e5919e8893f5681f0b89b05c9d4fc2b4cff1a856ba71653b2830573b4d12ab0f848f12fa876528bc79650c8b5a5ff SHA512 7d3f8fd60a34547a6b0c76966cd1f589edba5be05418e5561e60e1c86d666652037a37381ba2bdb5c166c84b7a8b1608228a10fcde8c80cf15ca7157cc119dd2
+EBUILD memcached-1.5.6.ebuild 2934 BLAKE2B b299969c7503c6d6ffddfb0ff194e746b5da395531aa3f81eb075a80fddce43a1bc4863ac66eea4e5b767500c41b671025cdcd0cc8b28c1c53f8c42f474a9924 SHA512 d81a2ce839cca833369715dca2a0eb92693cfa6be4338052abdfaafa5e814970e7db7f86da7063a390209b651fcd244b0a00df725b35d203a44f16474ee30e67
MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.4.39.ebuild b/net-misc/memcached/memcached-1.4.39.ebuild
index 8f0462455dad..a9ce2f91be30 100644
--- a/net-misc/memcached/memcached-1.4.39.ebuild
+++ b/net-misc/memcached/memcached-1.4.39.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="test slabs-reassign debug sasl selinux" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
index 28a5a31765f6..c3a62d5ae798 100644
--- a/net-misc/memcached/memcached-1.5.2.ebuild
+++ b/net-misc/memcached/memcached-1.5.2.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="test slabs-reassign debug sasl selinux" # hugetlbfs later
RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.6.ebuild b/net-misc/memcached/memcached-1.5.6.ebuild
index 7b92758285f1..08c1e0d3499a 100644
--- a/net-misc/memcached/memcached-1.5.6.ebuild
+++ b/net-misc/memcached/memcached-1.5.6.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/mico/Manifest b/net-misc/mico/Manifest
index e396c3c3a94c..9cad05a1ef40 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,8 +1,6 @@
DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf
DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895
DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 BLAKE2B 61aac1cc26031ca2c515a325ffc9dd28871e5a2e42e0d1367ccc619f04a6598d32241afc69e1c89f562bdd0e9ed5f0b217c611e3eeb7b0556fe20234bc20e98a SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10
-EBUILD mico-2.3.13-r10.ebuild 4590 BLAKE2B 2a772ab0eb5f5b4959c42b3b1e59679f0dcb53570e2785c86f63806346581ed87c95f825d7c21d758b908e242ed7a6df382a0742f332b487088fdb796d6ff452 SHA512 0ecfb9573f3970b755aa4aca9030e1837abd3661cc71add09fd7b8bf5430a5453adf857b83ce15637e0d5a1101e3f74f653f75833f8e8110140c09a55229ac60
-EBUILD mico-2.3.13-r8.ebuild 3970 BLAKE2B c600352a4d7c14751f251bbdb636bfca9ba0d58bc2e78b9eb896ac0312d4c38897671b538fe68a6d9765de1d1959b733128e02baf277980ff5bbdff00f42d2c4 SHA512 86f9edc2281fdeb190fc71ee315acd569364d18ff4b64647e552f400f030086e27262e13013403caf49c14dd410d0f5137b4b832177c49b29a25ff082a9022e0
-EBUILD mico-2.3.13-r9.ebuild 4304 BLAKE2B 240be780afdde310ff896a10486fca9edd8692bf906d2b72b41204794c88a70ac7db0d078e565a9b560c326f67429949bfbb52b180e070374f4fe0d631eb73bd SHA512 2c7de23f01b8789b55e7df548c351cb48bf8b04675b192828ad442df8fc13fe22dc72500947001df695d2f302c347a3d6bf7b83c1c9fbd0ee95c95c7525a5100
-EBUILD mico-9999.ebuild 4440 BLAKE2B 6d51f8f23a35d3cee0292e681e301d0a3f10bdbae283f75e74d1eeda3679ee1238f6de08c62082546b2c35d62884118917f1e280e9cdc9ca1276f40403858cef SHA512 ee384e476d508d2b1f8d15288dc8a18f15aa532ac84c603533f643741b9de11a6b516f051d4b1c127b40b5b24fff46b8cb977a78b4b667ba7a6f3f4ed2d5b2ef
+EBUILD mico-2.3.13-r11.ebuild 4198 BLAKE2B f7f0db6a8bd9c0cacbb264cc6b6c2298a879f096df2e61c9e2a32d6e02c2f4e753143d1ddcdede5ca09581ab02b8c693c0aea9f9b611d95dc8167cceed43e55a SHA512 2beafa375e6610bcd29de467df8d260ab6fd3a7e311b6cd5befea2b4ef0b68a544a54b7c3a253ff4cda83c8be65ca4b914cf42fa554a1423bded1e9bae4a6893
+EBUILD mico-9999.ebuild 4048 BLAKE2B e378cdd859ac471c10b7932a914a732a9ed5c5e9bddbe6d0c5521b1b68371f9b3da000893f27ca8c0195f509b0f79ee338792ac0adde449b06e0a4d4de1c0e26 SHA512 bfaff0f2e90998d2d3411a816ec12467530613db2d83e7b0797a64fd93b9acc88b1c0127677b0f407aa9bf630e8c19198e8c6b79e3ecc60ec631c8ef87b62d29
MISC metadata.xml 631 BLAKE2B bb0a1ee82b5b74160096ad9652a933f25c51f192ff30b3ae18d477aacff13a1021aa959e238b9103957ddff622b40f4ec8269b35b114d2325e3f75f90891c580 SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840
diff --git a/net-misc/mico/mico-2.3.13-r10.ebuild b/net-misc/mico/mico-2.3.13-r11.ebuild
index 024721e397f7..dea317a207b0 100644
--- a/net-misc/mico/mico-2.3.13-r10.ebuild
+++ b/net-misc/mico/mico-2.3.13-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.mico.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
+IUSE="gtk postgres ssl tcl threads X"
RESTRICT="test" #298101
# doesn't compile:
@@ -36,7 +36,6 @@ RESTRICT="test" #298101
RDEPEND="
gtk? ( x11-libs/gtk+:2 )
postgres? ( dev-db/postgresql:* )
- qt4? ( dev-qt/qtgui:4[qt3support] )
ssl? ( dev-libs/openssl:* )
tcl? ( dev-lang/tcl:0 )
X? ( x11-libs/libXt )
@@ -64,11 +63,6 @@ src_prepare() {
# This assumes that the compiler (or -wrapper) uses
# gcc flag '-mminimal-toc' for compilation.
sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-
- if use qt4; then
- sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
- die "cannot update to use Qt3Support of qt4"
- fi
}
src_configure() {
@@ -88,9 +82,6 @@ src_configure() {
# to disable openssl utilization seems to override the configure check.
use ssl || export ac_cv_lib_ssl_open=no
- # CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
- use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
local myconf=
myconf() {
myconf="${myconf} $*"
@@ -104,7 +95,6 @@ src_configure() {
# This applies to: gtk, pgsql, qt, tcl, bluetooth.
myconf --with-gtk=$( use gtk && echo "${EPREFIX}"/usr)
myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
- myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr)
myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr)
# bluetooth and wireless both don't compile cleanly
myconf --with-bluetooth=''
diff --git a/net-misc/mico/mico-2.3.13-r8.ebuild b/net-misc/mico/mico-2.3.13-r8.ebuild
deleted file mode 100644
index ec8a7b7a5d77..000000000000
--- a/net-misc/mico/mico-2.3.13-r8.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-PATCH_VER=20170529
-
-if [[ ${PV} == 9999 ]]; then
- EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
- inherit darcs
- SRC_URI=
-else
- SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
- SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
- PATCHES=${WORKDIR}/patches
-else
- PATCHES=
-fi
-
-DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
-HOMEPAGE="http://www.mico.org/"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
-RESTRICT="test" #298101
-
-# doesn't compile:
-# bluetooth? ( net-wireless/bluez )
-
-RDEPEND="
- gtk? ( x11-libs/gtk+:2 )
- postgres? ( dev-db/postgresql:* )
- qt4? ( dev-qt/qtgui:4[qt3support] )
- ssl? ( dev-libs/openssl:* )
- tcl? ( dev-lang/tcl:0 )
- X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.2
- >=sys-devel/bison-1.22
-"
-
-if [[ ${PV} == 9999 ]]; then
- src_unpack() {
- darcs_src_unpack
- default
- }
-else
- S=${WORKDIR}/${PN}
-fi
-
-src_prepare() {
- default
-
- eautoreconf
-
- # cannot use big TOC (AIX only), gdb doesn't like it.
- # This assumes that the compiler (or -wrapper) uses
- # gcc flag '-mminimal-toc' for compilation.
- sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-
- if use qt4; then
- sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
- die "cannot update to use Qt3Support of qt4"
- fi
-}
-
-src_configure() {
- tc-export CC CXX
-
- if use gtk && [[ -n ${PATCH_VER} ]]; then
- # need gtk-1 wrapper for gtk-2
- export PATH="${WORKDIR}"/helpers:${PATH}
- fi
-
- # Don't know which version of JavaCUP would suffice, but there is no
- # configure argument to disable checking for JavaCUP.
- # So we override the configure check to not find 'javac'.
- export ac_cv_path_JAVAC=no
-
- # '--without-ssl' just does not add another search path - the only way
- # to disable openssl utilization seems to override the configure check.
- use ssl || export ac_cv_lib_ssl_open=no
-
- # CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
- use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
- local myconf=
- myconf() {
- myconf="${myconf} $*"
- }
-
- myconf --disable-mini-stl
- myconf $(use_enable threads)
-
- # '--without-*' or '--with-*=no' does not disable some features,
- # the value needs to be empty instead.
- # This applies to: gtk, pgsql, qt, tcl, bluetooth.
- myconf --with-gtk=$( use gtk && echo "${EPREFIX}"/usr)
- myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
- myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr)
- myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr)
- # bluetooth and wireless both don't compile cleanly
- myconf --with-bluetooth=''
- myconf --disable-wireless
- # But --without-x works.
- myconf $(use_with X x "${EPREFIX}"/usr)
-
- # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
- [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
-
- if [[ ${CHOST} == *-winnt* ]]; then
- # disabling static libs, since ar on interix takes nearly
- # one hour per library, thanks to mico's monster objects.
- use threads &&
- ewarn "disabling USE='threads', does not work on ${CHOST}"
- myconf --disable-threads --disable-static --enable-final
- append-flags -D__STDC__
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
- if [[ $(get_libdir) != lib ]]; then #500744
- mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
- fi
-
- dodir /usr/share
- mv "${ED}"usr/man "${ED}"usr/share || die
- dodir /usr/share/doc/${PF}
- mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
-
- dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
-}
diff --git a/net-misc/mico/mico-2.3.13-r9.ebuild b/net-misc/mico/mico-2.3.13-r9.ebuild
deleted file mode 100644
index 08b8567e5dd8..000000000000
--- a/net-misc/mico/mico-2.3.13-r9.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs autotools
-
-PATCH_VER=20170529
-
-if [[ ${PV} == 9999 ]]; then
- EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository"
- inherit darcs
- SRC_URI=
-else
- SRC_URI="http://www.mico.org/${P}.tar.gz"
-fi
-
-if [[ -n ${PATCH_VER} ]]; then
- SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz"
- PATCHES=${WORKDIR}/patches
-else
- PATCHES=
-fi
-
-DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
-HOMEPAGE="http://www.mico.org/"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-IUSE="gtk postgres qt4 ssl tcl threads X"
-RESTRICT="test" #298101
-
-# doesn't compile:
-# bluetooth? ( net-wireless/bluez )
-
-RDEPEND="
- gtk? ( x11-libs/gtk+:2 )
- postgres? ( dev-db/postgresql:* )
- qt4? ( dev-qt/qtgui:4[qt3support] )
- ssl? ( dev-libs/openssl:* )
- tcl? ( dev-lang/tcl:0 )
- X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
- >=sys-devel/flex-2.5.2
- >=sys-devel/bison-1.22
-"
-
-if [[ ${PV} == 9999 ]]; then
- src_unpack() {
- darcs_src_unpack
- default
- }
-else
- S=${WORKDIR}/${PN}
-fi
-
-src_prepare() {
- default
-
- eautoreconf
-
- # cannot use big TOC (AIX only), gdb doesn't like it.
- # This assumes that the compiler (or -wrapper) uses
- # gcc flag '-mminimal-toc' for compilation.
- sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-
- if use qt4; then
- sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
- die "cannot update to use Qt3Support of qt4"
- fi
-}
-
-src_configure() {
- tc-export CC CXX
-
- if use gtk && [[ -n ${PATCH_VER} ]]; then
- # need gtk-1 wrapper for gtk-2
- export PATH="${WORKDIR}"/helpers:${PATH}
- fi
-
- # Don't know which version of JavaCUP would suffice, but there is no
- # configure argument to disable checking for JavaCUP.
- # So we override the configure check to not find 'javac'.
- export ac_cv_path_JAVAC=no
-
- # '--without-ssl' just does not add another search path - the only way
- # to disable openssl utilization seems to override the configure check.
- use ssl || export ac_cv_lib_ssl_open=no
-
- # CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
- use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
- local myconf=
- myconf() {
- myconf="${myconf} $*"
- }
-
- myconf --disable-mini-stl
- myconf $(use_enable threads)
-
- # '--without-*' or '--with-*=no' does not disable some features,
- # the value needs to be empty instead.
- # This applies to: gtk, pgsql, qt, tcl, bluetooth.
- myconf --with-gtk=$( use gtk && echo "${EPREFIX}"/usr)
- myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
- myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr)
- myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr)
- # bluetooth and wireless both don't compile cleanly
- myconf --with-bluetooth=''
- myconf --disable-wireless
- # But --without-x works.
- myconf $(use_with X x "${EPREFIX}"/usr)
-
- # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html
- [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED
-
- if [[ ${CHOST} == *-winnt* ]]; then
- # disabling static libs, since ar on interix takes nearly
- # one hour per library, thanks to mico's monster objects.
- use threads &&
- ewarn "disabling USE='threads', does not work on ${CHOST}"
- myconf --disable-threads --disable-static --enable-final
- append-flags -D__STDC__
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=:
- if [[ $(get_libdir) != lib ]]; then #500744
- mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die
- fi
-
- # avoid conflict with net-dns/nsd, bug#544488
- mv "${ED}"usr/bin/{,mico-}nsd || die
- mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die
-
- dodir /usr/share
- mv "${ED}"usr/man "${ED}"usr/share || die
- dodir /usr/share/doc/${PF}
- mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die
-
- dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO
-}
-
-pkg_postinst() {
- einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'"
- einfo "due to a name conflict with net-dns/nsd. For details"
- einfo "please refer to https://bugs.gentoo.org/544488."
-}
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild
index 7012727c9d66..a103d157da69 100644
--- a/net-misc/mico/mico-9999.ebuild
+++ b/net-misc/mico/mico-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.mico.org/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="gtk postgres qt4 ssl tcl threads X"
+IUSE="gtk postgres ssl tcl threads X"
RESTRICT="test" #298101
# doesn't compile:
@@ -36,7 +36,6 @@ RESTRICT="test" #298101
RDEPEND="
gtk? ( x11-libs/gtk+:2 )
postgres? ( dev-db/postgresql:* )
- qt4? ( dev-qt/qtgui:4[qt3support] )
ssl? ( dev-libs/openssl:* )
tcl? ( dev-lang/tcl:0 )
X? ( x11-libs/libXt )
@@ -65,11 +64,6 @@ src_prepare() {
# This assumes that the compiler (or -wrapper) uses
# gcc flag '-mminimal-toc' for compilation.
sed -i -e 's/,-bbigtoc//' "${S}"/configure || die
-
- if use qt4; then
- sed -i -e "s, -lqt\", $(pkg-config --libs Qt3Support)\"," configure ||
- die "cannot update to use Qt3Support of qt4"
- fi
}
src_configure() {
@@ -84,9 +78,6 @@ src_configure() {
# to disable openssl utilization seems to override the configure check.
use ssl || export ac_cv_lib_ssl_open=no
- # CFLAGS aren't used when checking for <qapplication.h>, but CPPFLAGS are.
- use qt4 && append-cppflags $(pkg-config --cflags Qt3Support)
-
local myconf=
myconf() {
myconf="${myconf} $*"
@@ -99,7 +90,6 @@ src_configure() {
# the value needs to be empty instead.
# This applies to: pgsql, qt, tcl, bluetooth.
myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr)
- myconf --with-qt=$( use qt4 && echo "${EPREFIX}"/usr)
myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr)
# bluetooth and wireless both don't compile cleanly
myconf --with-bluetooth=''
diff --git a/net-misc/netkit-bootparamd/Manifest b/net-misc/netkit-bootparamd/Manifest
index b44a600dd7cf..44151ef16b62 100644
--- a/net-misc/netkit-bootparamd/Manifest
+++ b/net-misc/netkit-bootparamd/Manifest
@@ -5,5 +5,5 @@ AUX bootparamd.initd 502 BLAKE2B ebc4d4c3381c1003924c402415aea4ad820e24f38520b4f
DIST netkit-bootparamd_0.17.orig.tar.gz 13934 BLAKE2B d828175594b0aae60c5284d4f02c73b4bb91cee2601dc52c6cbfb21e02779825a03567de7dbcc945246104889b7b4bc74f0429b508bda082a365a1d605e213e5 SHA512 fc237c72efd0c7a671c179ee4596f64e13a7a637441d32c9e82e81f4133d987f468c98b00611fbada1f7d6e5fa791c9b513978bfc7a58efe7d93102a2d3b4dca
EBUILD netkit-bootparamd-0.17-r2.ebuild 980 BLAKE2B 9e86e1df65f695f663aec792e70d92c911994eb4e992aebdbf086398103e188c0ad9ef60e3e8debf6fd609b32631542b3968384553f9ac5438c71c8ae8f5dddc SHA512 462e64f42f5319d16c1a46a615ea46f8dd0b75177953ecfb593ed9fc7d563b94441889e58bbe7f88f9cac445b59b72435ed5390df14b55cdbe2ba1b83401733e
EBUILD netkit-bootparamd-0.17-r3.ebuild 1197 BLAKE2B 3e94fb3e41d3020c870589ac0e1a8908b3165e50ecaafd9d259928d81f1ee998f18531b32c61d3aa15849d6d9e0bf1382b0b7fa2b984dddc3e4d81283a12f0cb SHA512 b2841f185d425053b8483b25b8a03f0a1a30b02f007640d3c70b9283ac6e7e271701e00b2eb7d114b1260ee93b815154286ef1f9de139cd7a25470e521adb713
-EBUILD netkit-bootparamd-0.17-r4.ebuild 1454 BLAKE2B 9f9d302cfe46f237bfb3cd5623a86c3e7e7f432a8eeb5f5fe2843f8d45670c7e1885974f8ec180d0bf3e2f9fa2e366e70d1faa46e2b1c0e2109288171c72d978 SHA512 44378d6016d81ba798a60642aa5a8a324e4384a9345726744e000748da3af8b4a7cc5af8cb633d04a32b2b81df2f9ed1a715917f17126584ec693782752b711a
+EBUILD netkit-bootparamd-0.17-r4.ebuild 1453 BLAKE2B c53af8280c334424dc10104f11f9d47450787512ce18ced1c5e54059f16ebe3aec35dba6424cc9a9d94e0a95dea920361fb21050aba0742b09454a4156725b18 SHA512 d8d3eb01fbf466f3b24516e629f9181720a0540ba27e79823570a1846fdfd1eb6508cc41033e1b2b72a6d53658ef3a60f6bc78f04d9b59853889927f54ba641e
MISC metadata.xml 338 BLAKE2B 24f41b1f254dff65a886a6d2d2449940349c1995efe4eac132ea52fa848b9474faa762224d86d82551154620aced2af9f4ab32e41afbef73994a8287af8a0d4e SHA512 d054668c4f93e1bb54cdb4bf6557feb53c07416435ca091498173a33cdc148e5292b2a8126b15fd9a57a993db536cee43ee0fecea0879adcdd83247017573dcf
diff --git a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
index 57f943cf50d0..a601d0e5e6d7 100644
--- a/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
+++ b/net-misc/netkit-bootparamd/netkit-bootparamd-0.17-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ~ppc sparc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc sparc x86"
IUSE="+libtirpc"
DEPEND="
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index a6decc0bc65f..b77310a4653d 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -22,5 +22,5 @@ DIST ntp-4.2.8p10.tar.gz 6998648 BLAKE2B 93875ddb71fda1a24bcde0358640eb0cdab7aa0
DIST ntp-4.2.8p11-manpages.tar.xz 25700 BLAKE2B 8efff006297925e4dfe57abfb8130d0dcb69e804744a597ad92b9969019b87c7b3e44f032187073d3c19092ca92445ce06b93f89f449430fd21cc540f11f5f3b SHA512 403bc238681abaadc838f5a6619851dcd0cfa5bf780e8aeaa94e8f77e776998d1f5142d65e3fa99c23e22e4cb7207d24b059fbbc6ddcf4414f0076a4b6ab4e81
DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c71499872272cda221d7356676762a23ac1066ddfed7fb803083dbb9b26ca7376ea75277a63ee8de1c70409e81432 SHA512 05ac60f15a6aac50aaf340d40e4e439a421fa6e3d897bf30a69b2cef0cc97f8a6956012bfc6ceba055f4c3485a24f7fb8ebbd055e1875f1c69cbfdc35e71f236
EBUILD ntp-4.2.8_p10-r1.ebuild 4516 BLAKE2B 6d60f5c47e7d82630b7e10dee95b13e8f7ba0b783422bc74737231ec662a6b1c87062ff0aa91268dd549fa52dde612342683ba0df5c424d8b8599bde0e9c052e SHA512 fccc0def7b97a42a62d798b75ffbfede6f58a5ed9ae8f1f8d7af58e49cb11da49cf245366f955171abdb6e797f6afc6737f27dbb88c08667e9b1e6ac4d123e5f
-EBUILD ntp-4.2.8_p11.ebuild 4527 BLAKE2B aab6adb14c39d2cf5ded64e8c2e9f03b4db5c9152d829f4ef4ee515027067ae85700ded1ee605d5c57208ae56b7a415bdb623c1b2066d69b58addb28845ca35b SHA512 ea5bfe4085840ff9046a3aac100f9bafb7a4fb4f2a26684545e5a62a5341a1d6a63d7d51c71c5f108f11a9642e9aa14932e038e662a61b8543e063799eb6c7a3
+EBUILD ntp-4.2.8_p11.ebuild 4522 BLAKE2B 824f2f25a487578815671808a9f489b5a4d58b54ee33286402ce06fab378d36a22e8feecc27ead4c27d524298ff23a7bc8fc23ee263b8a69c9faa013c98fe9ce SHA512 40092bd7e9312edcdce8ee9a28d6ac9ff522bfc0b5840974768164d7dcaa9130cb0c820fd8c805d7336afaa44cee8b8517734ab797a8eb6fc2cd8415ce931b39
MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p11.ebuild b/net-misc/ntp/ntp-4.2.8_p11.ebuild
index 179de05fc600..04a52f7cb6f2 100644
--- a/net-misc/ntp/ntp-4.2.8_p11.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
LICENSE="HPND BSD ISC"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 7334cc8d297f..fb57e5ef553d 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,7 @@
DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
DIST nx-libs-3.5.99.15-full.tar.gz 5269081 BLAKE2B 79301870463aae8e71eaf8cad64ad03376c33d42c76884313ca78d439a070d41fff91af4894b60e38bbcc97c3e08e167b45675641cd8d06959fc68f1fece9de4 SHA512 b292e938bc8da7456418ef5356ebe04910ad306d6bb16d6befa3bb875f82b11a2a3f07488e42c6379bef60fc9e150695a8ec84e7af2f594fbd94883d90030e3f
+DIST nx-libs-3.5.99.16-full.tar.gz 5269745 BLAKE2B c968b8dde07e397e84786131cede0dd82979c52069a653de540ec833e5189751db15347aa34cf68db523207aa13ae7507cce0b28b09e897606becdc6effd7fcc SHA512 6b80530345da879e62f9ea506a04c77bd918d3c48d46a22548d1534dab14cae5a715290942fdd5c77708f119522312cd667b6b9f286f106463c5a0debbb0451c
EBUILD nx-3.5.0.33.ebuild 2338 BLAKE2B 164bedd551b5be5ed917122cfff26069d411c5c5b0829ef9cf6712dbfca350209127d93fa36c18bbc6bdf2445b19d2ecc3bea91b0f9e867652e574655eede677 SHA512 e1f88b0e03f4066df1ef97cabcadd759cf80ed27619a3bbe228bed67a82ce287898cd47ac5f31c4de2e250441cf6eb5e69f6750609c978c56dd476c767828199
EBUILD nx-3.5.99.15.ebuild 2844 BLAKE2B 8938b066be31e5f9965e6e52fd576b2ed1604847d04bc89e56dce37e472bea4ca2eb918566470b0002efc913c0a0f2d2b754fca766120485f933e57e09a8621b SHA512 9c69a3c3e37ea419344d9217660ee3e44c37286765a1e4e2eedde47e29d36471b037d3a03b2ec884aac8c49e15bd60140bc5ff88f63ec90380ac7822795cb7b3
+EBUILD nx-3.5.99.16.ebuild 2844 BLAKE2B 8938b066be31e5f9965e6e52fd576b2ed1604847d04bc89e56dce37e472bea4ca2eb918566470b0002efc913c0a0f2d2b754fca766120485f933e57e09a8621b SHA512 9c69a3c3e37ea419344d9217660ee3e44c37286765a1e4e2eedde47e29d36471b037d3a03b2ec884aac8c49e15bd60140bc5ff88f63ec90380ac7822795cb7b3
MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild
new file mode 100644
index 000000000000..75aa788486f6
--- /dev/null
+++ b/net-misc/nx/nx-3.5.99.16.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="NX compression technology core libraries"
+HOMEPAGE="http://www.x2go.org/doku.php/wiki:libs:nx-libs"
+
+SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="media-libs/freetype:2
+ >=media-libs/libpng-1.2.8:*
+ >=sys-libs/zlib-1.2.3
+ virtual/jpeg:*"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-libs/libfontenc
+ x11-libs/libXfont2
+ x11-misc/gccmakedep
+ x11-misc/imake
+ x11-proto/inputproto"
+
+S="${WORKDIR}/nx-libs-${PV}"
+
+src_prepare() {
+ default
+
+ # We want predictable behavior. So let's assume we never
+ # have quilt installed.
+ sed 's@which quilt@false@' -i mesa-quilt || die
+
+ # run autoreconf in all needed folders
+ for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
+ pushd ${i} || die
+ eautoreconf
+ popd || die
+ done
+
+ # From xorg-x11-6.9.0-r3.ebuild
+ pushd nx-X11 || die
+ HOSTCONF="config/cf/host.def"
+ echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
+ echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+ echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+ # Respect LDFLAGS
+ echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+ echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+ # Disable SunRPC, #370767
+ echo "#define HasSecureRPC NO" >> ${HOSTCONF}
+}
+
+src_configure() {
+ for i in nxcomp nxcompshad nxproxy ; do
+ pushd ${i} || die
+ econf
+ popd || die
+ done
+
+ pushd "nx-X11/lib" || die
+ econf --disable-poll
+ popd || die
+}
+
+src_compile() {
+ # First set up the build environment
+ emake build-env
+
+ # We replicate the "build-full" make target here because
+ # we cannot call "make build-full" as it
+ # - calls autoreconf several times
+ # - invokes make directly but we prefer our emake
+
+ emake -C nxcomp
+ emake -C nx-X11/lib
+
+ mkdir -p nx-X11/exports/lib/ || die
+ local nxlib
+ for nxlib in libNX_X11.so{,.6{,.3.0}} ; do
+ ln -s ../../lib/src/.libs/${nxlib} nx-X11/exports/lib/${nxlib} || die
+ done
+
+ emake -C nxcompshad
+
+ ./mesa-quilt push -a || die
+
+ emake -C nx-X11 BuildDependsOnly FONT_DEFINES="-DHAS_XFONT2"
+ emake -C nx-X11 World USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" SHLIBDIR="/usr/$(get_libdir)" FONT_DEFINES="-DHAS_XFONT2" XFONTLIB="-lXfont2"
+
+ emake -C nxproxy
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="/usr" \
+ NXLIBDIR="/usr/$(get_libdir)/${PN}" \
+ SHLIBDIR="/usr/$(get_libdir)" \
+ USRLIBDIR="/usr/$(get_libdir)/${PN}/X11" \
+ install
+
+ # Already provided by mesa & related packages
+ rm -r "${ED%/}"/usr/include/GL || die
+
+ # Get rid of libtool files and static libs.
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 6c93c7e29835..c0450d7ccef3 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -5,12 +5,17 @@ AUX oidentd-2.0.8-gcc5.patch 855 BLAKE2B 38e814ef3ac03bcfaa99227dbf124a0c7868687
AUX oidentd-2.0.8-log-conntrack-fails.patch 1686 BLAKE2B a1e7dd40d5b6ccf4f7a03f6178101e096eed86e0504e479335b4b4e36a8962d91a64e33e697502d3aaafbf336617261402b00b6a91573ac9e01c7d2206256dbc SHA512 210dcf4ee04d61ee07f7a38cb5b943343526677242d2e284929a7ae83e6940ad2806eef6271f2eb8fc13ee5ad2f2366aff4d4ad3ba9c244277f41bcf8daca9a0
AUX oidentd-2.0.8-masquerading.patch 1288 BLAKE2B c653cfd9f43ea4b007a98d857c1bf2d6dd044b16187f5e0809dfab9e9f38e4df3583841f9486fcbc4b149e337878116b83cc62107ccd5ac65834376446613d62 SHA512 453787b4ef00a7578b65e04cc4fa36bc233d737294171e807b6d9711cbd2be9cd4fc461863ea8ddbd39901433a007d32403252e701604d13ddbb442a363439fc
AUX oidentd-2.0.8-no-conntrack-masquerading.patch 1141 BLAKE2B cda18949cdc768592b91de50ebdec992553611584d7ab0368f90b28ddde3a184526aeb5d05dd50dd4a92b9499f1e6335b9cab19a94bc6047bdfa1cbdaa148936 SHA512 8d0c44f16cab0331c52362671790360f47de7568b81622971a33865464a85342c956447164b516ed0fd90bbef72eab2bdec5fff0b0b7e23d554abaf109329b3b
+AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
AUX oidentd.conf 298 BLAKE2B cc234d09546ac12fc51440ad4a24234a348c947f15bdd750b88bb0e87b0276a3b27ac2d7ef10d1e30911e851b64894953d7ac53eeb2e873d7a9a15fe83ca44ad SHA512 a05de9b08f87a200309c39d3bc3aba0aa2c6461c3c43a9d851299e6083f0ca9a362409b0db93ca069c7a50d3a14169a308aea51b3d42ebf0180a4b4c99bf5126
AUX oidentd.service 186 BLAKE2B 2c5e3d68b2cc71ce369d063b27de0ba698f899003967d2eaf4e5746bd0637774070d951b23f040b6536ddda14ab8ba69a24d3f9c5ca1d98f86b785a0629127fd SHA512 dd89471b232c0cce1113ea8550a3cb0ad55bd0791b7c916ea13b533051fe10271cd8e41aff13bf4071b507251ab6b14de20c8b63a525074a728f007fe0d647e8
+AUX oidentd.service-r1 188 BLAKE2B adf68f123ad057936e92aee7de77d84781e13444508b65ad0f1c973192631f41623221a0be0330a5bb7e8b1800421b274dad755e21d85d002ae5e59e33e4c75b SHA512 8f0bc4a8ffd7800ca2c11a9eacf560e5297efbbd2c477fea85c2dfe9a4f3871a2ba67b7037149eea58cceeceaca20251480a5866c88f0a86b6de7485c58a3ce9
AUX oidentd.socket 142 BLAKE2B d085224442446c55f6850f15537ab9c4f51a4093e12de58a8765851131c41b3df1e5961115bfbed616b02862dd7a0bc6f1f9bae1abb9d189b3d05cd2aed8224d SHA512 151f846a889968084f4b6900e42806ea2c16f184fe65fe67b77bd9176318faeb3db3f7a43d6eec8d70bca7c2919952ad9059301ba396ec56a9da1ab0371b44d4
AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c80d481795b46b67ce779682480084a02234c2a9f6b4b052eaed7a6ab8d9e31df34e4b1c81e5201e7a4c SHA512 513e49d74c25ea0392a4b9541df0b275fa497bf2cb1d55a3c1c31a9cfe207ec2de69e76d7813531c90b5b378d1dd55b3ee21371ad281ff5f2a89ab70f59a25b4
+AUX oidentd_at.service-r1 181 BLAKE2B bc930b3eb87d310eeb41ba7be5cdc2075703220385d6fc24f922c89ddefcf6422bc259ed425ee0855ed0df1cf1504e3520fa1f0cf89dcd2178b551b81e004512 SHA512 788f822926549418dfc16b9c5ada7b31079fac385926edecec2f3924746341f4deee1c361bc67f9592a0f0c9eb4151a6d3b9b7c79967982158f9f750d536f304
AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
+DIST oidentd-2.2.2.tar.gz 260185 BLAKE2B a719413751280d44e134245793c4a88d93dd573d7d85895e341040c2d83a7b201f21f499b931c27e5c0f1d7d0957d730b2cda698ef98b74755e2ca1958457579 SHA512 c5c5040f8955e61e8a7cddd310501d24c3b2a3818e0cd122db85c03dc5b2b18ca7ea4e7edb420df3ad81558a25d4b31c1fea97684a9f53c71c9159014f84678d
EBUILD oidentd-2.0.8-r5.ebuild 1203 BLAKE2B ddcffc10ec4c3ade58052268aa8eb33d64eca064ffcde17061801ca1103e6ca4ae3c3ac73ac28492ec09327ac048f49d8e71a5e2cafcc64949a8cf78d531111e SHA512 53a4113831796de47144d3bcf0c26528a2567ee3b3473cb53d455f0b51bfeacc2b18ee7d1a5b0d9d71fcc91fd88fe0101f332193a1fab6bdf95bc0509a93ca17
-EBUILD oidentd-2.0.8-r6.ebuild 1454 BLAKE2B b243f9ff68f9f9e1fd1b83419288f7cf0324b7a2bd23954c25df30c7fc8c2ca886ab204ca0a9f030091e9af784fb98f3d77536fd49b807639e795624f0a09d32 SHA512 c55d5fa75e937a7958676d9f0b8a02d248b68bd6465560a62abdaf0e7b92b54cab822f153a839fe94516635a306c3f35bfb388a8488d40e55e3f56b219567432
-MISC metadata.xml 531 BLAKE2B fae587f7809249514174cd9aeb213efac8ea12882b437fe85fb6dadcbefbafe731b6da570590a3a4a71786e9e982a7530d9d603ae1327bbc40fa8157683f9319 SHA512 f6c11a386380db0197ab45fd6169028063e432e014a18f92b40bc1350cfd1b2dc517b95b55da93f22a58cb5fa00856215f9673d59fd12d27c92075ad93e42215
+EBUILD oidentd-2.0.8-r6.ebuild 1453 BLAKE2B f05c8c8bde3787b247655e49fe068f4faa56a2dfd6616676a74ad4974f6aa56a2096496329ac2f67ebc6dc1ccfe02f211832f0b3cfe37019032f2f83096ce3bc SHA512 fd331efca543b1951ea2252bdcdf011a0f36ec7acf18d7c87d82a4ca6d6feeb1bd495b764c1154e568cf9c381c61257b94891a8b7b42c34f5d50e7730ca0a2cb
+EBUILD oidentd-2.2.2.ebuild 1187 BLAKE2B 1245734eef6f751fc7564028231916fc88338236446e4d006802d438ff3052bb319007508ce50bc116d859d2668a665447db76edc04479172fd021b7d8fc103a SHA512 507a1e641075f577e60b9cfea052cab596e33f367214d2ad32d50f566ed56f1458455682ec6d8ab6100cf429580975f8fe5a42520356dfd72ccc8dd66cb7db41
+MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/files/oidentd-2.2.2-confd b/net-misc/oidentd/files/oidentd-2.2.2-confd
new file mode 100644
index 000000000000..215b62d88803
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd-2.2.2-confd
@@ -0,0 +1,4 @@
+# oidentd start-up options
+USER="oidentd"
+GROUP="oidentd"
+OPTIONS=""
diff --git a/net-misc/oidentd/files/oidentd.service-r1 b/net-misc/oidentd/files/oidentd.service-r1
new file mode 100644
index 000000000000..af426eed6175
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd.service-r1
@@ -0,0 +1,9 @@
+[Unit]
+Description=TCP/IP IDENT protocol server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -i -S -u oidentd -g oidentd
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/oidentd/files/oidentd_at.service-r1 b/net-misc/oidentd/files/oidentd_at.service-r1
new file mode 100644
index 000000000000..dac0e70fd79c
--- /dev/null
+++ b/net-misc/oidentd/files/oidentd_at.service-r1
@@ -0,0 +1,7 @@
+[Unit]
+Description=Ident (RFC 1413) per-connection server
+
+[Service]
+ExecStart=/usr/sbin/oidentd -I -S -u oidentd -g oidentd
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index 3be9f1f5f13d..ed7fbe111de7 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/metadata.xml
@@ -13,6 +13,6 @@
<flag name="masquerade">Enable support for masqueraded/NAT connections</flag>
</use>
<upstream>
- <remote-id type="sourceforge">ojnk</remote-id>
+ <remote-id type="github">janikrabe/oidentd</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index f0783369201c..ca2e86d89e56 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="debug ipv6 masquerade selinux"
DEPEND=""
diff --git a/net-misc/oidentd/oidentd-2.2.2.ebuild b/net-misc/oidentd/oidentd-2.2.2.ebuild
new file mode 100644
index 000000000000..73fc0be4d052
--- /dev/null
+++ b/net-misc/oidentd/oidentd-2.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd user
+
+DESCRIPTION="Another (RFC1413 compliant) ident daemon"
+HOMEPAGE="https://oidentd.janikrabe.com/"
+SRC_URI="https://ftp.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug ipv6 masquerade selinux"
+
+DEPEND="masquerade? (
+ net-libs/libnetfilter_conntrack
+ sys-libs/libcap-ng )"
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-oident )"
+
+pkg_setup() {
+ local CONFIG_CHECK="~INET_TCP_DIAG"
+
+ linux-info_pkg_setup
+
+ enewgroup oidentd
+ enewuser oidentd -1 -1 -1 oidentd
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable debug)
+ $(use_enable ipv6)
+ $(use_enable masquerade masq)
+ $(use_enable masquerade nat)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/${PN}-2.0.7-init ${PN}
+ newconfd "${FILESDIR}"/${PN}-2.2.2-confd ${PN}
+
+ systemd_newunit "${FILESDIR}"/${PN}_at.service-r1 ${PN}@.service
+ systemd_dounit "${FILESDIR}"/${PN}.socket
+ systemd_dounit "${FILESDIR}"/${PN}.service-r1
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5dea347c9b39..6dd3137ca1ee 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -7,6 +7,7 @@ AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ac
AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61
AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
AUX openssh-7.6_p1-hpn-x509-11.2-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
+AUX openssh-7.6_p1-permitopen-x509-glue.patch 1906 BLAKE2B 7b78577535bff9fc3c19d76bf5ebe1710b6e2743c40a336dbdfd65d2ba6c9f04979ebfa0a0bf3e8d87eb038fea945d7e5ad287adef13dec8a20b9160d964a226 SHA512 ad531ef8ce6cba778b66c3c912e6a57c8012d173f3e516ed4f9910213f0dc04b4fc76f4da6623a6a4ffc6f789c9f162279216aac801c67e4b62e33b0e1883e9d
AUX openssh-7.6_p1-permitopen.patch 1857 BLAKE2B f2f7e091b99d96e77ec95353789cfd8051ced60a198219a88ae409cdedde8751af9bea5b048c76a610411f86a4e802e488fb2c5b4045e1410a6b2f2cc1a34227 SHA512 1fc3410f52e86930af5188cadf9e9f1046e7a695639e27b95da9e25a781e8f4445e279c54cd010d280e7b4df58da404b97fce8e6192ae5d456d33b498aaf00c7
AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22
AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -27,5 +28,5 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5
DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
EBUILD openssh-7.5_p1-r4.ebuild 11115 BLAKE2B 31bfee62343a2124e48733c4db1367fcce121d5eff25008135d2e715a34a45a176c02a5fcee99271db723d437a62d0e79297cb17df1b1ab6a12534ad2cb0c0b5 SHA512 00dbc65bf70747906f2ae5ae538579b5bd4935bae224c59ad2de92820fc64f969ca2bddc1bf0ed8924f7b6825e5665730e3fa65b5682a7f7a170233b41b73acb
EBUILD openssh-7.6_p1-r4.ebuild 11099 BLAKE2B 975314f6b62e9191bf6300becb51f6282e52edc889407996ba640b07755dc713f28f9669e84a7f269d2be58764c561d7c2a14ff9af03ea7664794eb7f8656d9a SHA512 40276711daceea7e595a57b9805d5a4099e644650c6d2b501d581f5297bfc59bc20b325db455ce9e959d1a8d85bc25471e873177af5feadf1813f50205d6bb35
-EBUILD openssh-7.6_p1-r5.ebuild 11143 BLAKE2B 1746247964bb636a9427969be1470f59ccbb96fd117885827c172904c8029d426aaa9fefc4b1952ee2e2a518cd96e118f73644587748e46f1f8ca403e8dcdddd SHA512 28989a23b7ed00e608dfc9fb672ec7db2a960ae3e78924bf445ee8ee092f8ec15b9374075a4dee4f39f704512e289fa60689a079cd9bf711cab8b961979ecea9
+EBUILD openssh-7.6_p1-r5.ebuild 11292 BLAKE2B 0f8a0e888c539172a72cba3fbc08727de705df525c188e71f6f3e0fc7a4f314fc18b60e2c5fa09c35953b0684dc0ab69c0413172463588deba215af2688d22b1 SHA512 5fdc1fe303b7e183da3948fb177c5963e13df98cb61f24a81f291ff67c4820dc0afd8bc9d34077a966ccf5fc9fb7ff8f936689246f54686512ec45f61e3b7a97
MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch
new file mode 100644
index 000000000000..9d8f9a6cdef3
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-permitopen-x509-glue.patch
@@ -0,0 +1,44 @@
+--- a/openssh-7.6p1+x509-11.2.diff 2018-03-13 10:48:08.755434051 -0700
++++ b/openssh-7.6p1+x509-11.2.diff 2018-03-13 10:51:27.217980071 -0700
+@@ -29025,13 +29025,6 @@
+ diff -ruN openssh-7.6p1/servconf.c openssh-7.6p1+x509-11.2/servconf.c
+ --- openssh-7.6p1/servconf.c 2017-10-02 22:34:26.000000000 +0300
+ +++ openssh-7.6p1+x509-11.2/servconf.c 2018-02-11 12:07:01.000000000 +0200
+-@@ -1,5 +1,5 @@
+-
+--/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
+-+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
+- /*
+- * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+- * All rights reserved
+ @@ -9,6 +9,29 @@
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+@@ -29467,27 +29460,6 @@
+ case sAllowUsers:
+ while ((arg = strdelim(&cp)) && *arg != '\0') {
+ if (options->num_allow_users >= MAX_ALLOW_USERS)
+-@@ -1663,9 +1931,9 @@
+- if (!arg || *arg == '\0')
+- fatal("%s line %d: missing PermitOpen specification",
+- filename, linenum);
+-- i = options->num_permitted_opens; /* modified later */
+-+ value = options->num_permitted_opens; /* modified later */
+- if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
+-- if (*activep && i == 0) {
+-+ if (*activep && value == 0) {
+- options->num_permitted_opens = 1;
+- options->permitted_opens = xcalloc(1,
+- sizeof(*options->permitted_opens));
+-@@ -1683,7 +1951,7 @@
+- if (arg == NULL || ((port = permitopen_port(arg)) < 0))
+- fatal("%s line %d: bad port number in "
+- "PermitOpen", filename, linenum);
+-- if (*activep && i == 0) {
+-+ if (*activep && value == 0) {
+- options->permitted_opens = xrecallocarray(
+- options->permitted_opens,
+- options->num_permitted_opens,
+ @@ -1885,11 +2153,20 @@
+
+ case sDeprecated:
diff --git a/net-misc/openssh/openssh-7.6_p1-r5.ebuild b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
index e19d5f0f30b4..46f1d676f5f3 100644
--- a/net-misc/openssh/openssh-7.6_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
@@ -122,6 +122,11 @@ src_prepare() {
popd >/dev/null
save_version X509
fi
+ # remove this with the next version bump
+ pushd "${WORKDIR}" >/dev/null
+ eapply "${FILESDIR}/${P}-permitopen-x509-glue.patch"
+ popd >/dev/null
+
eapply "${WORKDIR}"/${X509_PATCH%.*}
fi
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 7559862392ad..1698010f07fd 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -7,10 +7,8 @@ AUX ovsdb-server.service 480 BLAKE2B 5192dfe98551bbd81eead18a7eaba70ff0901bf2cab
AUX ovsdb-server_conf 492 BLAKE2B e82cd92a1ac46023d63a70093e0f9cf78b72eed20a70d2599f5a405f6f7e30e1d550090b9debc2262da674b9d04d3be16aadf375ca2031e74056433c1ce20818 SHA512 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa
AUX ovsdb-server_conf2 544 BLAKE2B b406ef90df3988cdf4cf2870596471d98324bacdabdf9c517fdc30f6d59927894b310dc8d256fdc68c9d065a1c54c00035ec287d4970607cc2be1b2bf748bf17 SHA512 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5
AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6faf7ba386ae4e1ba7b8c77e3a3f0cbdef63d128dd765362e4ab8077da04a60444718283cc68d0a402ed12fa168c2ca983c1064a6 SHA512 7f2dd6fbd3f734abe2cf8e23a0aa49d81a8acb26ac5c28004a95ec0fe4630f7792aabdaeb8825a62ff96fcf1c3a871eea10b11c6b92ddf7965aa1f73150f7ec7
-DIST openvswitch-2.6.1.tar.gz 5399107 BLAKE2B a42e391e63c86559967ea08e425bca7a6968627ebf18fc6241c679ac011bd0688fe58124150ec48f96523bfb984aced980d011956a63d7c4df7da442ac1697fe SHA512 c5a716d2d9ac5f353827a4ad1e26f4d0ddfc4d7bf1e8f696043c32676e77c068e3e0dd423348cc33d5507753d7a27ce24898b823dad3fbc6a8d79297fa088b39
DIST openvswitch-2.7.2.tar.gz 6192414 BLAKE2B aea61637fe04d27d4c97e733987e843ef932bdd9e1d463c391e258a2b4461866a897c5063859708126c564e42ef99ab63a4b8fac8335bdc78531c46217abd945 SHA512 790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470
DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
-EBUILD openvswitch-2.6.1.ebuild 4543 BLAKE2B 0f09e27de8ebae5884357bcf3ba93edb42a9dcbcdde43ca79555fbee576e467b06386e03101cfee36919d0214737668cba0a13f5fd217afd0eed21e6d65ab624 SHA512 fd93d46f7177dac3dbad2040deca131f91aa96b99196d04bed648cc628c8808aa8203d25b4a97fa251b4212e24cac2535e9c73149101351a90949e5d8fe1b293
EBUILD openvswitch-2.7.2-r1.ebuild 4422 BLAKE2B 1423a1804bb2f724c23f42c0d467e80474ed3e17c19f63ec40a3423cb94537e92f785fa537d99e5167bd78118af163c5d02c2dc40a27b43e3c620a4b84ce117c SHA512 b5188d793ec63d0e278dd827063ea4814255a8b817906d5b37396d16d3a45df3e032f59bd89ef8315090b1ae440c7c4d9341dafa295973826d00247bbdaa8ca7
EBUILD openvswitch-2.7.2.ebuild 4369 BLAKE2B a2be186d00a4157e5260b8a2aafcf8a9cd2aba495b1ba08bb3487952137cb53ff720705a07ae0a9498bdd6ab2309f1436d85bf17c887c07c7402149f4125c260 SHA512 8d6e914fa089056522b676ef15e5664c04a9a2384cf7deb1f2b78672baa9e7b5f4e191dfb3afe1c877fbbe4346b9f7a3f91440db186aaa22ffe1f6cec4cfb86e
EBUILD openvswitch-2.8.1.ebuild 4428 BLAKE2B dd63abdc7909e48c06dc625dc6ff9637ead926cd774ed0b35876115a8b738cdd58971a4a96c81c267178921bd75556f0d400f9be668d16141234737819cbcb2a SHA512 498f2f3e22a68ef1fc41a49ca275be5d683c96a02d30986c41e7738a788a1449172c9ceb8839c86a32d9971084dd2a790acc5af3a7f4714d0e54d1baf6787ab9
diff --git a/net-misc/openvswitch/openvswitch-2.6.1.ebuild b/net-misc/openvswitch/openvswitch-2.6.1.ebuild
deleted file mode 100644
index 3830839ab694..000000000000
--- a/net-misc/openvswitch/openvswitch-2.6.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit autotools eutils linux-info linux-mod python-r1 systemd
-
-DESCRIPTION="Production quality, multilayer virtual switch"
-HOMEPAGE="http://openvswitch.org"
-SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug modules monitor +ssl"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ssl? ( dev-libs/openssl:0= )
- ${PYTHON_DEPS}
- ~dev-python/ovs-${PV}
- dev-python/twisted-core
- dev-python/twisted-conch
- dev-python/twisted-web
- 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 7 999 || die "Linux >= 3.10.0 and <= 4.8 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 ist 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
- for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
- sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" || die
- python_foreach_impl python_doscript utilities/"${SCRIPT}"
- done
-
- python_foreach_impl python_optimize "${ED%/}"/usr/share/ovsdbmonitor
-
- rm -r "${ED%/}"/usr/share/openvswitch/python || die
-
- keepdir /var/{lib,log}/openvswitch
- keepdir /etc/ssl/openvswitch
- fperms 0750 /etc/ssl/openvswitch
-
- rm -rf "${ED%/}"/var/run || die
- # monitor is statically enabled for bug 596206
- #if ! use monitor ; then
- # rm -r "${ED%/}"/usr/share/ovsdbmonitor || die
- #fi
-
- 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/socat/Manifest b/net-misc/socat/Manifest
index 3aefde14e6b0..9ee375815daf 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,11 +1,9 @@
AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf
AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed
-DIST socat-1.7.3.1.tar.bz2 488467 BLAKE2B 57e03488bb8513dd7961cf4ec42d9176ea1ce9827c78d643bdeb08a5290b3a00ad9f7643b94967538cddec5375f8cf4a155e52929fb33d619eaeebd17a3cd420 SHA512 463340f578d4d1d54458b8ef9573ad3eff51dbcc736205e1b62e9a4782770d4bb76e6a07506350fd35405b130660559aaa79dfa2664c53ea268d7d64231f9b32
DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.3.1.ebuild 1183 BLAKE2B c9a6ffac8e7155f3347c9ff4bbb24727525750556a94f96d6dc10ea6d020b28582ce54734a24aee5bf07d474290fce3c3e9698727c5fc69ff114ead8c0ab5e53 SHA512 e74c8df05fbda264927cfa59c1e35c596c64088dae51a193823967c23a121929cbc7d2d719d7ecc998279f8ce81dcd8e61be5abe5701280b0ad26f2eaf77c4c2
-EBUILD socat-1.7.3.2.ebuild 1526 BLAKE2B 065ff18af4b538d5f064d1a0d40bdb15a773ce0d0bce5f39d89ecd3ac27af7d05c2701c8e23b0f2df7fe79552d13f9c0769af87f55980c85d88271f5c9f99272 SHA512 bf991114ba2adc3d0a1a006456bdfb3af4504d03ba96bcd2aca698f2960affdaab2dfd829c097cee4da55c01d0a2336192cfdc487e8c3054d4794204ca451385
+EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbec99df447668b0eff67d82eaa1cb513c74e6f58d927969f110baa38b5055c2015e6dc837064e3e2f1dbb63b214 SHA512 9c60d66cf7b190cb41d2d2afb2bba5bb3982c301df5f8e989013d4d7e32a2b15ddccbb26a4d2ef84f65412e24efbe85530e7178d03b2ad86d78d7addec9a8c63
EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
EBUILD socat-9999.ebuild 1430 BLAKE2B 469a907b8192fdd96917be4aa71c0cf0aadc6853dc5db6b2f78cc98c979ec41bda06dd5575fd9426029ecd12fc151c3fad736c50807ae44931a009676dc886c0 SHA512 b4d6de5f62b6131efcfede03b81357abcc8201c609fad8b28b3527e0a5a956cb4e495493918005816bb83ab6cf1c07ac45fcddd770f0b4579624cd41d2fe5802
MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/socat/socat-1.7.3.1.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
deleted file mode 100644
index 63c88ab0a5be..000000000000
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="ssl readline ipv6 tcpd"
-
-DEPEND="
- ssl? ( dev-libs/openssl:0= )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-DOCS=(
- BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
-)
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
- epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags '-Wno-error*' #293324
- tc-export AR
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- dohtml doc/*.html doc/*.css
-}
diff --git a/net-misc/socat/socat-1.7.3.2.ebuild b/net-misc/socat/socat-1.7.3.2.ebuild
index 4d82cb66a518..d60e4c3ea1de 100644
--- a/net-misc/socat/socat-1.7.3.2.ebuild
+++ b/net-misc/socat/socat-1.7.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="bindist libressl ssl readline ipv6 tcpd"
DEPEND="
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
deleted file mode 100644
index 4d570192001b..000000000000
--- a/net-misc/ubridge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ubridge-0.9.14.tar.gz 63492 BLAKE2B 4c19bb79c264c9bec2ca39fea8b386817f6eb41d23b35f9fbd0a1407b45398ad5362bd76cbb81597438367a2af8d80308f13d3e8faa4e75c6173bbeb23da177d SHA512 7e92ca6ee8dd5815991c5d157278487cfad69710f0a63fc217d5d0e61678d272bf5a0d31b6afe25b1060df1ad13e229f1d573c03fecb1453167a9ff364283a5f
-EBUILD ubridge-0.9.14.ebuild 935 BLAKE2B dcef1058bd7f96c1736d666fd59e4e95e6d96649dc62131cd89604f55936a31df4b76227179a4831daee191a049ee11b57582a8d0d3453f1fa2da08bb9e2b073 SHA512 e7ed35fcc9a5fab41664c79886f4a5e70b86937edc39681be526c2813c251346dda6e91b506af3d48845d7b1a1ed911898b03829b1d0c5d5e71a393a346e0ef4
-MISC metadata.xml 304 BLAKE2B 6c6bdd7ed65d6d4ff07fefad752e781d8f9ae7464126e38009ec24c020f5e2bd2d2c1ec9bcfc74666060ecb5b887f5ab97842b33e4a7cb88c27132f1d6c3b87d SHA512 c12018bf171da9b243405c0f3ccdf50752bcc77a5744acf94d7643ca5f52dc2d5f04f3cff22d7e16b530cd0255d3e183f2a39a6f099915d49d2bb2bbce673633
diff --git a/net-misc/ubridge/metadata.xml b/net-misc/ubridge/metadata.xml
deleted file mode 100644
index 3a39499f142b..000000000000
--- a/net-misc/ubridge/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <bugs-to>https://github.com/GNS3/ubridge/issues</bugs-to>
- <remote-id type="github">GNS3/ubridge</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/ubridge/ubridge-0.9.14.ebuild b/net-misc/ubridge/ubridge-0.9.14.ebuild
deleted file mode 100644
index f0697a74df8d..000000000000
--- a/net-misc/ubridge/ubridge-0.9.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit fcaps user
-
-DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
-HOMEPAGE="https://github.com/GNS3/ubridge"
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="net-libs/libpcap:="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup ubridge
-}
-
-src_prepare() {
- default
-
- sed -i -e "s/CFLAGS =/CFLAGS ?=/g" Makefile || die "Failed to fix Makefile"
-}
-
-src_install() {
- insinto /usr/bin
- insopts -m 750 -g ubridge
- doins ubridge
- dodoc README.rst
-}
-
-pkg_postinst() {
- fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
- "${EROOT%/}"/usr/bin/ubridge
-
- ewarn "NOTE: To read packets from the network interfaces with ubridge as"
- ewarn "normal user you have to add the appropriate user to the ubridge group."
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index fc4f5ec02dec..039fdd6f6667 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.02.26.tar.gz 2910402 BLAKE2B 4cf4cf0971962ca5aa688f91ca56eda6bd582e0244f233264dc0ce8b7ee26e3cbad59c60b2c3e11e024c1a2816ddb87d1c2228f8111c8ee0ea1459bf301b5068 SHA512 ca89b8c68a321855a37a56a1126f105b5d18a39bf24ad1ce662a157f4e9074658fa3c2b11f1cf3f1d33d448e2e4cc509d9a9e9d3e71c35933bcf11af702dfc5b
DIST youtube-dl-2018.03.03.tar.gz 2914319 BLAKE2B 793a26dfad0149e74aacdc861c38ec953728915ac1890dbfa3a52da36bbc26c8155fb5dbb5db9c8857e6a3fb6798b2caf6491bc9b3a18374ceab9924b4cbffc4 SHA512 fe7a3d16b7773f8ff4cc7815fe40aee83020fed68b8218743694432d4e298b7d811b0e52a4f9ab0e20a5eef57399c73dd42a7b1ee3fc950f69c32a102d329a4f
+DIST youtube-dl-2018.03.14.tar.gz 2930477 BLAKE2B b0acd81acbaebf698a665f7d744cefb0c07e1e07d3430ee816ca5bbb19ebaa2d908cebf0e639369af8f8431cc9c72706c5a343f5907778283bc5a365caae8e39 SHA512 9bbc382872f532c2fd66e6beabaa277c81bd920939df8e4511736c404bffdf9246b3cb6afd06e4259cb575ec46733107dca7579044bcdca9245064b14ec26a07
EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
EBUILD youtube-dl-2017.11.15.ebuild 2377 BLAKE2B 7bb4c24c0fce599405c239c27ad81e31b8f57337ff111c8a142934093ddf4400cf2b4d0aae3cd0110957ec2c727dc7d0d46108c1b89fe0cb729547258498ffce SHA512 bf33ce707ebe05dfd88860ee892f8d7ec8b3313460524cbcfa4c215a37e1fe670ccd43fe329ff0159cc1b63a7f1f9fe289b4f734b03e1bf311a6480d206d2289
-EBUILD youtube-dl-2018.02.26.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
EBUILD youtube-dl-2018.03.03.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
+EBUILD youtube-dl-2018.03.14.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.02.26.ebuild b/net-misc/youtube-dl/youtube-dl-2018.03.14.ebuild
index db51a779b025..db51a779b025 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.02.26.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.03.14.ebuild