summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/Manifest.gzbin49609 -> 49619 bytes
-rw-r--r--net-analyzer/arpon/Manifest2
-rw-r--r--net-analyzer/arpon/metadata.xml5
-rw-r--r--net-analyzer/bwping/Manifest2
-rw-r--r--net-analyzer/bwping/metadata.xml4
-rw-r--r--net-analyzer/icinga2/Manifest4
-rw-r--r--net-analyzer/icinga2/icinga2-2.9.0.ebuild163
-rw-r--r--net-analyzer/icinga2/icinga2-9999.ebuild21
-rw-r--r--net-analyzer/mrtg/Manifest2
-rw-r--r--net-analyzer/mrtg/mrtg-2.17.7.ebuild49
-rw-r--r--net-analyzer/netwatch/Manifest2
-rw-r--r--net-analyzer/netwatch/metadata.xml4
-rw-r--r--net-analyzer/prelude-correlator/Manifest3
-rw-r--r--net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch36
-rw-r--r--net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild33
-rw-r--r--net-analyzer/prelude-lml-rules/Manifest2
-rw-r--r--net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild21
-rw-r--r--net-analyzer/prelude-lml/Manifest2
-rw-r--r--net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild57
-rw-r--r--net-analyzer/sslscan/Manifest2
-rw-r--r--net-analyzer/sslscan/sslscan-1.11.11.ebuild2
-rw-r--r--net-analyzer/wireshark/Manifest11
-rw-r--r--net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch17
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.5.ebuild4
-rw-r--r--net-analyzer/wireshark/wireshark-2.4.6.ebuild291
-rw-r--r--net-analyzer/wireshark/wireshark-2.6.1.ebuild2
-rw-r--r--net-analyzer/wireshark/wireshark-2.6.2.ebuild242
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild2
-rw-r--r--net-dns/Manifest.gzbin9220 -> 9229 bytes
-rw-r--r--net-dns/bind-tools/Manifest4
-rw-r--r--net-dns/bind-tools/bind-tools-9.12.2.ebuild146
-rw-r--r--net-dns/bind-tools/metadata.xml1
-rw-r--r--net-dns/bind/Manifest4
-rw-r--r--net-dns/bind/bind-9.12.2.ebuild401
-rw-r--r--net-dns/bind/metadata.xml1
-rw-r--r--net-dns/dnsmasq/Manifest2
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.79.ebuild2
-rw-r--r--net-fs/Manifest.gzbin4694 -> 4704 bytes
-rw-r--r--net-fs/libnfs/Manifest2
-rw-r--r--net-fs/libnfs/libnfs-2.0.0.ebuild2
-rw-r--r--net-fs/nfs-utils/Manifest4
-rw-r--r--net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild178
-rw-r--r--net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild2
-rw-r--r--net-fs/samba/Manifest7
-rw-r--r--net-fs/samba/files/4.4/samba4.confd2
-rw-r--r--net-fs/samba/files/samba-4.8-without_ads_build_fix.patch49
-rw-r--r--net-fs/samba/samba-4.7.7.ebuild1
-rw-r--r--net-fs/samba/samba-4.8.3.ebuild1
-rw-r--r--net-ftp/Manifest.gzbin4503 -> 4504 bytes
-rw-r--r--net-ftp/vsftpd/Manifest2
-rw-r--r--net-ftp/vsftpd/metadata.xml5
-rw-r--r--net-im/Manifest.gzbin9235 -> 9236 bytes
-rw-r--r--net-im/kadu/Manifest2
-rw-r--r--net-im/kadu/kadu-4.3-r2.ebuild6
-rw-r--r--net-im/qtox/Manifest2
-rw-r--r--net-im/qtox/metadata.xml11
-rw-r--r--net-im/signal-desktop-bin/Manifest4
-rw-r--r--net-im/signal-desktop-bin/signal-desktop-bin-1.14.1.ebuild (renamed from net-im/signal-desktop-bin/signal-desktop-bin-1.13.0.ebuild)0
-rw-r--r--net-im/telegram-desktop-bin/Manifest13
-rw-r--r--net-im/telegram-desktop-bin/files/telegram-desktop-bin5
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10.ebuild (renamed from net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.7.ebuild)8
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.8.ebuild1
-rw-r--r--net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild1
-rw-r--r--net-irc/Manifest.gzbin9338 -> 9329 bytes
-rw-r--r--net-irc/epic5/Manifest3
-rw-r--r--net-irc/epic5/epic5-1.1.10-r1.ebuild87
-rw-r--r--net-irc/epic5/epic5-1.1.10-r2.ebuild2
-rw-r--r--net-irc/quassel/Manifest7
-rw-r--r--net-irc/quassel/quassel-0.12.5-r2.ebuild2
-rw-r--r--net-irc/quassel/quassel-0.13_rc1.ebuild (renamed from net-irc/quassel/quassel-0.12.5.ebuild)44
-rw-r--r--net-irc/quassel/quassel-9999.ebuild4
-rw-r--r--net-irc/znc/Manifest20
-rw-r--r--net-irc/znc/files/README.gentoo22
-rw-r--r--net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch23
-rw-r--r--net-irc/znc/files/znc-1.6.1-systemwideconfig.patch215
-rw-r--r--net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch26
-rw-r--r--net-irc/znc/files/znc-1.7.1-inttest-dir.patch (renamed from net-irc/znc/files/znc-1.7.0-inttest-dir.patch)19
-rw-r--r--net-irc/znc/files/znc.initd-r139
-rw-r--r--net-irc/znc/metadata.xml1
-rw-r--r--net-irc/znc/znc-1.6.5.ebuild130
-rw-r--r--net-irc/znc/znc-1.6.6.ebuild129
-rw-r--r--net-irc/znc/znc-1.7.1.ebuild (renamed from net-irc/znc/znc-1.7.0.ebuild)14
-rw-r--r--net-irc/znc/znc-9999.ebuild9
-rw-r--r--net-libs/Manifest.gzbin34217 -> 34215 bytes
-rw-r--r--net-libs/courier-authlib/Manifest2
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.67.0.ebuild4
-rw-r--r--net-libs/courier-unicode/Manifest2
-rw-r--r--net-libs/courier-unicode/courier-unicode-1.4.ebuild4
-rw-r--r--net-libs/gnome-online-accounts/Manifest2
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild93
-rw-r--r--net-libs/grpc/Manifest6
-rw-r--r--net-libs/grpc/grpc-1.12.1-r1.ebuild (renamed from net-libs/grpc/grpc-1.12.1.ebuild)2
-rw-r--r--net-libs/grpc/grpc-1.13.0-r1.ebuild (renamed from net-libs/grpc/grpc-1.13.0.ebuild)2
-rw-r--r--net-libs/grpc/grpc-1.13.1.ebuild172
-rw-r--r--net-libs/libisds/Manifest2
-rw-r--r--net-libs/libisds/libisds-0.10.8.ebuild54
-rw-r--r--net-libs/libpcap/Manifest2
-rw-r--r--net-libs/libpcap/libpcap-1.9.0_rc2.ebuild77
-rw-r--r--net-libs/libsrtp/Manifest2
-rw-r--r--net-libs/libsrtp/libsrtp-2.2.0.ebuild2
-rw-r--r--net-libs/libtorrent-rasterbar/Manifest2
-rw-r--r--net-libs/libtorrent-rasterbar/metadata.xml5
-rw-r--r--net-libs/nghttp2/Manifest2
-rw-r--r--net-libs/nghttp2/nghttp2-1.31.1.ebuild2
-rw-r--r--net-libs/nodejs/Manifest2
-rw-r--r--net-libs/nodejs/nodejs-10.7.0.ebuild200
-rw-r--r--net-libs/openslp/Manifest2
-rw-r--r--net-libs/openslp/openslp-2.0.0-r5.ebuild2
-rw-r--r--net-libs/tox/Manifest2
-rw-r--r--net-libs/tox/metadata.xml11
-rw-r--r--net-libs/zmqpp/Manifest2
-rw-r--r--net-libs/zmqpp/zmqpp-4.2.0.ebuild17
-rw-r--r--net-mail/Manifest.gzbin18230 -> 18234 bytes
-rw-r--r--net-mail/courier-imap/Manifest2
-rw-r--r--net-mail/courier-imap/courier-imap-4.17.3.ebuild2
-rw-r--r--net-mail/notmuch/Manifest2
-rw-r--r--net-mail/notmuch/notmuch-0.26.2.ebuild208
-rw-r--r--net-misc/Manifest.gzbin61045 -> 61037 bytes
-rw-r--r--net-misc/curl/Manifest2
-rw-r--r--net-misc/curl/curl-7.61.0.ebuild2
-rw-r--r--net-misc/electrum/Manifest5
-rw-r--r--net-misc/electrum/electrum-3.2.2.ebuild174
-rw-r--r--net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch23
-rw-r--r--net-misc/electrum/metadata.xml1
-rw-r--r--net-misc/lldpd/Manifest2
-rw-r--r--net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch11
-rw-r--r--net-misc/lldpd/lldpd-1.0.1-r1.ebuild103
-rw-r--r--net-misc/mulk/Manifest2
-rw-r--r--net-misc/mulk/metadata.xml5
-rw-r--r--net-misc/netctl/Manifest2
-rw-r--r--net-misc/netctl/metadata.xml5
-rw-r--r--net-misc/networkmanager/Manifest2
-rw-r--r--net-misc/networkmanager/networkmanager-1.10.10.ebuild2
-rw-r--r--net-misc/nextcloud-client/Manifest3
-rw-r--r--net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild108
-rw-r--r--net-misc/oidentd/Manifest2
-rw-r--r--net-misc/oidentd/oidentd-2.0.8-r6.ebuild2
-rw-r--r--net-misc/openssh/Manifest2
-rw-r--r--net-misc/openssh/openssh-7.7_p1-r5.ebuild2
-rw-r--r--net-misc/owncloud-client/Manifest4
-rw-r--r--net-misc/owncloud-client/owncloud-client-2.3.4.ebuild98
-rw-r--r--net-misc/owncloud-client/owncloud-client-2.4.0.ebuild98
-rw-r--r--net-misc/pmsvn/Manifest2
-rw-r--r--net-misc/pmsvn/metadata.xml5
-rw-r--r--net-misc/qtm/Manifest2
-rw-r--r--net-misc/qtm/metadata.xml6
-rw-r--r--net-misc/sshpass/Manifest2
-rw-r--r--net-misc/sshpass/metadata.xml4
-rw-r--r--net-misc/streamlink/Manifest2
-rw-r--r--net-misc/streamlink/metadata.xml8
-rw-r--r--net-misc/trackma/Manifest2
-rw-r--r--net-misc/trackma/metadata.xml9
-rw-r--r--net-misc/ttytter/Manifest2
-rw-r--r--net-misc/ttytter/metadata.xml5
-rw-r--r--net-misc/whois/Manifest4
-rw-r--r--net-misc/whois/whois-5.3.2.ebuild (renamed from net-misc/whois/whois-5.3.0.ebuild)4
-rw-r--r--net-misc/wol/Manifest2
-rw-r--r--net-misc/wol/metadata.xml5
-rw-r--r--net-nds/Manifest.gzbin3240 -> 3239 bytes
-rw-r--r--net-nds/openldap/Manifest2
-rw-r--r--net-nds/openldap/openldap-2.4.44.ebuild2
-rw-r--r--net-news/Manifest.gzbin2384 -> 2386 bytes
-rw-r--r--net-news/rssguard/Manifest2
-rw-r--r--net-news/rssguard/metadata.xml9
-rw-r--r--net-nntp/Manifest.gzbin2687 -> 2691 bytes
-rw-r--r--net-nntp/nzbget/Manifest2
-rw-r--r--net-nntp/nzbget/nzbget-20.0.ebuild2
-rw-r--r--net-nntp/pan/Manifest2
-rw-r--r--net-nntp/pan/pan-0.145.ebuild48
-rw-r--r--net-p2p/Manifest.gzbin9426 -> 9421 bytes
-rw-r--r--net-p2p/airdcpp-webclient/Manifest2
-rw-r--r--net-p2p/airdcpp-webclient/airdcpp-webclient-2.3.0.ebuild2
-rw-r--r--net-p2p/ktorrent/Manifest2
-rw-r--r--net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch23
-rw-r--r--net-p2p/qbittorrent/Manifest2
-rw-r--r--net-p2p/qbittorrent/metadata.xml6
-rw-r--r--net-p2p/torrentinfo/Manifest2
-rw-r--r--net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild (renamed from net-p2p/torrentinfo/torrentinfo-1.8.6.ebuild)18
-rw-r--r--net-p2p/transmission/Manifest2
-rw-r--r--net-p2p/transmission/transmission-2.94.ebuild2
-rw-r--r--net-p2p/xmr-stak/Manifest4
-rw-r--r--net-p2p/xmr-stak/xmr-stak-2.4.6.ebuild67
-rw-r--r--net-p2p/xmr-stak/xmr-stak-2.4.7.ebuild67
-rw-r--r--net-print/Manifest.gzbin6918 -> 6919 bytes
-rw-r--r--net-print/cups-filters/Manifest5
-rw-r--r--net-print/cups-filters/cups-filters-1.20.3.ebuild137
-rw-r--r--net-print/cups-filters/cups-filters-1.20.4.ebuild4
-rw-r--r--net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch28
-rw-r--r--net-proxy/Manifest.gzbin6214 -> 6214 bytes
-rw-r--r--net-proxy/haproxy/Manifest4
-rw-r--r--net-proxy/haproxy/haproxy-1.8.12.ebuild169
-rw-r--r--net-proxy/haproxy/haproxy-1.8.9.ebuild2
-rw-r--r--net-vpn/Manifest.gzbin4703 -> 4709 bytes
-rw-r--r--net-vpn/openfortivpn/Manifest2
-rw-r--r--net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild4
-rw-r--r--net-vpn/tor/Manifest8
-rw-r--r--net-vpn/tor/tor-0.3.2.10.ebuild82
-rw-r--r--net-vpn/tor/tor-0.3.4.2_alpha.ebuild87
-rw-r--r--net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild (renamed from net-vpn/tor/tor-0.3.3.8.ebuild)6
-rw-r--r--net-vpn/wireguard/Manifest4
-rw-r--r--net-vpn/wireguard/wireguard-0.0.20180718.ebuild (renamed from net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild)0
-rw-r--r--net-wireless/Manifest.gzbin15566 -> 15564 bytes
-rw-r--r--net-wireless/gnuradio/Manifest4
-rw-r--r--net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild (renamed from net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild)2
-rw-r--r--net-wireless/unifi/Manifest4
-rw-r--r--net-wireless/unifi/unifi-5.9.16.ebuild (renamed from net-wireless/unifi/unifi-5.9.4-r1.ebuild)2
206 files changed, 2973 insertions, 2114 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fdaf5e9a011b..6468203d73e8 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest
index b79b1b863983..692d5bd1a145 100644
--- a/net-analyzer/arpon/Manifest
+++ b/net-analyzer/arpon/Manifest
@@ -2,4 +2,4 @@ AUX arpon.confd 128 BLAKE2B 864417d8892d037f005123938b3ffd970c69f6ad06fdc6e03187
AUX arpon.initd 406 BLAKE2B b519b05207a2cf54301493d85a5b50205d27bacc5c4eb2dedb18ccc450a01b74b9d159da0c66b6aed20a31ec454747e0ab533906633cd8dc7ab6bdaaa9d44ca0 SHA512 5a889f94fa495ee63475a8ca2774b09247548a0a7170b32b0c74ed5808822818fda23516959ad4c3598ed39f31ad2a2ab68b81f00a715267b0d12e194532324a
DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4
EBUILD arpon-2.7.2.ebuild 884 BLAKE2B e83db5a744d62b0a7f7f3e7441a300345f81799617c93f220f320cb61f653c209aaa631fb0525d159c95337d83d339ca19e979a8cd3f4a35580e487c8085101d SHA512 4427110fc2ac7557d57d2bf9b453bb2b121ac5121e287d4273f1aea4bdc503ab38f64092c1776ca64d2ad66fddbeae4a25c82b53b98d6734b3a3347b070adbbe
-MISC metadata.xml 325 BLAKE2B 6c4ea869444055aea198dffd4446c5bbb8a73e47f3ca7413fad581414d6838c84b542c955fe49792afbee4b15511c96f7bef5b30fd3ed7e1b6dd057f86bf9417 SHA512 16d4be756ad83262eab59a91c3dd5b86d550eb5640dae17a236c07380848035ed81a9a2447f306a4eddc145d484a3f542f3a427c3c938382c47057e60d4901c3
+MISC metadata.xml 242 BLAKE2B ff85d6f7c94b7a327031d666c89344f6d69ed7a8c5cac45f89650c5f3aeb43edd3a4c7b5814ace420c7804a411235ba0f7deda58424e417681f74f9468e0ef0e SHA512 a01133ba691e36e58aa94e18a91db4a4a42b8ae621540319cab84241a07cc541263f753268ab759430699332a77018423c1a54d886d9c2fd3fab24537b64742d
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index 2e90eb6ff783..d587671b9bf6 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">arpon</remote-id>
</upstream>
diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest
index 94cc130a63f5..5afc064665db 100644
--- a/net-analyzer/bwping/Manifest
+++ b/net-analyzer/bwping/Manifest
@@ -4,4 +4,4 @@ DIST bwping-1.9.tar.gz 90877 BLAKE2B f19b865b30cf92e80f7482c8c19b9fa364b95ec3359
EBUILD bwping-1.7-r1.ebuild 413 BLAKE2B fe0207442e38ee224b650126ae837f67b7df4dd52e17603628c46967b7fe659c2d8c44a6d6d40297b0879a099a84652c935ea3b2dd3d75ddc47b0115bc62a03f SHA512 28af947741c68432f9e6a9312cb74cef83aaaccb3dcd00d808a9b76dee3665ebe0d04d7a2c12b2eed06e78cd13e58a73f98102999e87147dbdaa5d175488874f
EBUILD bwping-1.8.ebuild 415 BLAKE2B dd194c432b928cb4c696b4424d6b5f65af043d54dbc95549a73cdd864cc4151131c45d8a9d3cbbb21c47062138c147da6e2cb288a02fdf2f6bdc3ccc151bd0b1 SHA512 b920655976c17e7a73a3a7f7f7f444241bcc787fa94fead1ca7125f5a1a4b11930df5e50ac254044f80cbba5191ce29530c75f512d7753c4ca61ee9f9b108efb
EBUILD bwping-1.9.ebuild 415 BLAKE2B e3e994562d53530ae3f925d911d220ce3b4d99207aef29d2ea702869018c7d28cea53dd2527f882d097740c9663324587938a409fc67b2ad951be346ebdb4034 SHA512 147edbc346d231e9134e8052d5c252e43bf4351f48e424754f191098fd9ac3396ae1bf3b50f526ca84724273ba3808ac152c3c589dc996b65f1a4f1b15c05005
-MISC metadata.xml 762 BLAKE2B 9817fed6b9deaea3108dc166ad6e99dfb2919d1664256ca5a993df02b901c4bce8f34dccbf10044d19b09ea5570dd3736e464bdafdccbe2ac83aa53985faca52 SHA512 250abfb0ba5bab99ccad8b1494814339844b6e46ebb6d3af9fa3933d01964ce5a3c97e74e2ded0d5bea221c4eed20ffd7cc7bc9c1e8680feec907f390df27dd2
+MISC metadata.xml 651 BLAKE2B 5879ca4d339fc3b541e1b7f68be857a9552c9a06efd8b1985470f5143f1e1e14edb0eccb4815b7498590718a02ddbb155a1e49556cdef76ebd9fae6dc6f306c8 SHA512 bef41fb4c3d894de7f2b39b16171fd22e6ce584d2dd2a65e2ce2c645ffc4ae1d1b38d7667765fa3e6fbfacb92cd3ef7006d141b14a5a476489ed235d2ca095e0
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
index a3345073919a..a5d9e36f9669 100644
--- a/net-analyzer/bwping/metadata.xml
+++ b/net-analyzer/bwping/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a657ff2003c3..90cbc934174c 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,5 +1,7 @@
AUX icinga2.initd 2276 BLAKE2B 9573c876cb1fc6ff641d4503d5446840725d94ac2a824cd124872af84032519a5ee1237b0ebc38783e673cb87169feb48b7690978e9b7d2e38549a7272f403fc SHA512 5b31f748eda8f52d8efe2c744c3c1adacffdb40c04d93cdaf7ee82129d632783362f6ea51b5a4c05ca9cd98d3343abfcfc86c98e99afd429d6bce390b9ffd082
DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
+DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
EBUILD icinga2-2.8.4.ebuild 4604 BLAKE2B 074505319ffdb68d93df79dbfe6c2a88a971b1a188e28526dd97e131d7494e6076173cbe9b8ee3599c7deecb62610f23828f0c107460555d47394d29f81eedbe SHA512 be570d2178c8750227b1dfb46c682a1805696fe9b46241f6ef9f59fa1e6ac9886d7e88cc14bcd5e094cd3671f49dfa1ad91046d3e08288b8266f888fde37a2a1
-EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
+EBUILD icinga2-2.9.0.ebuild 4432 BLAKE2B 2a5f9a690609af8d683c98bfe2e4f53026b8ce261bf91e2585781a51994bb515e5ce86624923c908d2fd8f9ef11c3fd68a88f9e0de42a3cafe0cda51ff5ef2db SHA512 f7cffee062c8830c32f9888b026b39de2924cb4d7c017404a6db3567b561191f07ae5d4250bcd3edd5e13c3e60fc5b2d62994a656ea7a2e5da6506b1da9f77b0
+EBUILD icinga2-9999.ebuild 4432 BLAKE2B 2a5f9a690609af8d683c98bfe2e4f53026b8ce261bf91e2585781a51994bb515e5ce86624923c908d2fd8f9ef11c3fd68a88f9e0de42a3cafe0cda51ff5ef2db SHA512 f7cffee062c8830c32f9888b026b39de2924cb4d7c017404a6db3567b561191f07ae5d4250bcd3edd5e13c3e60fc5b2d62994a656ea7a2e5da6506b1da9f77b0
MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.9.0.ebuild b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
new file mode 100644
index 000000000000..3085070c612b
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+ inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+ inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+ EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+ EGIT_BRANCH="master"
+ KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/boost-1.58-r1
+ console? ( dev-libs/libedit )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )"
+
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+ >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+ ${CDEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )
+ mail? ( virtual/mailx )
+ classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup icingacmd
+ enewgroup nagios # for plugins
+ enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+ sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+ local mycmakeargs=(
+ -DICINGA2_UNITY_BUILD=FALSE
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc
+ -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+ -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+ -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+ -DICINGA2_USER=icinga
+ -DICINGA2_GROUP=icingacmd
+ -DICINGA2_COMMAND_GROUP=icingacmd
+ -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+ -DUSE_SYSTEMD=$(usex systemd ON OFF)
+ -DLOGROTATE_HAS_SU=ON
+ )
+ # default to off if minimal, allow the flags to be set otherwise
+ if use minimal; then
+ mycmakeargs+=(
+ -DICINGA2_WITH_MYSQL=OFF
+ -DICINGA2_WITH_PGSQL=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+ -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+ )
+ fi
+ # LTO
+ if use lto; then
+ mycmakeargs+=(
+ -DICINGA2_LTO_BUILD=ON
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_LTO_BUILD=OFF
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+ cd "${BUILDDIR}" || die
+
+ emake DESTDIR="${D}" install
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/icinga2.initd icinga2
+
+ if use mysql ; then
+ docinto schema
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+ docinto schema/upgrade
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+ elif use postgres ; then
+ docinto schema
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+ docinto schema/upgrade
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+ fi
+
+ keepdir /etc/icinga2
+ keepdir /var/lib/icinga2/api/zones
+ keepdir /var/lib/icinga2/api/repository
+ keepdir /var/lib/icinga2/api/log
+ keepdir /var/spool/icinga2/perfdata
+
+ rm -r "${D}/var/run" || die "failed to remove /var/run"
+ rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+ fowners root:icinga /etc/icinga2
+ fperms 0750 /etc/icinga2
+ fowners icinga:icinga /var/lib/icinga2
+ fowners icinga:icinga /var/spool/icinga2
+ fowners -R icinga:icingacmd /var/lib/icinga2/api
+ fowners icinga:icinga /var/spool/icinga2/perfdata
+ fowners icinga:icingacmd /var/log/icinga2
+
+ fperms ug+rwX,o-rwx /etc/icinga2
+ fperms ug+rwX,o-rwx /var/lib/icinga2
+ fperms ug+rwX,o-rwx /var/spool/icinga2
+ fperms ug+rwX,o-rwx /var/log/icinga2
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles
+ doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+ doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano
+ doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+ fi
+}
+
+pkg_postinst() {
+ if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+ elog "DB IDO schema upgrade may be required required.
+ http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2"
+ fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index ebdd790be879..3085070c612b 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-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
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
WX_GTK_VER="3.0"
CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
net-analyzer/nagios-plugins
) )
mail? ( virtual/mailx )
- classicui? ( net-analyzer/icinga[web] )
- studio? ( x11-libs/wxGTK:3.0 )"
+ classicui? ( net-analyzer/icinga[web] )"
REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
@@ -50,9 +49,6 @@ want_apache2
pkg_setup() {
depend.apache_pkg_setup
- if use studio ; then
- setup-wxwidgets
- fi
enewgroup icinga
enewgroup icingacmd
enewgroup nagios # for plugins
@@ -74,6 +70,7 @@ src_configure() {
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_GROUP=icingacmd
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+ -DUSE_SYSTEMD=$(usex systemd ON OFF)
-DLOGROTATE_HAS_SU=ON
)
# default to off if minimal, allow the flags to be set otherwise
@@ -98,16 +95,6 @@ src_configure() {
-DICINGA2_LTO_BUILD=OFF
)
fi
- # STUDIO
- if use studio; then
- mycmakeargs+=(
- -DICINGA2_WITH_STUDIO=ON
- )
- else
- mycmakeargs+=(
- -DICINGA2_WITH_STUDIO=OFF
- )
- fi
cmake-utils_src_configure
}
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index f4edacceaf63..c4641902fe10 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -2,6 +2,8 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac
AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
DIST mrtg-2.17.4.tar.gz 1096879 BLAKE2B 12d485e8bdb28ff3706341d5b53e78dc37291e6f157e7792f1d2f3b43ee09c7b7eed57acfd8c7e9c9621187f75ee117e0ea85ce1ec34636f26aaf7e06ca58e14 SHA512 b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110
+DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
EBUILD mrtg-2.17.4-r1.ebuild 824 BLAKE2B 34727aafba25ed97e7eb8e5f37806f533eac1d4300bf225c6142dc884cc2d7dcbf33cd0a4367a06427d789c076f78d0d4c6bd75a36c6adf16fd44f1f76d549f5 SHA512 a81daab88b80342d21a46eb8be24135b301e0c1169abd6871c4fa7081a765ed7adb8a39a4de35774f5da151788c7a805e9c7b082a5127074575146f03a9ed9c4
EBUILD mrtg-2.17.4-r2.ebuild 1000 BLAKE2B 335c76bb71ba16bc1908762dc5002b8ab26e464ce294d6ecab2763bda86fde929bcd826fbafcb9d3b69bc1a64f58ffed09de597914bc4d5b9eb7badeb3481196 SHA512 3c71dfe63faa649b90aba120b148348a2b1bdf5ff6250887006183939f8e94f0d87fc855e94782f3f9aa6c1f355a2ec27dfca5af820906319b681e80a5dddba4
+EBUILD mrtg-2.17.7.ebuild 1008 BLAKE2B 1425567185472439f014548534d2568c19b3ddcccc48ed1c76229ae3944e1213dccd63838d55806fd715a82aea88d3019edf6678b0d639f2a2c999c95bcb3edc SHA512 9215aa63ab6fc3c8c3099dbf36149e2f84f10cd57d615029112e09c4e97acc276bbc8e6c7d14534a22388db74a6197d74d2ef35295ccc005749e70c52285c547
MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
new file mode 100644
index 000000000000..926ed585809a
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="https://oss.oetiker.ch/mrtg/"
+SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="
+ >=dev-perl/SNMP_Session-1.13-r2
+ >=dev-perl/Socket6-0.23
+ dev-lang/perl
+ media-libs/gd[png]
+"
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-mrtg )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.17.4-socket6.patch
+)
+
+src_prepare() {
+ rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+
+ sed -i \
+ -e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
+ $(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
+
+ default
+}
+
+src_install () {
+ keepdir /var/lib/mrtg
+
+ default
+
+ mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
+
+ newinitd "${FILESDIR}/mrtg.rc" ${PN}
+ newconfd "${FILESDIR}/mrtg.confd" ${PN}
+}
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index d3de0de85a96..2aedd7c23223 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -6,4 +6,4 @@ AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc
AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d
DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a
EBUILD netwatch-1.3.0.1-r3.ebuild 1004 BLAKE2B d671a299e4e4ad06b26774c37b4b8fbe3d47bac238927e48c7f9c7efbf62501ebac117e5c7787d82abb57d722586b92bc92b65e8795302f1cd70cbcb49d88391 SHA512 75964e3687c8323ba835b249de104cf8b49e6de8bff300bd0229c5dbe3fb835ffddc4d4b01477b87992a5ae58c3c434398f609ea82648f99febca3a51e197c59
-MISC metadata.xml 379 BLAKE2B a008d3d3cd917ef147f3ec86c8dfc827bacb9397d66cc1656bfec6ff36a22eb2e6424a5608d064db2928d78ee34eec99ff4482c6c924b6188a2b44d1f63c47d5 SHA512 f5dde23a39bad67db3b9594517b410ac2c2713927c8e53682fc3e13ea186fe80b93bd66e500220ac600457bf6d47364113785acacd28bd56bcb2d52084a30e9f
+MISC metadata.xml 274 BLAKE2B 75e74aa7e81d0d0097bcd02f91b106e38607e8c17cd10ecf224e3423d3b117d6110bfd0345a723b1e84a4b5d63ab07e8be1661e71f83eaaffcf6164d780e8858 SHA512 1d248e6ffe1a07fd1e2d6ca9f83f8108d8d5941b5067860e8c8daf5cf383446d21008f9fc1555fa6d3b045138173661e0426fb68b923969ffec027bc858bd53d
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index fb98d86a637d..af0a0fe5e3bb 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest
index 6de722fd9e3b..96a5c9890279 100644
--- a/net-analyzer/prelude-correlator/Manifest
+++ b/net-analyzer/prelude-correlator/Manifest
@@ -1,10 +1,13 @@
+AUX prelude-correlator-4.1.1-fix_python3.patch 984 BLAKE2B 5b51c44d1da541e16b68788357e5b25274b6b2620880c1a81e7dda2dc07d77e12c1746fa966d1251d0a548ad0cc00e545bae50540b601c21c215f31e4ad43d67 SHA512 ef72812b5a2daceff20efb54c68311ef3486b8ffd56ec8bbc62ffba96e674a1f88562ed94eef531629684db13f6e2aa5c3a42d558c62869664131feb61939bea
AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5
AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51
AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68
DIST prelude-correlator-3.0.1.tar.gz 181019 BLAKE2B 9156b7c76ac641326dcbb6e89f336ad1a65ed9c0af3b32acaa2d4430d3ba0b5015b5baf6372bdeb8e08d269b7742304f84ac026c512b63ca8710cc757697d0c6 SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3
DIST prelude-correlator-3.1.0.tar.gz 185812 BLAKE2B 8390059cf00f1f4038d31eff401d4a2e475f9ef89fe84b4748c891ccf521fa6c6d241e4e441d6398a2acaf2bf01451e4407188e95779f8c0dbb19713c405cc6d SHA512 f44d805445c19af1f80f2662b7c5d2678e9928fd5cea17e1938a712157ca3ac51eaf361bd164ec6fa38836461b3719cf739232c130f3c784cf692e1588256d79
DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b
+DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597
EBUILD prelude-correlator-3.0.1-r1.ebuild 723 BLAKE2B 7eadb37a0f6316a87acd061ea90011fdf5158b2d1e0dd025eaa8b07426959af0fe55a57dc76bac474eaa1a43fadf4836621a60f6a708682bcb30ce49f2aca2c5 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1
EBUILD prelude-correlator-3.1.0.ebuild 730 BLAKE2B 66213e6210c1a2aedeafb7aa964968916e7dae6c98e7fb8c99745146487d898f90c5e94bbd1f0ef56cc707d015e47427538341cb980dd9350c81bdd8608cc9ee SHA512 f79772b4efec8ed3cd4f1023dc6e9661b5669233321393e807519bf28f792491488bf44562114b3cbd98a7c5fbd4b1b0131818dc592908e3dcf7fa2c665bb00f
EBUILD prelude-correlator-4.0.0.ebuild 759 BLAKE2B bcf71507bec9e7978cf9f861fe091c9550394edcf1092d8a5715540de6a27b9ac52c8bdc9d09684b9adcc4ac2a5165e5c340d910e8729eef3388d7b81faca0ae SHA512 1b5ac5a4685186fb94a4d81695cf06f98409c73e1f87b2e9440a81c72e6fbe14b3d6ea4419de539177257e7a0c5a9957d836e01e56e70ea389a455f37cc3fb07
+EBUILD prelude-correlator-4.1.1.ebuild 817 BLAKE2B b739386a10b3b5c3286ddb3b29f62fd95ba83733d4f36a0fd928b71a08112dd1a5641168426e4d00a7a1ab3e083db01feb6e9418bb926c1c916be90099f13cdf SHA512 17713240c2ec9af350c3d804572d8108c2463b69e286d52bbb7db75c50392866bc822b7feb2338744a163abdc575c8e6eb21439855fb239ea33240adb442aae2
MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209
diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
new file mode 100644
index 000000000000..a671aa476585
--- /dev/null
+++ b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch
@@ -0,0 +1,36 @@
+--- a/preludecorrelator/config.py
++++ b/preludecorrelator/config.py
+@@ -19,7 +19,11 @@
+
+ import os
+ import glob
+-import StringIO
++import sys
++if sys.version_info >= (3, 0):
++ from io import StringIO
++else:
++ import StringIO
+ try:
+ import configparser
+ except:
+@@ -77,5 +81,8 @@
+ f = open(fname, 'r')
+ except IOError:
+ continue
+- self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
++ if sys.version_info >= (3, 0):
++ self.readfp(StringIO('[prelude]\n' + f.read()))
++ else:
++ self.readfp(StringIO.StringIO('[prelude]\n' + f.read()))
+ f.close()
+--- a/preludecorrelator/context.py
++++ b/preludecorrelator/context.py
+@@ -362,7 +362,7 @@
+
+ try:
+ _CONTEXT_TABLE.update(ContextUnpickler(fd).load())
+- except EOFError:
++ except:
+ return
+
+ logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE))
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
new file mode 100644
index 000000000000..1ff9d4c41e25
--- /dev/null
+++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild
@@ -0,0 +1,33 @@
+# 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,5,6}} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Real time correlator of events received by Prelude Manager"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.1.1-fix_python3.patch"
+)
+
+src_install() {
+ distutils-r1_src_install
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest
index 97c1ea5f17e8..95ececc9d51f 100644
--- a/net-analyzer/prelude-lml-rules/Manifest
+++ b/net-analyzer/prelude-lml-rules/Manifest
@@ -1,7 +1,9 @@
DIST prelude-lml-rules-3.0.1.tar.gz 117551 BLAKE2B 65b4c5a03adf0cad2063463526165a3789ecffd15c75131acbbce6510e354e9e5ddb1575cc682b235e6833a16872889ce67c1557bbe19557e7f154b219c68b00 SHA512 fc3b35fcb6249b40e5f5fad6b22b238167f7039a48a3e7732110a77f23fd82d0f0150a891f83e07ab7e0ccd8b33cbcff5d8498f6f14f01248d87b8f37e6ea9a3
DIST prelude-lml-rules-3.1.0.tar.gz 117010 BLAKE2B 0ec6c3a02dcc013368ba7793c8ad3446991099b7ae9224b7ee7daa210acd31c7933eb5e0b4098b7a4a870ca9a85937d8642074e09cb9e870efb11bfbf06881a9 SHA512 8addb0ac785098d49aa220e63e95805290028f42504df868660f8ccd5f516c9a7f53e794714fe395c8a50935e64575cd405a20f65dd02692c5613c9bc9a028b7
DIST prelude-lml-rules-4.0.0.tar.gz 115058 BLAKE2B 93f3bc14f14a8aea70850b67a427f74818bd8119e7f54c66c3391a2e81656dd13462362a6e82d03997701cc8d8189b744922545c7e7463df79b0052e2449c302 SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3
+DIST prelude-lml-rules-4.1.0.tar.gz 116148 BLAKE2B 0b24d5673a186f085935cd146dc27d38224736141ec480564e5be0bea7f6d624084e5bd2178453950a5ce57caf1b8ff6e3574d789b230ec07268559801856528 SHA512 a4752bb16a0b7d24f2a5d1ee62390d646778509e63dbdefa2419caca6d6251c429f18abf38dce7729cf185b9a3ef819de3fa75324e36787b984800a76c8dd3f7
EBUILD prelude-lml-rules-3.0.1.ebuild 485 BLAKE2B 4386ff4b8f8ff7034e601e8e2ad8efb381cd5398f2acc645bb35a99edfada906b6e2de89a9962c453021d7d3a2af62dec5b81795aff4a5c597ad3b66d95dde12 SHA512 69939ca37558057b4c3b2dbce32e755e834235acfbf9ce11b7570bf049d6cd5f8270264284c60904211bf61ccddce1f4c5b84812c43add186a9b64fdb2a860a1
EBUILD prelude-lml-rules-3.1.0.ebuild 492 BLAKE2B 2c9758156f5793d7924aa5df076f811658a40b61ca03871208317794587e179751cc66b495df14493450e432f76003e01485b9735a6c78b8d6fddbbbf1d49c84 SHA512 3bab272f739243b2b4af96ab9227562bc58d2d4d36a723f4e31a876b7e48c7a7d0633f4e542b0511df6b8cad70baa3b6306536a36d18214b7d0d0541f740d655
EBUILD prelude-lml-rules-4.0.0.ebuild 456 BLAKE2B 9defe3181c15de9e839092b35afc63d8e5a2b62dd2341f15d20b8c50825cfb3a5eb1ea49d6997a6c658e9c88098b7ae67ba43afead0f0a6e5cfafc4bf388a305 SHA512 78766de94e82be4044997cefef9434f5d3b72c2b69833e4516002f0170bac933eb469c1d65c8cf700e36bfb9a6d2afb55d2e61df8d41b798e6002ec12e2ce67d
+EBUILD prelude-lml-rules-4.1.0.ebuild 456 BLAKE2B 8973181a90812fe583f17cfbdf2c294f4f5437edc0376e1ce89d9ec037565c290082970f4c5cfc451b442ca6ec977f4ca5f1002ae1b3ad3b599fb6a6642c81c1 SHA512 094855a812d3f0e55cffd72d3e33a512d674d9e268d93af11c6466334877884868d56ed5db3e3b57b98449fd47f6dfa903f43e0ae728192513f762dbcee98109
MISC metadata.xml 476 BLAKE2B ff36dabaf589375064e572c154dc5725109905c5ce43e20b4c47ffdbb857a24c9a6e89f8cc3f2dc8977458e8207e52bc77a5354f901b3b6c2298c515f030e811 SHA512 67d80e0bc56afd5694c392259e8ca7488b9595cfd2a2c79479344398513511549b4fa1acab280a67b5d1295bff1a73f2a0a8f5e36980a0087d00a67d2d43d410
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild
new file mode 100644
index 000000000000..59a9a724b22b
--- /dev/null
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Prelude LML community ruleset"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="~net-analyzer/prelude-lml-${PV}"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+ insinto "/etc/prelude-lml/ruleset"
+ doins ruleset/*.rules
+}
diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest
index 9d626684c7fe..c23bcbf671bd 100644
--- a/net-analyzer/prelude-lml/Manifest
+++ b/net-analyzer/prelude-lml/Manifest
@@ -8,7 +8,9 @@ AUX prelude-lml.service 297 BLAKE2B c1ecbb3f69c21ccd82f7c985598a3cfcf5313d9004d9
DIST prelude-lml-3.0.0.tar.gz 1391203 BLAKE2B b3e4bfab596f869919c70dd7d2c3860bba33754970eff9b1a8c238f35cafec67601548985bd36244740062455a19fc816cbd7eb50bc6a3c4c97cf9da5b288dd3 SHA512 f206407f99df394186466566608b434a94d4fdce3e5e8991a4236f2ee670f6ae2573adea22bc248fdfea760588e94160faa7260257aeaeb35c938e1bb886ee6c
DIST prelude-lml-3.1.0.tar.gz 1408600 BLAKE2B 7475754de5df1200e89fe37fbdc27ec7d0862f7d844ad56adf6875fea88c19e3a7f4da725a729bde16171e207ce47f40200eaf10ddeededf0b14ac60fd92cf4a SHA512 16fe23c410f6ee585513589c1f9435e0a7dded010ccfd8bb0a8744603e7e020378afee474f6146472afa39263052defddc8c9115235dbd3015727c18f625773b
DIST prelude-lml-4.0.0.tar.gz 1435446 BLAKE2B 03231bfe4763bfbbc3256075f832a99f83c8e26221412f6b07ab7464d4d46b6abdad6dccdd3379927dbf05cfe808b31df57398f48bd794a311ced19f6e7fac67 SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8
+DIST prelude-lml-4.1.0.tar.gz 1457294 BLAKE2B ec57e0e1d9048918c838965444888e80ee320882057dd3972c5da68402ca2443363dc26efc86e89916b1bc4e25d32c36aeac350ddf4aafb4598e8b3704e4f6e7 SHA512 e34d542e3b9e12873f9e2a19e2573b32e2b686574cbc8678cefbb198d7397695f8a2512effb58be9e6703663158c2294d741e0f6f8db23c5541e58bdd3c7f035
EBUILD prelude-lml-3.0.0.ebuild 1109 BLAKE2B 4f2be6c6d6bd55d6a6d3f9bd906f1f44d2807cae707ff250104889ba158eef110ee8d05fd1f81bcd85b5e467b30bfbbb54bc27402d1913bfbc0a8e93450ceea9 SHA512 aa73cbe3ef1c8da02224fb03ea7a8f43f1eaf41563bb922428cae527a83378db76a8ead23b5247cc2c0688f47ed32a6c966967f7d9729ea5b9e3505492afae14
EBUILD prelude-lml-3.1.0.ebuild 967 BLAKE2B 71a06b5af5d23ea93e164ad4046d92c8225f5c96ad435205a217bcbd8f239d775082e8947f60ea6abb4229eeaef0097be502e9b221c7092629e5e03972785f3b SHA512 43e1ce24d1a1929b6848cb1cc66d9d2fad451b9c952a2e816cc4266f2d52c411cb0d892696c7fc6abf8e4da654cf633a0f3aae4ca7713eccc1102746a3bade73
EBUILD prelude-lml-4.0.0.ebuild 974 BLAKE2B 1d458ff6c476e56b22a0e510c9dbd831d6ee88e6647d9a040b6270507aa7a86779a85c825a029d3333122ac5909b3329817a98e284d7ca9cbeaaa2d53c5557d2 SHA512 c5b5b976364e17a1cd34a7b260b75891a75d8211a808e34551134e6e5419bf004865ea26589ccaed712aaabc31e42e27fdac3c68c61a4068ad46ac4efe7641a2
+EBUILD prelude-lml-4.1.0.ebuild 1045 BLAKE2B d5538ff12b7a81d4828d9f36c89987836f8697228779cae58fb86261b16796792b9ac711680bf82cd6cf6a2f7c71ce2ae9db9e9a2010fccddbdd5cff7ec79ba1 SHA512 b69be9c14f0587bc2bcfd85ea8c23f8f06f49704bcf373c2fee5921402ada7694fb57aa06357277ddace4b1528db05732cd85e4c8063a03b4900c76625412004
MISC metadata.xml 859 BLAKE2B 029350529cf91a38bba7ebf303271c5388e7407266a1808a410aa05d004d68b01fe48470384cfa45bf671d6ea095b14ee6f9b462b94cee4b30c1198485626e68 SHA512 8a5d558c9a92c34f3a9eb082c2295422cf834c158bf295cdb2c85f6bde1c242d6e350299ef53b8a6556eb736c1ea7cb825723354a370b419a338021b8ca6e724
diff --git a/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild
new file mode 100644
index 000000000000..754a0268b461
--- /dev/null
+++ b/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="The prelude log analyzer"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="icu ssl"
+
+RDEPEND="~dev-libs/libprelude-${PV}
+ dev-libs/libpcre
+ icu? ( dev-libs/icu:= )
+ ssl? ( net-libs/gnutls:= )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.1.0-run.patch"
+ "${FILESDIR}/${PN}-3.0.0-conf.patch"
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}/var"
+ $(use_with ssl libgnutls-prefix)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ rm -rv "${ED%/}/run" || die "rm failed"
+ keepdir /var/${PN}
+
+ find "${D}" -name '*.la' -delete || die
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index 6f83f36296ff..60962a538e66 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -3,5 +3,5 @@ DIST sslscan-1.11.10-rbsec.tar.gz 52108 BLAKE2B db78ae281149da451cc2f6f60d8379d5
DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
EBUILD sslscan-1.11.10.ebuild 1303 BLAKE2B 2c39f37ed0ad85e4e2a3f76e5b47a29906e2d50150f96686b2466fd5ebb7a364bf9355cf155434720967e1430c6363eaf1b468bbb884039914504038f2bf6085 SHA512 f11f67b88a4577a70c684584e70b6bf75e8498a3b48fc9ed7f07601ce97415375ab3136577e3b4feabc3ebe02d711de3b76b4b14715b2831a4312d517f0d43a4
-EBUILD sslscan-1.11.11.ebuild 1163 BLAKE2B 7bccef3a83ed1a8c7d914dd0959beb92d4402f1c141df390bd209ad7c77eaf7e2346c6547305a7dbf471e0d091199b70e4fbc1583b1076a13ff6c4bb21225400 SHA512 d86e6c4ea2e1437b63956e37d26c3240e71386c2e0dce98edd8077bd8aafb1c7b1ca4d2b8c3cb87250d51af6fa24a86e13992679ebbdd07d3667fa7171cbe920
+EBUILD sslscan-1.11.11.ebuild 1161 BLAKE2B 11d5dc98ef503bef04efdb8037ca794e2e7341378543f3c987b5c3e2c25665ee94c393ea632dd1af69bcb5e7463b727db72dbe6666c812c5e88161b8c589e792 SHA512 b1be927c3ee5a5fe0a26621c089222ca38d31f1d169c4dca73986dfb27a7e4dcdceafb37ce7b68828003422e008a1dca241589777616476b687834b4a6e1eefc
MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.11.ebuild b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
index 61ffbbe5632e..3c2e05a39993 100644
--- a/net-analyzer/sslscan/sslscan-1.11.11.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libressl +static"
DEPEND="libressl? ( dev-libs/libressl )"
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2ebdc316e604..dfde766bd448 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -6,15 +6,16 @@ AUX wireshark-2.6.0-androiddump-wsutil.patch 640 BLAKE2B 07e8bbb0a892d35fc58d63c
AUX wireshark-2.6.0-qtsvg.patch 800 BLAKE2B 767fdc6f54ad226b5b55333bfeb9a0c79d989a274b430a582f7a79406ac424474af2b723ade963a8d52428dfc66686aeb71366d133cdf2b0e714efdde549628a SHA512 fe326b15364ce139ac616ba9e6799d2519b00d67fb6e770c5294e15c8141fcf6d9fb4462e31d609bd98ac15c3a67dedd9e37a2eec42f47c95861aba7dee20f31
AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db464f1274beba49c440af831d708bf251ad7481231f27bd7d7f99cf50f964e7f8aa80ce3c0f4d3b06f00ce624f7347 SHA512 92d498c7b6c3a4ae461f5bbca090943dbd7a3151628eebd4b212f3d9eca133260fe46bc72c6bec8444a83517d7a69c334257c61f9fd8e1256f71dd70241e3f66
AUX wireshark-2.6.1-Qt-5.11.patch 1968 BLAKE2B 74c96bfdec9540b7ea91dd71c9420ac735e9f9b7d2ebccafad5447252d7f6768184ce3af16628e966634473687f8da92e300b47c01ab2ce974a475e8796886b9 SHA512 a079b03d35733f837e73c5d2bd6860ccc3dc185f4488ac4768b3cf081bde15e86a562c7c5e445775e2618f993e8286d5bde9b0617f9d3f30e94d1802d4d75a63
+AUX wireshark-2.6.2-qtsvg.patch 548 BLAKE2B a86981841b4bd76c429d68bb94439317c29404a8917ee8419b7f9e729e857a6dafb94c738f656633672f4f31a8a0e3ccc6a1946b6db3a15b27244cf5ab34a7e5 SHA512 08530766e3e3e3273847a7147303c0bbb0f2b9230e54f057fe4e266ea4f67d577d301a4c02e63d69bb5cdeaf0445466c906278ab76e636a0f2bb8a886eb21ddc
AUX wireshark-99999999-androiddump-wsutil.patch 772 BLAKE2B 061dc2253d10dd088ebf7cacbe6a1afadf2b5b41d37ad1de07e6c3985feb13934f743c3c303dab0548d4df4b762afd876ace6f522a3d0d750ed1d77b823402b7 SHA512 181683e22a2b694c28e49915d2b00e7c3261dc9eabc1893892d0c62f73b4aa28f3811a5b69ff496e2c166e2fa958f0a54776d63489337ccd4851d4eafddc0f0a
AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
AUX wireshark-99999999-qtsvg.patch 792 BLAKE2B 88a51d38d3854ff6488a5b3042866f9dba4a94009e241c1ec1838b008af7c006433d59b550a289bc132a01ee873838c22bc478f780d5e930afdb04de295426f0 SHA512 7cc0d21d5689fdae0714799f6b2ba3711a44eb353e55d4f367b5fd1974688be517d9629a8b68537edad8545ce5f5149109a5af3392d1c70e6d76734b7bae1822
AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3
DIST wireshark-2.4.5.tar.xz 28836740 BLAKE2B 797540daca259a2d5d7dc6e637f2b504b6d14191af4040e6b344c95db6c776b7de80c25c59c98ab84d0337cc96c7313b42c13103a3c3944768a793130deae258 SHA512 2f2c201d6b8a37dcbe03bc9affbf97d632d8e40e4fe5b3a3e79cbd5cfbeb5b9111919850546ccae355fcb042def3456438eb1c4d73f7d56d373e7898311b42f3
-DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54ded5dcd0396ba97d1cbd99addaeb9670d5a870f5e83c39384230def04c078d676580bded81746753716cb392ee05a SHA512 171047fa36a6cb29d1edb8e28086e24075f8b77581d9f3142fa39af8ae3d6dfe0c2e41a9335ca5d9851578b54ac9e6e74ff5bd92a96af262a5cc7a73857b8b81
DIST wireshark-2.6.1.tar.xz 28386244 BLAKE2B fe45f4249c81fd83ce35384b7038d7f1b5e21d884a5faec4344dda8f0c8b71393207e043672ce57bb6f1c45800ffce8feed8573a064db8048b3c0268feb0b486 SHA512 e68f7fa5975f10feccb76ab64c9a00f141cd04a12fa586a9839c93630d3554565d8e2ddfab83ec31cb813485b14b3227b7ec6e59baef007a6fe74b8b2a5ed444
-EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c
-EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b
-EBUILD wireshark-2.6.1.ebuild 6626 BLAKE2B e577e69a7b9db97cb7f35374787d44abd53c5a0a02235f459a68b683ef8b669d3787332b00d5b57b62723c20ad04e0fb09c8ec2dbc30bf3e2a757edf8368fe8c SHA512 443adade8dede2f90531d65ebe34e90f3cec6fb29e2c5cdeb2764326b0509b08437a94532d979fca1270a8a9d0aa5734f2540bb936e38c785c004083eb8b2af3
-EBUILD wireshark-99999999.ebuild 6391 BLAKE2B a97356a1ffeafe735cad35e35d7633dc34c97239f7a0f47542da28d2912ca8eff0f9e5172d37efdc157d921026ddd6a92bb22d45b628cdecfdd485b0369552d4 SHA512 56818a23c3cd32a9553b4e7ca77ca21f99546a0a2bbab5fd8c3311d4c564c7e634fb19da5587609386ceb3c925150031b1c296753e89be68626b0f1e137903d8
+DIST wireshark-2.6.2.tar.xz 28392140 BLAKE2B 08fb59061f618494ee07ca19cd97ab2ebe7c483419c1932e185dd42a0fe2b6d0070834ae5b7aaea4981f6fbc4baeaadb7c9eee8bf32b823af77e753c468257ce SHA512 e39cd8dec44c8c64e5da25df0ffda529130541e5267fb0bdaa232fb4a4438c28ac5c9169ba17a37119d6cedf04a022b40da09f35f44a3739bdfb9486703f39e2
+EBUILD wireshark-2.4.5.ebuild 7334 BLAKE2B 8a968571ad9b7ecfca31dab7e22feda54ecd9ca42e244b89cc8e6f024fc767c9bc81d7fa36408c9332381024b6cd75abda7607fa26bca0dccc7a5dc105a24d3d SHA512 08a980bdb34a2929ea2f0d62ff1dbd73328897ddd3c20d529b67e8564e487c216f0fcddddbaaf54f8132fbc2139261217d0c36e0d9c644c01020600e62b7096f
+EBUILD wireshark-2.6.1.ebuild 6604 BLAKE2B 7d29d72adf6b118afd922ec74bca8f261b98765ac4c28b76620eac8d1aced4329fd85fbe8e5707c0245402385b71f98aaa6a70c4ce080e37893e5c3fe1bd71e1 SHA512 1599d590d6adba1a29baa40045a7fed23f70bfa56e965cab1e8042269705c11194e87442dd152fd9ce5bf3f94fcf363daf69b177c961429db367da43bd6ad8c4
+EBUILD wireshark-2.6.2.ebuild 6566 BLAKE2B da412a21e0fc09082365ea38c19f3aaf0096da797925a47022e8099fb97e3503634529d046092802146f821516bfc68d386609abc945e59ce25f6c13c8c4609b SHA512 a41d38397e8bcd6d68f4111c757d447d45487106bcb30f3d5c54d45090a8d0c3ab82861bfad4fcc4923b4db5b2e741fd1b4cadb786503de5177ca087aa71842b
+EBUILD wireshark-99999999.ebuild 6369 BLAKE2B 099383aae55deb0186a58215a7fc5e13c07e5ebb309f06883ec1ba307fdb8dbb3f8da5b8a8edcf7623d01fef9b1297da44aeda2ec1fe6e16e92cd0af2404cfb8 SHA512 6dafc31e2a5726dd3f57d144b7944924199b331e2d241abbbb79a41641bf8df026a3a8b2db391df67dbb8fa92ca39e06cd9c6290949825668e9dfcbc37a27abe
MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9
diff --git a/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
new file mode 100644
index 000000000000..445851090a69
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.6.2-qtsvg.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -939,14 +939,12 @@
+ Qt5LinguistTools
+ Qt5Multimedia
+ Qt5PrintSupport
+- Qt5Svg
+ Qt5Widgets
+ )
+ set(Qt5Core_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ set(Qt5LinguistTools_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ set(Qt5Multimedia_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ set(Qt5PrintSupport_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+- set(Qt5Svg_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ set(Qt5Widgets_OPTIONS ${QT_FIND_PACKAGE_OPTIONS})
+ if (APPLE)
+ set(PACKAGELIST ${PACKAGELIST} Qt5MacExtras)
diff --git a/net-analyzer/wireshark/wireshark-2.4.5.ebuild b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
index d5a957dd4257..49ec9932a089 100644
--- a/net-analyzer/wireshark/wireshark-2.4.5.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="~arm64 ppc ppc64 ~x86-fbsd"
IUSE="
adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
@@ -61,7 +61,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-2.4.6.ebuild b/net-analyzer/wireshark/wireshark-2.4.6.ebuild
deleted file mode 100644
index 9ab79ccdd073..000000000000
--- a/net-analyzer/wireshark/wireshark-2.4.6.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fcaps flag-o-matic gnome2-utils multilib qmake-utils user xdg-utils
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
-IUSE="
- adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
- +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
- lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
- +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
- tfshark +tshark +udpdump zlib
-"
-REQUIRED_USE="
- ciscodump? ( libssh )
- sshdump? ( libssh )
-"
-
-S=${WORKDIR}/${P/_/}
-
-CDEPEND="
- >=dev-libs/glib-2.14:2
- dev-libs/libgcrypt:0
- netlink? ( dev-libs/libnl:3 )
- adns? ( >=net-dns/c-ares-1.5 )
- caps? ( sys-libs/libcap )
- geoip? ( dev-libs/geoip )
- gtk? (
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/pango
- x11-misc/xdg-utils
- )
- kerberos? ( virtual/krb5 )
- libssh? ( >=net-libs/libssh-0.6 )
- libxml2? ( dev-libs/libxml2 )
- lua? ( >=dev-lang/lua-5.1:* )
- lz4? ( app-arch/lz4 )
- nghttp2? ( net-libs/nghttp2 )
- pcap? ( net-libs/libpcap )
- portaudio? ( media-libs/portaudio )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- >=media-libs/speex-1.2.0
- media-libs/speexdsp
- x11-misc/xdg-utils
- )
- sbc? ( media-libs/sbc )
- smi? ( net-libs/libsmi )
- snappy? ( app-arch/snappy )
- spandsp? ( media-libs/spandsp )
- ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
-"
-# We need perl for `pod2html`. The rest of the perl stuff is to block older
-# and broken installs. #455122
-DEPEND="
- ${CDEPEND}
- dev-lang/perl
- !<virtual/perl-Pod-Simple-3.170
- !<perl-core/Pod-Simple-3.170
- doc? (
- app-doc/doxygen
- app-text/asciidoc
- dev-libs/libxml2
- dev-libs/libxslt
- doc-pdf? ( dev-java/fop )
- www-client/lynx
- )
- qt5? (
- dev-qt/linguist-tools:5
- )
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-RDEPEND="
- ${CDEPEND}
- gtk? ( virtual/freedesktop-icon-theme )
- qt5? ( virtual/freedesktop-icon-theme )
- selinux? ( sec-policy/selinux-wireshark )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
- "${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
- "${FILESDIR}"/${PN}-2.4-androiddump.patch
- "${FILESDIR}"/${PN}-99999999-androiddump.patch
- "${FILESDIR}"/${PN}-2.4.3-libsmi.patch
-)
-
-pkg_setup() {
- enewgroup wireshark
-}
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
- # --with-ssl to ./configure. (Mimics code from acinclude.m4).
- if use kerberos; then
- case $(krb5-config --libs) in
- *-lcrypto*)
- ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
- ewarn "Note there are annoying license incompatibilities between the OpenSSL"
- ewarn "license and the GPL, so do your check before distributing such package."
- myconf+=( "--with-ssl" )
- ;;
- esac
- fi
-
- # Enable wireshark binary with any supported GUI toolkit (bug #473188)
- if use gtk || use qt5; then
- myconf+=( "--enable-wireshark" )
- else
- myconf+=( "--disable-wireshark" )
- fi
-
- if ! use qt5; then
- myconf+=( "--with-qt=no" )
- fi
-
- if use qt5; then
- export QT_MIN_VERSION=5.3.0
- append-cxxflags -fPIC -DPIC
- fi
-
- # Hack around inability to disable doxygen/fop doc generation
- use doc || export ac_cv_prog_HAVE_DOXYGEN=false
- use doc-pdf || export ac_cv_prog_HAVE_FOP=false
-
- econf \
- $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
- $(use dumpcap && use_with pcap dumpcap-group wireshark) \
- $(use_enable androiddump) \
- $(use_enable capinfos) \
- $(use_enable captype) \
- $(use_enable ciscodump) \
- $(use_enable dftest) \
- $(use_enable dumpcap) \
- $(use_enable editcap) \
- $(use_enable mergecap) \
- $(use_enable randpkt) \
- $(use_enable randpktdump) \
- $(use_enable reordercap) \
- $(use_enable sharkd) \
- $(use_enable sshdump) \
- $(use_enable text2pcap) \
- $(use_enable tfshark) \
- $(use_enable tshark) \
- $(use_enable udpdump) \
- $(use_with adns c-ares) \
- $(use_with caps libcap) \
- $(use_with geoip) \
- $(use_with gtk gtk 3) \
- $(use_with kerberos krb5) \
- $(use_with libssh) \
- $(use_with libxml2) \
- $(use_with lua) \
- $(use_with lz4) \
- $(use_with nghttp2) \
- $(use_with pcap) \
- $(use_with portaudio) \
- $(use_with sbc) \
- $(use_with smi libsmi) \
- $(use_with snappy) \
- $(use_with spandsp) \
- $(use_with ssl gnutls) \
- $(use_with zlib) \
- $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
- $(usex netlink --with-libnl=3 --without-libnl) \
- $(usex qt5 --with-qt=5 '') \
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
- $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \
- $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \
- $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \
- --disable-profile-build \
- --disable-warnings-as-errors \
- --sysconfdir="${EPREFIX}"/etc/wireshark \
- ${myconf[@]}
-}
-
-src_compile() {
- default
-
- if use doc; then
- emake -j1 -C docbook
- if use doc-pdf; then
- addpredict "/root/.java"
- emake -C docbook all-pdf
- fi
- fi
-}
-
-src_install() {
- default
-
- # FAQ is not required as is installed from help/faq.txt
- dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
- doc/{randpkt.txt,README*}
-
- if use doc; then
- docinto /usr/share/doc/${PF}/html
- dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
- if use doc-pdf; then
- docinto /usr/share/doc/${PF}/pdf/
- dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
- fi
- fi
-
- # install headers
- local wsheader
- for wsheader in \
- config.h \
- epan/*.h \
- epan/crypt/*.h \
- epan/dfilter/*.h \
- epan/dissectors/*.h \
- epan/ftypes/*.h \
- epan/wmem/*.h \
- register.h \
- wiretap/*.h \
- ws_diag_control.h \
- ws_symbol_export.h \
- wsutil/*.h
- do
- insinto /usr/include/wireshark/$( dirname ${wsheader} )
- doins ${wsheader}
- done
-
- #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/
- insinto /usr/include/wiretap
- doins wiretap/wtap.h
-
- if use gtk || use qt5; then
- local c d
- for c in hi lo; do
- for d in 16 32 48; do
- insinto /usr/share/icons/${c}color/${d}x${d}/apps
- newins image/${c}${d}-app-wireshark.png wireshark.png
- done
- done
- for d in 16 24 32 48 64 128 256 ; do
- insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
- newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png
- done
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- # Add group for users allowed to sniff.
- enewgroup wireshark
-
- if use dumpcap && use pcap; then
- fcaps -o 0 -g wireshark -m 4710 -M 0710 \
- cap_dac_read_search,cap_net_raw,cap_net_admin \
- "${EROOT}"/usr/bin/dumpcap
- fi
-
- ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
- ewarn "add yourself to the wireshark group. This security measure ensures"
- ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-2.6.1.ebuild b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
index efde4f468e86..9e43a2a0eac0 100644
--- a/net-analyzer/wireshark/wireshark-2.6.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.1.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
diff --git a/net-analyzer/wireshark/wireshark-2.6.2.ebuild b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
new file mode 100644
index 000000000000..2eefb6006408
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.6.2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils
+
+DESCRIPTION="A network protocol analyzer formerly known as ethereal"
+HOMEPAGE="https://www.wireshark.org/"
+SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc64 x86"
+IUSE="
+ adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+ +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
+ nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux
+ +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump
+ zlib
+"
+
+S=${WORKDIR}/${P/_/}
+
+CDEPEND="
+ >=dev-libs/glib-2.14:2
+ dev-libs/libgcrypt:0
+ netlink? ( dev-libs/libnl:3 )
+ adns? ( >=net-dns/c-ares-1.5 )
+ bcg729? ( media-libs/bcg729 )
+ filecaps? ( sys-libs/libcap )
+ gtk? (
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/pango
+ x11-misc/xdg-utils
+ )
+ kerberos? ( virtual/krb5 )
+ sshdump? ( >=net-libs/libssh-0.6 )
+ ciscodump? ( >=net-libs/libssh-0.6 )
+ libxml2? ( dev-libs/libxml2 )
+ lua? ( >=dev-lang/lua-5.1:* )
+ lz4? ( app-arch/lz4 )
+ maxminddb? ( dev-libs/libmaxminddb )
+ nghttp2? ( net-libs/nghttp2 )
+ pcap? ( net-libs/libpcap )
+ portaudio? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ >=media-libs/speex-1.2.0
+ media-libs/speexdsp
+ x11-misc/xdg-utils
+ )
+ sbc? ( media-libs/sbc )
+ smi? ( net-libs/libsmi )
+ snappy? ( app-arch/snappy )
+ spandsp? ( media-libs/spandsp )
+ ssl? ( net-libs/gnutls:= )
+ zlib? ( sys-libs/zlib )
+"
+# We need perl for `pod2html`. The rest of the perl stuff is to block older
+# and broken installs. #455122
+DEPEND="
+ ${CDEPEND}
+ dev-lang/perl
+ !<virtual/perl-Pod-Simple-3.170
+ !<perl-core/Pod-Simple-3.170
+ doc? (
+ app-doc/doxygen
+ dev-ruby/asciidoctor
+ )
+ qt5? (
+ dev-qt/linguist-tools:5
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ gtk? ( virtual/freedesktop-icon-theme )
+ qt5? ( virtual/freedesktop-icon-theme )
+ selinux? ( sec-policy/selinux-wireshark )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch
+ "${FILESDIR}"/${PN}-2.4-androiddump.patch
+ "${FILESDIR}"/${PN}-2.6.0-androiddump-wsutil.patch
+ "${FILESDIR}"/${PN}-2.6.0-redhat.patch
+ "${FILESDIR}"/${PN}-2.6.2-qtsvg.patch
+ "${FILESDIR}"/${PN}-99999999-androiddump.patch
+)
+
+pkg_setup() {
+ enewgroup wireshark
+}
+
+src_configure() {
+ local mycmakeargs
+
+ # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
+ # --with-ssl to ./configure. (Mimics code from acinclude.m4).
+ if use kerberos; then
+ case $(krb5-config --libs) in
+ *-lcrypto*)
+ ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
+ ewarn "Note there are annoying license incompatibilities between the OpenSSL"
+ ewarn "license and the GPL, so do your check before distributing such package."
+ mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
+ ;;
+ esac
+ fi
+
+ if use qt5; then
+ export QT_MIN_VERSION=5.3.0
+ append-cxxflags -fPIC -DPIC
+ fi
+
+ mycmakeargs+=(
+ $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
+ $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
+ $(usex qt5 MOC=$(qt5_get_bindir)/moc '')
+ $(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
+ $(usex qt5 UIC=$(qt5_get_bindir)/uic '')
+ -DBUILD_androiddump=$(usex androiddump)
+ -DBUILD_capinfos=$(usex capinfos)
+ -DBUILD_captype=$(usex captype)
+ -DBUILD_ciscodump=$(usex ciscodump)
+ -DBUILD_dftest=$(usex dftest)
+ -DBUILD_dumpcap=$(usex dumpcap)
+ -DBUILD_editcap=$(usex editcap)
+ -DBUILD_mergecap=$(usex mergecap)
+ -DBUILD_mmdbresolve=$(usex maxminddb)
+ -DBUILD_randpkt=$(usex randpkt)
+ -DBUILD_randpktdump=$(usex randpktdump)
+ -DBUILD_reordercap=$(usex reordercap)
+ -DBUILD_sharkd=$(usex sharkd)
+ -DBUILD_sshdump=$(usex sshdump)
+ -DBUILD_text2pcap=$(usex text2pcap)
+ -DBUILD_tfshark=$(usex tfshark)
+ -DBUILD_tshark=$(usex tshark)
+ -DBUILD_udpdump=$(usex udpdump)
+ -DBUILD_wireshark=$(usex qt5)
+ -DBUILD_wireshark_gtk=$(usex gtk)
+ -DDISABLE_WERROR=yes
+ -DENABLE_BCG729=$(usex bcg729)
+ -DENABLE_CAP=no
+ -DENABLE_CARES=$(usex adns)
+ -DENABLE_GNUTLS=$(usex ssl)
+ -DENABLE_KERBEROS=$(usex kerberos)
+ -DENABLE_LIBXML2=$(usex libxml2)
+ -DENABLE_LUA=$(usex lua)
+ -DENABLE_LZ4=$(usex lz4)
+ -DENABLE_NETLINK=$(usex netlink)
+ -DENABLE_NGHTTP2=$(usex nghttp2)
+ -DENABLE_PCAP=$(usex pcap)
+ -DENABLE_PORTAUDIO=$(usex portaudio)
+ -DENABLE_SBC=$(usex sbc)
+ -DENABLE_SMI=$(usex smi)
+ -DENABLE_SNAPPY=$(usex snappy)
+ -DENABLE_SPANDSP=$(usex spandsp)
+ -DENABLE_ZLIB=$(usex zlib)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # FAQ is not required as is installed from help/faq.txt
+ dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
+
+ # install headers
+ insinto /usr/include/wireshark
+ doins ws_diag_control.h ws_symbol_export.h \
+ "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h
+
+ local dir dirs=(
+ epan
+ epan/crypt
+ epan/dfilter
+ epan/dissectors
+ epan/ftypes
+ epan/wmem
+ wiretap
+ wsutil
+ )
+ for dir in "${dirs[@]}"
+ do
+ insinto /usr/include/wireshark/${dir}
+ doins ${dir}/*.h
+ done
+
+ #with the above this really shouldn't be needed, but things may be looking
+ # in wiretap/ instead of wireshark/wiretap/
+ insinto /usr/include/wiretap
+ doins wiretap/wtap.h
+
+ if use gtk || use qt5; then
+ local s
+ for s in 16 32 48 64 128 256 512 1024; do
+ insinto /usr/share/icons/hicolor/${s}x${s}/apps
+ newins image/wsicon${s}.png wireshark.png
+ done
+ for s in 16 24 32 48 64 128 256 ; do
+ insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
+ newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
+ done
+ fi
+
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ # Add group for users allowed to sniff.
+ enewgroup wireshark
+ chgrp wireshark "${EROOT}"/usr/bin/dumpcap
+
+ if use dumpcap && use pcap; then
+ fcaps -o 0 -g wireshark -m 4710 -M 0710 \
+ cap_dac_read_search,cap_net_raw,cap_net_admin \
+ "${EROOT}"/usr/bin/dumpcap
+ fi
+
+ ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
+ ewarn "add yourself to the wireshark group. This security measure ensures"
+ ewarn "that only trusted users are allowed to sniff your traffic."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index d1a9875cba39..820661327c1d 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.ebuild
@@ -52,7 +52,7 @@ CDEPEND="
snappy? ( app-arch/snappy )
spandsp? ( media-libs/spandsp )
ssl? ( net-libs/gnutls:= )
- zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
+ zlib? ( sys-libs/zlib )
"
# We need perl for `pod2html`. The rest of the perl stuff is to block older
# and broken installs. #455122
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 3d323b1f6012..25fed9428ffc 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
Binary files differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 59868d98a6eb..98d38a7da415 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,6 +1,8 @@
AUX bind-tools-9.5.0_p1-lwconfig.patch 1856 BLAKE2B 3f65aaf584ced53a098cd9536eb4e8fd243b50ef0845be3008066fa0b45915f4e2db585d3f64896782e7bf94362235fc31c1f869169d92996cdaf081935a4047 SHA512 f46290cddfb39b077269cd2198d04eef6a7e680b5f0f8dcf471e551a61b4b7a56871a56cdd20afdeaa86edb790513d8c522032fb725a266c18e0e59eee803dcc
DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
DIST bind-9.12.1.tar.gz 9302783 BLAKE2B 731ce67acb22f72e54de1122c5d5c3c1f0663c400bdff9545578a45e5fe3094c6d754351e57dd5c52cdfe1528305dfde25eba7382a723a60b8bfdfeebb9536cd SHA512 701e34a0a3313568c8e5cf76668fefc2a1fceb2ade0de201b8f678401569f1c622c3d1657a71772fa3298efc8b3cdefe974d98432c0087e8b45af3d50a4262fb
+DIST bind-9.12.2.tar.gz 9424960 BLAKE2B 85bb95568de0204da5bcf97555d659f3e2acd4b6f1c255586f1ca8552cdf734aa644406f7dabf64a8f2ce98980a5fbe011746011be7a8f4edf47ce2555cf2f55 SHA512 17b641138e4e9a878fe1c5843363eff090a8d2b056eb1f10eb4ff34e0e3f457990a4ab9e7136aca850641b6d92601088971d40b6976d105e57f61fcd5537dcbe
EBUILD bind-tools-9.11.2_p1.ebuild 3150 BLAKE2B d27676a209a1c10af67af40fb8e4cca5044a7086e6ba8752a16cd2dbaa6b47e518b3885f2592318364b6dbbb78c7b120aea9da9dae6c05214b1ad6b3d0fba8a8 SHA512 946118c94832fc9583ebcac861b6fa7b9d673c29b744d02af8733732a61dd743ccc289e7f002319e8e351183d0d94a302af00bb0377e08bb433041cde8f455a5
EBUILD bind-tools-9.12.1.ebuild 3368 BLAKE2B 800b01b9fb04b2729beb94f422b64dbff471e21490a1f70864f2a535426194960430de58e0547e487a8f95b6898f5557a5776bded565aded00b8d50548432c89 SHA512 d787f6ce937c47a94eb9e1e9654647403746056f2b0fd4d8a57615de03bd490fa50ad7651ab7cea6a9818a85de0d4926e6c07f868755c92e551d8734285c3a8b
-MISC metadata.xml 513 BLAKE2B bfb78568f9c2b262000c297e06791ddee8455c24a29e0fc822e272ed7d1cc3b90cd106f4faf3eff1da3824aca8dbe359b7fb3f767d72a967464edc649728066e SHA512 5c817f1afce4f096d912de9f0cd82b92e2b97f86db24de5eae8aa1a877c78e1800582b4615666c43f139049e179dbc30134692d7039517f97cf53ba9a2dcbd4d
+EBUILD bind-tools-9.12.2.ebuild 3439 BLAKE2B 3b924df8db1dd9034ea43e9f12da6f180fec964d146820a0b3dc1b4395b4fad579ea98be33f7e38da7ddedf02808274237b5af69231044c55192f1c80c776bba SHA512 65f9e22ba1c9816865abf24b6746b3f519b61ee3a79ccff5b198a0b8399cc96e7aabbc99c3e98f4251fee3f18d96b8ef135699c0411cdd3c0b1c3af519c68a57
+MISC metadata.xml 640 BLAKE2B e563c600c07069fbcf6b9c6a650c4ea47004973757ee685ef12d88c012d70dc2d50831f238aa0ce557531dc91fe8dbb606e526a3b3a72d56725024d76329bcf7 SHA512 e87aa31e416bf3051f213c22b744262a6f4700254a42ab684da2a99eb2b9efb848ccbd2ec747f7c9f309556e6ba5426edaaf3a877cc620758cbde0b40d8c6b37
diff --git a/net-dns/bind-tools/bind-tools-9.12.2.ebuild b/net-dns/bind-tools/bind-tools-9.12.2.ebuild
new file mode 100644
index 000000000000..f4e0311bb53c
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.12.2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc gost gssapi idn ipv6 libedit libidn2 libressl readline seccomp ssl urandom xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="gost? ( !libressl ssl )
+ idn? ( !libidn2 )
+ libidn2? ( !idn )"
+
+CDEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ gost? ( >=dev-libs/openssl-1.0.0:0=[-bindist] )
+ xml? ( dev-libs/libxml2 )
+ idn? ( <net-dns/idnkit-2:= )
+ libidn2? ( net-dns/libidn2 )
+ gssapi? ( virtual/krb5 )
+ libedit? ( dev-libs/libedit )
+ !libedit? (
+ readline? ( sys-libs/readline:0= )
+ )
+ seccomp? ( sys-libs/libseccomp )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ !<net-dns/bind-9.10.2"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4
+ rm -rf libtool.m4/
+
+ mv configure.in configure.ac || die # configure.in is deprecated
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+
+ if use urandom; then
+ myconf="${myconf} --with-randomdev=/dev/urandom"
+ else
+ myconf="${myconf} --with-randomdev=/dev/random"
+ fi
+
+ # bug 607400
+ if use libedit ; then
+ myconf+=' --with-readline=-ledit'
+ elif use readline ; then
+ myconf+=' --with-readline=-lreadline'
+ else
+ myconf+=' --without-readline'
+ fi
+
+ # bug 344029
+ append-cflags "-DDIG_SIGCHASE"
+
+ # localstatedir for nsupdate -l, bug 395785
+ tc-export BUILD_CC
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --without-python \
+ --without-libjson \
+ --without-zlib \
+ --without-lmdb \
+ $(use_enable ipv6) \
+ $(use_with idn idnkit) \
+ $(usex idn --with-idnlib=-lidnkit '') \
+ $(use_with libidn2) \
+ $(use_enable seccomp) \
+ $(use_with ssl openssl "${EPREFIX}"/usr) \
+ $(use_with xml libxml2) \
+ $(use_with gssapi) \
+ $(use_with readline) \
+ $(use_with gost) \
+ ${myconf}
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+ local AR=$(tc-getAR)
+
+ emake AR="${AR}" -C lib/
+ emake AR="${AR}" -C bin/delv/
+ emake AR="${AR}" -C bin/dig/
+ emake AR="${AR}" -C bin/nsupdate/
+ emake AR="${AR}" -C bin/dnssec/
+}
+
+src_install() {
+ dodoc README CHANGES
+
+ cd "${S}"/bin/delv
+ dobin delv
+ doman delv.1
+
+ cd "${S}"/bin/dig
+ dobin dig host nslookup
+ doman {dig,host,nslookup}.1
+
+ cd "${S}"/bin/nsupdate
+ dobin nsupdate
+ doman nsupdate.1
+ if use doc; then
+ dohtml nsupdate.html
+ fi
+
+ cd "${S}"/bin/dnssec
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ dobin dnssec-"${tool}"
+ doman dnssec-"${tool}".8
+ if use doc; then
+ dohtml dnssec-"${tool}".html
+ fi
+ done
+}
diff --git a/net-dns/bind-tools/metadata.xml b/net-dns/bind-tools/metadata.xml
index 0db3429195ab..89bc2188b1f4 100644
--- a/net-dns/bind-tools/metadata.xml
+++ b/net-dns/bind-tools/metadata.xml
@@ -6,6 +6,7 @@
<name>Christian Ruppert</name>
</maintainer>
<use>
+ <flag name="libidn2">Enables IDN support using <pkg>net-dns/libidn2</pkg> rather than using <pkg>net-dns/idnkit</pkg></flag>
<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
<flag name="gssapi">Enable gssapi support</flag>
<flag name="gost">Enables gost OpenSSL engine support</flag>
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 259909055ea1..14094aa8109d 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -12,8 +12,10 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b
DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B 5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f SHA512 168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
DIST bind-9.11.3.tar.gz 9523375 BLAKE2B 978986e02767b8ac9f015b52e87b3bc161a7ea72f59f343dcb23f50fbe8474528c4b27ee4fd54bdbe6bd825ce6e8b164e8ad145260b2cdcd004e8892bacd313b SHA512 1f0da13165d1ee872800fe10bb8b0f69c6c76515f9861c1528fb6005213bb71b21a1270906d2ea9ded3eaf6df1a1bac0f2c80aa511683b8d57dcff4f278d8c35
DIST bind-9.12.1_p2.tar.gz 9305005 BLAKE2B 6be328e9e14a26d17c2f789aafc1f83a4690db0b0ae2aeac7dcc4b54a0e5d228692475a39160599fc5c6fd7ed8733d2f0bbac65a20c513f5fa7b6b49ad4b09ae SHA512 de47eef272c437316444c4f585a2f98ae9169fc118fd057464a5cd064bb9079ffc07145dabf388cd240f56a5ad6d3ad78cf8d98fc37609681eba5d87e18a4f9a
+DIST bind-9.12.2.tar.gz 9424960 BLAKE2B 85bb95568de0204da5bcf97555d659f3e2acd4b6f1c255586f1ca8552cdf734aa644406f7dabf64a8f2ce98980a5fbe011746011be7a8f4edf47ce2555cf2f55 SHA512 17b641138e4e9a878fe1c5843363eff090a8d2b056eb1f10eb4ff34e0e3f457990a4ab9e7136aca850641b6d92601088971d40b6976d105e57f61fcd5537dcbe
DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
EBUILD bind-9.11.2_p1.ebuild 12446 BLAKE2B fe6955788d154964b51fa1fc891070dad6183da778f10d0fb9d0089032e3fe55b7aaf814aacff6de1685c447b44717827a765e47e347bd9c4d1e692e4aebbeb5 SHA512 10bd18014db1837d12398d1978c65a20595de1fed0227b5117c702cc749fbf5b19a37f236e4fe8907e7d50868e4d88fa28103b5c9e7a6c447836c9ddfa658862
EBUILD bind-9.11.3-r1.ebuild 12181 BLAKE2B 8efe68cae507e1d58df6081419c9db121d7b5d9ef8345defbfb52323390b248b8d3864736df2b6a8dfa393c53534aab0e8b433f21444ec6869d745386e3987de SHA512 cde50f5355c5efc37600c2cae49eed83d296b8fd862fcb512acb8fd4838efd738d890e29d7664a820ac3a93cd23b3844b9357c4f3c0301843876598d8163e8d6
EBUILD bind-9.12.1_p2-r1.ebuild 12140 BLAKE2B 3c4198382162186541ca90b176b5c3bed82be1e38d48f2e5b2a3d2329e9a9b757b7b69362e5c9276ca158e250a3764d411aad3e55655f21ef92c3bade0dd0890 SHA512 e36ce712b00c80f4518907e7e58e01a1d83b0118544ee3ea5cf15d8906574e09d834831c6af6da23e0cd1884bc1b070720cc85f52a02ff11b13ab3d3b3983236
-MISC metadata.xml 1225 BLAKE2B 731eb2beeb78b21f6dfd01ad2ea13ca45cc26b34e767a0776ef6c6c5370cd7389a9a2670ada393977a9cd887c9e7f09bb64ade83dec6e131a0f7db293a515d7d SHA512 a2e7cc788973055c0aad540eaf2f0bacdc552299ae74e0f80a04bff091e457abd9386aa2a84b7b71fd4f612f960114c5a9c1cc9057bbabff3398737e064d42b8
+EBUILD bind-9.12.2.ebuild 12169 BLAKE2B 365eee1da0687002f634366c1cee23c5dc89457a17d55d2bdad09cb4dee212a22d8059048c4b1bebac77454d9420dc02671879ec3256241a412653c012af98b2 SHA512 e7624673a93893b33bb9c4307968d5673d9cf5ce97eb7c5f99d51ad56da80befee7cb10cc0363a014f2a1707e7951da61c662b928860b74cc848ac9fe8e32518
+MISC metadata.xml 1352 BLAKE2B 89e5d161d824bd1b9a9e9c6ab49457b12d856a8eeb4dba9fb2f3ea987fb88ef708aca88d0d654aeba4ade9d49dc190f9d3e18f86e2c2c874e017aabe7ea8f079 SHA512 47171fcafd8b7b316166e8ba565cc3126ccf2cca4b447abffb7120c34f9ea22243539857d040bf17c509862a9d42d564ccbe151e533a4961516799c5d73d30ab
diff --git a/net-dns/bind/bind-9.12.2.ebuild b/net-dns/bind/bind-9.12.2.ebuild
new file mode 100644
index 000000000000..1d4cd915c433
--- /dev/null
+++ b/net-dns/bind/bind-9.12.2.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="BIND - Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="http://www.isc.org/software/bind"
+SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${P}.tar.gz
+ doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+# sdb-ldap? (
+# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2
+# )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# -berkdb by default re bug 602682
+IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn ipv6
+json ldap libidn2 libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl static-libs
++threads urandom xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+REQUIRED_USE="idn? ( !libidn2 )
+ libidn2? ( !idn )
+ postgres? ( dlz )
+ berkdb? ( dlz )
+ mysql? ( dlz !threads )
+ odbc? ( dlz )
+ ldap? ( dlz )
+ gost? ( !libressl ssl )
+ threads? ( caps )
+ dnstap? ( threads )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+# sdb-ldap? ( dlz )
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ )
+ mysql? ( >=virtual/mysql-4.0 )
+ odbc? ( >=dev-db/unixODBC-2.2.6 )
+ ldap? ( net-nds/openldap )
+ idn? ( <net-dns/idnkit-2:= )
+ libidn2? ( net-dns/libidn2 )
+ postgres? ( dev-db/postgresql:= )
+ caps? ( >=sys-libs/libcap-2.1.0 )
+ xml? ( dev-libs/libxml2 )
+ geoip? ( >=dev-libs/geoip-1.4.6 )
+ gssapi? ( virtual/krb5 )
+ gost? ( >=dev-libs/openssl-1.0.0:0[-bindist] )
+ seccomp? ( sys-libs/libseccomp )
+ json? ( dev-libs/json-c:= )
+ lmdb? ( dev-db/lmdb )
+ zlib? ( sys-libs/zlib )
+ dnstap? ( dev-libs/fstrm dev-libs/protobuf-c )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/ply[${PYTHON_USEDEP}]
+ )"
+# sdb-ldap? ( net-nds/openldap )
+
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-bind )
+ || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd )"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+pkg_setup() {
+ ebegin "Creating named group and user"
+ enewgroup named 40
+ enewuser named 40 -1 /etc/bind named
+ eend ${?}
+}
+
+src_prepare() {
+ # Adjusting PATHs in manpages
+ for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do
+ sed -i \
+ -e 's:/etc/named.conf:/etc/bind/named.conf:g' \
+ -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
+ -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
+ "${i}" || die "sed failed, ${i} doesn't exist"
+ done
+
+# if use dlz; then
+# # sdb-ldap patch as per bug #160567
+# # Upstream URL: http://bind9-ldap.bayour.com/
+# # New patch take from bug 302735
+# if use sdb-ldap; then
+# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch
+# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/
+# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/
+# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/
+# fi
+# fi
+
+ # should be installed by bind-tools
+ sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+ # Disable tests for now, bug 406399
+ sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+ # bug #220361
+ rm aclocal.m4
+ rm -rf libtool.m4/
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=""
+
+ if use urandom; then
+ myconf="${myconf} --with-randomdev=/dev/urandom"
+ else
+ myconf="${myconf} --with-randomdev=/dev/random"
+ fi
+
+ use geoip && myconf="${myconf} --with-geoip"
+
+ # bug #158664
+# gcc-specs-ssp && replace-flags -O[23s] -O
+
+ # To include db.h from proper path
+ use berkdb && append-flags "-I$(db_includedir)"
+
+ export BUILD_CC=$(tc-getBUILD_CC)
+ econf \
+ --sysconfdir=/etc/bind \
+ --localstatedir=/var \
+ --with-libtool \
+ --enable-full-report \
+ --without-readline \
+ $(use_enable caps linux-caps) \
+ $(use_enable dnsrps) \
+ $(use_enable fixed-rrset) \
+ $(use_enable ipv6) \
+ $(use_enable rpz rpz-nsdname) \
+ $(use_enable rpz rpz-nsip) \
+ $(use_enable seccomp) \
+ $(use_enable threads) \
+ $(use_with berkdb dlz-bdb) \
+ $(use_with dlz dlopen) \
+ $(use_with dlz dlz-filesystem) \
+ $(use_with dlz dlz-stub) \
+ $(use_with gost) \
+ $(use_with gssapi) \
+ $(use_with idn idnkit) \
+ $(use_with libidn2) \
+ $(use_with json libjson) \
+ $(use_with ldap dlz-ldap) \
+ $(use_with mysql dlz-mysql) \
+ $(use_with odbc dlz-odbc) \
+ $(use_with postgres dlz-postgres) \
+ $(use_with lmdb) \
+ $(use_with python) \
+ $(use_with ssl ecdsa) \
+ $(use_with ssl openssl "${EPREFIX}"/usr) \
+ $(use_with xml libxml2) \
+ $(use_with zlib) \
+ ${myconf}
+
+ # $(use_enable static-libs static) \
+
+ # bug #151839
+ echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc CHANGES README
+
+ if use idn; then
+ dodoc contrib/idn/README.idnkit
+ fi
+
+ if use doc; then
+ dodoc doc/arm/Bv9ARM.pdf
+
+ docinto misc
+ dodoc doc/misc/*
+
+ # might a 'html' useflag make sense?
+ docinto html
+ dohtml -r doc/arm/*
+
+ docinto contrib
+ dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+ # some handy-dandy dynamic dns examples
+ pushd "${D}"/usr/share/doc/${PF} 1>/dev/null
+ tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+ popd 1>/dev/null
+ fi
+
+ insinto /etc/bind
+ newins "${FILESDIR}"/named.conf-r8 named.conf
+
+ # ftp://ftp.rs.internic.net/domain/named.cache:
+ insinto /var/bind
+ newins "${FILESDIR}"/named.cache-r3 named.cache
+
+ insinto /var/bind/pri
+ newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+ newinitd "${FILESDIR}"/named.init-r13 named
+ newconfd "${FILESDIR}"/named.confd-r7 named
+
+ if use gost; then
+ sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}/' "${D}/etc/init.d/named" || die
+ else
+ sed -i -e 's/^OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-1}$/OPENSSL_LIBGOST=${OPENSSL_LIBGOST:-0}/' "${D}/etc/init.d/named" || die
+ fi
+
+ newenvd "${FILESDIR}"/10bind.env 10bind
+
+ # Let's get rid of those tools and their manpages since they're provided by bind-tools
+ rm -f "${D}"/usr/share/man/man1/{dig,host,nslookup}.1*
+ rm -f "${D}"/usr/share/man/man8/nsupdate.8*
+ rm -f "${D}"/usr/bin/{dig,host,nslookup,nsupdate}
+ rm -f "${D}"/usr/sbin/{dig,host,nslookup,nsupdate}
+ for tool in dsfromkey importkey keyfromlabel keygen \
+ revoke settime signzone verify; do
+ rm -f "${D}"/usr/{,s}bin/dnssec-"${tool}"
+ rm -f "${D}"/usr/share/man/man8/dnssec-"${tool}".8*
+ done
+
+ # bug 405251, library archives aren't properly handled by --enable/disable-static
+ if ! use static-libs; then
+ find "${D}" -type f -name '*.a' -delete || die
+ fi
+
+ # bug 405251
+ find "${D}" -type f -name '*.la' -delete || die
+
+ if use python; then
+ install_python_tools() {
+ dosbin bin/python/dnssec-{checkds,coverage}
+ }
+ python_foreach_impl install_python_tools
+
+ python_replicate_script "${D}usr/sbin/dnssec-checkds"
+ python_replicate_script "${D}usr/sbin/dnssec-coverage"
+ fi
+
+ # bug 450406
+ dosym named.cache /var/bind/root.cache
+
+ dosym /var/bind/pri /etc/bind/pri
+ dosym /var/bind/sec /etc/bind/sec
+ dosym /var/bind/dyn /etc/bind/dyn
+ keepdir /var/bind/{pri,sec,dyn}
+
+ dodir /var/log/named
+
+ fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+ fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+ fperms 0750 /etc/bind /var/bind/pri
+ fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+ systemd_newunit "${FILESDIR}/named.service-r1" named.service
+ systemd_dotmpfilesd "${FILESDIR}"/named.conf
+ exeinto /usr/libexec
+ doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+pkg_postinst() {
+ if [ ! -f '/etc/bind/rndc.key' ]; then
+ if use urandom; then
+ einfo "Using /dev/urandom for generating rndc.key"
+ /usr/sbin/rndc-confgen -r /dev/urandom -a
+ echo
+ else
+ einfo "Using /dev/random for generating rndc.key"
+ /usr/sbin/rndc-confgen -a
+ echo
+ fi
+ chown root:named /etc/bind/rndc.key
+ chmod 0640 /etc/bind/rndc.key
+ fi
+
+ einfo
+ einfo "You can edit /etc/conf.d/named to customize named settings"
+ einfo
+ use mysql || use postgres || use ldap && {
+ elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+ elog "uncomment the specified rc_named_* lines in your"
+ elog "/etc/conf.d/named config to ensure they'll start before bind"
+ einfo
+ }
+ einfo "If you'd like to run bind in a chroot AND this is a new"
+ einfo "install OR your bind doesn't already run in a chroot:"
+ einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+ einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+ einfo
+
+ CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+ if [[ -n ${CHROOT} ]]; then
+ elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ elog "To enable the old behaviour (without using mount) uncomment the"
+ elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ elog "If you decide to use the new/default method, ensure to make backup"
+ elog "first and merge your existing configs/zones to /etc/bind and"
+ elog "/var/bind because bind will now mount the needed directories into"
+ elog "the chroot dir."
+ fi
+}
+
+pkg_config() {
+ CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+ CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+ CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+ if [[ -z "${CHROOT}" ]]; then
+ eerror "This config script is designed to automate setting up"
+ eerror "a chrooted bind/named. To do so, please first uncomment"
+ eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+ die "Unset CHROOT"
+ fi
+ if [[ -d "${CHROOT}" ]]; then
+ ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+ ewarn "To enable the old behaviour (without using mount) uncomment the"
+ ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+ ewarn
+ ewarn "${CHROOT} already exists... some things might become overridden"
+ ewarn "press CTRL+C if you don't want to continue"
+ sleep 10
+ fi
+
+ echo; einfo "Setting up the chroot directory..."
+
+ mkdir -m 0750 -p ${CHROOT}
+ mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run}
+ mkdir -m 0750 -p ${CHROOT}/etc/bind
+ mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/
+ # As of bind 9.8.0
+ if has_version net-dns/bind[gost]; then
+ if [ "$(get_libdir)" = "lib64" ]; then
+ mkdir -m 0755 -p ${CHROOT}/usr/lib64/engines
+ ln -s lib64 ${CHROOT}/usr/lib
+ else
+ mkdir -m 0755 -p ${CHROOT}/usr/lib/engines
+ fi
+ fi
+ chown root:named ${CHROOT} ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ ${CHROOT}/etc/bind
+
+ mknod ${CHROOT}/dev/null c 1 3
+ chmod 0666 ${CHROOT}/dev/null
+
+ mknod ${CHROOT}/dev/zero c 1 5
+ chmod 0666 ${CHROOT}/dev/zero
+
+ if use urandom; then
+ mknod ${CHROOT}/dev/urandom c 1 9
+ chmod 0666 ${CHROOT}/dev/urandom
+ else
+ mknod ${CHROOT}/dev/random c 1 8
+ chmod 0666 ${CHROOT}/dev/random
+ fi
+
+ if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+ cp -a /etc/bind ${CHROOT}/etc/
+ cp -a /var/bind ${CHROOT}/var/
+ fi
+
+ if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+ mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP
+ fi
+
+ elog "You may need to add the following line to your syslog-ng.conf:"
+ elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/bind/metadata.xml b/net-dns/bind/metadata.xml
index 3ebfa6b11197..8ccec0f9e0a2 100644
--- a/net-dns/bind/metadata.xml
+++ b/net-dns/bind/metadata.xml
@@ -15,6 +15,7 @@
<flag name="gost">Enables gost OpenSSL engine support</flag>
<flag name="gssapi">Enable gssapi support</flag>
<flag name="json">Enable JSON statistics channel</flag>
+ <flag name="libidn2">Enables IDN support using <pkg>net-dns/libidn2</pkg> rather than using <pkg>net-dns/idnkit</pkg></flag>
<flag name="lmdb">Enable LMDB support to store configuration for 'addzone' zones</flag>
<flag name="nslint">Build and install the nslint util</flag>
<flag name="rpz">Enable response policy rewriting (rpz)</flag>
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index e9755ebc2c93..35fe37ce756d 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -8,5 +8,5 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
DIST dnsmasq-2.78.tar.xz 489172 BLAKE2B 996b59181c4b582b74c91be073e62f0756d2e4c67ee36ff825b6973699f60e44959bb0451bbb8623f277e5a8378cda987a300eee6ec9398ae99284b302da2747 SHA512 9b79b84e5a768d52f90f6335ccef2c404ecd7a13e78e49f4cd0755fffc6cf34d0dc96ad4c72cad1dab3c5743a8d0d789b3e9b6e625b03c5675bb898ca61a698b
DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f
EBUILD dnsmasq-2.78.ebuild 4507 BLAKE2B 15472be6911ec12f64e3f0ff322d15bde8c15857f1b01e1e9053ba476c832ae852049e558b05b54b74dde2fe60e34202835e90d68c7ec4381a5a4e268fd023d6 SHA512 b7db6c09a5a0febfa1bc0437e34b793cbd1c6f5aba8a96769e2c85fffa7aabd88eb3bb198ba5bf0263c3b113ac9f1ab608a36421ab64120e7f62fd6815ec1ca3
-EBUILD dnsmasq-2.79.ebuild 4604 BLAKE2B c7b2f199815a75df3bc69e3a883149bcf8db300b54f5dec7e744f52c41a6c26fb2af6cbcb48c5c874e9d0d652aeeb000b8d9f2751a9267c888412513b9649136 SHA512 41a01845b0f97ad79c8791c3e5b2800e41e0690dc85de060d7a92cd3e3a32efb2e14c68411ca897ca063f27ebcb5292410e87d595ed8cfbf3cbeb8ca236bde66
+EBUILD dnsmasq-2.79.ebuild 4597 BLAKE2B 22eb9b426f8fde30bdf7117a8764d0453a8802aac7677bb90f12cd3dd79795a104c8765344668b35c7e6b19ce7617c1b2da9e15f38e5b1ea409b8280eccecd67 SHA512 345687728e8e52b22f59692fda5f3b95fa87a7a93e5da48e177cc090a4539d8f805a64cb4ab3561e66bbce67bce661de85ce24d67959b4c2ce1d96cc0cbd6bf7
MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6
diff --git a/net-dns/dnsmasq/dnsmasq-2.79.ebuild b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
index 5af2dbb6c98d..ca4a6b8217d2 100644
--- a/net-dns/dnsmasq/dnsmasq-2.79.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.79.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec id idn libidn2 +inotify"
IUSE+=" ipv6 lua nls script selinux static tftp"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index cb9577e4c172..c8c6382e3127 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
Binary files differ
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 750f03a5e1ef..500565b92735 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -3,7 +3,7 @@ DIST libnfs-1.9.7.tar.gz 145925 BLAKE2B 0b1d7a2d67b5dc870e20642438eddcd667c6fa57
DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
EBUILD libnfs-1.9.7.ebuild 1041 BLAKE2B c10d98df553a00f89ae4ae30219067ff16ec308f69d25d91b34a58b9be5d13155d58c309af6f66b7b1854cbc59075b07a79349105f7dddd3b9e756f059dc8e1b SHA512 bcec2c0c325e1ebad33b62caa1891176fed02c40f962ea047d4366d0427c0920e242c90d54502d8a216774c3c083ab4e0a80aab92c4aabc1e83a3a7ec8e698af
-EBUILD libnfs-2.0.0.ebuild 1110 BLAKE2B fb8098132e10496fd160092eb5b0eaa207b9fce499a97d19ed9f2c0562ec138d6237f49f5061c0eaec3d0b5c2224462f91c2858b5269cd402fcd48aded422d85 SHA512 31fe7ef50c243c033501d310e0d7bf995ff4c84895403caf94251a9793ec9e1404b1e1ca4d19dbfdb3dc48ff86fc49b0013e81242b541e81aac6a3a600454425
+EBUILD libnfs-2.0.0.ebuild 1107 BLAKE2B c429ddaf504458c32bb2f6fe90917039db4da09812edd411a08229bba084322d5743fbcabd549c887b87a9184e5d49440fbe3c7a86c5363312c116073089cea3 SHA512 fe8efc097123d8b6f4b82c202dd4171daeb59c851e11b0a0d506cf9f50c51a46e11aa600882bacc1eae1c60d0b9dd22ae7eb25f4c6b13480f377e836d5013e97
EBUILD libnfs-3.0.0.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
EBUILD libnfs-9999.ebuild 1210 BLAKE2B 24f63a66d483c1ce06aa120a33e7b19e93c3600861a771b3e050d6802637dc5912cd8ac18a15a85fdd1dbb05baec6927da3ca5ccaa405b6ed72b0e7ac40f5ec6 SHA512 07ce95ae4b64c0dc86b51d6e22d991fe82cf7fc6fc676a29fb682ce88652f7ec522ece3c963849b44baa8933f1fce27160a36c42e2bef368a2fdc25b0e2c5a41
MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index d5c0961b9ee8..894937592457 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
fi
DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index ae4928d5b224..6281914e614e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -17,10 +17,8 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970
AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b
AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
-DIST nfs-utils-1.3.4.tar.bz2 814545 BLAKE2B 4b8c5fa4c1c21858e19d05f973c6d94185cf6a15c88348dda5e47c6714f9dba00dfa05237d908479970440b2ea57287600e92cb4d49872127b3801e075d6bf1a SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c
DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3
DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf50880a89ec97cb8ce4453266ba5b145eb1ca7a4362ac1a91ea5c1ebddd4fcd1d6a4cd12f45637cd5d845cc6d8d5f139d SHA512 4b948d92f515e9340163f53ab26dd7189fa8b13909f5c668b7c66ae13f181ed778967edc0a20753763540b5a3f93a41a2de38a7276ffbfadfd866c5ed422520c
-EBUILD nfs-utils-1.3.4-r1.ebuild 5139 BLAKE2B 8c2504911449d130588e6293c0691ddaa881630e01b390e4f7cd891e02ebcf137984565867b21ad59261d38d5ae5bad89ce7d5a3684bc9ae6f3b8a0787d08d06 SHA512 828f39b3f7f117e5930b42c62908b9f6f5ba7cefacaf2a2149108b428b03da8ca1f1ca993a86264876f1103d6118ef6be62ec25babb4d6aff0270b24a4fe4e0a
-EBUILD nfs-utils-2.3.1-r3.ebuild 5294 BLAKE2B 3c04d19a98bd620de460ae07bca7a609bc57c1de39ac621c7cf9404a5297b79d8f3e2d9d5ec2c2fb14754dcd6cb5b0e4e39d1c5f54cb3568e70ae95b266e76ef SHA512 342f97daba6c64b74da49617024c659e3be6f50b698564958a171b222502911369b87f2d18e7770c3fe5f0869d89a5db6d15c1624a62fe1d311de581e1fe137f
+EBUILD nfs-utils-2.3.1-r3.ebuild 5293 BLAKE2B 785b622435b7f2a7ffe2993c4a3dfd4a18d25170761f1c59157d55fe3643ddee33862b9ce0da3d29a9a50d80ef2c50d1a77d61ef2c86dca5f10082761da712fd SHA512 70b6a1c3dce229571c1c07f0fe32a3cb392f349d8928b5d7007c4485c3cc3f20710eb400141d893af2098518af481a2fa79d3a0b5e8f2bab5dca571dacc86af6
EBUILD nfs-utils-2.3.2.ebuild 5385 BLAKE2B 4dfc11b9a80be2dcd0501c3da9e541d16cd6d260cf28d18d2fe2cb539274b85b9fa2b29c4f1c251989b8cc2b2778f1aea0f93f10a259458f3e55a15787e03c02 SHA512 1e05759322d7726187956010ff65985970dc3b032838d8b4090361035a922c9d4d425a7c6cd1c415ea5e6f32aacf1f1fbdff1a3d50a58ac09f43e310964799a7
MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild
deleted file mode 100644
index 466e8e2c5e4f..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
- caps? ( sys-libs/libcap )
- sys-libs/e2fsprogs-libs
- >=net-nds/rpcbind-0.2.4
- net-libs/libtirpc:=
- libmount? ( sys-apps/util-linux )
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- dev-libs/libevent:=
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- >=net-libs/libtirpc-0.2.4-r1[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- >=sys-apps/keyutils-1.5.9
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
- !net-nds/portmap
- !<sys-apps/openrc-0.13.9
- selinux? (
- sec-policy/selinux-rpc
- sec-policy/selinux-rpcbind
- )
-"
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
- epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-
- sed \
- -e "/^sbindir/s:= := \"${EPREFIX}\":g" \
- -i utils/*/Makefile.am || die
-
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
- export ac_cv_header_keyutils_h=$(usex nfsidmap)
- econf \
- --with-statedir="${EPREFIX}"/var/lib/nfs \
- --enable-tirpc \
- --with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
- $(use_enable libmount libmount-mount) \
- $(use_with tcpd tcp-wrappers) \
- $(use_enable nfsdcld nfsdcltrack) \
- $(use_enable nfsv4) \
- $(use_enable nfsv41) \
- $(use_enable ipv6) \
- $(use_enable caps) \
- $(use_enable uuid) \
- $(use_enable kerberos gss) \
- $(use_enable kerberos svcgss) \
- --without-gssglue
-}
-
-src_compile(){
- # remove compiled files bundled in the tarball
- emake clean
- default
-}
-
-src_install() {
- default
- rm linux-nfs/Makefile* || die
- dodoc -r linux-nfs README
-
- # Don't overwrite existing xtab/etab, install the original
- # versions somewhere safe... more info in pkg_postinst
- keepdir /var/lib/nfs/{,sm,sm.bak}
- mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
-
- # Install some client-side binaries in /sbin
- dodir /sbin
- mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
- if use nfsv4 && use nfsidmap ; then
- # Install a config file for idmappers in newer kernels. #415625
- insinto /etc/request-key.d
- echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
- doins id_resolver.conf
- fi
-
- insinto /etc
- doins "${FILESDIR}"/exports
- keepdir /etc/exports.d
-
- local f list=() opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list+=( rpc.idmapd rpc.pipefs )
- use kerberos && list+=( rpc.gssd rpc.svcgssd )
- fi
- for f in nfs nfsclient rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
- for f in nfs nfsclient ; do
- newconfd "${FILESDIR}"/${f}.confd ${f}
- done
- sed -i \
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
- "${ED}"/etc/conf.d/nfs || die #234132
-
- systemd_dounit systemd/*.{mount,service,target}
- if ! use nfsv4 || ! use kerberos ; then
- rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
- fi
- if ! use nfsv41 ; then
- rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die
- fi
- rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
- sed -i -r \
- -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
- -e '/^(After|Wants)=nfs-config.service$/d' \
- -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
- "${D}$(systemd_get_unitdir)"/* || die
-
- keepdir /var/lib/nfs #368505
- keepdir /var/lib/nfs/v4recovery #603628
-}
-
-pkg_postinst() {
- # Install default xtab and friends if there's none existing. In
- # src_install we put them in /usr/lib/nfs for safe-keeping, but
- # the daemons actually use the files in /var/lib/nfs. #30486
- local f
- for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
- cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
- done
-
- if systemd_is_booted; then
- if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
- ewarn "We have switched to upstream systemd unit files. Since"
- ewarn "they got renamed, you should probably enable the new ones."
- ewarn "You can run 'equery files nfs-utils | grep systemd'"
- ewarn "to know what services you need to enable now."
- fi
- else
- ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
- ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
- ewarn "same runlevel as nfsmount."
- fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
index ff490a255b5b..5cd180a79be4 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *_rc* ]] ; then
S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
else
SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
fi
LICENSE="GPL-2"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 1932e357ba66..da2695cdab3e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,6 @@
AUX 4.2/samba4.confd 1783 BLAKE2B 773d5da817e3c4a93ce31a3bd81715632f879711a3ecfa6821f91523c65eb49c90498f86e7c2108df8b5c89d811105d2e685efadb1317a10af07e501339fb8c8 SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d
AUX 4.2/samba4.initd-r1 1103 BLAKE2B cf8a53aff9ec49a745168593e737c35d61ccc138ed304d27977a420f71440b4a7a0e241110180278684d26c5f848810c9b1bfc32af54a22f039119513765bccc SHA512 8627b32446afed2cf1238eafc0f154ddb6c16857ee96f959e47f8d485b7317354afe59a08fcb3adbd17da087069cf2b94020a44b9190d597b40afd0b8aedf9a5
-AUX 4.4/samba4.confd 2036 BLAKE2B afc872734ee4b5d4332e1550e29dca6fdfe5e70a77018621df731aed5c69471294c5c9766050b1109bf978c785690930d8e6aa0429d60ae4d0b37487b4c2c8bf SHA512 122fa1eb8bcf43b0cab64be604c4cae82553f4fbff58ba831afdd2dd5e032618a875154bd50578aeba880a28c45027aa1fba66a76d1c3c28d5850fc098d9812c
+AUX 4.4/samba4.confd 2035 BLAKE2B a9fa538a0b259c8a184012e0370819729e24fa971de52e3d3891107bd78e6d4e074a2df80b1c424c23229ce5e84ea1da908887c8fef88dd45104eb5c6eb0e4a5 SHA512 d6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af
AUX 4.4/samba4.initd-r1 1125 BLAKE2B 204a639069495cfd711bd1c9dcd78a480e07bca7b760efdec49061f093d7e41dc6ce16b9264cc4762094bb7a796dc96d71003668416d40948036bd6fcc944a2e SHA512 982771fd7e1d260d8d4305eb18a3c15871f535b700d2b9554af24df62286e59ce6c5c76ef4ffee7a751fc01040eefaaabad71b2f67e3749ba1ee97a368b14d5a
AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75b8b616e039e235f2202e4c5275421ec018911e92680da923d9403f7bfc65e1995216f4c157fef SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d
AUX samba-4.2.3-heimdal_compilefix.patch 819 BLAKE2B f19e9e1af0d5616fc04473ddcdd898f2a942afb284e72a3a50454ffa63c201a3ad1b061d966107c749450cefe260e40090327f0144e1086e9bba4607c3811500 SHA512 0f6ddbf58e5d5b83e3fb9738dd10c2ab0f1ed96fb62f9b4389a40729b3fe2d4af1a5c5bd2d44fa7d568136072b787b6358aeca3026f1acec4f5a6869e74f2536
@@ -9,7 +9,6 @@ AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8f
AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24
AUX samba-4.6-no_ads.patch 1102 BLAKE2B 34d7f4364a1eb5dc93cfdba3fe011d71361c134bcc7ed15f07731a8dbfc57d8b555b6942b3a1fb7ff1ae082d609849c0b8191613ed3880318102a03588a2d2ce SHA512 a077711b51801d7af215dec62782ef166e45fdc007a9a8f3ae724638d3d7f6e3177ace5be549d327964b787b1d64b7e0d4485fa4a2a013617824d991c547c780
AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5
-AUX samba-4.8-without_ads_build_fix.patch 1325 BLAKE2B 3a203397c4cc860f9681bf5015dcf36e2c4ba2672714fc95151548855790e7d0b517ca0568494a8915d02e492c02d3cbf07d5e4fc74a44acfe0153ffb62f2a5a SHA512 1947ec4a1d98c52e223763a7e3981642d3faa38c0e11e8f947c369b7e4ecde17d657e96fc8eeb3dd1ef8fa688c930c77a67e240d9176728583a9d8f55cf9a490
AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
@@ -30,7 +29,7 @@ DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f
EBUILD samba-4.2.14.ebuild 7140 BLAKE2B c09f771cb1db8d7be599084d4ad9956a41afefeeb9e2b229a9f215b24494348641a95c9f1da7048e18485f14f10dd7d2e0ba745b0c59930b0dbdf810ccd7119e SHA512 70ee5c801744693da54a8c0d944f41e80b60b1ce4a44b51bc36d0433ddbfe3ac98f704094f734faed3b425f08cd2c7543a9bfd4329ee450862a57475af1ac840
EBUILD samba-4.5.16.ebuild 8167 BLAKE2B d979c6b102cfcb3a77a18decad488ba40604fc9ac8d8889e114f09cef489897727197a09eed2c2d057a04aaf2367b3e4f53db260a2edc792db8cd2091113312b SHA512 db32b221d811e09f0a07c5d5fde3f528425c4a7375e8fa45fc9cca96d3b1e64f165f19836926efc8198f05bdb8ddc43f718854d82ad034a97d11f0423e36f2d6
EBUILD samba-4.6.15.ebuild 8732 BLAKE2B 984e99c120299e958b69d749b84627c2a094d6f4a207e775112af2bcfe09918feb6cfe89cb999ea31c645dd59fd7edf2fee8e53f98ba664c331142044d3ec3ad SHA512 3f39c3320b0ef3b6d611827b103432726c7788cc9164ae5eb11b02b0eaa8fe1eecb1677cd9630024b5a6abc78f72d8abaa90f63e72df718a36462216e92f76fc
-EBUILD samba-4.7.7.ebuild 8728 BLAKE2B 2ce8c1eeb3251f446af6844642bf449a7a0fa53ded5dc4202aee6f109cf76145c9fe201be37e371804d147d3c1870d97e554d1d7dbbf996c131ef7f0d40479c0 SHA512 390a7b3fa453a36061237e8f78e94d061e2f130c9fc7197ae21b14f296592868a775228042194cc36b0f6ce0bf2244c2d9314a38234316d5bf80b15fce33871c
-EBUILD samba-4.8.3.ebuild 8308 BLAKE2B 44920ec9e0594446ffc441ef6b5a3843351b3ca0ab98516e5f3951e728e5ea1a99b30ae62ae9d890e65e95b11e7eeee05b19272c95c25ac6805baca39a4761c4 SHA512 c2f58f7f1f381241a97982cb760bbbe7f03f6203989ca59f9e7c290c23f6c5a19c46e1f1dba94a5ec84d925a8ccc0fdaf78602ec856877507e42b8ec5fc01e8b
+EBUILD samba-4.7.7.ebuild 8803 BLAKE2B 5fe9b941bd95067a7b7820677af872f2c1d3e8a6076e7f1428446fed81e37181b61716706e5ce09383dc2415e7df2fbd60f5ba9dc94ddb6cafb08a81e76607a1 SHA512 dc30f815d2631838322e8fd1233e54a336e4be71dc8c274bd6085278869cf82d8e12f773d14079d1ebbd845cf875e3a0165126ba21c50e5742f849cc97b49521
+EBUILD samba-4.8.3.ebuild 8383 BLAKE2B f4abb5ea2efc4a15ddfc763290e0fc3d5328b1a02460a5490eafc7f4005202e2797154b4dc18ac6a61d9946a963b17471336b6cbe4b51932941f08d0c4e1df2c SHA512 377c4a72ea8eab9ef8bec96af6cfdeb07f43d3a430b93606c44f4a3b29ca9c23e1c2de8089d461994daf8baa983f979ed17727138f93e7093242704be6702dff
EBUILD samba-4.9.0_rc1.ebuild 8392 BLAKE2B ee657d46873bb03311b2e18b2b89c2d196461dc34aff8931f4ec35bcb6e49a18a4147b899522646bda06f56410b3b557b05d280904096cf246aa8bcc902b5c23 SHA512 a389ed4223c5f3ab81a4b7048ac3efee94669b70c03ce960b53f8d0f0ca186831944bcf3645fae29d7afff74fc719a5d91d3c32d4843825ccce5c01249457827
MISC metadata.xml 1730 BLAKE2B d42bec763cdfdbee859606d1b39474dd9977bfb70ac597d2bbfb66bf5f77ca318b7064aa7f02eaf3ace85462fe19dd0f5da919f4a5c1d900d6a4dc57fc21688d SHA512 b10a146ac000f15e75701e49dbb672081b6704aa1f57c8d5bdac7a2983b5d8846c9b34634c81eec961ba683141202ce1197c980882d438b42beec25d9cfeece6
diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd
index 2604981f2141..629a605021a2 100644
--- a/net-fs/samba/files/4.4/samba4.confd
+++ b/net-fs/samba/files/4.4/samba4.confd
@@ -32,7 +32,7 @@ nmbd_reload="killall -HUP nmbd"
samba4_start_options=""
samba4_command="/usr/sbin/samba"
-samba4_pidfile="${piddir}/samba4.pid"
+samba4_pidfile="${piddir}/samba.pid"
samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}"
samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}"
samba4_reload="killall -HUP samba"
diff --git a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
deleted file mode 100644
index a2a4702d0075..000000000000
--- a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl@samba.org>
-Date: Sat, 3 Feb 2018 07:07:55 +0100
-Subject: [PATCH] libgpo: Fix the build --without-ads
-
-Signed-off-by: Volker Lendecke <vl@samba.org>
-Reviewed-by: David Disseldorp <ddiss@samba.org>
-
-Autobuild-User(master): David Disseldorp <ddiss@samba.org>
-Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331
-
-(cherry picked from commit a222b7506b53e689708834237f18877231dca589)
----
- libgpo/pygpo.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
-index 7a02a0d..b6b53b7 100644
---- a/libgpo/pygpo.c
-+++ b/libgpo/pygpo.c
-@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self,
- return result;
- }
-
-+#ifdef HAVE_ADS
- static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
- const char *samaccountname,
- uint32_t *uac_ret, const char **dn_ret)
-@@ -468,11 +469,15 @@ out:
- return ret;
- }
-
-+#endif
-+
- static PyMethodDef ADS_methods[] = {
- { "connect", (PyCFunction)py_ads_connect, METH_NOARGS,
- "Connect to the LDAP server" },
-+#ifdef HAVE_ADS
- { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS,
- NULL },
-+#endif
- { NULL }
- };
-
---
-1.9.1
-
diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild
index 70a7a8aa61e8..9ed05cd5ef1f 100644
--- a/net-fs/samba/samba-4.7.7.ebuild
+++ b/net-fs/samba/samba-4.7.7.ebuild
@@ -50,6 +50,7 @@ CDEPEND="
net-libs/libnsl:=[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ <sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
sys-libs/readline:0=
diff --git a/net-fs/samba/samba-4.8.3.ebuild b/net-fs/samba/samba-4.8.3.ebuild
index 46470a900f6d..49f819fe736f 100644
--- a/net-fs/samba/samba-4.8.3.ebuild
+++ b/net-fs/samba/samba-4.8.3.ebuild
@@ -50,6 +50,7 @@ CDEPEND="
net-libs/libnsl:=[${MULTILIB_USEDEP}]
sys-apps/attr[${MULTILIB_USEDEP}]
>=sys-libs/ldb-1.3.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+ <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
sys-libs/libcap
sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
sys-libs/readline:0=
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 2fef14b51940..d276cc7664cf 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index b59bde7d24b0..dacc0d6059cd 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -28,4 +28,4 @@ EBUILD vsftpd-3.0.2.ebuild 3149 BLAKE2B d0e49b3fcea35ef606a68754cfbcc1a27241978c
EBUILD vsftpd-3.0.3-r1.ebuild 3652 BLAKE2B c84736785a7023e1373d3439dc57a7da549d66d2febca816151b45a7cf0b0d0dc94a5738a96b3524fbc762734ae264396fc36b854e560f61e5d6ab4e4eb16780 SHA512 55b936fc31fe73981d89f5b87f8042e3824faaa1414df6403a9b4c7251d455b615e1cb548f88c05aa622c76f07757326ba95dc8e81ad1f1d270dcd763d500c33
EBUILD vsftpd-3.0.3-r2.ebuild 3706 BLAKE2B ea396f463bd91bab18c73b1a962b2f52e3e61552448d6a847b8014f723f3861f93da3794b41e18b224d6cc6c10935523cfebdc784b7cd23d9d7a867c2a5202d0 SHA512 6fb9ca1d426cbde4d668c1ec90bc01c09718259a05b04748c4e9b864f034707f79d9a9a1459b20d61cd90e0b43070f9facd7b5b53ed71f19ee4366b8edef9e8d
EBUILD vsftpd-3.0.3.ebuild 3594 BLAKE2B d12430e805fda76679da43feb7554fc63f2ceb39376c3ff5e6fd7378d29a5bce023d153e1e7ae20178b41bc87938226e3ba95e66cf51c382817aecd2af643f95 SHA512 967e258a7e72cab67c5adc433658687593fecd89894845e58999d0f40aa13ff39aef8a1eee53751b7b2fa623faa085830c7c6f0c75723c72ff68cd8611138649
-MISC metadata.xml 372 BLAKE2B a6655b8af8eb08968f4d61f1b7ee6720aa0096f27ee54794fb97cc218d20700189a6769632e792d222ae86d368c47c7bd4d9f8d85bf25e26970e6c4d1d837a26 SHA512 d673dfbc265acd4e0231111adcd9d099b6a465a508f64b031edd12601ac45cded8994eab8b3bd912ab00858197c9d68c4f83d461cd19a488e67daa055c2db334
+MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 6b6ef604ceaa..6d628fb373e0 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription lang="en">
Very Secure FTP Daemon written with speed, size and security
in mind
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index c2c63b822512..151997a47797 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
Binary files differ
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 0e3a29d3e065..bf03fcad2bd3 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -6,5 +6,5 @@ AUX kadu-4.3-gcc7.patch 266 BLAKE2B 1211251304c10c46df75d3fbc84dff1f560c89a533c8
DIST kadu-2.1.tar.bz2 6013519 BLAKE2B 31df1b245ec402a44c60581084d4ec9216636e14a1c11d8609862d982ad08ff3717c16bc9431c21366ef9852eb0035828a11d8010178736ec6b6ebfbadfd971c SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a
DIST kadu-4.3.tar.bz2 8087786 BLAKE2B b63ce2beebb1fd1f64ae8e85430784c6c7d25a071e00342e33d97a2e49b25c02ab131fb30d591acc11a336427118d4dd23e03d89ad07ef066eca09d0463397db SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9
EBUILD kadu-2.1-r2.ebuild 2712 BLAKE2B fcd6b7ced431d192ddc7ea1f90e226d3b12449bfe815639f3d30162e78a7008918a3fe93401dfba105c9bab787d5060a7939183dd491bad20109209f3e3454c1 SHA512 fddb7b9f30b8310fc93734af671ac75273a704d31e6c3a3ba37e80d951329f08f5d4a783e51a0ed8a7c184c4a64997023aef07e5d76f426988fd9368e4a9f0b9
-EBUILD kadu-4.3-r2.ebuild 2539 BLAKE2B 0508cffe2b7ec731f1c1e13cdbf22dd7d6633f8f9e1f4ab8e3bd42a3fe9c2e59d8b44a5320c473209086ba1a55010aabc7af1b39b47c0c05eee136baf22068ec SHA512 0fe2b13fac7ef9fba6a57719c1c2b48311955a4dcb670eefc790718382c20ac50516e37b80b5850e24bb0ef4b5eebfbe1e89a01e1ad1b031ed6d11ba54b06315
+EBUILD kadu-4.3-r2.ebuild 2592 BLAKE2B 09315408ef22f02a91b22c852af6ae93258c2b236020fc347f560d5b011579aa26f832b42259217a537b0035bfd9605b1170d309ac959b52e9ea351a1d865a6d SHA512 37739c785a86097eb1dc1cdc0b007549acd4a0e73e2b81a7dccf3f0762e450628c21a5ae50bf47d4c11b9f71ffe27ef63e598b0a41f08758356b7087025095c4
MISC metadata.xml 635 BLAKE2B 024363b73640cde3ad95f4c1a0a953cc87ea0786da585cdf7b69c75ed2c472120af558d099cced80eaeea6ff293f6502e1cc8e7b2a60621682947b28a95818d3 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571
diff --git a/net-im/kadu/kadu-4.3-r2.ebuild b/net-im/kadu/kadu-4.3-r2.ebuild
index c6c749dc4d31..7c7b4b2617f5 100644
--- a/net-im/kadu/kadu-4.3-r2.ebuild
+++ b/net-im/kadu/kadu-4.3-r2.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-inherit cmake-utils flag-o-matic gnome2-utils
+inherit cmake-utils flag-o-matic gnome2-utils virtualx
MY_P="${P/_/-}"
@@ -133,6 +133,10 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ virtx cmake-utils_src_test
+}
+
pkg_postinst() {
gnome2_icon_cache_update
}
diff --git a/net-im/qtox/Manifest b/net-im/qtox/Manifest
index 728ec919af72..dde3f5703c67 100644
--- a/net-im/qtox/Manifest
+++ b/net-im/qtox/Manifest
@@ -3,4 +3,4 @@ DIST qtox-1.8.1.tar.gz 3594727 BLAKE2B a1d4191551b082cef21ee211eebf7288aa805bb24
EBUILD qtox-1.11.0.ebuild 1620 BLAKE2B 246d85e8d731d87bebae67ee154fd52a9c48a38abfbea788044bd1b7cfdb64fb7c70df216fd475e140dc30cfa33660e610c0d0d2dfe7ae1a1c8a57a9eb7c8263 SHA512 78eb94640ee216cbc111671e89e4bb3cb647cba0da35da55e4f6c5027a9cb32678efa23fe4c92c53e114be1d823428741b8387632f23fa96fe7478c485532420
EBUILD qtox-1.8.1.ebuild 1645 BLAKE2B 46e40eea2eb11c6424ad3165d6adb6ac4c66d1ffc2fda29ccf811538cd6cecc43708bd59a07c884f9e2f8d921e5e990d3f14fc0b6051f46f60ee2c3e0a135803 SHA512 77f53452e5de2599f96828de62a42b5827aa716e204ecb907ca882b86851cb8c9152d9855555d25e7913662ab313193ae7cf9c1fd32425e3a2d52554e9c163a2
EBUILD qtox-9999.ebuild 1531 BLAKE2B 728c7c62de2e5dcb68fff989f2b2d96f88df944e26318fc843cfd95efa2701d0e126a0c1880e56eb33d49d7bd0222b3cb8eaf2727c47081c0dac067ea3cc2576 SHA512 5d5d82ef5220545ae9f4be28a68fbfdf463b566280d1e5217ce475244c878b29e15bcaea9e2cec95759118da1e0a620c9d13f80c3bea1a7ba5f914ab95c6a85e
-MISC metadata.xml 581 BLAKE2B f9dc80dd6e7ccb10eedff8698a91d3aa2bf1c6309f7ea60a543bedc25cfb8f764ee4da13ca4c3f5187fab5530fee56fec8e14d05c4d914fb94003f2e9bd71b78 SHA512 5309c7c89755e543ff5783db805536cd3d25f6cf7146d2c2b2e090cb0cd04dfe1480cde851ac31c42493ea0279cab3b762001a59b36c0b8c40ab700d4681488b
+MISC metadata.xml 382 BLAKE2B da6ba1556fdfe321ff206c5aae1389b6acbafbc50e546e94e67e6e32c33a09f637a8fcc48af5c98771ecce65a628ee24523db18dc9c4b142de46d151fd1d324e SHA512 285be9118fcc760301cad9bab6f5bc61b70498f262278e92c95f35eb48098aaa35e0f72ab693343394df8cb6c51673861a72402d9ca15978b52fc98e1ae7c87c
diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 32a9c62df147..1ce2420d23bb 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -1,14 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zexavexxe@gmail.com</email>
- <name>Zetok Zalbavar</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="gtk">Adds support for GTK and Status Notifier tray backends</flag>
<flag name="X">Adds support for X11</flag>
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 212769d2d2dc..05e39eef181e 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.13.0_amd64.deb 65702626 BLAKE2B bbe0cf058e98f587c1c828170d287a4c796e9638b921a0a5e33a6cf0a6031977366e240bd72a339620ce65f3bcd624ab49616d75ea30a51251dbe7b624d2e419 SHA512 396a918b4a078ca8511917664a4ef4c0fedf042e44099a4801e1607c8c4f1a5ec01ac50dc39e32b3b7de62482b75842d906318a56c4413a2efcadacf6e8151cb
-EBUILD signal-desktop-bin-1.13.0.ebuild 1204 BLAKE2B 14c337f5c12ddcf3197c7bfc3a902b4e930bf87bb868f276bb2a37245ad9e23de59effbf56ac3c98631598c3ac20b7691ec48d8abcd6a2569236f7954de9572e SHA512 59455890ec3c64060964b4b430047d6e1273794083d8fce5a41c2efc1a30b47fb7d99f60935f2664a9a57c1e9adf62fae74dec52ada893bf3558bf79458db261
+DIST signal-desktop_1.14.1_amd64.deb 65711118 BLAKE2B 17baf6e83c54a504784d9fc1bdcf5ec1b2ae9148b4d833a77d5f916c84cd3affcc4f77f205284b86aaaa2a253e0a8480742270c4f21ab566d7213c7422f68157 SHA512 3180c44e4131a2e13d75896e728f4ee4f20064902536fdeafa4ccfb47a29a131826622341ada4ba1d3e71db8a8a141fdeb7f66b586c8993ba1ed78daaa23d2df
+EBUILD signal-desktop-bin-1.14.1.ebuild 1204 BLAKE2B 14c337f5c12ddcf3197c7bfc3a902b4e930bf87bb868f276bb2a37245ad9e23de59effbf56ac3c98631598c3ac20b7691ec48d8abcd6a2569236f7954de9572e SHA512 59455890ec3c64060964b4b430047d6e1273794083d8fce5a41c2efc1a30b47fb7d99f60935f2664a9a57c1e9adf62fae74dec52ada893bf3558bf79458db261
MISC metadata.xml 510 BLAKE2B 618fc8fb3b176d175bb15ceef941c60ebd89666f4b01f7b7912a4c26d8f54802982a8c089480f11573418daf88fb559dacca797c7f42493d122fd448c53eb923 SHA512 9d9ae0f5f1961fc1ad9b0e59f8d2003fc746f6f25dabb6c35b6ee8e151caf25e724b321e0c11a1b02f5431a204215caf5a4614232508b8492a0d33cd4bb46b8a
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.13.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.14.1.ebuild
index 4c7b60f0d173..4c7b60f0d173 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.13.0.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.14.1.ebuild
diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest
index 858635430a2a..450fd5db81ad 100644
--- a/net-im/telegram-desktop-bin/Manifest
+++ b/net-im/telegram-desktop-bin/Manifest
@@ -1,13 +1,14 @@
-DIST tdesktop-1.3.7.tar.gz 17056555 BLAKE2B 1ba22af19a5ad346ee3e540ded473128fe3582fb0260164c1bec3b141a94cedf34e2c75dd8601dd79c9832391bff5a59ff95aef60050f74cb36f109ffb8df98e SHA512 f92003335ac53c77ce5d320e0549734feceed6b60121429f167134cc8d16b547bd27ad3c85dcbf0da5f55ac8e1e60f5027c910082afd9f683d8a98cb7ac16d6b
+AUX telegram-desktop-bin 222 BLAKE2B dc8af6a58e9841c9b3aae86286fb072e13f911f451e9f3718fb3dad9787616ba732d415091e8ebd56fef5ecd7bd4cf18e5a6897c18e2be1b8170d4df3f95c985 SHA512 28477ac203e31244d738f9698cf825821ead39dd2bb67a795155a0516cb0302b2e6c8e666754e4f37c91ed3227cc21bcfb09994334d158056b62f9482c4dacdd
+DIST tdesktop-1.3.10.tar.gz 17167027 BLAKE2B b1748abbfaa08ab22d26707b1b5be7e31dc804869a5ac5cf91bba823787758cd180d9cc41a96eb12787bf445aa6729d66df3aa4ad9acd338500c72da7725211d SHA512 91833405de4d68c6e791fbe3a6ed45926227bc8f7131ffcd2e048e38f8f74419050745a3a56dee926c708e187d9ae985d2efa564ad16fc75f18b60f48a601011
DIST tdesktop-1.3.8.tar.gz 17127764 BLAKE2B ff9390803bbddbd939eb3173f89b42f161d06c81f3c4702562318d08ecbcfbcf548eab04b8bd80a6f4d546db2c6d5a20c3bf73d0db9ae8ccdd9f4c88048f8074 SHA512 4cef9a2b379b090f6993e4e391152d7fa02db3863c0758ea04f04bdac219ae96e4e43459a44a2857895264555f7bf93a03a9969b1f9bd194185cc7c6e746549a
DIST tdesktop-1.3.9.tar.gz 17133428 BLAKE2B b8a8d0bf6d1ae2a55625284c16347b9f5da0f39bdad594b4ae6a8cfe57dce595da2ed54344a13641b31bbe4035b3b83ab9a1b3bce6880777ebd78c3f631c2e89 SHA512 7d9b908e038179448678eb0d29bb9ca62969674e199b89970bac85383ac839156c528939126413e6675901084a2c7d96a254195ebd1780a0b0816ae063f7c7f1
-DIST tsetup.1.3.7.tar.xz 33921540 BLAKE2B 4d309bab164299ff7729f72aed44e21716e8ff1e6c41434fcd3e6c8ce9238891a2b93e4d55e62c6e44846781e755a32258dda36e02351d56357241daede342eb SHA512 c4d1249cb2e1be0e9410ba6d7b5f34f342c420d1b44e6b78736aeb611fa3e11519e4c0dfe2fd6f9a819fea09030d8cf451b2c36fc283fb12e4007b4a29855949
+DIST tsetup.1.3.10.tar.xz 34424588 BLAKE2B c71fda6091d402809fd6989dc6f79c5d43df15e910b939350406233c143e1c8964e67c116d84844aeb54f4a4d6103962281d013507be91b74c58e094b550d5dc SHA512 432d9177e65a461d64f7ccd48745de09cfb2f8d864ba7bf46949e9edd20a5859fcb26491de9053b4823e429a204215daba7399426daaedccf263ffc671697ffa
DIST tsetup.1.3.8.tar.xz 34517696 BLAKE2B 2a3350b2bdb05c880e306965566f622aa6cb440cc8fe3b72e8487efe6473b2e769db988766903634a90c78b66bdcbe7893742346e163de3bef4a4611f657397a SHA512 31766007ca47fe8c47fad9cebb95b1cae0db3ddec8bfee6f0108dd5e490790822d2ef4fceff2c24ca8c09483724f43aa8fa3a6cf5cb0e09de2fc26911cb66fb2
DIST tsetup.1.3.9.tar.xz 34532440 BLAKE2B 628597a1f04a676129f7b219fa991f1dcae51f70d95366d0ee6bd0c8c8592e4cd3f7453d01d4f980c760e8541f619e9b7ee79ffc7e66953dbf22739d6d600094 SHA512 e176a0d7fe7cad421ec1e09023c8e99f143fef6c6e7aabb344cff9f62e915c9cc3ea7afe4ab58bfb776d8eb304a6a9c140c622614fa9e7f6ef7ea62bb56cf88b
-DIST tsetup32.1.3.7.tar.xz 36187736 BLAKE2B 3da383c0067192e523d5b85056acf12085ceea4de6d06135f11c298e1f58ae3b09ffc500fa6cf07b72a186c8c6f6fde592f8a8aaa956ac83f90489c1383a3dd9 SHA512 7b8e3ef29f557af0912ff15cee976b7e244e7367346f1d5b4d6fbdb52941930a8952e0c01f8dc53d4a8c2bd6eb0f1f309b3dbff4b60f8790c204ccaf60565108
+DIST tsetup32.1.3.10.tar.xz 36904652 BLAKE2B 42904f09d4ce26f6d930028f81b7891dfab5ba7d780eace2e70f92752f69612eed6519ccf2ecb0420bd5bfb9f4c999476899df17abf41eca5d4b666bdb7fea9f SHA512 223db27115723cb011f4709ce39fe99228171986a954984a678065d780894d5845ab9bd90541a9cadc7ca6abd01f123ecd53491cd02c235f78615172f40a7a27
DIST tsetup32.1.3.8.tar.xz 37194796 BLAKE2B bfcb48b9f65bc54e1b7c269b500424ec2687c45359aec89da310548d310c5abb9d71547e77a250580f63d077fcb9b477ccd4cd8ae40a4bb4666e216950a3b809 SHA512 cae2c1a6abf2f02515e2ad8df107ab2306c0d1d7d3edf8b04fbee5c2130a0ad4b9e61929fe9b7576dc6d55f42541c2b863c30c1e3aeb186be8c9948334ecdd44
DIST tsetup32.1.3.9.tar.xz 37241464 BLAKE2B e83927531ecda2fdb3181c105b26d320857d9f047bb50ed17b38c8c8686675240c6b0b7acc139e06064746edaf3fc69af8eb6d12ab06dc49642ca39621594a8b SHA512 8d90b4e6568730e304714afd09daa70937784e82c9ad1a84a9808104a7731a3b61101042be3644b8a2d0982b2aac97827a8228bc0c3be311e233183a806ec623
-EBUILD telegram-desktop-bin-1.3.7.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
-EBUILD telegram-desktop-bin-1.3.8.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
-EBUILD telegram-desktop-bin-1.3.9.ebuild 1249 BLAKE2B 27d542a0a7ddb51d2b2a71d22732095ffb99f11c4b4a4e65fd5361c4526d98530baebb804f884737eec5867b5ac4e4a8baf8826dee87172bd50773bb24640f27 SHA512 0f249d71bc25711cc1baf875d94e6418872e35a0c523ccecfb2c2bf2e497f4208d2d8f1f1e5ebda469b516af51b6e938ae5dae6037deb3831a6753b265d506dc
+EBUILD telegram-desktop-bin-1.3.10.ebuild 1307 BLAKE2B fe5836e95483966f06590052aaaabbc7c2e669d4f1d9dfb4bb485163695b6a81b00d3bdbd9b295352db8ef5336de4e94e9e1f7bf6f1f0bec4b36a111baa37b4c SHA512 ef62500c548fda9943c225d976e90e71f48acadc700dbe93eacaf942e6762c9098f8d1944beab10cde4ef745127f00ce523fc3af0afd097aad7b4b1d369b65f7
+EBUILD telegram-desktop-bin-1.3.8.ebuild 1239 BLAKE2B 75378740e43e0a961e60044639c5cd123ec1f122a5f9b121b37e9274ca67e433123f2ceee991e17a145db256a75e0100ade3e4ff8e995af2756421c940da6b03 SHA512 16827af0caa76d6d3d913aebfc51588869f8e09257c6781b0b4a5f6aa9da641c323646517fa94604557554436347ce143b9cad31d96014057f48fa3cf6572304
+EBUILD telegram-desktop-bin-1.3.9.ebuild 1239 BLAKE2B 75378740e43e0a961e60044639c5cd123ec1f122a5f9b121b37e9274ca67e433123f2ceee991e17a145db256a75e0100ade3e4ff8e995af2756421c940da6b03 SHA512 16827af0caa76d6d3d913aebfc51588869f8e09257c6781b0b4a5f6aa9da641c323646517fa94604557554436347ce143b9cad31d96014057f48fa3cf6572304
MISC metadata.xml 585 BLAKE2B 0f6f2dbb75e3fc543ad04b0d72652802b8de0336ccd1171fc06e2d2b61ff5288346b9e3c44afad9e5dbd9de9fa46d3324710697d83e94c9a5da5a8c5a137b26f SHA512 d5af59695ad9fa610865b3719637a7f5dd283f30bf7051f39fd6b8ae7c485f46d52627900cc3d46450491c7429844e0d7c535f2a028a112cb65d7523ff2c669b
diff --git a/net-im/telegram-desktop-bin/files/telegram-desktop-bin b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
new file mode 100644
index 000000000000..3529333838ec
--- /dev/null
+++ b/net-im/telegram-desktop-bin/files/telegram-desktop-bin
@@ -0,0 +1,5 @@
+#!/bin/sh
+# this wrapper disables the auto-updater of telegram-desktop
+# This program is licensed under the same license as telegram-desktop
+
+exec /usr/lib/telegram-desktop-bin/bin/telegram-desktop-bin -externalupdater $@
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.7.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10.ebuild
index 6522d0b976f6..d55f48e2ac53 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.7.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.10.ebuild
@@ -17,7 +17,7 @@ LICENSE="telegram"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-QA_PREBUILT="usr/bin/telegram-desktop"
+QA_PREBUILT="usr/lib/${PN}/bin/${PN}"
RDEPEND="
dev-libs/glib:2
@@ -26,12 +26,14 @@ RDEPEND="
x11-libs/libX11
>=x11-libs/libxcb-1.10[xkb]
"
-DEPEND=""
S="${WORKDIR}/Telegram"
src_install() {
- newbin "${S}/Telegram" telegram-desktop
+ into /usr/lib/${PN}
+ newbin "${S}/Telegram" ${PN}
+ into /usr
+ newbin "${FILESDIR}"/${PN} "telegram-desktop"
local icon_size
for icon_size in 16 32 48 64 128 256 512; do
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.8.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.8.ebuild
index 6522d0b976f6..f9828c5a11d0 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.8.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.8.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
x11-libs/libX11
>=x11-libs/libxcb-1.10[xkb]
"
-DEPEND=""
S="${WORKDIR}/Telegram"
diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild
index 6522d0b976f6..f9828c5a11d0 100644
--- a/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild
+++ b/net-im/telegram-desktop-bin/telegram-desktop-bin-1.3.9.ebuild
@@ -26,7 +26,6 @@ RDEPEND="
x11-libs/libX11
>=x11-libs/libxcb-1.10[xkb]
"
-DEPEND=""
S="${WORKDIR}/Telegram"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 279209744fce..a280ba3b786d 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
Binary files differ
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 5cc8e5daf9c0..131c2807fe6f 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -6,6 +6,5 @@ AUX epic5-1.1.10-xlocale.patch 350 BLAKE2B 4c2fe87d2bd42bee7cea05ab3426403836bb4
AUX epic5-1.1.2-libarchive-automagic.patch 1707 BLAKE2B 94eb0be15058b7ce86fe6500337477729ab2b4ab792d8c100c941c1fd9ff8ff96982616c539ae41bda111b08c1792478e4f47e2ec44e6e84d800e5b5d3ee7fd9 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c
AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 BLAKE2B b104b7ab792010e0113e8f4ef378a53dac2f64182e7045866e3d57176427a735ded0b3a3b7975fab892dfa77692589e7324c927206dfb7a636d7f9ad69950f90 SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c
DIST epic5-1.1.10.tar.bz2 851439 BLAKE2B 13cf0f78ed2009595479fac8173b2936cf74382ec22964e00de2d84fd89c6cee661e4ea9e3d8ba44ec715ac7e861f4639b3459d3ac2d67c74cc49ad4aeebf127 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048
-EBUILD epic5-1.1.10-r1.ebuild 2248 BLAKE2B cdfbaad2493b5b4842d5c09a9f887241438fbde9002848166ac09a33795071f93b0e473560f1e67dcedcfe040ff5672eb4094fc03c4cb8fcf53e5fe78509d030 SHA512 4825e4e3b278cfb9c8954644c5a7c9fe20b1b6cc873d84687cf93fce92bd52c656f0cd0e712e9061aea21a52bbe677f4a54a16e5866d87448ac90a025caac6a8
-EBUILD epic5-1.1.10-r2.ebuild 1851 BLAKE2B 9578453296c0e92b3f9c9289a2c17f535ebaa1723f5bbb926e4df27efd381ba357b7fec52505f2eca6846e9276d4b3430ace008ed759c0ddbb020f9b937fb7a7 SHA512 901bcd66a0b1acb618ebcfe3e161155b323ef2bd34c6a541226aa66d668a3746cd91a69dda36f96d01da7339f727bac9ee4aea79afc413de2c76b31b597cbe42
+EBUILD epic5-1.1.10-r2.ebuild 1849 BLAKE2B e8567259e61a5e33fb1930296900cad6ac23c82f1b099fec405cd5b3295ad72663547da7553ecad9996a1846ccb337c41068d3b609fa324fbf6a8f138531a751 SHA512 86703fe7e6f5eada432846b7cacde9a300a5f7ca008a2708e0a531e6797ac1a330987bd0484e133e0608858f97776f983c1b2a7e7a646f0c203e207186d51cae
MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
deleted file mode 100644
index 32634a469338..000000000000
--- a/net-irc/epic5/epic5-1.1.10-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-USE_RUBY="ruby22 ruby23"
-RUBY_OPTIONAL=yes
-inherit autotools eutils multilib ruby-ng toolchain-funcs
-
-DESCRIPTION="Epic5 IRC Client"
-SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
-HOMEPAGE="http://epicsol.org/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
-
-RDEPEND="
- >=dev-libs/openssl-0.9.8e-r3:0
- >=sys-libs/ncurses-5.6-r2
- virtual/libiconv
- archive? ( app-arch/libarchive )
- perl? ( >=dev-lang/perl-5.8.8-r2 )
- tcl? ( dev-lang/tcl:0 )
- socks5? ( net-proxy/dante )
- ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${RDEPEND}
- valgrind? ( dev-util/valgrind )"
-REQUIRED_USE="ruby? ( ^^ ( $(ruby_get_use_targets) ) )
- $(for t in $(ruby_get_use_targets); do echo "${t}? ( ruby )"; done)"
-
-S=${WORKDIR}/${P}
-
-pkg_setup() {
- # bug #489608, bug #497080
- use ruby && ruby-ng_pkg_setup
-}
-
-# Don't use ruby-ng's separated sources support:
-src_unpack() {
- default
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
- "${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
- "${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
- "${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
- "${FILESDIR}"/${P}-without-localdir.patch \
- "${FILESDIR}"/${P}-socks5-libsocks.patch \
- "${FILESDIR}"/${P}-xlocale.patch
- eautoconf
-}
-
-src_configure() {
- # Because of our REQUIRED_USE constraints above, we know that
- # ruby_get_use_implementations will only ever return one ruby
- # implementation.
- econf \
- --libexecdir="${EPREFIX}"/usr/lib/misc \
- $(use_with archive libarchive) \
- $(use_with ipv6) \
- $(use_with perl) \
- $(use_with ruby ruby "$(ruby_implementation_command $(ruby_get_use_implementations))") \
- $(use_with socks5) \
- $(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
- $(use_with valgrind valgrind)
-}
-
-src_compile() {
- # parallel build failure
- emake -j1
-}
-
-src_install () {
- default
-
- dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
-
- cd "${S}"/doc || die
- docinto doc
- dodoc \
- *.txt colors EPIC* IRCII_VERSIONS missing \
- nicknames outputhelp README.SSL SILLINESS TS4
-}
diff --git a/net-irc/epic5/epic5-1.1.10-r2.ebuild b/net-irc/epic5/epic5-1.1.10-r2.ebuild
index 19db1f3b7bc4..85532830333b 100644
--- a/net-irc/epic5/epic5-1.1.10-r2.ebuild
+++ b/net-irc/epic5/epic5-1.1.10-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://epicsol.org/"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
RDEPEND="
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index c1f9d25c33e0..f25c62a9d2bb 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,7 +4,8 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-EBUILD quassel-0.12.5-r2.ebuild 4944 BLAKE2B b98fa3138101abca722cbb1d2a8dd82a8e62bb3f8394e0a1fce4cfb6c41efdb3022ab7f93311d5451c494075189997447e911cd8354acf0b1ecd646ae5e9586d SHA512 977e4f053599fdd291289d4a6f089c2514ca1dcfeaa119ca3aa11841a516e11df2048b7992702f305f9957ad6799f1a100417447f89c3e4c71d28d0e62f52121
-EBUILD quassel-0.12.5.ebuild 4885 BLAKE2B f732d9aea2322f507845cf69321a442c02ff835f24be64974b15f64858a661ac594894e8f2b81d7305469d50523a862fbd08186fc96aa7f2b20301c1ec77e467 SHA512 d59718ca4709c99279f2a0ef8a4786bb32a3b0a4ab57c4f65db13e4518dfd2add6ef9642532313a60c06fc72b9e46e462b791384da2cdacb2e8cc957380daf54
-EBUILD quassel-9999.ebuild 4935 BLAKE2B 1fd769f104e51caa2ab20837368cb53d5c71f802c4f6fd8624403e265980a0d2870ef2c66c90b6a1f598e15d4d09f019430f68a0f210a38d1aa9a01377790602 SHA512 dfb30906d7bca817d6a14b1e7a1ac6df4a7076bd1b119e8af44cadfb582bf7bfffda6fa8daa25b8964138fac27d2a2a029c254d7efdd3050395f9be29edf0caa
+DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e SHA512 13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
+EBUILD quassel-0.12.5-r2.ebuild 4943 BLAKE2B 5f996b57334d498c9311e1df249fe6f6ca5703ff1b6d5cfc5d64cd82e08298a098b03f23f763f0580c8e328cea3fe49599f390476c8bf372e71d526f8ce90a32 SHA512 cda2554d2e63d4f600b82293e04dbd8e2d90be8ded0749ee95cd98c9b0363a33147b05fd05acb7b3e872742d54e9eca04daf1eed5a44d4285db815c401714255
+EBUILD quassel-0.13_rc1.ebuild 4979 BLAKE2B 6b39a3322e17ebc86a7897d8031a20385a38fa9815e458fd2297d7b10846da6b3a63b0520d20423151a7b6556de8ec8a1f39f6c09a77de088485d79854313ce8 SHA512 e2af4521ffd8f87d332ea82d66f405fa46c5ed141ecd83c930b31cffc011c922d63bc69843419e5e909e073ee48739a81b0d767fded91ba83fa1f259bad64cf0
+EBUILD quassel-9999.ebuild 4984 BLAKE2B 5c9a7134ead3008d6eefedc8007a03a216df0a49ff861c5da11f37a57e1e70fab57a8d87b8f54e1a27930202ae0d5cb2a23c53a4e4634208a899939b5d6a1519 SHA512 40d62c134fea0c93fc1f197a5f40f4333c70fa3acfd908c151fafe96e9227a0fcf2400200638029ea85e16f4c186fe2456ef555adb97aa7e3a7632dc16b981cd
MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild b/net-irc/quassel/quassel-0.12.5-r2.ebuild
index dd632d791bb6..a0296d1e259e 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user versionator
if [[ ${PV} != *9999* ]]; then
SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+ KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
inherit git-r3
diff --git a/net-irc/quassel/quassel-0.12.5.ebuild b/net-irc/quassel/quassel-0.13_rc1.ebuild
index 6f3dde9b18d0..ed2efb5c8b9f 100644
--- a/net-irc/quassel/quassel-0.12.5.ebuild
+++ b/net-irc/quassel/quassel-0.13_rc1.ebuild
@@ -3,11 +3,13 @@
EAPI=6
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+inherit cmake-utils gnome2-utils pax-utils systemd user
if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
+ MY_P=${PN}-${PV/_/-}
+ SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+ S="${WORKDIR}/${MY_P}"
else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
inherit git-r3
@@ -17,12 +19,13 @@ DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
HOMEPAGE="http://quassel-irc.org/"
LICENSE="GPL-3"
SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
+snorenotify +ssl syslog urlpreview X"
SERVER_RDEPEND="
dev-qt/qtscript:5
crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+ ldap? ( net-nds/openldap )
postgres? ( dev-qt/qtsql:5[postgres] )
!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
syslog? ( virtual/logger )
@@ -30,7 +33,12 @@ SERVER_RDEPEND="
GUI_RDEPEND="
dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
+ !bundled-icons? (
+ kde-frameworks/breeze-icons:5
+ oxygen? ( kde-frameworks/oxygen-icons:5 )
+ )
dbus? (
>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
dev-qt/qtdbus:5
@@ -45,9 +53,8 @@ GUI_RDEPEND="
kde-frameworks/kxmlgui:5
kde-frameworks/sonnet:5
)
- phonon? ( media-libs/phonon[qt5(+)] )
snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
- webkit? ( dev-qt/qtwebkit:5 )
+ urlpreview? ( dev-qt/qtwebengine:5[widgets] )
"
RDEPEND="
@@ -73,13 +80,11 @@ DOCS=( AUTHORS ChangeLog README.md )
REQUIRED_USE="
|| ( X server monolithic )
crypt? ( || ( server monolithic ) )
- dbus? ( || ( X monolithic ) )
- kde? ( || ( X monolithic ) dbus phonon )
- phonon? ( || ( X monolithic ) )
+ kde? ( || ( X monolithic ) dbus )
+ ldap? ( || ( server monolithic ) )
postgres? ( || ( server monolithic ) )
snorenotify? ( || ( X monolithic ) )
syslog? ( || ( server monolithic ) )
- webkit? ( || ( X monolithic ) )
"
pkg_setup() {
@@ -94,27 +99,26 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ -DUSE_QT4=OFF
-DUSE_QT5=ON
- -DEMBED_DATA=OFF
+ -DUSE_CCACHE=OFF
-DCMAKE_SKIP_RPATH=ON
+ -DEMBED_DATA=OFF
+ -DWITH_WEBKIT=OFF
+ -DWITH_BUNDLED_ICONS=$(usex bundled-icons)
$(cmake-utils_use_find_package crypt QCA2-QT5)
$(cmake-utils_use_find_package dbus dbusmenu-qt5)
$(cmake-utils_use_find_package dbus Qt5DBus)
-DWITH_KDE=$(usex kde)
- -DWITH_OXYGEN=$(usex !kde)
+ -DWITH_LDAP=$(usex ldap)
-DWANT_MONO=$(usex monolithic)
- $(cmake-utils_use_find_package phonon Phonon4Qt5)
+ -DWITH_OXYGEN_ICONS=$(usex oxygen)
-DWANT_CORE=$(usex server)
$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
- -DWITH_WEBKIT=$(usex webkit)
+ -DWITH_WEBENGINE=$(usex urlpreview)
-DWANT_QTCLIENT=$(usex X)
)
- # Something broke upstream detection since Qt 5.5
- if use ssl ; then
- mycmakeargs+=( "-DHAVE_SSL=TRUE" )
- fi
-
cmake-utils_src_configure
}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a5038bf8a0ac..5db02b583e65 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -6,8 +6,10 @@ EAPI=6
inherit cmake-utils gnome2-utils pax-utils systemd user
if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+ MY_P=${PN}-${PV/_/-}
+ SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+ S="${WORKDIR}/${MY_P}"
else
EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
inherit git-r3
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 660f62433bc6..1b428a6e26ff 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -1,19 +1,9 @@
-AUX README.gentoo 768 BLAKE2B 83e7cdf538b89a8ef6ab242c9f1d5b01dd5a57aa4dc5b4f1b96998fbe0e01fb554c2d6de02fc552a1ac4ab26584a7fa14c19a96b4eda1ebd0367b68f965c2402 SHA512 627d3a8291e228fbeb783e61f46fe82f45ebc2a3647962c9bda150651d9bcadef699b6318083fc2396e6acc988ddf0ae1c01694e618d099591fa0db0258879d6
AUX README.gentoo-r1 530 BLAKE2B 5feab666142884c67c3c1a51322bb614bbdbaa453a4b6a4eb17b9fe774e4a4b188471a449f2cb5a1d07845a02a5eb15f2fad08958a839306d2029f56e8306543 SHA512 d5be4c0fc0069e6e8c6bf92f281034a603d6041f2b9a54d4fa97cae662225095d4473f54c4573141396ecccf369158f6c0986cafb9c39837edf9ab15200c8e18
-AUX znc-1.6.1-create-pidfile-per-default.patch 650 BLAKE2B 1316a818971396db3f2fea706afe57435a176db0f47e0e05fd5c53eeff9c5dfb2ffed201b75cd0bc9edbc521a962cb28ac1b8ac11d69729a41a1d01e3b7cd6ae SHA512 2e2342c8f87a58cd1703f19d3d76f58ac4c92a049de5b342dd46c2476a1344cbb9f85743fe387713a2465006f71f1379951d7f3770019f1867544b6705e0e8ec
-AUX znc-1.6.1-systemwideconfig.patch 8079 BLAKE2B f0ae13248ba1f49a8f4c7e49ea06c1107ebefdb916d09f8e45f21368f194daa33e0edd005595c9eb36014dab20e3a40e4fba13ec531fe40a3a18d71cc6183ebf SHA512 295a08dd5ce43b217e816148e272b722dff1a956ccdb5e58b0d337b7929a2bdae4e017ec686e820f89e53b310dd86ea8668095134d9618e5552ec323b83e624d
-AUX znc-1.7.0-inttest-dir.patch 1868 BLAKE2B be859b4aeb0c0d052a72780518c85e7b2bcdc4c9fd871a1584d31bf6f01296bd8dcbdf53980dc794689e82fdebaa495c8da5ad65d736efb858f38237d56a3d8a SHA512 5f6b57f1d3c26028f06841f1e7c5db065cb8c6475dc4f6ca75f46603ad25041b6be03ae9ca5e45961812ce358092203e9fe82e0eee8d1a8e2a845a2940dcd74f
-AUX znc-1.7.0-inttest-fix-make-warning.patch 1112 BLAKE2B 5404deec32a7126e10f1472681ea0b52785c2946a62eda4369cae39ec2e847bea3375f9118bdab9e98b21fc6291dbb9081cb8eef4864798203ddb9eb39676836 SHA512 6d3aef103e2f5b16bc6107ff69b38ff1814d692a46fca36e42df2c95dd94334a239b3576daaf2b49a3b56cea287e289a55f1ec6ddbf976bf80ebc8049cfb9a01
+AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca2787937afdd2ac1fe0b0b4ab55ad7d453029bf4a8c748c5787fc4ed3b46e2b33c925cb962ec868f7a5c07356697a3039e2 SHA512 b74d136985546114604252be74e55e8f5e0740b678bdd224ea63cc3587d17d861c81c69b4bdea0aabc23e64097dda0097e97fbd80110c2c2a919b33d912d2dea
AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468
-AUX znc.initd-r1 914 BLAKE2B df6854929c0dbddc2fa75dec0b5b4103ffc9c6a6d9de05c9f04c0d36a4ffff28e834e42b22c363e24be03435088b2fa4428486c08adedb12ff3b484445545b0c SHA512 01f44ab51f6fa29383b4a4bc6e5f19928ebac6b32f73fb96906113596a904324dd53ef9dbb895a8dd29028f3523e6f7285d2d5b2ee43058fc017f0b47ae788c1
AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
-DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
DIST gtest-ba96d0b1161f540656efdaed035b3c062b60e006.tar.gz 987370 BLAKE2B fcedfe559c4c93166962900117dc492da3cbb99165c30766c39131c20e3b41f057a31a8cb631beaca829c1e9966e90cbc37469ba56a5fc15a2bea86cbe401a63 SHA512 ce78098f973b45f4a177db387c42a56d5ea34407a2af278760b850c326e8450760a58991d62a5408f5df79f89fefd10fee71745b7e8669b2a6f74fa63a259600
-DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
-DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
-DIST znc-1.7.0.tar.gz 1853666 BLAKE2B 3e519d4005a10a9a5329f22ab6abbd19dfa2c7cecb949c138bc72909eae8883576fc0352e3ac46b852b8c58f038150419720aa48791a1339b004206f3afc20e9 SHA512 718dec65dfa2374c568b2694e4faef1f8cf313ae96d171e2263656e077e0fae5f8037c69a23ae33f4ea314ac6e15480c7dccef73ad3ac9324eb79caca622d54b
-EBUILD znc-1.6.5.ebuild 3474 BLAKE2B fb127e5cb20f375da773dc5bf628ba6c4a4d45b408fe5f975768999c82a93844b2091511a90d694438743a0f165fb4afd1c774358fec09561be3fae64085715c SHA512 7a4c7f7d30eb63273fa75f6b925f11b2f426afea29de82dd1b33fdfcdaba911cf5172a564e230fc50d0a97c769389b963609c59169783f7a5354bf71ced2d0e4
-EBUILD znc-1.6.6.ebuild 3473 BLAKE2B 612f02114d9a058e109ee6f7185774bdc382e26abac72ff6b912997f1a8020ab67cbdd559739ffa5e7f121730d868ba54894fc333b63e41ae99706dca522d103 SHA512 06fc0f3897e7b2946f258cd48bc0a7ad689df339c2413cdddd7872a92774f17034d9d5f62e4d64222b62d07f1e321859428a05936f00775c63fa92805498456c
-EBUILD znc-1.7.0.ebuild 5207 BLAKE2B 0e17aa348cb278d47df83da152646ec10b4d3ab9bdc1714b1cd86936b07c6acfc483640911fcde0badf1493455d42a7c6dcef38071d54108e55c2d8bc137d0e3 SHA512 9f3b4ceef80bafa6666d50e285f659a948a2a11493bac4f8a96e40d3d3e853e997d2efa691cc0e35a9fb91857555d773a8ddc07ea6e75622b8d9a67e546f5c5b
-EBUILD znc-9999.ebuild 5149 BLAKE2B 31067d50828a946fec99fbe2f89ba6290ea9401ffb8ccf9eb9bd0f2dcb1c2cd3f2af9ce5931a89384d3ed347a3a4c35dc00d8ce20ad19e271ab98e0d1ac6dfd1 SHA512 843e39790b2d8687109a321d380dd3fc9ba3a2815badd24893cec9fdd996f5b43c0b61c6972dcd5c82aeb24eb5cabbb213f8183c7ea10a409fa85e67435d7c10
-MISC metadata.xml 633 BLAKE2B 506bc5b769694797c07165febefd08354b744a28644148d86901442a8d437cee7ec2552382eaa280cd99fe3c00cd2ae3adfded62980fe2fce31e550f00f4fc25 SHA512 58c2f6174c32c3b2bc52d5589844305cdac275d38bff7ec959d8a7e1eb14991789ba218f3dab2a993ab98ff0af7f7a574c3bfefdf7c9fd495043892732cb2502
+DIST znc-1.7.1.tar.gz 2041669 BLAKE2B 57ead136e28b0fc4a875802ef89ef004213789e68d19ceeab15c6fac6fe51ea51618764c484ea618fc6359d9c15cc7ffcf5529642d730b9217a4f127e92d9ae6 SHA512 907068fb0828091026d440145b70ca76109302f13c18d94f772660192434287f209a06a52da1dd39726b9a38735b3cea9afbd062eb6def4cd428bb73c562a902
+EBUILD znc-1.7.1.ebuild 5210 BLAKE2B 39e1bfeff0b6b062a85ce1f362a6cdc1a30434f8ff4d3e6f0ffb9c9e7c079834a76dea87f2ec955be4a2c2e5c32752ed42f1d7dbf597d498ffca43b3e92dafed SHA512 2bdbcfc173bf15f77619c07ec13f0e5af8a4a368c01f620ec830a52ae6e97ded36a986c251925911d8f232f978c7a5b7cfd2792cca5b390f53bea3f18d4c3ef1
+EBUILD znc-9999.ebuild 5211 BLAKE2B 4e17086ad59007af436fbbfafb225c9708c66bf47eed8936d43c63feee16d6597f99fe5286fce7e1efd347b9a55fe5ecc932756322813646dfc36cabf7e98c07 SHA512 761110da439be96c483c0b7253e83b12fcbe1574b8d8e226879cead14c54e11200c9fafb6d9234756751c3c2ba27bc974840d80d981e456260a657fb325872e5
+MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/files/README.gentoo b/net-irc/znc/files/README.gentoo
deleted file mode 100644
index 5b222a24f589..000000000000
--- a/net-irc/znc/files/README.gentoo
+++ /dev/null
@@ -1,22 +0,0 @@
-To run znc as a user, run 'znc --makeconf' to create a configuration file.
-
-If znc was compiled with the 'daemon' use flag, you may run
- emerge --config znc
-to configure it.
-
-To generate a new SSL certificate, run:
- znc --system-wide-config-as znc --makepem -d /var/lib/znc
-as root.
-
-If migrating from a user-based install, you can copy the existing
-configuration files:
- mkdir /var/lib/znc
- mv /home/$USER/.znc/* /var/lib/znc
- rm -rf /home/$USER/.znc
- chown -R znc:znc /var/lib/znc
-You may also adjust the location of the files and the user running znc
-in /etc/conf.d/znc instead.
-
-To run as a daemon, please make sure that your configuration contains
- PidFile = /run/znc/znc.pid
-or that the PidFile value matches the one in /etc/conf.d/znc.
diff --git a/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch b/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
deleted file mode 100644
index 8419e9344bf2..000000000000
--- a/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Add PidFile option to new configurations per default
-
-Our runscript requires that ZNC creates a pidfile. This patch will add
-the PidFile directive to ZNC's default configuration.
----
- src/znc.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/znc.cpp b/src/znc.cpp
-index b33e860..4a02568 100644
---- a/src/znc.cpp
-+++ b/src/znc.cpp
-@@ -575,6 +575,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
- VCString vsLines;
-
- vsLines.push_back(MakeConfigHeader());
-+ vsLines.push_back("PidFile = /run/znc/znc.pid");
- vsLines.push_back("Version = " + CString(VERSION_STR));
-
- m_sConfigFile = ExpandConfigPath(sConfigFile);
---
-2.5.0
-
diff --git a/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch b/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
deleted file mode 100644
index d28fa30c219d..000000000000
--- a/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Add system-wide daemon support.
-
-This patch adds system-wide daemon support to ZNC so that you can run
-one ZNC instance system-wide using the new "--system-wide-config-as"
-option.
-
-Patch is based on @mrueg version from 2012.
-
-X-Gentoo-Bug: 438430
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438430
----
- include/znc/znc.h | 3 ++
- src/main.cpp | 83 ++++++++++++++++++++++++++++++++++++++++---------------
- src/znc.cpp | 7 ++++-
- 3 files changed, 70 insertions(+), 23 deletions(-)
-
-diff --git a/include/znc/znc.h b/include/znc/znc.h
-index cf2326e..16394f9 100644
---- a/include/znc/znc.h
-+++ b/include/znc/znc.h
-@@ -187,6 +187,8 @@ public:
-
- static void DumpConfig(const CConfig* Config);
-
-+ void SetSystemWideConfig(bool systemWideConfig);
-+
- private:
- CFile* InitPidFile();
- bool DoRehash(CString& sError);
-@@ -231,6 +233,7 @@ protected:
- unsigned int m_uiConnectPaused;
- TCacheMap<CString> m_sConnectThrottle;
- bool m_bProtectWebSessions;
-+ bool m_bSystemWideConfig;
- bool m_bHideVersion;
- };
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 09b2c9c..bd5cca6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -16,6 +16,9 @@
-
- #include <znc/znc.h>
- #include <signal.h>
-+#include <sys/types.h>
-+#include <pwd.h>
-+#include <grp.h>
-
- #if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD)
- #include <znc/Threads.h>
-@@ -99,34 +102,36 @@ static inline int getopt_long(int argc, char * const argv[], const char *optstri
- #endif
-
- static const struct option g_LongOpts[] = {
-- { "help", no_argument, 0, 'h' },
-- { "version", no_argument, 0, 'v' },
-- { "debug", no_argument, 0, 'D' },
-- { "foreground", no_argument, 0, 'f' },
-- { "no-color", no_argument, 0, 'n' },
-- { "allow-root", no_argument, 0, 'r' },
-- { "makeconf", no_argument, 0, 'c' },
-- { "makepass", no_argument, 0, 's' },
-- { "makepem", no_argument, 0, 'p' },
-- { "datadir", required_argument, 0, 'd' },
-+ { "help", no_argument, 0, 'h' },
-+ { "version", no_argument, 0, 'v' },
-+ { "debug", no_argument, 0, 'D' },
-+ { "foreground", no_argument, 0, 'f' },
-+ { "no-color", no_argument, 0, 'n' },
-+ { "allow-root", no_argument, 0, 'r' },
-+ { "makeconf", no_argument, 0, 'c' },
-+ { "makepass", no_argument, 0, 's' },
-+ { "makepem", no_argument, 0, 'p' },
-+ { "datadir", required_argument, 0, 'd' },
-+ { "system-wide-config-as", required_argument, 0, 'S' },
- { 0, 0, 0, 0 }
- };
-
- static void GenerateHelp(const char *appname) {
- CUtils::PrintMessage("USAGE: " + CString(appname) + " [options]");
- CUtils::PrintMessage("Options are:");
-- CUtils::PrintMessage("\t-h, --help List available command line options (this page)");
-- CUtils::PrintMessage("\t-v, --version Output version information and exit");
-- CUtils::PrintMessage("\t-f, --foreground Don't fork into the background");
-- CUtils::PrintMessage("\t-D, --debug Output debugging information (Implies -f)");
-- CUtils::PrintMessage("\t-n, --no-color Don't use escape sequences in the output");
-- CUtils::PrintMessage("\t-r, --allow-root Don't complain if ZNC is run as root");
-- CUtils::PrintMessage("\t-c, --makeconf Interactively create a new config");
-- CUtils::PrintMessage("\t-s, --makepass Generates a password for use in config");
-+ CUtils::PrintMessage("\t-h, --help List available command line options (this page)");
-+ CUtils::PrintMessage("\t-v, --version Output version information and exit");
-+ CUtils::PrintMessage("\t-f, --foreground Don't fork into the background");
-+ CUtils::PrintMessage("\t-D, --debug Output debugging information (Implies -f)");
-+ CUtils::PrintMessage("\t-n, --no-color Don't use escape sequences in the output");
-+ CUtils::PrintMessage("\t-r, --allow-root Don't complain if ZNC is run as root");
-+ CUtils::PrintMessage("\t-c, --makeconf Interactively create a new config");
-+ CUtils::PrintMessage("\t-s, --makepass Generates a password for use in config");
- #ifdef HAVE_LIBSSL
-- CUtils::PrintMessage("\t-p, --makepem Generates a pemfile for use with SSL");
-+ CUtils::PrintMessage("\t-p, --makepem Generates a pemfile for use with SSL");
- #endif /* HAVE_LIBSSL */
-- CUtils::PrintMessage("\t-d, --datadir Set a different ZNC repository (default is ~/.znc)");
-+ CUtils::PrintMessage("\t-d, --datadir Set a different ZNC repository (default is ~/.znc)");
-+ CUtils::PrintMessage("\t-S, --system-wide-config-as Create a system-wide ZNC daemon configuration");
- }
-
- static void die(int sig) {
-@@ -192,6 +197,8 @@ int main(int argc, char** argv) {
- bool bMakeConf = false;
- bool bMakePass = false;
- bool bAllowRoot = false;
-+ bool bSystemWideConfig = false;
-+ CString sSystemWideConfigUser = "znc";
- bool bForeground = false;
- #ifdef ALWAYS_RUN_IN_FOREGROUND
- bForeground = true;
-@@ -201,7 +208,7 @@ int main(int argc, char** argv) {
- #endif
- CZNC::CreateInstance();
-
-- while ((iArg = getopt_long(argc, argv, "hvnrcspd:Df", g_LongOpts, &iOptIndex)) != -1) {
-+ while ((iArg = getopt_long(argc, argv, "hvnrcspd:DfS:", g_LongOpts, &iOptIndex)) != -1) {
- switch (iArg) {
- case 'h':
- GenerateHelp(argv[0]);
-@@ -219,6 +226,10 @@ int main(int argc, char** argv) {
- case 'c':
- bMakeConf = true;
- break;
-+ case 'S':
-+ bSystemWideConfig = true;
-+ sSystemWideConfigUser = optarg;
-+ break;
- case 's':
- bMakePass = true;
- break;
-@@ -254,8 +265,36 @@ int main(int argc, char** argv) {
- return 1;
- }
-
-+ if (bSystemWideConfig && getuid() == 0) {
-+ struct passwd *pwd;
-+
-+ pwd = getpwnam(sSystemWideConfigUser.c_str());
-+ if (pwd == NULL) {
-+ CUtils::PrintError("Daemon user not found.");
-+ return 1;
-+ }
-+
-+ if ((long) pwd->pw_uid == 0) {
-+ CUtils::PrintError("Please define a daemon user other than root.");
-+ return 1;
-+ }
-+ if (setgroups(0, NULL) != 0) {
-+ CUtils::PrintError("setgroups: Unable to clear supplementary group IDs");
-+ return 1;
-+ }
-+ if (setgid((long) pwd->pw_gid) != 0) {
-+ CUtils::PrintError("setgid: Unable to drop group privileges");
-+ return 1;
-+ }
-+ if (setuid((long) pwd->pw_uid) != 0) {
-+ CUtils::PrintError("setuid: Unable to drop user privileges");
-+ return 1;
-+ }
-+ }
-+
- CZNC* pZNC = &CZNC::Get();
- pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
-+ pZNC->SetSystemWideConfig(bSystemWideConfig);
-
- #ifdef HAVE_LIBSSL
- if (bMakePem) {
-@@ -304,7 +343,7 @@ int main(int argc, char** argv) {
- CUtils::PrintStatus(true, "");
- }
-
-- if (isRoot()) {
-+ if (isRoot() && !bSystemWideConfig) {
- CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
- CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
- if (!bAllowRoot) {
-diff --git a/src/znc.cpp b/src/znc.cpp
-index 78cda1a..b33e860 100644
---- a/src/znc.cpp
-+++ b/src/znc.cpp
-@@ -55,6 +55,7 @@ CZNC::CZNC() {
- m_sConnectThrottle.SetTTL(30000);
- m_pLockFile = NULL;
- m_bProtectWebSessions = true;
-+ m_bSystemWideConfig = false;
- m_bHideVersion = false;
- m_uDisabledSSLProtocols = Csock::EDP_SSL;
- m_sSSLProtocols = "";
-@@ -861,7 +862,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
- CUtils::PrintMessage("");
-
- File.UnLock();
-- return bFileOpen && CUtils::GetBoolInput("Launch ZNC now?", true);
-+ return bFileOpen && !m_bSystemWideConfig && CUtils::GetBoolInput("Launch ZNC now?", true);
- }
-
- void CZNC::BackupConfigOnce(const CString& sSuffix) {
-@@ -1973,3 +1974,7 @@ void CZNC::LeakConnectQueueTimer(CConnectQueueTimer *pTimer) {
- bool CZNC::WaitForChildLock() {
- return m_pLockFile && m_pLockFile->ExLock();
- }
-+
-+void CZNC::SetSystemWideConfig(bool systemWideConfig) {
-+ m_bSystemWideConfig = systemWideConfig;
-+}
---
-2.5.0
-
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch b/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
deleted file mode 100644
index 0be20e4c08d0..000000000000
--- a/net-irc/znc/files/znc-1.7.0-inttest-fix-make-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From abee9f9bfc8c9ca9d4616238fdd812c4200b17d5 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <alexey+znc@asokolov.org>
-Date: Thu, 28 Jun 2018 23:57:29 +0100
-Subject: [PATCH] Fix a warning in integration test / gmake / znc-buildmod
- interaction.
-
-It was requested on https://github.com/gentoo/gentoo/pull/8901
----
- test/CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index b19c22fab..296cb0de7 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -85,5 +85,10 @@ externalproject_add(inttest_bin
- "-DZNC_BIN_DIR:path=${CMAKE_INSTALL_FULL_BINDIR}"
- "-DQt5_HINTS:path=${brew_qt5}")
- add_custom_target(inttest COMMAND
-+ # Prevent a warning from test of znc-buildmod, when inner make
-+ # discovers that there is an outer make and tries to use it:
-+ # gmake[4]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
-+ # This option doesn't affect ninja, which doesn't show that warning anyway.
-+ ${CMAKE_COMMAND} -E env MAKEFLAGS=
- "${CMAKE_CURRENT_BINARY_DIR}/integration/inttest")
- add_dependencies(inttest inttest_bin)
diff --git a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch b/net-irc/znc/files/znc-1.7.1-inttest-dir.patch
index 250eccc53fb6..9aff2a9b64be 100644
--- a/net-irc/znc/files/znc-1.7.0-inttest-dir.patch
+++ b/net-irc/znc/files/znc-1.7.1-inttest-dir.patch
@@ -1,3 +1,12 @@
+commit 95f1c7e9081866ea1e716743ea039a74565f80c6
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date: Sun Jul 15 15:36:21 2018 +0200
+
+ Allow integration tests to be run inside a different root
+
+ Based on DarthGandalf's patch submitted in
+ https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15112014e7605d13624297d7601504b5d187a6de
+
diff --git a/include/znc/znc.h b/include/znc/znc.h
index ecb2b41a..a791a648 100644
--- a/include/znc/znc.h
@@ -28,15 +37,15 @@ index 5aec7805..6f9c34ae 100644
return ret;
}
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
-index 19ece50a..8ea4d9fa 100644
+index a5841987..f1b8a421 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
-@@ -563,7 +563,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) {
- sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkinName;
+@@ -565,7 +565,7 @@ CString CWebSock::GetSkinPath(const CString& sSkinName) {
+ sRet = CZNC::Get().GetCurPath() + "/webskins/" + sSkin;
if (!CFile::IsDir(sRet)) {
-- sRet = CString(_SKINDIR_) + "/" + sSkinName;
-+ sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkinName;
+- sRet = CString(_SKINDIR_) + "/" + sSkin;
++ sRet = CZNC::UnusualRoot() + CString(_SKINDIR_) + "/" + sSkin;
}
}
diff --git a/net-irc/znc/files/znc.initd-r1 b/net-irc/znc/files/znc.initd-r1
deleted file mode 100644
index dedb44b1362f..000000000000
--- a/net-irc/znc/files/znc.initd-r1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="config"
-extra_started_commands="reload save"
-command="/usr/bin/znc"
-command_args="--datadir \"${ZNC_DATADIR}\""
-pidfile="${ZNC_PIDFILE:-/run/znc/znc.pid}"
-user=${ZNC_USER:-znc}
-group=${ZNC_GROUP:-znc}
-start_stop_daemon_args="--chdir \"${ZNC_DATADIR}\" --user ${user} --group ${group} ${ZNC_SSDARGS}"
-retry="${ZNC_TERMTIMEOUT}"
-
-required_dirs="${ZNC_DATADIR}"
-
-depend() {
- use dns logger
-}
-
-start_pre() {
- checkpath -d -m 0770 -o ${user}:${group} "$(dirname ${pidfile})"
-}
-
-stop_post() {
- rm -f "${pidfile}"
-}
-
-reload() {
- ebegin "Reloading ZNC Configuration File from Disk"
- start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
- eend $?
-}
-
-save() {
- ebegin "Saving ZNC Configuration File to Disk"
- start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
- eend $?
-}
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
index 16293e77692c..b58dd845044e 100644
--- a/net-irc/znc/metadata.xml
+++ b/net-irc/znc/metadata.xml
@@ -6,7 +6,6 @@
<name>Louis Sautier</name>
</maintainer>
<use>
- <flag name="daemon">Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.</flag>
<flag name="zlib">Enable mod_deflate-like gzip support for znc's web interface using <pkg>sys-libs/zlib</pkg>.</flag>
</use>
<upstream>
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
deleted file mode 100644
index 20fc31e09572..000000000000
--- a/net-irc/znc/znc-1.6.5.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit eutils python-single-r1 readme.gentoo-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
-
-SRC_URI="
- http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )
-"
-KEYWORDS="amd64 arm x86"
-
-HOMEPAGE="https://znc.in"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- icu? ( dev-libs/icu:= )
- perl? ( >=dev-lang/perl-5.10:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
- fi
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable debug) \
- $(use_enable icu charset) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl) \
- $(use_enable zlib) \
- $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
-}
-
-src_install() {
- default
- dodoc NOTICE
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
- DISABLE_AUTOFORMATTING=1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "/etc/znc exists on your system."
- ewarn "Due to the nature of the contents of that folder,"
- ewarn "we have changed the default configuration to use"
- ewarn " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
-}
-
-pkg_config() {
- if use daemon; then
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
- ewarn "any existing configuration. If you are sure you want"
- ewarn "to generate a new configuration, remove the folder"
- ewarn "and try again."
- else
- einfo "Press any key to interactively create a new configuration file"
- einfo "for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT%/}/var/lib/znc" || die
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
- die "Setting permissions failed"
- "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- fi
- else
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
-}
diff --git a/net-irc/znc/znc-1.6.6.ebuild b/net-irc/znc/znc-1.6.6.ebuild
deleted file mode 100644
index 76b253fef239..000000000000
--- a/net-irc/znc/znc-1.6.6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit eutils python-single-r1 readme.gentoo-r1 systemd user
-
-MY_PV=${PV/_/-}
-GTEST_VER="1.7.0"
-GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
-
-DESCRIPTION="An advanced IRC Bouncer"
-HOMEPAGE="https://znc.in"
-SRC_URI="
- http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
- test? ( ${GTEST_URL} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- icu? ( dev-libs/icu:= )
- perl? ( >=dev-lang/perl-5.10:= )
- python? ( ${PYTHON_DEPS} )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tcl? ( dev-lang/tcl:0= )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
- "${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
-)
-
-pkg_setup() {
- if use python; then
- python-single-r1_pkg_setup
- fi
- if use daemon; then
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
- # The home directory was previously set to /dev/null
- # This caused a bug with the systemd unit
- # https://bugs.gentoo.org/521916
- esethome ${PN} /var/lib/${PN}
- fi
-}
-
-src_configure() {
- econf \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable debug) \
- $(use_enable icu charset) \
- $(use_enable ipv6) \
- $(use_enable perl) \
- $(use_enable python) \
- $(use_enable sasl cyrus) \
- $(use_enable ssl openssl) \
- $(use_enable tcl) \
- $(use_enable zlib) \
- $(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
-}
-
-src_install() {
- default
- dodoc NOTICE
- if use daemon; then
- newinitd "${FILESDIR}"/znc.initd-r1 znc
- newconfd "${FILESDIR}"/znc.confd-r1 znc
- fi
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
- DISABLE_AUTOFORMATTING=1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
- if [[ -d "${EROOT%/}"/etc/znc ]]; then
- ewarn "/etc/znc exists on your system."
- ewarn "Due to the nature of the contents of that folder,"
- ewarn "we have changed the default configuration to use"
- ewarn " /var/lib/znc"
- ewarn "please move /etc/znc to /var/lib/znc"
- ewarn "or adjust /etc/conf.d/znc"
- fi
-}
-
-pkg_config() {
- if use daemon; then
- if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
- ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
- ewarn "any existing configuration. If you are sure you want"
- ewarn "to generate a new configuration, remove the folder"
- ewarn "and try again."
- else
- einfo "Press any key to interactively create a new configuration file"
- einfo "for znc."
- einfo "To abort, press Control-C"
- read
- mkdir -p "${EROOT%/}/var/lib/znc" || die
- chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
- die "Setting permissions failed"
- "${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
- die "Config failed"
- echo
- einfo "To start znc, run '/etc/init.d/znc start'"
- einfo "or add znc to a runlevel:"
- einfo " rc-update add znc default"
- fi
- else
- ewarn "To configure znc as a system-wide daemon you have to"
- ewarn "enable the 'daemon' use flag."
- fi
-}
diff --git a/net-irc/znc/znc-1.7.0.ebuild b/net-irc/znc/znc-1.7.1.ebuild
index 7cd8c8865979..1de5e05761e8 100644
--- a/net-irc/znc/znc-1.7.0.ebuild
+++ b/net-irc/znc/znc-1.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
@@ -16,11 +16,14 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
SRC_URI=""
else
+ MY_PV=${PV/_/-}
+ MY_P=${PN}-${MY_PV}
SRC_URI="
- https://znc.in/releases/archive/${P}.tar.gz
+ https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 arm x86"
+ S=${WORKDIR}/${MY_P}
fi
HOMEPAGE="https://znc.in"
@@ -52,10 +55,7 @@ DEPEND="
test? ( dev-qt/qtnetwork:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.0-inttest-fix-make-warning.patch
- "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
pkg_setup() {
if use python; then
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index ec9c6196f378..e59849a6e29b 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -16,11 +16,14 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
SRC_URI=""
else
+ MY_PV=${PV/_/-}
+ MY_P=${PN}-${MY_PV}
SRC_URI="
- https://znc.in/releases/archive/${P}.tar.gz
+ https://znc.in/releases/archive/${MY_P}.tar.gz
test? ( ${GTEST_URL} )
"
KEYWORDS="~amd64 ~arm ~x86"
+ S=${WORKDIR}/${MY_P}
fi
HOMEPAGE="https://znc.in"
@@ -52,9 +55,7 @@ DEPEND="
test? ( dev-qt/qtnetwork:5 )
"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.0-inttest-dir.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
pkg_setup() {
if use python; then
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 989280aed5ef..bf65a26ca1f1 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/courier-authlib/Manifest b/net-libs/courier-authlib/Manifest
index 4b7358ecda68..23ad91435c4e 100644
--- a/net-libs/courier-authlib/Manifest
+++ b/net-libs/courier-authlib/Manifest
@@ -9,7 +9,7 @@ EBUILD courier-authlib-0.65.0-r3.ebuild 5163 BLAKE2B 6c096213af78df0374243ba9c78
EBUILD courier-authlib-0.66.3.ebuild 4465 BLAKE2B d2dd6e77898e81a731678e37c9c3a438a83fb5497d978b50eb02074438b22a63b2ffe37a3eedf7457209d94e1ee02d616cb72145cc87673ae307420a6a274554 SHA512 0738d4d20f42b55e5425142f215c3f10fbce26a1c4cd42b0a93c94b6de9d6ca657ff2891e2258279a0fa8c7ded193739c15ccba9dbbb74460e15b6685c8d4323
EBUILD courier-authlib-0.66.4-r1.ebuild 4516 BLAKE2B 6babad0243712dc97ee8e717460962482bdf7f31f9a5d059d35f5e876cd1e8aedac11f4606795ccc9b86f414445126b3b6faf8c9cb6a6eab001e0567a3b12257 SHA512 7d3f38818e17602829e6ff0f30f00c32abbaffec7419fd482a973bd30239fce34933b78ed1fab7b6b149771ed4d3e36da43eb2eaf4caf994efcf624956dc02c4
EBUILD courier-authlib-0.66.4.ebuild 4507 BLAKE2B 7ccddf9fe24f3c2787bdebf26ac5cc721ed64b6a3acb94d778a51dbd5ac177f08af4e07406d4bda38bf30dcacda24a4ffecfbb878b66c4115edde49ec153eb07 SHA512 f23af0db15399330915a10eb8cf24dae2724c1eba1810ea010db6ebfe6b98127c4ccf4e7b122c7ccc857381446eb18eb81d62d9b9aec187612a3344f80751cad
-EBUILD courier-authlib-0.67.0.ebuild 4560 BLAKE2B 0f6e95e479106c135f25227f998c6f66082661d27cec454c63a7814be242a3c96a024bf3b4fe71ee0d7d26860dbea14f031c9d3ad5d3f8f27136eaa247b94e24 SHA512 45919327d442a889a1c7803a64d2b93c9549e01aebbb72d10670002bb2b9d5dd8a6cdac11e68cefb237b4f5f665b76604ef5add6f3a63dc947b2388c310aa2bb
+EBUILD courier-authlib-0.67.0.ebuild 4559 BLAKE2B a6ccafc2841c77b7f20d4a9345d538b981e6720ef7ce8c3c2c7a6945150cd5443061d1966de7852ea95e0adb7df06cd9d2be6188b52aad285f906e56c91e19aa SHA512 8e2d0c01762c859d77db022637afae695d6f412bdc28e272d6e0431fcec53ecce8e66a573387de80ad7316889af114eff202d96ac55ee7d9d0b847a9db28d47b
EBUILD courier-authlib-0.68.0-r1.ebuild 4560 BLAKE2B df061f092e834802c5c9b7ed00dfe2dc4689d125539ceea03d19dfe0cd5a2d98369cf38254b592d86b522767631699d582b35791a462a32c4c0e67f0d74400df SHA512 7951967aeda9b1c3a0fa51ce74e53a98605db8216b276bf8b3d19deaffe2af1bd2b2273dd8d1d11fa07836c0f0baf0a3858dcb45f0e1ff67bcf2c6a35347bb86
EBUILD courier-authlib-0.68.0.ebuild 4560 BLAKE2B 0f6e95e479106c135f25227f998c6f66082661d27cec454c63a7814be242a3c96a024bf3b4fe71ee0d7d26860dbea14f031c9d3ad5d3f8f27136eaa247b94e24 SHA512 45919327d442a889a1c7803a64d2b93c9549e01aebbb72d10670002bb2b9d5dd8a6cdac11e68cefb237b4f5f665b76604ef5add6f3a63dc947b2388c310aa2bb
MISC metadata.xml 405 BLAKE2B 825e1751581d92e1716769ead19217a1fbd01e31acaace5ef73a51fcb92ef7737e6e73fcd5d3fb124c586fdb39bed2c837b0057547581bd0529ea9034504c21b SHA512 ca3fcfc719c6c05c2f693a1e4896f7788acbfd083dce4358a94e1c0227b7d50d4e06f657ba80236a574b052fca6c03bce45a256bd65aa963915f4f577a413bbe
diff --git a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
index 951b69d639fd..fd7d8f6786c4 100644
--- a/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.67.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
DESCRIPTION="Courier authentication library"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index fd4b4c231afd..be1daf83aa48 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -4,6 +4,6 @@ DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f7
DIST courier-unicode-2.0.tar.bz2 446215 BLAKE2B b5e24f47f1714b71aa2fe176b4517eb49a04780a62f025c5a6546353a03defeedef5cd19f69a35a2646edbf88b4774abcf30c718fa4aee8f17feed6d3f947172 SHA512 32fe0aae62d7f7f7ac6832b28515b83642753c6bd881e95494254b7055686dc38d85488aa26a99d82a5b42aa5cce308bccc2b471580603f690ed6e405cc91e8a
EBUILD courier-unicode-1.1.ebuild 440 BLAKE2B 22249cf6ba2a420b508cf69e49373178f275c7859bbc5825414ffdb3f3ef4be761225f698ce0692d16f8641c8e12e346667b710ae9252b5fee83313252d57a3f SHA512 3e2e121bedf09408d04c80666d840fcc6716b26b6adef9089d9c90e0b7f0ad9e61625909136a91491bf5adec8229e5e0548ccc5874cb88aec67c7e5031ef57da
EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
-EBUILD courier-unicode-1.4.ebuild 477 BLAKE2B 2907f16988561ec6d663bcd311ee4b9a2ac34cdefbe4c486d324d3f6f6cf4a9aa8f5146f97ab97f09e6739a48797997814b0ded111c45f747b11d8ebd4724a6f SHA512 478ec4301b74cdbeb76f627dbc6c46605ea27314df686e236a04c290537f22b61f9a17ecf51a7c2641b363f4a2c6a71b41354a1cd13ff1a7f229d0d418d6f0fc
+EBUILD courier-unicode-1.4.ebuild 476 BLAKE2B 771db130fe65e6706575a479e41da3c7d682c22686ad5b6d653825dbde257ebb4be4c8eb517f63bbde86f980d794dc076a68e7b260959b3be0eab9c2b3cf6745 SHA512 fcd044aa0ae0369605ce07b06ea8da6dcb7fda9b6c11890c18277941371ef7f1f59d07e96fcafeeb1cf82f57054036d0c6e9e104c39588f77b0653a41299739d
EBUILD courier-unicode-2.0.ebuild 482 BLAKE2B 9fe175a175903d8482aa7e8656e2c86f2eecc404a84559a2b7f9a986fd3481f56ccd69e25704cbf3af19f82d070858efbcd38dfffb3448f3f3eceae7eaf1e826 SHA512 8091fb06b485407bca3119709ac8b71d209ff2dad451c632ec79e66ab72b7c1c6c69e3f7e4b348ab2d5d43b660e502bc0ccbf4f6686624b4bcabeb6909ada654
MISC metadata.xml 398 BLAKE2B 5a29532863617f727864e5a02b31d9170bbe09d5bed8641c94aad759997613832940cdffdaf8ed31c44b41b3c5e769ba220b5e6fa53c9d3540d9646e9c31a492 SHA512 78789db4f9e2b92e56c3833245f64c31bc274f6986b70af9c3bda21e5c6d3c6b3987a6a97e0ec73aa619d71ee814fa6a263ed8d295ec7473481134769414396b
diff --git a/net-libs/courier-unicode/courier-unicode-1.4.ebuild b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
index d477926f5430..3d7b8fd6cb3e 100644
--- a/net-libs/courier-unicode/courier-unicode-1.4.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
src_install() {
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 22a532facb73..c626b27a2ed1 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,3 +1,5 @@
DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
+DIST gnome-online-accounts-3.24.5.tar.xz 1391332 BLAKE2B 9085cbb0c92bfcd338d5feca7ebdd3e3b15483e47fe29faffb8f9fb474663adeaf8d5cc81673c552652c9444e742f2782fd727c93bf488f5c976bde72d00ddce SHA512 8db35d21f0639e7452ec5cb34455b6d48a77fe0755c525f22e5235abe758f09ad5a4685e5e4912a53def298c76a13b558704a83803b5aabecc13a0f9bc3ae0e4
EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d
+EBUILD gnome-online-accounts-3.24.5.ebuild 2473 BLAKE2B f589b5a55606011a556628ec04375cbc47b330100665409a693f8eec7ba15c23de2323b6e5c0f269ca8fc71a118f8a6b493a410b7b7890d569050b353d6b73f6 SHA512 18b212a9b3b3896252eff5d6455adeadea67c8a7f036c2e7018615aec0cd7002babbc431b2d4360d50752a1a5937f7ccd5226970b7f95b7ae61cbc9f5077504d
MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
new file mode 100644
index 000000000000..4acaf6e21902
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos vala" # telepathy"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=app-crypt/libsecret-0.5
+ >=dev-libs/json-glib-0.16
+ dev-libs/libxml2:2
+ >=net-libs/libsoup-2.42:2.4
+ net-libs/rest:0.7
+ net-libs/telepathy-glib
+ >=net-libs/webkit-gtk-2.7.2:4
+ >=x11-libs/gtk+-3.19.12:3
+ x11-libs/pango
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+ kerberos? (
+ app-crypt/gcr:0=[gtk]
+ app-crypt/mit-krb5 )
+"
+# telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+ vala? ( $(vala_depend) )
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.3
+ >=dev-util/gdbus-codegen-2.30.0
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ dev-libs/gobject-introspection-common
+ gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # TODO: Give users a way to set the G/FB/Windows Live secrets
+ # telepathy optional support is really a badly one, bug #494456
+ gnome2_src_configure \
+ --disable-static \
+ --enable-backend \
+ --enable-documentation \
+ --enable-exchange \
+ --enable-facebook \
+ --enable-flickr \
+ --enable-foursquare \
+ --enable-imap-smtp \
+ --enable-lastfm \
+ --enable-media-server \
+ --enable-owncloud \
+ --enable-pocket \
+ --enable-telepathy \
+ --enable-windows-live \
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable kerberos) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+ #$(use_enable telepathy)
+ # gudev & cheese from sub-configure is overriden
+ # by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index b6b78125b6f7..bd16db687c6a 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -11,8 +11,10 @@ AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec59
DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
DIST grpc-1.13.0.tar.gz 13755973 BLAKE2B 533f0a7d4eb606b8a55f12aade503285dbff2cfa29ff2af71d407e3df25f3ec4b7572335c455d5dd0069eb343f18f8641a4f9326065cc118922942f77d2d2403 SHA512 25a489cd67d12219696c397afa75282eb702bd0af418381990b2eeb4b56483a46276d05314710582dd17be04c80aaf9bb16e01e2c1729d9a59d84ff273baa254
+DIST grpc-1.13.1.tar.gz 13757818 BLAKE2B 9387efb980a0cff20c36d7653f24fb7982809428f7f35af0819786753d6cf380a581af81bde72f3682fcdfb3f41c71d628e5ef3b6b83663c8d3d182b4fdb6272 SHA512 f44028299d47865814ada2b8b93dc98dc51c8729bedc9c30dd79c04f6ecc3789ff06bbe7555e5d3512d9aec027751761ae10a80a09a94cf85bbd3260d651b356
DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
EBUILD grpc-1.12.0.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282
-EBUILD grpc-1.12.1.ebuild 4150 BLAKE2B 211375c9194684d63812417e4701ce54588237d65350d2d8bc956b5106b352f9ba204ffb174d8e7e8609851b282c816a008aa792e28e067d98a30a31db8f8591 SHA512 8531b6975d0f95dcfd8f1231caa2b6135a1f1ede25ee0ec2156719b3f238adaf9a5301e5cc7832e9b7fe62cc668fc2beb84d28e55ba16a8c4f3d099cf98e25d8
-EBUILD grpc-1.13.0.ebuild 4259 BLAKE2B 6c034723907f6f1c464cac41aefa1762e36db3c027ec2708a851f5732dbcb8350266169d09b71ee10fa3830613252af657cf7690ec0c792d69155b598a9062c9 SHA512 701c7179e1b8adb308bc9acf6b892970d4fa2c261e13fbe56a3eb58c347709b593743b3a0adf239b78562bca3d00e71439cff9a768ca1b168c48bdc1fd8a3340
+EBUILD grpc-1.12.1-r1.ebuild 4259 BLAKE2B ca43c1322b2b3b372de13bfb27e671c21cc6754eb161a8bf81756001c71d8af9885739950732064bf925a402a4d1b754d78f84b737dffe956dac86a946c2468b SHA512 21febff464b1551c011da6fa9db30a3ba63b9b62b7e6eef425890e4814ab7de11e8537d81fc525ebe2841cb91e3e31feba199634ee49c5b6073456bd365e12de
+EBUILD grpc-1.13.0-r1.ebuild 4368 BLAKE2B 349d192044bd3faef859aaeb4b6d5dcf466c5f29daf477563d0a0c2709e57b60548b4f96f2509b5234b166cb2ef58c6dc7b802a1990b0a2d2eaa230641872941 SHA512 147de0ba938be55d3b0592a547cb535c07ae8c4daba5381f6d02e1b3228d4116334e5e31119482c5da9b01df523edecdbe6715f127e180b937ba961404f6222a
+EBUILD grpc-1.13.1.ebuild 4381 BLAKE2B 49dd3565bb52ae69ff98e90bc74a241082835bd48e280b048f92be0947184b3870a242761c7adca42679cd0549254a9cf8b79ca6d99af8aa1d403b1ed88fb3b0 SHA512 a428bc0e88112227b9526d0bb431b9f0eb4fef2cfd8dcfae1c9df6cb6b3949423533dc08d37202e9822889139a6f41256b6530a8d95bd3f88b3102d1a22254ed
MISC metadata.xml 646 BLAKE2B cd1e7daa64d2ba30c25d0c84433f946be486507890f9a5da98fa419239fff924228ea7eac15a5bd360e8b75a291718c0e8a991923709f7452ca42982bc92b213 SHA512 a667f40567b9d65371553cdde70a033c81f73f7370f19733e21c885f7c26cf7c144f81a8e1a6af3bda88947ef4c8efcfe7356b8127cf82a5f33fcdbaae2dad95
diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1-r1.ebuild
index e57c672f4837..6c9403c76269 100644
--- a/net-libs/grpc/grpc-1.12.1.ebuild
+++ b/net-libs/grpc/grpc-1.12.1-r1.ebuild
@@ -83,6 +83,8 @@ python_prepare() {
ln -s ../../../../third_party ./ || die
# ./grpc_root -> ${S}
ln -s ../../../../ ./grpc_root || die
+ # https://bugs.gentoo.org/661244
+ echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
popd >/dev/null || die
fi
}
diff --git a/net-libs/grpc/grpc-1.13.0.ebuild b/net-libs/grpc/grpc-1.13.0-r1.ebuild
index 824ec4b1aa05..b3f51b4ee149 100644
--- a/net-libs/grpc/grpc-1.13.0.ebuild
+++ b/net-libs/grpc/grpc-1.13.0-r1.ebuild
@@ -85,6 +85,8 @@ python_prepare() {
ln -s ../../../../third_party ./ || die
# ./grpc_root -> ${S}
ln -s ../../../../ ./grpc_root || die
+ # https://bugs.gentoo.org/661244
+ echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
popd >/dev/null || die
fi
}
diff --git a/net-libs/grpc/grpc-1.13.1.ebuild b/net-libs/grpc/grpc-1.13.1.ebuild
new file mode 100644
index 000000000000..620789c5cc90
--- /dev/null
+++ b/net-libs/grpc/grpc-1.13.1.ebuild
@@ -0,0 +1,172 @@
+# 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} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+# should match pinned git submodule version of third_party/protobuf
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
+# also should ~depend on same version of dev-libs/protobuf below
+PROTOBUF_VERSION="3.5.2"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="http://www.grpc.io"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc python systemtap static-libs tools"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tools? ( python )
+"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2:0=[-bindist]
+ >=dev-libs/protobuf-${PROTOBUF_VERSION}:=
+ dev-util/google-perftools
+ net-dns/c-ares:=
+ sys-libs/zlib:=
+ python? ( ${PYTHON_DEPS}
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ tools? ( >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}] )
+ )
+ systemtap? ( dev-util/systemtap )
+"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ python? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/0001-grpc-1.13.0-fix-host-ar-handling.patch"
+ "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
+ "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+ "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
+ "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+ "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
+)
+
+src_prepare() {
+ sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+ default
+ use python && distutils-r1_src_prepare
+}
+
+python_prepare() {
+ if use tools; then
+ rm -r third_party/protobuf || die "removing empty protobuf dir failed"
+ ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die
+ # absolute symlinks will fail
+ # ./src -> ${S}/src
+ ln -s ../../../../src ./ || die
+ # ./third_party -> ${S}/third_party
+ ln -s ../../../../third_party ./ || die
+ # ./grpc_root -> ${S}
+ ln -s ../../../../ ./grpc_root || die
+ # prevent above symlinks creating huge SOURCES.TXT files, bug #661244
+ echo "prune grpc_root/tools/distrib/python/grpcio_tools" >> MANIFEST.in
+ popd >/dev/null || die
+ fi
+}
+
+src_compile() {
+ tc-export CC CXX PKG_CONFIG
+
+ emake \
+ V=1 \
+ prefix=/usr \
+ INSTALL_LIBDIR="$(get_libdir)" \
+ AR="$(tc-getAR)" \
+ AROPTS="rcs" \
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LD="${CC}" \
+ LDXX="${CXX}" \
+ STRIP=/bin/true \
+ HOST_CC="$(tc-getBUILD_CC)" \
+ HOST_CXX="$(tc-getBUILD_CXX)" \
+ HOST_LD="$(tc-getBUILD_CC)" \
+ HOST_LDXX="$(tc-getBUILD_CXX)" \
+ HOST_AR="$(tc-getBUILD_AR)" \
+ HAS_SYSTEMTAP="$(usex systemtap true false)"
+
+ use python && distutils-r1_src_compile
+}
+
+python_compile() {
+ export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+ export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+ export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+ export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+ distutils-r1_python_compile
+
+ if use tools; then
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die
+ distutils-r1_python_compile
+ popd >/dev/null || die
+ fi
+}
+
+python_compile_all() {
+ if use doc; then
+ esetup.py doc
+ mv doc/build doc/html || die
+ fi
+}
+
+src_install() {
+ emake \
+ prefix="${D}"/usr \
+ INSTALL_LIBDIR="$(get_libdir)" \
+ STRIP=/bin/true \
+ install
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+
+ if use examples; then
+ find examples -name '.gitignore' -delete || die
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use doc; then
+ find doc -name '.gitignore' -delete || die
+ local DOCS=( AUTHORS README.md doc/. )
+ fi
+
+ einstalldocs
+
+ use python && distutils-r1_src_install
+
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ if use tools; then
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die
+ distutils-r1_python_install
+ popd >/dev/null || die
+ fi
+}
diff --git a/net-libs/libisds/Manifest b/net-libs/libisds/Manifest
index 16bcbad7514d..d94f29918c2f 100644
--- a/net-libs/libisds/Manifest
+++ b/net-libs/libisds/Manifest
@@ -1,6 +1,8 @@
DIST libisds-0.10.6.tar.xz 724120 BLAKE2B b6d3f42d4ff84c377c9425dfd84a14ae97ccc39ea4bb96169e3a8de21b99dd6e5ceda39a6d4a574ccb418561dbec2507f72afc8b6f185c34ff92202abcc49441 SHA512 602c4e7f047dedff131cda941d02ea41fca7b8ea80eb668ab8f7ab2626a013ddc1a86f1e2c7b5759adf266c7c22c515284e6d4fdd9fd594ad310bed1be6016f4
DIST libisds-0.10.7.tar.xz 724840 BLAKE2B 73d93b518271cbd08787a38da454ceb8fa6c2d421b0291c61cded8f1438d44c5607d1e90d75714c3d76e0886ac723e38dc2a41d60284a58d567abdcba76becd4 SHA512 ba2ef11c2983cb3bc8f779e7af3fb8319d38a786911e68c6b53c25aff339b4630bdf78886825ea3da671e87f689cab376cd9e41398f3f74608af932abe7a0023
+DIST libisds-0.10.8.tar.xz 726040 BLAKE2B e3509202cb95e6e2bd0a6e7592c3d1d649ecb47806823265e5e12fa3a79a5daff9d249b2f0642d13aaebf1c64243690d06c9387fcb3a166f4b989c19f337c059 SHA512 648ba30c3156ece329d663d0d6e649319d8d104de97ca1946d94c24205c44189be08cb0c573df1f5a889fba487f2d088ac472c3f922a1920e172dda0c592b41e
EBUILD libisds-0.10.6.ebuild 1160 BLAKE2B 5f4d4d1805b282a16e7967af3c0a60c16ea7a3460b065222c4852c0c86883e9773128435f22ca9386a1c21ba5f75c5657f5ea592eee710c3bed4e27c1f21c09a SHA512 dcf884de16b11260aa3db9436a3298c2dd4e36a3f7b25646e336654da908faebf1cca5b2fc61784c87f2defe56f13473ea578269fae972904652c15b85af15ef
EBUILD libisds-0.10.7.ebuild 1160 BLAKE2B 5f4d4d1805b282a16e7967af3c0a60c16ea7a3460b065222c4852c0c86883e9773128435f22ca9386a1c21ba5f75c5657f5ea592eee710c3bed4e27c1f21c09a SHA512 dcf884de16b11260aa3db9436a3298c2dd4e36a3f7b25646e336654da908faebf1cca5b2fc61784c87f2defe56f13473ea578269fae972904652c15b85af15ef
+EBUILD libisds-0.10.8.ebuild 1161 BLAKE2B c6cd8879338b6b0cc099cd750035bb73308db49faebf0c5a980fd3c821e77c3647b34e8367b4c3fd7178ee416ea18cf8e462405140ff93a1053419daa9ab7ea0 SHA512 b53e2d5f10cafd816a22a4962d66bdbbf14cc3a5d8963b3737d9211ab311f088a71e6fbe48270518bf6594c0526faf52901496c766607bf905498f7f78994176
EBUILD libisds-9999.ebuild 1208 BLAKE2B 996a41fa67545b9ea3b26f69d101de67ec7d38bb2a5bf001f037c6f706296a3ec09816a05f1d19b2abd3586cb606b5bdcace401e4f4e684e5a72ceb94455ecd1 SHA512 440120e6d3d583780020b4c2e22a8f0598c2c28ec81da44c4df4c4018142e0051fbcf9aa7fd0e69ecddadbd3b09f8f4b38441284c7b8ca784f7efc162ab5847a
MISC metadata.xml 728 BLAKE2B 624c69a771c5b48821a5f061f812c7255331bf6892ae51b9ac7f78744d6a8fa75084428d0607f7e7f562a26409ae31b6347b9bc8e15927f76badf78748255126 SHA512 e474e018a9161694202d372a8e40934a77662ff8fa8a50120ab69d4ff3db7098ef303b5d7c4db071a4ad12ff01f43db0a96c0d9474a1ebf87c294449a8331a0e
diff --git a/net-libs/libisds/libisds-0.10.8.ebuild b/net-libs/libisds/libisds-0.10.8.ebuild
new file mode 100644
index 000000000000..1470c31c1070
--- /dev/null
+++ b/net-libs/libisds/libisds-0.10.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Client library for accessing ISDS Soap services"
+HOMEPAGE="http://xpisar.wz.cz/libisds/"
+SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.xz"
+KEYWORDS="~amd64 ~mips ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="+curl debug nls openssl static-libs test"
+
+COMMON_DEPEND="
+ dev-libs/expat
+ dev-libs/libxml2
+ curl? ( net-misc/curl[ssl] )
+ openssl? ( dev-libs/openssl:= )
+ !openssl? (
+ app-crypt/gpgme
+ dev-libs/libgcrypt:=
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ test? ( >=net-libs/gnutls-2.12.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !openssl? ( >=app-crypt/gnupg-2 )
+"
+
+DOCS=( NEWS README AUTHORS ChangeLog )
+
+src_configure() {
+ local myeconfargs=(
+ --disable-fatalwarnings
+ $(use_with curl libcurl)
+ $(use_enable curl curlreauthorizationbug)
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable openssl openssl-backend)
+ $(use_enable static-libs static)
+ $(use_enable test)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}/" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 7dddcddb766a..87ed5a2233b3 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -7,8 +7,10 @@ AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a
AUX libpcap-9999-parallel.patch 640 BLAKE2B cb1b081fba0b53af09ead5e4c0bc3e5b7856ad2c0ebaf68dc99b8a375158a112c47e0dfad7763caff7b0f7da8ce5b1ebfcb79a6cf3cf72636605dfd4097fb711 SHA512 82e0c48f2fc42c8df4a21009b9afac18ca4aaa14db822c0c85b4ea420434391dec3b5da90261d7afe01879354b43ef425c7464c9fe98a407a4b232590e361117
AUX libpcap-9999-prefix-darwin.patch 394 BLAKE2B b54df9fa5f1d796ad4739b2ae4ea55a8b66fc2ba434438a0e17cbd7ca5bfaf5d1611e0d8431be45d3fb80dbd61bc2bda2b6fa50378da4780154b4ce523a688d8 SHA512 bfd560b1bba72a84c5afa1cdf166944e9ede10cb817c7273941b3fc0838ca2676adfd143c0e8873f234de343aabb2177f46f2cd062738d2837d42a1da7370083
DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
+DIST libpcap-1.9.0rc2.tar.gz 820710 BLAKE2B 0c0a56769ba1dd8a4698f3ee14be9f831603e8553aa55991ad032522c93d001adca4874fcae5cda6174b8c9dc532b3a88abcb2a1256efa907cdd570c691f09bc SHA512 d1f04bf7dd6f3fd0bad0e145563af52084736227af447c1ace4fd47deca0529041457d4eb099c50e77671e0fc3ab2eaef089e98e26a8c89ff900801e7082b330
EBUILD libpcap-1.8.1-r1.ebuild 1952 BLAKE2B 5bd058d1c738a3e8b19c3b63a9b7c7860dd7ddeebaf547c839fe4c99f0a543724a94af0f45f71b33ab9a47f02801a91aa0e6d11cf9d8df2b8af8f2fcc3a7648c SHA512 cd158b14c41661e28f87dc2ce6d82d037ab243fbbaf231057943079c23ed1116591262adde4a314ff7b9717969b3f722e33990598f7a93bfe47b91c1b2b4c70c
EBUILD libpcap-1.8.1-r2.ebuild 2014 BLAKE2B 946e33f229507957e49927fd17cca8bab97b40aae6f26f94a0428961aedd9c6c1f795e574fdd406d419e4b3388176226d15fce66422c055660c34a61ae2a91bd SHA512 d9a4f50d26a7bb0ea07ae0ba9e8f01174cd22abe9f3df6db1af7fbd4e9d762d6f0e48891d3a117ef72fbd8bfca63fd80bd8864c3352d5ceaa937ad59ae9f5497
EBUILD libpcap-1.8.1.ebuild 1927 BLAKE2B 5e6b558d87a07b874c3c945848d21694930ed45899c3d9675cbc76d87a0cdd5048b00737b3abaefeafb579d4b925f588b363dfcf6c2639d249a27542bc92abe7 SHA512 29f28f19b0a258b0102a3d1ae611673d51f1649667b8816aa4dbcb36c91866cef2ea09c9bd03adcb74a524fa587b44de5056308d901d381e7bebe041dcc40c45
+EBUILD libpcap-1.9.0_rc2.ebuild 1814 BLAKE2B 57ff3e23646cb9a4dd371d75e62fb038173f898c468c8d34c7da05849f097d0ae9c67f8a48bb799528c8ff3fdd78bb0ae41965ca782ac98abb468fed2f706b5d SHA512 69fd6345d365ef3972a96afdae8a873d8d38bf14be5dd9c80eeea502a700625c16848bbd828c7f6f0249a0cadac4d3f32fc9cd88c282f19ff22ce13c6afe6fd8
EBUILD libpcap-9999.ebuild 1505 BLAKE2B 0071ca57d3c8d1dd7601b5b52e3e3fbb9f45fea0afb9361557856b31bf1ccdfd6d408c1adf46e54d619f55a99eccc18faff6919f5412782960012102d0ec240d SHA512 06600088a52b75baa2c2a4aa90a5c6d8dbae5cbe54d5b74d5702d0adcf762a72c6546ff151b2750a45fb1e7fa20f621c0d9e59e83cc5f370cf91762a97a72e24
MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
diff --git a/net-libs/libpcap/libpcap-1.9.0_rc2.ebuild b/net-libs/libpcap/libpcap-1.9.0_rc2.ebuild
new file mode 100644
index 000000000000..93560ef4a407
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.9.0_rc2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib-minimal ltprune
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+ http://www.tcpdump.org/
+ https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+ https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink static-libs usb"
+
+RDEPEND="
+ bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P/_}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+ "${FILESDIR}"/${PN}-1.8.1-darwin.patch
+ "${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+)
+
+src_prepare() {
+ default
+
+ echo ${PV} > VERSION || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable bluetooth) \
+ $(use_enable usb) \
+ $(use_enable dbus) \
+ $(use_with netlink libnl) \
+ --enable-ipv6
+}
+
+multilib_src_compile() {
+ emake all shared
+}
+
+multilib_src_install_all() {
+ dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
+
+ # remove static libraries (--disable-static does not work)
+ if ! use static-libs; then
+ find "${ED}" -name '*.a' -exec rm {} + || die
+ fi
+ prune_libtool_files
+
+ # We need this to build pppd on G/FBSD systems
+ if [[ "${USERLAND}" == "BSD" ]]; then
+ insinto /usr/include
+ doins pcap-int.h portability.h
+ fi
+}
diff --git a/net-libs/libsrtp/Manifest b/net-libs/libsrtp/Manifest
index e30533703f5f..25b5d9dbb757 100644
--- a/net-libs/libsrtp/Manifest
+++ b/net-libs/libsrtp/Manifest
@@ -9,5 +9,5 @@ EBUILD libsrtp-1.6.0.ebuild 2215 BLAKE2B 0c7fc9e569f320487aa26c95c9d5b70335fa770
EBUILD libsrtp-2.0.0-r1.ebuild 1911 BLAKE2B 02c26044260d022738fb2ef726181f05b1ce5144d03e5a7efbdf371908ea2985aa373188f319034b8eff65f0e9d0fc290d8bfdeab564f5e75e502bd9bb922cb3 SHA512 8ee91195f444de10b1fcce602943d099ecf7ef4b2e4cae9d92c41fb71842db6395ec572bd298669069138f4525ae4008480c36000525d02f16ce8fe7ff5e757f
EBUILD libsrtp-2.0.0.ebuild 1711 BLAKE2B 9b3d9549d9b491a8049770229bb364671f8c89e63281b84d57050d0092072eeed9bb402073c012b44d16c0b9a45c3351b6b0910ef9d7d60ce26af383c73e76c8 SHA512 68343d3a4f86f72f6881e885a89110360e7e342ae65fac94706c0e08fcd6af7a0d00bf3cdff91f11cb77482e86ddbe7b041df7c4a9a59b54caa79e2346fa9c62
EBUILD libsrtp-2.1.0.ebuild 1888 BLAKE2B 745b206204bd6b9ec77ea27a94a024154f0b495f57656e4c432de9a928fc043fc67408184a70af66a256cc17ae49c50d430a987350134193c2d3870447fcfb91 SHA512 b6999a6b65f2d0536504273644e99de39d9a8787021e0d16a2a205afaee2ca9e3487a41202bddb1e67c298e585e8fa84cf26699aa769cf259d31e5a6e8c18513
-EBUILD libsrtp-2.2.0.ebuild 1851 BLAKE2B dbe6659a09a18039d93b1f4018336ef8f32c8c3beffa2d52e81fcad14589742ee245a950210a912c8298a8660507bf032cecb02bfb0a8a573602d1c51169ad3e SHA512 1b2b919949ee53b5c35549a49e62b8b8ff09a0e498c6ed996d727edb2399e42066c7638aacae52c25aacb1ea0ef819a53649d01cfffb5483902bbd652d84ab25
+EBUILD libsrtp-2.2.0.ebuild 1846 BLAKE2B df425613aa38b8c5af2ea2ef48efdba68be6b6c124c748760fe071f1f8282b78356828c79bb47147ea3dc3863abac583347638ae79aab0af8b8914678aded144 SHA512 c8eba2c9a27f98459b8b66756e748e9a970effa9eb9a19226b686b8069c2c7cf9a4a77eaae5dbb6eb4c42f1d7eeb44beebfde9b8d2d07137c52e104d598db401
MISC metadata.xml 785 BLAKE2B 4dca0339742c5c52eede087bc89e86b8f1da07dd895e1c3361f11456d2408361ead847997ea9d344e369949cf0d29ff88a22fa65917b7c74143b642f8d28d716 SHA512 3c23a7d6242dc7d42e34681850ad861bb67a5c44c5113ef5a82201127900e66bfbe03d065f60410d5652ed2abada24b1ac373a6c061392b48afb97080caa718d
diff --git a/net-libs/libsrtp/libsrtp-2.2.0.ebuild b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
index 05aa4830df6b..6f0a9d03662a 100644
--- a/net-libs/libsrtp/libsrtp-2.2.0.ebuild
+++ b/net-libs/libsrtp/libsrtp-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="2/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
RDEPEND="
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 0df6aba9caac..7a956ae079c0 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -2,4 +2,4 @@ DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 BLAKE2B 0a1102e1b74049c1f5d898036
DIST libtorrent-rasterbar-1.1.7.tar.gz 3951887 BLAKE2B 4729a718f5ce5bf2a41506f18f48bc588ad863ea8e640dde6f9e0a35bb909ff651fca3c8729668b25507fa3928218be579964c683d9d6bf3dc1c3abcce0f9452 SHA512 e35e95eec55a69b81c1d21f73e230dc4de7502b5adce99193c01b0d89a04b0f484788ff235d3f73cc77eeccba8d8d441fac92aa76a17afb56bafabd318b4a75e
EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2398 BLAKE2B 319dd61c379cc1e0b92f938c9364eb9af477e017fd2595ccf6bfde65a05bb8d7d27ac3ed7396233aedb24a1b02296e33fd66d42af74bc8b31f1ee97efc6c5a0d SHA512 ba767f43b744e9f1a50c7a559b91a8b45009a1b08820852c9a005d3d6a2c7f6114a6091cbfed2df34e9e7bb2c75ca10873af69bc067356913774f027b27dd2e4
EBUILD libtorrent-rasterbar-1.1.7.ebuild 2402 BLAKE2B 56c5cd008f5228123a10ff5947d181fade302610184e6f5e17061f67644876f3b7cfe1531a0844ec16ecfd2b7c2b506e12566f06cbe4fd9e51e27a67f5426b83 SHA512 7381f9f833bc83d01504b4d47312185d6459cd0e9ec4c49999e31c877220260326db5136d7d6390d014af52a5abd20ec9523f3491b8bb91a4af5d068d1453a19
-MISC metadata.xml 527 BLAKE2B 3bd0290e624e222f59731d8c5806b8a4185d637adba56e1fbdd83a7b65156a97fa39743d8d9ea7ce9d8bc6fd0500815d39090b9b53e5c77e40f03b61ece94843 SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3
+MISC metadata.xml 444 BLAKE2B f9abe9123b6f4b841accff6c9eec879a0aab90abeba75ec1d08b1a97d179e18645bf47d2f0ba039fafe43b3340a5c67479c67e09fe25910429fe6fa382c0eb20 SHA512 5d8a3bc354ddba410e8b394303f4faebc8072738f1ac1d44b7a3af02116c8a67b4edab39e730c35c313c8abc44703fc7b22709766e62da9aa46de15ea2c3d962
diff --git a/net-libs/libtorrent-rasterbar/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml
index 7cac58e92207..486018d1ae1d 100644
--- a/net-libs/libtorrent-rasterbar/metadata.xml
+++ b/net-libs/libtorrent-rasterbar/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="google-code">libtorrent</remote-id>
<remote-id type="sourceforge">libtorrent</remote-id>
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 93d8ddbdf3e3..91972435f75f 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -2,7 +2,7 @@ DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe6
DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
EBUILD nghttp2-1.29.0.ebuild 1855 BLAKE2B 0793576995532dc0626a55ded3a58a9c821a8f982f7cf02457145893cd953f1d369454830f7882fd971cac20b7bfda05fea27e9012367433dedfec0b3e302022 SHA512 e52fce760a93bbc0dcaa3f1625bb7a3cd9abccd969881ed17e4e33d5f4a0bdd3f4ec805667c1f4dd98fdcbc3427fb3f0e60083543c80a0864733f4c358ce19fd
-EBUILD nghttp2-1.31.1.ebuild 1865 BLAKE2B 0c3885e7442978d0bb8b80620a8a720fe44763795accc7672d98c6bf5af0340963a3448e21da00558971bb4836c5fc7d7b9676646c289992b98051e4ccb8f306 SHA512 f72b769c28f8ab9d599e4d06a3d8d0f31a8f5a05550f8adf7b29db826e117ae393ae14f23ea7bd490bdf85a5d82bab4f9f31451412cf044fa320f19a0bc84c14
+EBUILD nghttp2-1.31.1.ebuild 1864 BLAKE2B 7a7dd9bb67e6f900d02ab38353764655ac32b5f7d62f44cbb0d6daca3e476626666330a27e85abb2297cc507206767f26fd7566c7e01b079d4ae213d552e2e4f SHA512 879b31dee79958bc567f0730718dbd2da3046e5a1104f8b619d2fe19f8fd3729dd3892a3e5c1856ef9cecb71bd4a2034e32ca99ef9121499ca5606bed06cf3ed
EBUILD nghttp2-1.32.0.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
EBUILD nghttp2-9999.ebuild 1937 BLAKE2B a3fbca3092493aa311acca430b3c741f3e5b7f2b573463a2f90c10c12c6e83a6a18c53ad993c5333895596862da9112ac8c8eac8ac63def6876dce426abb0de4 SHA512 5f978d788a709eff86996a1a6a080162d7c6d762c09fda34138001bdf32ae203cbe69556658271e1c7462f9c2405dc35e4619d41b5ebecedb0088f82d5611289
MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.31.1.ebuild b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
index 7513374f7f4e..26138c1a2905 100644
--- a/net-libs/nghttp2/nghttp2-1.31.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 31e10d930eaf..60348afb462e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,6 +3,7 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 705ba235f707c750971a64ea3d
DIST node-v0.12.18.tar.gz 19842591 BLAKE2B f94f4de6e2875267be194580c645087a262b90da99f10d651a22838c041da07056df81204bb04ce8da083a080062509dcca4d1e3ac2250d651ead8a4cc025028 SHA512 6866608a43eb213f3b715ea0fcc28983fd959ab679c567a1b464f62acd936506f2bce88ea48a60209d8ef8d98259f4b47cd3434893eb4ff82a132775edb37b7b
DIST node-v10.5.0.tar.xz 19700916 BLAKE2B eb687776a4e51f9eba30ba0ff293bfb9a7f30443191bd2023edd6d41e973e58c13c8d783a48fa34e500769e9b8846b45abf28e5406bb443e9df1409a382a15bf SHA512 f22774d604e552fc105054aea531486ec84995e3e20c482c098dff5ddbcda41674423a98ee86f3a44245d3cb3e57a9c7c7ff31baf9539576bb1d3b74cf1a983d
DIST node-v10.6.0.tar.xz 19741864 BLAKE2B f94ba788b4510b93e4ec556d0452da713e380621d9b3cc65a47fb0ac91766b4b25ec1f6dd06f35f621dd2d18781186a2a90aae7d728803ae221c08dd015139ba SHA512 c9434d8ea362aa8ea41053013bbd69fc5b5f4e133f9662419947919d29c246950ffad4d262cf9a252bc9f8a0cc63676947c8f0b83135a120c031d71ca37f4fd8
+DIST node-v10.7.0.tar.xz 19770604 BLAKE2B b869f11c3b14dd078f5d8b228108ff60dbafa5e3ee3948b4323bf86233ecbfe8a6e06c24d8545fa364d3880997c298fab834b33660f2cffc7bb0f7e34744e9a4 SHA512 ceb70f79a3251a6243082f17a1c96617df7c40a6e1e3a24ecdd9e4d7f1203562d586e7a85a1e8e642df1de69839a9c0ea33e4a753643c5e8a1b502fd1f2debaf
DIST node-v4.8.7.tar.xz 13370828 BLAKE2B b1ee93a586b66f8582783b1be50667547afe4bf48038ebc0b8148db55542cbc0520ac84ef88e4a7f453cabc245f484c32dbc238c1932bbc708791ceeb5c9d2ab SHA512 25837a31023747723b146c45984a5b2096b61c0aa43cbf45fc8ff50b4bd5079bd0bc9f1dfd3fb076817448dc5537eb93ffb2f345280b7756ba93b67ad757c696
DIST node-v4.9.1.tar.xz 13250164 BLAKE2B 7a689b99bb4bf507f7f21dd2c096a5766d023a8174c0f468cab37365af1920b8700da04157e1a406917790524255ef32c243a74662fd50ef7d3567d189dac9cf SHA512 690c9fdf608e5194069a10955bdd94ec87cb1c308f13bc4d2cae92fa01436ace10fadf58f2e51d477dde6c570b23edc1c71fafea79bfc9cab2903eb2fa5f87aa
DIST node-v6.11.5.tar.xz 15699404 BLAKE2B ba2df91bf5ef38cedb60b42919cf56f16807e619a81876fc92a5741e49da7ec91c4239d00f549c5e80d0bb8282bb9b396dd984507916cd18d61b403a3a7cef94 SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9
@@ -14,6 +15,7 @@ DIST node-v9.11.2.tar.xz 18507832 BLAKE2B f5ef210632065f2c99dbe3fd210fa832bdd096
EBUILD nodejs-0.12.18.ebuild 3435 BLAKE2B 2fd0c799325e0def135f2618901aee64fd5d950aabe64b4ce52d3d525ce08a7581c68b60fe2e84773e04a0c101d873efe7cbfb08020a0b6f384649d0a265e182 SHA512 6d9a761e4fc8cd35899a10f57e47f00c1222c6573246756599c702e17885422a253b6906b1fc119d4298e562f6bc9994c89f59a405021bed1f6e03c4f53d88f0
EBUILD nodejs-10.5.0.ebuild 6339 BLAKE2B c1642519de2c47f964c1a8f32ed4cf5caa2fcaa42d0ca3bee0189d1662fdb170b0ddf80e9a2fbbe7bd51d146623aff652d5c6ef7030a94257c90d76eb63992af SHA512 8e276ab90bf81f0f27da9f8b1d393ed608f98dab610ff3b6c48674e9bcad3a4fbe3cc5da8efb2e1aad4c04a19a4b6be1b7638af295462f8e99c7c7938125f04c
EBUILD nodejs-10.6.0.ebuild 6339 BLAKE2B 909a1b6e0fad010c2422482d08ccb7ee170eeba8976d1c5928824bf54d61ecce2468998bbb2a8f5024ff1d2ffbb98922ee49dbac4116ab91279e3da296cbc259 SHA512 98a3c5a57a70b8089ef98f09d06f0dd6f520c11c1cf37b41202c4e64b73eff566cb09f2dd43e9d4516fc0013c3ab61c8e260d59b4180d6ba790baf2d66691286
+EBUILD nodejs-10.7.0.ebuild 6339 BLAKE2B 621f278c58c4458cbe593f28e9082df4726a6864b97e81fa157db6ddf01a6cfe6bcd0b4955091253c53dac08e3c42664c13f42dacf5ee457f57610b7fc8c6332 SHA512 da4d8791c425ae98d7ae29a696b007e5d000b670f63c4c0f55739ecc41105648b62c8093fe6760b08b53d6f1edaf433e186dcf687cc0c9691d771885aaef3efc
EBUILD nodejs-4.8.7.ebuild 4431 BLAKE2B ebdf991fab56e0e40958ec1d08570a8d32732237115fa6b468e788d4d92245c553d4f0e6187a83bb5cf57ee1aee334002cbf255925cc5f3788d566d9204316a8 SHA512 dfd48068f1f246211a001fd9b180cbf5344b6948714f17eb6435be604e4138f8bcd72812b8d782c33d1569f25b907736ffd92b7852b2542f63f2dadf06ac1ca8
EBUILD nodejs-4.9.1.ebuild 4432 BLAKE2B 3650a661997bdfeef6097b4e356a186a2b829c0f2224624b71ad832b1e957ce9e841136b83f62c53b8e524993b4eb8e203c1d10176f98f09503047e058804fbc SHA512 98b52c0ebade643785b90d8362fc047b361c4c29e5a7e81b59c581978025a24c9562171fca342d29855f4881985db4d8f017b2711c5ab4e54f0dbdf18aa69a03
EBUILD nodejs-6.11.5.ebuild 6089 BLAKE2B d1b1c07ac7eb975d28291fca7fc10688e316e1fd62419f6cf87c9ce7952e074afb23eb89f40df0d336dd4c0f0d22ed40157035b7e6b8e2730eb2ef95a538ba60 SHA512 9a4310b2b53b0f58e855f35dd04052f4b1b8e0a8c9341486321b5e78ecd5df0078fcc614c3786d6f54799ce031c3046868d8970a041ad67fc7be0bd6e789cdb1
diff --git a/net-libs/nodejs/nodejs-10.7.0.ebuild b/net-libs/nodejs/nodejs-10.7.0.ebuild
new file mode 100644
index 000000000000..f5919ddd574e
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.7.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ inspector? ( icu ssl )
+"
+
+RDEPEND="
+ >=dev-libs/libuv-1.22.0:=
+ >=net-libs/http-parser-2.8.0:=
+ >=net-libs/nghttp2-1.29.0
+ sys-libs/zlib
+ icu? ( >=dev-libs/icu-62.1:= )
+ ssl? ( >=dev-libs/openssl-1.1.0:0=[-bindist] )
+"
+DEPEND="
+ ${RDEPEND}
+ ${PYTHON_DEPS}
+ systemtap? ( dev-util/systemtap )
+ test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+
+pkg_pretend() {
+ (use x86 && ! use cpu_flags_x86_sse2) && \
+ die "Your CPU doesn't support the required SSE2 instruction."
+
+ ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # https://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # make sure we use python2.* while using gyp
+ sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+ sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+ # Avoid writing a depfile, not useful
+ sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+ sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ default
+}
+
+src_configure() {
+ local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+ use debug && myconf+=( --debug )
+ use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+ use inspector || myconf+=( --without-inspector )
+ use npm || myconf+=( --without-npm )
+ use snapshot && myconf+=( --with-snapshot )
+ use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+ local myarch=""
+ case ${ABI} in
+ amd64) myarch="x64";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ ppc64) myarch="ppc64";;
+ x32) myarch="x32";;
+ x86) myarch="ia32";;
+ *) myarch="${ABI}";;
+ esac
+
+ GYP_DEFINES="linux_use_gold_flags=0
+ linux_use_bundled_binutils=0
+ linux_use_bundled_gold=0" \
+ "${PYTHON}" configure \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ $(use_with systemtap dtrace) \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out mksnapshot
+ pax-mark m "out/${BUILDTYPE}/mksnapshot"
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ emake install DESTDIR="${D}"
+ pax-mark -m "${ED}"usr/bin/node
+
+ # set up a symlink structure that node-gyp expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ if use doc; then
+ # Patch docs to make them offline readable
+ for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+ sed -i '/fonts.googleapis.com/ d' $i;
+ done
+ # Install docs!
+ dohtml -r "${S}"/doc/*
+ fi
+
+ if use npm; then
+ dodir /etc/npm
+
+ # Install bash completion for `npm`
+ # We need to temporarily replace default config path since
+ # npm otherwise tries to write outside of the sandbox
+ local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+ sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+ local tmp_npm_completion_file="$(emktemp)"
+ "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+ newbashcomp "${tmp_npm_completion_file}" npm
+ sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+ # Move man pages
+ doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+ # Clean up
+ rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+ local find_exp="-or -name"
+ local find_name=()
+ for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+ ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+ "*.md" "*.markdown" "*.bat" "*.cmd"; do
+ find_name+=( ${find_exp} "${match}" )
+ done
+
+ # Remove various development and/or inappropriate files and
+ # useless docs of dependend packages.
+ find "${LIBDIR}"/node_modules \
+ \( -type d -name examples \) -or \( -type f \( \
+ -iname "LICEN?E*" \
+ "${find_name[@]}" \
+ \) \) -exec rm -rf "{}" \;
+ fi
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ "${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ einfo "The global npm config lives in /etc/npm. This deviates slightly"
+ einfo "from upstream which otherwise would have it live in /usr/etc/."
+ einfo ""
+ einfo "Protip: When using node-gyp to install native modules, you can"
+ einfo "avoid having to download extras by doing the following:"
+ einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
index d9d252a88827..d2fbb1a46039 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -12,5 +12,5 @@ DIST openslp-1.2.1.tar.gz 886195 BLAKE2B f4ccdf37028d41b6e405768f1b3982b1eaa89e8
DIST openslp-2.0.0.tar.gz 5424646 BLAKE2B f63560742cb3f679d052fb48b0afdd7cc7995806d77ef93f01da3cd80a884a840d0b678927685d4f4138358dfcf10e93269217643e399d7721571251c31fcbe5 SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade
EBUILD openslp-1.2.1-r3.ebuild 1023 BLAKE2B 9129caf5bbae1f3c6021d089f87f2b91f763acd0deae8927103aa4878f3590043345c2ab171de10cbde4fd1552c5a13efe4f75ea60e5846b84ce048d80f95781 SHA512 f9e0e8dd843444a33c38f711fada3f576db0bf25b6bad4165ae1b019fb1e70f9f7d96445975afabc5d31ed233a7fc35524969bd6c93e6a9ea2df87af00624675
EBUILD openslp-2.0.0-r4.ebuild 1072 BLAKE2B fe26811ff5d4ee7334d1f53741955f757d3a9f26977038b63599a1d3898b6da67d3129aee1d6ac281164a3c16dc4b15688d5850dc15c8374f9e469c5e7f00097 SHA512 c22179f59218873aa99fed9100e456d5e33229c4b51436dc457b0589ad179ff65317400b2a92dafcf4ebb90295f5b9e41c1a92981978a13ccfe236574b64c9e3
-EBUILD openslp-2.0.0-r5.ebuild 1132 BLAKE2B 303f2eb68810f74d92fcd8141c05137c93452efcc8a12a09808748a361a48bdda4764c76c338449667cbc54ce7b573c4318f88e2c73b69b55797d06e0f0714be SHA512 cd160030d9f88f52513b94144252b63b868a787517d2ac54fcf5ad0d5e6f557315096ed28a8ee856fd93f397caf1981d78ff1822c03fb2d3b22395e1b440e2d1
+EBUILD openslp-2.0.0-r5.ebuild 1131 BLAKE2B 01f1e145d3e206ebc9335c8bb9d9b5a0f88797f63c249cfe9bd56dc9f85a092d380dd437007e94154aca1e7a86389cba78e69d4c5279a142c35c40447c298666 SHA512 1d0ba0e6fce38cbf35a77aa3bc39044454c582c10e69b4c5ce38ba58335daf4c37a4e05c965cd99cecab7522a2156cd14be2ed49d620935a5c8fad76555c93fa
MISC metadata.xml 336 BLAKE2B 8af4358f9a3d06983df228c81b3add5373b04fe7a322d0e5045d3b1224b4311ccfb27b7ab3f19bb6ecc4a12e8e061b7ba4435e70a7371b9018990748aa036e44 SHA512 2aab4978f409d1ceb235b846e06bae2c750c68c69f54f6d5a3f96b30be24c6262cd085b741cc193d8d60a4486581817347ab5b3bcc84d43da48dcc2c215df84f
diff --git a/net-libs/openslp/openslp-2.0.0-r5.ebuild b/net-libs/openslp/openslp-2.0.0-r5.ebuild
index 1b765349b633..5871635b5544 100644
--- a/net-libs/openslp/openslp-2.0.0-r5.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
LICENSE="BSD GPL-2"
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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="libressl"
RESTRICT="test"
diff --git a/net-libs/tox/Manifest b/net-libs/tox/Manifest
index bd12de89f2a8..cd5bf25f9a58 100644
--- a/net-libs/tox/Manifest
+++ b/net-libs/tox/Manifest
@@ -9,4 +9,4 @@ EBUILD tox-0.1.10.ebuild 2214 BLAKE2B 5d2003fadd0af8870610f10f0f5f1ff310de209e9e
EBUILD tox-0.1.6.ebuild 2250 BLAKE2B e4fdb58e9a9861eaf3420e05228d2dcfb213ea2ed839562394cac6207afe3a97947ff34c8c31c9c737669758d49a9f757eb03fe99da98ed134d4d96a90dd5f7b SHA512 3566194ff9f4afc1ccb95cce44ecc47b13c3ad1b0ee8eecd6acbfd4e122deed63342ccd23eda9202070aba9f59e21328e610d454a2209edc3d513d54ed2963c1
EBUILD tox-0_pre20160904.ebuild 2237 BLAKE2B fbdd8f30956ad73dcd398468e537260e0597c8b6f1a6f3d75987167b1b16da38a0c3e9b1159d25e6f58b4ecbcb4d99dc63870c71cb6c3d2dcd4d9863efeb452a SHA512 123f25a734fbd69c6d48d594359264b1ddfe9ad2423ebf8bf5f768e352e38b9d59d3be42932d6709340900fcc45131d5496bf0f474ea9ed70753a3d97c841543
EBUILD tox-9999.ebuild 2146 BLAKE2B 8388e75e8cce0532cd18c3053b5fcda8adccc155c5c426e5ca5457ef4e842b379a1eabc13b789929dd2df4b2e6875265b8469c40f90ff1d6ebe4335d335530b2 SHA512 d4f6aee075b56a8e034488c3f4b0808544dd718751a4cbcaf2ca81d6fdf04b4b4dfaa68f17665faa7457af36398769ba26d73545b1e1a6ee803001eeb9ce36dc
-MISC metadata.xml 930 BLAKE2B e54a2153889dddd0337eba9a0499119a8b9d1768e3404aa7a3facf3475c90efae2b4bc79885020ef61202d707e7009e892234655e01750d9e108b2b62826b31b SHA512 0c874f5e77438cb34af28003a832f8422d3c0baa41c563476ae1cc67ba82b5dbea9cebbf28a96e05828c7163e0bf6f27721ad3dce6fcc82a14b6ffd7d9c058cf
+MISC metadata.xml 731 BLAKE2B 7c279eba74cd218439392afee1509adcdc022a54a87545f98fb1b9fadecd31efc383a1fd6e44bcf2db53ae82b3cfdf4fb2d14d427d94699278ff978250510b0e SHA512 952aaa54d9b72cae58e6ac6852435a7394fee3805d5772c223dc48757066d457efa1094682f2afa5056ef782a8c2ab61b45e724f1cf80f33643a57152f75a8b0
diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index 578a876b40a1..0dc9808e046b 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -1,14 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>zexavexxe@gmail.com</email>
- <name>Zetok Zalbavar</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="av">Adds support for audio and video.</flag>
<flag name="no-log">Log level: 0 (no debug info logged)</flag>
diff --git a/net-libs/zmqpp/Manifest b/net-libs/zmqpp/Manifest
index 10565ff96367..7aa41433f352 100644
--- a/net-libs/zmqpp/Manifest
+++ b/net-libs/zmqpp/Manifest
@@ -1,4 +1,4 @@
AUX zmqpp-4.2.0-multilib-strict.patch 496 BLAKE2B a91028c19591f329832ed81798a96bb153ddc56e9344161fbab1ce24cfad1c04ab461ecc35b008e9d7a1c80db798d79d3569d514d5c1f419209ae6e01887a0c8 SHA512 2696c95f5ae7dc5a36141b756ea73c0fcd50b9ba7c3e4e9ff3187d0bb76c22bc52fdcb334e748e27a2f1fd6f71dc7ec97b60c73b6733f0d1c598c63c041d0fc1
DIST zmqpp-4.2.0.tar.gz 102942 BLAKE2B c72e807e68aa9142e3e7f06a1c9207a4477538b6ffa1a9077d70dd4f7f2a7c17809bc9f71a478aad4cb3204955252d6468cf14f1aef014c062a08e7f68b2f1d0 SHA512 a6b767278d85f38e5d78a958980782f15e3214db169ec2da118216c002657e525783d4ad3b9043d742801acf77b9b070ea12c18ec0e311e01f13d90d409277a7
-EBUILD zmqpp-4.2.0.ebuild 773 BLAKE2B 68b73ee1d0455c0f63eba2fe3e1b6dafd48e5ed4178236632992706b77a4d1f9646a707f1f2bab260c01b31f1142254ef9450cc044c8fdc846ff8e5c3440036c SHA512 e98ae794bbc2736d622b5d7b150a77e8cdc07b115eb7dde0b10822802d04c64609ee84600aeb93e0a033bdc31807356a72eadd00eb7ea2bf354262b1f6c0dcbe
+EBUILD zmqpp-4.2.0.ebuild 763 BLAKE2B 18adf26085e21083a3c2633da4efe152bfa878107ef1498005c0c980f4683d02fe778d61d5d4553e6a9da71983e57016cf940385f3c36894e99a2e4e4977dbf7 SHA512 90e4619d39ed3fdd557c2ca49823a01d58efd0bd62ba1bf2dc6b87d50a24556a9e61869b606946d601bbe6ae0288841a19cc240803f289d45057892e57755d11
MISC metadata.xml 340 BLAKE2B 449dcee565bd94118423698d1b0a0775ed49e399489904411ba41257fca80b6a6ff3ca4cb735571e4b64d7441ad1603de687ee113498b2193e323d16d4f12c16 SHA512 603c91cf185cf470c55b427d8aacbab2e7b2298e4e1d49f3af5fc50257a4eaf7b3ed301a134696743b550db32ffab956efa17c25c7d2a524a7d6d65b230841f9
diff --git a/net-libs/zmqpp/zmqpp-4.2.0.ebuild b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
index 4eb86e192ea6..b78adb04f7a4 100644
--- a/net-libs/zmqpp/zmqpp-4.2.0.ebuild
+++ b/net-libs/zmqpp/zmqpp-4.2.0.ebuild
@@ -1,20 +1,19 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="ZeroMQ 'highlevel' C++ bindings"
-HOMEPAGE="https://github.com/zeromq/zmqpp"
if [[ $PV == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/zeromq/zmqpp.git"
else
SRC_URI="https://github.com/zeromq/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
fi
+inherit cmake-utils
-KEYWORDS="~amd64 ~x86"
+DESCRIPTION="ZeroMQ 'highlevel' C++ bindings"
+HOMEPAGE="https://github.com/zeromq/zmqpp"
LICENSE="MPL-2.0"
SLOT="0"
@@ -23,15 +22,13 @@ IUSE="static-libs"
DEPEND="net-libs/zeromq[static-libs?]"
RDEPEND="${DEPEND}"
-PATCHES=(
- "${FILESDIR}/${P}-multilib-strict.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-multilib-strict.patch" )
src_configure() {
local mycmakeargs=(
-DIS_TRAVIS_CI_BUILD=OFF
-DZMQPP_BUILD_SHARED=ON
- $(cmake-utils_use static-libs ZMQPP_BUILD_STATIC)
+ -DZMQPP_BUILD_STATIC=$(usex static-libs)
)
cmake-utils_src_configure
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index c8ea73c697fe..381ac4233b76 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
Binary files differ
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index a46b6932d64f..7e5e48242984 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -20,6 +20,6 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
DIST courier-imap-4.17.3.tar.bz2 3202534 BLAKE2B c42eb369bdcb65e7f904b3bd7b018e2785e48fddcc1690374ba254ce17a76b3191c301a81626f0fe44587f4f4b9e4f34edc06e8e8098c509b2c76e3830db2563 SHA512 3166cc703cdc09a71d33257671a662d95cfdb8977bc3b19e0218a4d25eb99a1a108d2868a6eb593106e6538aadf684f11ff0426cd58d522e3ca4b2988f0a88f1
DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e
-EBUILD courier-imap-4.17.3.ebuild 6787 BLAKE2B 4f560cbb7538ff3c61ecc73705db27e46b3bd95673747c4322c7bf9043cc3c06f576b44d727048388542aa3c5473ee59c9f5461dea8df1e4b65136da46bfb79a SHA512 c8e3b52940b45fb492b2af63a1912eebd8ba48e996228953f1c59896f1630c16f2c9f448b369c033d2e2d183a1f1626c8d3556606ad3de97ec0cf26b23e5d8b5
+EBUILD courier-imap-4.17.3.ebuild 6786 BLAKE2B d962cad6e6b87a421d119d9cd38a5174506105021e1201513d3f8ff17512baf586ff9d27dc80024e9abc5f32b6e1b6effc601a12bc74cee1edcf41ba41353dd6 SHA512 b1e8998dc673f5531751bf58e629596c31c31fe93320f2fdb59c7c3ce6519f110093c4e419dbbc8047705b897ae24635c1472a01cdba1544e6dfa2d213e28d2e
EBUILD courier-imap-4.18.2.ebuild 6857 BLAKE2B bca5cd6d8df1872c2b2ae789b585d2b1fd29d4c65dc1b0091b506c482f8ce29f492fcfe6a93d04e23e5879076252bb305ee59f2c6f1c1b876ef09570837f4e10 SHA512 9ef62d539a49e8c6ae329a92e45cde7d4f9b678c828762445ab4ab4b9c167e5e5462e6fa6da528564633ff302018192fbf8b64e932fcd95880e3fa2e2cbd38f3
MISC metadata.xml 382 BLAKE2B e8299d24ed437cceeb508779d1915b7d2e54ed50a12e9959ff7ba6aca31a226817a01e9b0c778dd72047c345e5ce359f97e6baa443893357e0155c9dca9eca96 SHA512 2422c2a28ee3049a7b8da4b27f0dfca5699cb62ac77d39c89de4b9287f32f78167fc4b3eabf20e890c5c5dc1e00ccdce8a745501d3423846e42224f60e8ed110
diff --git a/net-mail/courier-imap/courier-imap-4.17.3.ebuild b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
index 400faa8125bc..6fe86248dddf 100644
--- a/net-mail/courier-imap/courier-imap-4.17.3.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.17.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="berkdb debug fam +gdbm gnutls ipv6 libressl selinux trashquota"
REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 3a1683d8b42b..425bd96db62e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -7,6 +7,7 @@ DIST notmuch-0.25.2.tar.gz 882672 BLAKE2B 8bd90b87cf60a1eac8c331c4d67cfc511db91b
DIST notmuch-0.25.3.tar.gz 883151 BLAKE2B 511f93c310e8b82f1b629735cbe626ab1ba8eabf23245ba4aa4c936d4c5d868d9e6d5b0d626f16ce6087245a293cf1acd8bb2e2dd0639729af4b92d558c78051 SHA512 1c0fcfdeb7a7eddcd10a8175676679ef6985407732d5bcc15edd327d9985017696cef3287c0398c628a604ae3fbab5d222d71537e37265cf6a594b4914e4599a
DIST notmuch-0.25.tar.gz 882093 BLAKE2B ea0f5568ec0bf6a1d2c177468f4ec25fabfd416162c01a0d861e78164f15f2cc0176e1a012250a2a6bb45a6c7c2f6ffa651ad15776d44fed8ec191026b0f04c7 SHA512 5f4961818c8c0350e3fbbedd86f407a55fecf211971003a770d99ea2db89bb6b98c2294e114d6abff4d40985f506b7f4b52736a7ee5c78390eb4f2363a65c6f5
DIST notmuch-0.26.1.tar.gz 906523 BLAKE2B da0b06361d586d84bea5c6e28adf7850dcb119e9f70ae67e06ff1438b9d20f4b04707d3e6ee6e755d569d15b8a720506b4c242c0c84258e8f5c8996caa62fc47 SHA512 f0d95a0f03535495037c73ab18d1251ece505284736efa5a535fe9bc8aea33954b5c87e5dcdfd30670c8df53178294be520a63e5b19beac7d90f166e616d19dd
+DIST notmuch-0.26.2.tar.gz 907187 BLAKE2B 81212555d729bd05be2edfb0f3dfd604de9d5f3e99e79ebd24a195441bd3778c7c72abe0b6b569dc1cf2ad9d94af1cbe3ca3aff77f521888b7be2eb08444dde1 SHA512 ebd8460c5f08cb8c79dabc1bc1bc32e1f2e1f123d304bb20205d4dedb982186336fd43d0e39acf020ea2563278bee0a063ceb3bf276f1251c099d8fcdd5098e7
EBUILD notmuch-0.23.7.ebuild 4582 BLAKE2B 5e3d91233776f8bea407db340ad5ad083628f0d4d06849934e8dc78385acdb64bf2f9e1d804399636170f1524efc1b3d778a0ed5e4f2e32e01588b111947949f SHA512 abb5e69be4ee2405ec9e59683b040d7e6c2492403f3bff5d103cf2e957e9293a9f91b21a839d847e13f690b531c39b9e8df5eb6bf044e76ef26707800a47765e
EBUILD notmuch-0.24.2.ebuild 4770 BLAKE2B 40bb192f400a0114976120b1b15294ce015d36637001e25a354aec5c686316e2045136091c71727ff003264be198780e132f7cce087310e5225a3a584d919a49 SHA512 d2a176d88df335783fcad6a397a44d6726c723f1d70fafafe986dadf138ba1410199a2b1347baf69d6589357c18931c1c9b791eb9437558ffb16afae9de3d654
EBUILD notmuch-0.25.1.ebuild 4772 BLAKE2B 42b44d62a5a98be224f06a02573cd24397e05889d9a9d3f8aea67dcd56db2b869feccd457ae27dd1ab323e97a8e5e50ca9f3782c5c00887f884d8250a06f54b8 SHA512 19f4076e1415ff6498cabc8b900e589652b94b4cfb0cbee47b7c52eedca26b747df1a3f4157e2ba123c3a350b3c5cafd00e1635d100aff701a0e19bc9e325845
@@ -14,4 +15,5 @@ EBUILD notmuch-0.25.2.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62
EBUILD notmuch-0.25.3.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
EBUILD notmuch-0.25.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62a1b6d5e8392458982e5d829dada98492cf778d46fe43d0df0618f7748d705d99f1c406683299c16f407b40c0d9 SHA512 76825642fd0d738345f2d9f2043d527c4d60d36b12cb5e44530af3190a9e7c760f1bd840744f8bec59b145a634d5207e7636413671b3914336acd881e0734623
EBUILD notmuch-0.26.1.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
+EBUILD notmuch-0.26.2.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.26.2.ebuild b/net-mail/notmuch/notmuch-0.26.2.ebuild
new file mode 100644
index 000000000000..bcf492e422d9
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.26.2.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common eutils flag-o-matic pax-utils \
+ distutils-r1 toolchain-funcs
+
+DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
+HOMEPAGE="https://notmuchmail.org/"
+SRC_URI="${HOMEPAGE%/}/releases/${P}.tar.gz
+ test? ( ${HOMEPAGE%/}/releases/test-databases/database-v1.tar.xz )"
+
+LICENSE="GPL-3"
+# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
+# meant to be binary backward compatible.
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~x86 ~x64-solaris"
+REQUIRED_USE="
+ nmbug? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( crypt emacs python valgrind )
+ "
+IUSE="crypt doc emacs mutt nmbug python test valgrind"
+
+CDEPEND="
+ !!<app-shells/bash-completion-1.9
+ >=dev-libs/glib-2.22:2
+ >=dev-libs/gmime-2.6.21:2.6
+ >=dev-libs/xapian-1.2.7-r2:=
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ >=sys-libs/zlib-1.2.5.2
+ sys-libs/talloc
+ crypt? ( >=dev-libs/gmime-2.6.21:2.6[smime] )
+ emacs? ( >=virtual/emacs-23 )
+ python? ( ${PYTHON_DEPS} )
+ "
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
+ >=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
+ crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+ valgrind? ( dev-util/valgrind )
+ "
+RDEPEND="${CDEPEND}
+ crypt? ( app-crypt/gnupg )
+ nmbug? ( dev-vcs/git )
+ mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
+ dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
+ virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
+ virtual/perl-Pod-Parser )
+ "
+
+DOCS=( AUTHORS NEWS README )
+SITEFILE="50${PN}-gentoo.el"
+MY_LD_LIBRARY_PATH="${WORKDIR}/${P}/lib"
+
+bindings() {
+ local ret=0
+
+ if use $1; then
+ pushd bindings/$1 || die
+ shift
+ "$@"
+ ret=$?
+ popd || die
+ fi
+
+ return $ret
+}
+
+pkg_pretend() {
+ if has_version '<net-mail/notmuch-0.18'; then
+ ewarn
+ ewarn "There are few not backward compatible changes between"
+ ewarn "<notmuch-0.18 and >=notmuch-0.18. See NEWS file"
+ ewarn "(0.18 section) for details before first use!"
+ ewarn
+ fi
+}
+
+pkg_setup() {
+ if use emacs; then
+ elisp-need-emacs 23 || die "Emacs version too low"
+ fi
+}
+
+src_unpack() {
+ unpack "${P}".tar.gz
+ if use test; then
+ mkdir -p "${S}"/test/test-databases || die
+ cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die
+ fi
+}
+
+src_prepare() {
+ default
+
+ bindings python distutils-r1_src_prepare
+ bindings python mv README README-python || die
+ mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
+
+ # assure that new Makefile.config will be generated
+ rm -f Makefile.config || die
+
+ if use test; then
+ append-cflags -g
+ append-cxxflags -g
+ fi
+
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+}
+
+src_configure() {
+ local myeconfargs=(
+ --bashcompletiondir="$(get_bashcompdir)"
+ --emacslispdir="${EPREFIX}/${SITELISP}/${PN}"
+ --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}"
+ --without-desktop
+ --without-ruby
+ --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+ $(use_with emacs)
+ $(use_with doc api-docs)
+ )
+ tc-export CC CXX
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ V=1 default
+ bindings python distutils-r1_src_compile
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt || die
+ emake notmuch-mutt.1
+ popd || die
+ fi
+
+ if use doc; then
+ pydocs() {
+ pushd docs || die
+ emake html
+ rm -r html/_sources || die
+ rm html/{objects.inv,.buildinfo} || die
+ mkdir -p ../html && mv html ../html/python || die
+ popd || die
+ }
+ LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" bindings python pydocs
+ fi
+}
+
+src_test() {
+ pax-mark -m notmuch
+ LD_LIBRARY_PATH="${MY_LD_LIBRARY_PATH}" V=1 default
+ pax-mark -ze notmuch
+}
+
+src_install() {
+ default
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ fi
+
+ if use nmbug; then
+ dobin devel/nmbug/nmbug
+ dobin devel/nmbug/notmuch-report
+ fi
+
+ if use mutt; then
+ pushd contrib/notmuch-mutt || die
+ dobin notmuch-mutt
+ doman notmuch-mutt.1
+ insinto /etc/mutt
+ doins notmuch-mutt.rc
+ dodoc README-mutt
+ popd || die
+ fi
+
+ DOCS="" bindings python distutils-r1_src_install
+ use doc && bindings python dodoc -r html
+}
+
+pkg_preinst() {
+ if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
+ elog "To enable notmuch support in mutt, add the following line into"
+ elog "your mutt config file, please:"
+ elog ""
+ elog " source /etc/mutt/notmuch-mutt.rc"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+
+ if has_version '<dev-libs/xapian-1.4'; then
+ elog "Regular expression searches supported for from: and subject:"
+ elog "require >=dev-libs/xapian-1.4."
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6b59045ae095..7acda35b1d07 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 63fe11d892b9..53701f3050fe 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,5 +5,5 @@ DIST curl-7.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13
DIST curl-7.61.0.tar.bz2 2949354 BLAKE2B bb9fb6155aa6031d000081fa17410e772a58ec111401e7854ad0148c33169f1a7067bb04029965f117be7df20c51a6157bf93fb6439bc4a2d25849a4784baadc SHA512 4907234c75a9e52a5b81cf895bcc811d7a69f1db84a9ae1adc3af360e8cc4371f58c00925ce6bc5170f2a8072848da47a52c41f4bfedcf14274ec75802afcddd
EBUILD curl-7.60.0-r1.ebuild 7214 BLAKE2B c146b26c7a5872dff04bf4a77511df27597749ef09ddd625092e79fd6a6b756c65ba11f18fc4cf30f19c5480b6d44e083ed47a16aa5e79d66320556c26906ee4 SHA512 5a3ab159fdbff04d492a2e34f3f581944c163115bf52c4975bb9cde376101657435da985c522720651b7c2a6904de61087297bbcc22203f3bf8536d6f8d2f199
EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
-EBUILD curl-7.61.0.ebuild 7209 BLAKE2B 8b2d82cbf0d2974755d513f6849a4386dd39a8f21479c617a8cbcdb6b6881a9c1bf999fc6cce0042785d249bf97821c5fa4332889b6d12a5a6653259d1131910 SHA512 8fe630f4a1b4f2d8408add8e897f9461cea523bb602b073bf8c2860780ce1f472c850f16fc3faead8635c6c780b1290cd20133168d355fea39eb9e534c364a03
+EBUILD curl-7.61.0.ebuild 7205 BLAKE2B 4410b33b59a90bd6596758f6f0da55bf4c5fdf9291195b99e663c66ceb84ab65fc447c9fa513e6f8a3900263b019a3cb634a63f4b81692b23383d361af11733f SHA512 fc0eaab7edbc82ca67961003429fea9400938cfd551cffdf79e9bba25a59435e54ebaba2d6591b67173b485a8ecbcb5de442f9bd9239f5b5be25251128eec336
MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.61.0.ebuild b/net-misc/curl/curl-7.61.0.ebuild
index 45cddf32ae70..34b333df18cd 100644
--- a/net-misc/curl/curl-7.61.0.ebuild
+++ b/net-misc/curl/curl-7.61.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 61495fa97b0c..1b805814f96c 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -4,14 +4,17 @@ AUX 3.1.2-desktop.patch 671 BLAKE2B 1be7fddfb50dccb1c4dbca8827e2a1198c926abba507
AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f
AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
+AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d
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
DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
+DIST Electrum-3.2.2.tar.gz 5617363 BLAKE2B aae6e12644c55542fb1e0ff702e751dc5ebcb3d1da6ef58c3509be248208c38b10f43bed555a1228f9e9f397350765d24544d89f56ffbfccda71ec39fe2256d3 SHA512 32c4a24c2d3e2e38b9d66f6102176533a991b1c1fd25173bcd3bdd2e78cf42fc5fd2f0d2ee0c6a8d99db1b17d47bd3e7f3cf1303964f0566f4eef4edb3c87f15
EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B c17c9fcdfec66850c979f0b35e8544cca75cb812052c6b437f432a5fb0dd102545c0082e2bbf210171fb379e89bc4f8ba1644a9d0687055c1f14ef272722912a SHA512 e8e97edc343ef92ff8f54c965fe1e9c1cb9428292425c67e591721c0d8d1d685c3cd144a31f96f3c24161d93dd82209f97643a9909bdf5b9b896eff9055ccb0f
EBUILD electrum-3.0.6.ebuild 4225 BLAKE2B 845f9b71a1b9288b32110658f9d0aed5c841fbde6c3a1f7814a0f87130cb5bde5b8a7982a3dbe814d4901faa7ac92205fbed5e73b4102359841fa1bfa48a5d8f SHA512 488fce80e3ef95a47cc9198dd3c3df263757536a2adec499a33c6836ef391f8c0e9650e7445ac6572be26c9de1db00b8bb541884749a30e72c340068e319f1d0
EBUILD electrum-3.1.1.ebuild 4266 BLAKE2B f2215c3d8fa7380a11d2afaac31c4c732363a6292f632cad6a4a2a0d7c62cf0e4a2c19925cb7e8c4a28ba01f63b51c684e5e672e701b922aeefb149e413626ef SHA512 dee404b782ec8bf6e67ea9a6ad18f1c84d34b1d2ec785b6e6f0324353ab34c08fcb42b9c25316fcc59960385b6a1f4b6f9ca74dd96f58f953785e8aba528c1a2
EBUILD electrum-3.1.2.ebuild 4308 BLAKE2B 2c8bde9e2e8624a2a87881bc44197883ea9ae5e1a099452f24053ac753cfd34a66c5e44bd05d8dfa40c6337879754acee815101250aa980d59d9fe3c0b436e83 SHA512 602c93d714e71ac737ac3930f09fc0712026a4c1703923908c63531a1e2b5a52785fe7011ee814a1a715bfbc93efc836721a4ad893488ee4eb3b4dec5803b896
EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
-MISC metadata.xml 1215 BLAKE2B b83eaefbc4e8ff18b6ecc097d9e7a84a0f810b97abe6d9bb0676ac728a0249daba58da27271e2c367365b7770e3e3302e55122ccbde8e5479b5a63f64b7103cd SHA512 227b4091ffbfa3160f44723ac043bb5c95a5a40598c300afe0fb112f64cfd84a110490c634f15e368216eb4459d89cf540adc6557e514932893b596bac3182c1
+EBUILD electrum-3.2.2.ebuild 4393 BLAKE2B 26acc075fd21430cfd08cb940ffac4c1217c1ca23f035e53a0edb4cdfe704fd239e93fb9a564486b6dc5cb36a56151eb867f85468e509d491df2c2d0ec96c1ce SHA512 5152ee6d100af50f2eef4c47c844adb50be11a397e0f81e20dfac9111b7bfb43bbd50adc8d77dabf41ae33993668f236b12ef4777f9e4a9932d0925b8a167dfd
+MISC metadata.xml 1310 BLAKE2B a513446594197d15f1ef462faf8730b0a5b593ff280b6221e6086f8caec173c6e75389c0dbb7b50e2ee2eba236350ab0503b5b9c4cd68beb570847b81847cc3a SHA512 4b07d535c78c4a039a426be75450f7a7718396e265f0fe19d22250be4f0090f6cad0d9ba383765a7cfc491d3c863c4bf0189c6f4de5ee08430080ddb41d1519f
diff --git a/net-misc/electrum/electrum-3.2.2.ebuild b/net-misc/electrum/electrum-3.2.2.ebuild
new file mode 100644
index 000000000000..d6633f147754
--- /dev/null
+++ b/net-misc/electrum/electrum-3.2.2.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 revealer 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}]
+ 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}/3.1.2-no-user-root.patch"
+ eapply "${FILESDIR}/3.2.2-pip-optional-pkgs.patch"
+ eapply "${FILESDIR}/3.1.3-desktop.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 ) \
+ $(usex revealer '' revealer ) \
+ trezor \
+ $(usex trustedcoin_com '' trustedcoin ) \
+ $(usex vkb '' virtualkeyboard ) \
+ ; do
+ rm -r plugins/"${plugin}"* || die
+ sed -i "/${plugin}/d" setup.py || die
+ done
+
+ eapply_user
+
+ xdg_environment_reset
+ 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.2.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..0f54f477adc6
--- /dev/null
+++ b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
@@ -0,0 +1,23 @@
+diff -Naur Electrum-3.2.2.orig/setup.py Electrum-3.2.2/setup.py
+--- Electrum-3.2.2.orig/setup.py 2018-07-01 08:00:11.000000000 -0400
++++ Electrum-3.2.2/setup.py 2018-07-16 14:09:10.790238994 -0400
+@@ -40,19 +40,10 @@
+ (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
+ ]
+
+-extras_require = {
+- 'hardware': requirements_hw,
+- 'fast': ['pycryptodomex'],
+- ':python_version < "3.5"': ['typing>=3.0.0'],
+-}
+-extras_require['full'] = extras_require['hardware'] + extras_require['fast']
+-
+-
+ setup(
+ name="Electrum",
+ version=version.ELECTRUM_VERSION,
+ install_requires=requirements,
+- extras_require=extras_require,
+ packages=[
+ 'electrum',
+ 'electrum_gui',
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 4e86014c54f7..41040e7157e4 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -17,6 +17,7 @@
<flag name="email">Enable plugin to support emailing invoices</flag>
<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+ <flag name="revealer">Enable revealer plugin for extra security. https://revealer.cc/</flag>
<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
<flag name="vkb">Enable plugin for virtual keyboard</flag>
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index ba91d110c75f..5f06cc43d646 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,6 +1,7 @@
AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c0891020b1c896e6b412bdefbf2db6715065df8b1bf75965f262f42a794d2be3cfe78c716c44b02e6076bc5a1bfcb68f88730e337 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1
AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
+AUX lldpd-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -9,5 +10,6 @@ AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c04
DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
EBUILD lldpd-0.9.3-r1.ebuild 2457 BLAKE2B 4db8bd65035df013e9c3d8e70a235f2503c3e313da17f510deb498830966408f6761f42b12c8ee3dd98f296edb815df1de7f4da35f7eeebda7cbcbe9627dda27 SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd
+EBUILD lldpd-1.0.1-r1.ebuild 2420 BLAKE2B 8847c8718f419481e92fdd857196c71bd73014448855ea8fba5f1b425def8614852fe2891498655acfb5fbc9d0eccf487f520ecc2bf2f475334b06d6c2524b09 SHA512 246b57c0f0e9acf2224e3138d136202d05603e5aa170314d5395679140b4545451a1eaf62d57f9842b967bf1ab2bdcd1ae1892e02bb178d6669a0127591f3335
EBUILD lldpd-1.0.1.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440
MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
diff --git a/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
new file mode 100644
index 000000000000..40cc428ec8f2
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
@@ -0,0 +1,11 @@
+diff -purN lldpd-1.0.1.orig/src/daemon/priv-seccomp.c lldpd-1.0.1/src/daemon/priv-seccomp.c
+--- lldpd-1.0.1.orig/src/daemon/priv-seccomp.c 2018-06-12 07:48:04.282557213 +0200
++++ lldpd-1.0.1/src/daemon/priv-seccomp.c 2018-06-12 07:52:26.214348537 +0200
+@@ -162,6 +162,7 @@ priv_seccomp_init(int remote, int child)
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
++ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(brk), 0)) < 0 || /* brk needed for newer libc */
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..88ddeebee8dd
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+ seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+ >=dev-libs/libevent-2.0.5:=
+ snmp? ( net-analyzer/net-snmp[extensible(+)] )
+ xml? ( dev-libs/libxml2 )
+ seccomp? ( sys-libs/libseccomp )
+ zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ graph? ( app-doc/doxygen[dot] )
+ !graph? ( app-doc/doxygen )
+ )
+ test? ( dev-libs/check )"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+ "${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
+ "${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+)
+
+pkg_setup() {
+ ebegin "Creating lldpd user and group"
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+ eend $?
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --without-embedded-libevent \
+ --with-privsep-user=${PN} \
+ --with-privsep-group=${PN} \
+ --with-privsep-chroot=/run/${PN} \
+ --with-lldpd-ctl-socket=/run/${PN}.socket \
+ --with-lldpd-pid-file=/run/${PN}.pid \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_enable cdp) \
+ $(use_enable doc doxygen-man) \
+ $(use_enable doc doxygen-pdf) \
+ $(use_enable doc doxygen-html) \
+ $(use_enable dot1) \
+ $(use_enable dot3) \
+ $(use_enable edp) \
+ $(use_enable fdp) \
+ $(use_enable graph doxygen-dot) \
+ $(use_enable lldpmed) \
+ $(use_enable old-kernel oldies) \
+ $(use_enable sonmp) \
+ $(use_enable static-libs static) \
+ $(use_with readline) \
+ $(use_enable sanitizers) \
+ $(use_with seccomp) \
+ $(use_with snmp) \
+ $(use_with xml)
+}
+
+src_compile() {
+ emake
+ use doc && emake doxygen-doc
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files
+
+ newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+ newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+ newbashcomp src/client/completion/lldpcli lldpcli
+
+ use doc && dodoc -r doxygen/html
+
+ insinto /etc
+ doins "${FILESDIR}/lldpd.conf"
+ keepdir /etc/${PN}.d
+
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/mulk/Manifest b/net-misc/mulk/Manifest
index 1ad9e15f537d..19ca9c0ce441 100644
--- a/net-misc/mulk/Manifest
+++ b/net-misc/mulk/Manifest
@@ -3,4 +3,4 @@ DIST mulk-0.6.0.tar.gz 459141 BLAKE2B f63d2d78128e9f9cfa39107ec294d49d401fffe378
DIST mulk-0.7.0.tar.gz 487995 BLAKE2B 446cf6652f7a1736dc1fbadf7a4fca8941507fa02abdc6ff3871e1cbb7dcd341e00be03c0e0b860f4cfe70ce1241a90adbae15e947e958fe37fd206863aaa01e SHA512 e1c6cf14b0ee2e42d83c8ad33d011feec9eb192ea4f8495cc67926db934d7ac132dfea66e40c47844965321573bd5b0734e4b19fe34c97c38170ee0cf4643499
EBUILD mulk-0.6.0.ebuild 808 BLAKE2B 0f74eac84b91c0fd46504130291bc32c1717907e2f2412e46cd945231e6683e40a2648a07a8ddeb6c977c3bb7979c769b681ed48f05fb8b3b3dc47e0040a74bc SHA512 b19c6d6ac579f72fb128cae2ff6c7b39718942945866e1e2c84bcfeb513eb361895e10ccefe6e32151b87baff5bbe7c1830b03a2b2a900a6740c27ced35ea445
EBUILD mulk-0.7.0.ebuild 758 BLAKE2B 1bc5c95884921369679b10ac05a639997fe76ada83803eaffb397c3826bb49f985b579f7263b202a84228615e7c5e7395f404868e541237360c0db86c1e314a2 SHA512 8cbd690937d3e4447e3b86a2667d89c740d59463c74578654cd52863b6dcbb2a2ef9e6091700a59996c688a0328d5500be1e80a737a18f0c6908f53faee71faf
-MISC metadata.xml 529 BLAKE2B 8c244ec7dc22e52d9358dc59de483006f3f22e2db391d2a864c205c525fca9dfea7c2cbe9ad2cccadafcf8eea709a474867b4b0132d18a5e62cfed3e9a9f1314 SHA512 889e8f520e741c56bf6d49b235af4cd3a1d39b63d37f6b5fd18ee6c29c2dd18c26bf4919dd98858e70f47921184bd1d39a3fc5836ae43753b029a0756a998b83
+MISC metadata.xml 446 BLAKE2B f58d02b9addd2437ec243d741627a52a72192583a4f2b99df560d9681d6486811c52149678161f5bdb8055b071fb1565cdc52fd07c136854a4c7180f764e2cb7 SHA512 8d36ae10e4da6a5a6aab41ac25d6e85dfd9b2dd1e976f771a330aa175a30e932d6e40e86ca32751e9c89b227a173757da647465c59f3de5659abaeae66e1fb20
diff --git a/net-misc/mulk/metadata.xml b/net-misc/mulk/metadata.xml
index 616f1fe1a5a0..88dc6dace8d7 100644
--- a/net-misc/mulk/metadata.xml
+++ b/net-misc/mulk/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="checksum">Enable checksum verification for Metalink from <pkg>dev-libs/openssl</pkg></flag>
<flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
index 8c616c7409a0..15b380632dc4 100644
--- a/net-misc/netctl/Manifest
+++ b/net-misc/netctl/Manifest
@@ -5,4 +5,4 @@ EBUILD netctl-1.10.ebuild 1724 BLAKE2B 3e517407b274c15110e15ef7d4205169cbee392b6
EBUILD netctl-1.11.ebuild 1684 BLAKE2B 617a84b658d99b4edc42aebb9a95a5636de0fd4f17c76bf9774cb3488f87ebccd9c4ab4bae66f42156761be1f2c3e865a3ad2e9e85c5e6ae985ce44b82a0fa76 SHA512 9ca531641c48a8d0c3829433dc9c363dc06ea8135dd508c820c617d9b129278d10a3eecaf6cca31d22657e7f01f2541d53c3f6e604d4c0f4b936d95ed6d10931
EBUILD netctl-1.9.ebuild 1722 BLAKE2B 5fd24ed67d94e5394d6688d95b1a1576131984ea8df5e81bc9db411f9fc88ea382348c1bb6a547dd30f8009e352bd3a0da76a2ee8d85a31de497224e69afa83d SHA512 320d76469bf2534b1d137664ca20a8cedd20d4e2b26c22d1bb32abc8f899a6a027de74b5c19a29717aacdf8d475fc979c54c989ccba835e168eae4adc994b46f
EBUILD netctl-9999.ebuild 1679 BLAKE2B 2a4eaf1d400ef026638c41680df2356dc6752f6cb0121330aa94f34917262c59833c22df57adc3908917ec1ac4027ff6bfa45ebaa9870cd2c21a6f11aed99024 SHA512 6991ea6d2a2fa753f97763b552b2defcd4400f8cb5bc6acea4657a95c17facd686f338a96f0f241ffe257bc8fc813dbb0fd357efbb2352784640bd5a8be91be1
-MISC metadata.xml 250 BLAKE2B 923ba29298f48b552a4e9659a0a7aaed2ad5e95749b4f5043f8c7a6fca5b973762577072789007eb6f047717189be9e6aa5b6b5964a6bf13d52da6f85399b042 SHA512 c1832990e49282daac7d60cef0249c7b287d4957dc820079efacf988ffee53463ec5a63fc0dd5551793808793fe14c5e5cfd4cd75701eb07dacae7c414a4a2c3
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/netctl/metadata.xml b/net-misc/netctl/metadata.xml
index 18e140956483..7a38bb900964 100644
--- a/net-misc/netctl/metadata.xml
+++ b/net-misc/netctl/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3c600756ca48..1833c3629817 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,7 +6,7 @@ DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f08
DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
-EBUILD networkmanager-1.10.10.ebuild 10770 BLAKE2B 67dbefb85f4edcd0134f51b4e9393d13db0f356bc782d72460f7a2d191ce3adc6c83f0a2726fe25862dcf15297bffd26f80ca4857103fb4867b71d170ba62e3f SHA512 77c6fac337708f8295d50da5cd4783694c43389d1142f2dc7dd917bcac288c55fb2090ac30f310723cc299ed0192d6e212ddf213b761231f54eb1cdf56befd47
+EBUILD networkmanager-1.10.10.ebuild 10769 BLAKE2B 0adb377fc034856e1e1045a9134f231009e9e4181e13e9b7a9e990dcf562d3b98984ebcb27c15ee475b9024a76e3e262b9a9a162f58c16510a86ac920cca7d57 SHA512 af2868a2490d80ecaa0e703b5f2091fe481e6c47e3362a781344cd2313e2cbf5bd5cfdd0ee5c404b1dcebc70e9ebc32f2bcc59416718659b2e0af6925f0b97f1
EBUILD networkmanager-1.10.6.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
EBUILD networkmanager-1.8.4.ebuild 10684 BLAKE2B 5f5459e190d2c682f9b0cd84495be993ddc22cc6df6bb5961928d647676e9c99b27b0ab8b0ce576228d86f7b623e8289ba7d9b810320367b5d24849be2a833b2 SHA512 95b658dd24645f839870548fd14c1ae03a6f774282adc30cca5ef57c9dcef013438b8894e258b201af37e777f4b1adcf2ea564a5a0475347c8078e3b1e468dd3
diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index 4c6417e0f0a1..35a4798cab10 100644
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
?? ( consolekit elogind systemd )
"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
# gobject-introspection-0.10.3 is needed due to gnome bug 642300
# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index b35d01086d1f..0d57edbd5790 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,4 @@
-DIST nextcloud-client-2.3.2.tar.gz 671944 BLAKE2B 7970cca40e2642a6d7c6eca52568e7980d878b0232f87c1be9b1d7b814e1d36ee2e989ec6646b6b143c18f6a7ae162a657753919c8400a70edcd1f51dc1929c1 SHA512 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628
DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
-DIST owncloudclient-2.3.2.tar.xz 12266008 BLAKE2B 53d08aec4971ae309b4fd07cea4e6ed9643411d4f6921c82213d55ec757abcd61ee64abc81e359ea0808b54d8447e3742fdec5394ed55b2e09805616f5430a75 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c
DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
-EBUILD nextcloud-client-2.3.2-r1.ebuild 2524 BLAKE2B f5a3f007fccc1e969614f8fd1d3dcd98bed981a0d90d5950b9e1557f1ea2b34e1eb39ed887517284943bbff1b8575e1af29747a459043ba132c095e1d442804b SHA512 2e032d6612dfeb36912e81b1b32d3a0d1324c4a45052d7e0c8ec9da48180574e8310e7e635d1355b507e1d4c4f62de226842bca6f6073cc3b7d7f47f448ae4bc
EBUILD nextcloud-client-2.3.3.ebuild 2614 BLAKE2B c3b4090eba159a5b9170e2e951938faa22235946e8f846cbb28acdf3bc3e948f2bd89cc845a14e76cf65f5c34726bb5365fafe2795a06b43eba36697c9fcae88 SHA512 eb47fcbb1dad6ad540f81501d4b855ffbed8ee7ffcf387720084298772e2dc0b3665680a95fe78eabd2a80b9a41c83be8e3e0aedabb81c4957829f94f1f383e0
MISC metadata.xml 684 BLAKE2B 68867eb334a7fba5a788d8174b44982d656e3a055372e42aaa1d08be948fb0ee8309fc547fe75adbb3f586f0761e6a4b31beb2f7a90be4c00a1ac2ce9c6776dd SHA512 914f49b010493ae3019d678fcaf92e2d41a2cdd7cee3b7041db7a65a8c122dba81fc3e6df237201d6a69b8755768fee5b65fb9df83c977449a48eb5fc1479b29
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
deleted file mode 100644
index 94a0c9840073..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Nextcloud themed desktop client"
-HOMEPAGE="https://github.com/nextcloud/client_theming"
-SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
- https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sys-fs/inotify-tools
- virtual/libiconv
- dolphin? (
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- )
- nautilus? ( dev-python/nautilus-python )
- samba? ( >=net-fs/samba-3.5 )
- sftp? ( >=net-libs/libssh-0.5 )
- shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !net-misc/ocsync
- !net-misc/owncloud-client
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-tex/latexmk
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )
-"
-
-S=${WORKDIR}/client_theming-${PV}
-
-src_unpack() {
- default
-
- rmdir "${S}"/client || die
- mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
- || die
-}
-
-src_prepare() {
- CMAKE_USE_DIR="${S}"/client
- # Keep tests in ${T}
- sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
- # Fix icon name
- sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
- -i client/mirall.desktop.in || die
-
- if ! use nautilus; then
- pushd client/shell_integration > /dev/null || die
- cmake_comment_add_subdirectory nautilus
- popd > /dev/null || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DWITH_ICONV=ON
- -DWITH_DOC=$(usex doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
- -DBUILD_WITH_QT4=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
- -DNO_SHIBBOLETH=$(usex !shibboleth)
- -DUNIT_TESTING=$(usex test)
- -DOEM_THEME_DIR="${S}"/nextcloudtheme
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Documentation and man pages not installed"
- elog "Enable doc USE-flag to generate them"
- fi
-}
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index c0450d7ccef3..cc3be97a3cac 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -16,6 +16,6 @@ AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a
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 1453 BLAKE2B f05c8c8bde3787b247655e49fe068f4faa56a2dfd6616676a74ad4974f6aa56a2096496329ac2f67ebc6dc1ccfe02f211832f0b3cfe37019032f2f83096ce3bc SHA512 fd331efca543b1951ea2252bdcdf011a0f36ec7acf18d7c87d82a4ca6d6feeb1bd495b764c1154e568cf9c381c61257b94891a8b7b42c34f5d50e7730ca0a2cb
+EBUILD oidentd-2.0.8-r6.ebuild 1452 BLAKE2B dd2938141d3d6d7bd666eec975e1c2a2908688c3da7295cc24a066a46555021657eaee49973f551af2d086a2d98c647650d441e93f658b5ab2401e837699f5c4 SHA512 ec3554673feb64904c19231bd749bc67a333148c61e56e1a57ac8ecfb451b13f739ec9b269f1e7cfb4a4fc2371d516a27c722bb87e269dead98d97a626c3de8f
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/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index ca2e86d89e56..f8ee48e0bbb9 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -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/openssh/Manifest b/net-misc/openssh/Manifest
index 3b60452efe8c..763742f53c93 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -39,6 +39,6 @@ DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e18
EBUILD openssh-7.5_p1-r4.ebuild 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
EBUILD openssh-7.6_p1-r5.ebuild 11360 BLAKE2B ca0a8157c9c4fbd9219f8e73f6009c18b467e3a1b234bfa346ddb20c8e21438d16230ce0f1062ed947da67435f7e3a50a57675a7e285c37c8b515a9d17430f29 SHA512 fb6ee3771fb67700e596835267c8f26d0c1afe5c3c3366963951c07266a7ab58224d78062256c176e13a00238d9c21ba0ad66965ce6ffd41eb74e28eab81970c
EBUILD openssh-7.7_p1-r103.ebuild 16934 BLAKE2B d1108c86af72036ea9e64e7ae173c9cc8ae280b133963c1960244a4eb5d6539b5b164dc470f528db4e69b401b78a9fad72977a2865c7cc8b0facf29204418773 SHA512 28146aaf128a80222a0b821f75143b6f58ae31afcf033c54522188ea849cca5ef796b03f5cae31ffe01067949efb07ee2762746ec5810fe52e643f8bc63506fa
-EBUILD openssh-7.7_p1-r5.ebuild 15729 BLAKE2B 96f8fc8f63f16fcb10c023e19126bae10bfe33b528727638024a7fcddd558f99200cb11241410293034500c31426290cdbcee6ec7e44968583b25c5c53c7427a SHA512 a36d94286a23b8d890293c64020869b15e783f9577908ac030f61fc02f936462f57e217eebf4d868035e9779edd792cdec2f7ad3edfe24a958acfbb6d49894b5
+EBUILD openssh-7.7_p1-r5.ebuild 15727 BLAKE2B eea6af8f12731c8754bda3b4daf5cf1ef876a3aca9b07597a1be61de44f31591ceec65511ca441e28b5853a2284f0afd9110cf2e452455956a9e99573bb9f609 SHA512 19a538ad50c0c512088b45d5de10161eec33cfa777fc280b3321f45fd61bb2c9407dedd77dc2ed7238fe3b27a2e91a1b621445170c3231da35c7c1e790627572
EBUILD openssh-7.7_p1-r6.ebuild 16444 BLAKE2B 4fdaa4029cefb40da2865653c508ea951dfc8becf4c79b8e37e2c8848859dade97523d3c3845a67df0ef206ee1e1d82beea6f3fa7af0e0c381333704b087a209 SHA512 c7decf934c521481962f05498b3c0807322bf097b5d423ea03cb380c7be3ebb10586a700df7403d4e96656f4c03853366cf56f0e77f068f1c6e7b81141d1f139
MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r5.ebuild b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
index bed23d9a6036..88b05334bf72 100644
--- a/net-misc/openssh/openssh-7.7_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
LICENSE="BSD GPL-2"
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"
+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"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
REQUIRED_USE="ldns? ( ssl )
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index aa1e84bfad9d..176e435c77da 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,3 @@
-DIST owncloudclient-2.3.4.tar.xz 33796736 BLAKE2B 3792be4f534c3424a58e83bfacef30a20d089df55de79dbaa51cfc9d20e7558ab65b65bda4ebf691276de050436253ffdb69dcdf7bad397c3dd4a074124e3053 SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b
-DIST owncloudclient-2.4.0.tar.xz 15385568 BLAKE2B 616c4d5ca58a5c7fb4900a7b46df81a13f477c623e590e74be3b14fae2bf51f3f00154707aebb22fe839cba896c41caa6c71aa9d0f481bb8cf2b2b79dc648060 SHA512 b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
-EBUILD owncloud-client-2.3.4.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
-EBUILD owncloud-client-2.4.0.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
EBUILD owncloud-client-2.4.1.ebuild 2138 BLAKE2B 2fd7cc230f5f55334603d550ba700a42c4387931b6446765dfb982bdd81b1a48f78833d5209a299d030434b506849fd1491aaa307cadc9685440ce485593768a SHA512 45620d1ef30809dece06130559231f49f88a831823dc91bd3844612cfbe00bb722c3990a83c2fafca8e0b32fc2d6631a0027f50e23351c2bdd10588d0253f723
MISC metadata.xml 595 BLAKE2B c5e1e40ab739c9c5713804647af8dde5f46743686da261d81523cda8e8f0c89eafd70f59b1b65d165febed25db03f6565a0bc5b345a56cd647476605745170b5 SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
deleted file mode 100644
index d8fb3b873c2d..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sys-fs/inotify-tools
- virtual/libiconv
- dolphin? (
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- )
- nautilus? ( dev-python/nautilus-python )
- samba? ( >=net-fs/samba-3.5 )
- sftp? ( >=net-libs/libssh-0.5 )
- shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !net-misc/ocsync
- !net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-tex/latexmk
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
- # Keep tests in ${T}
- sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
- if ! use nautilus; then
- pushd shell_integration > /dev/null || die
- cmake_comment_add_subdirectory nautilus
- popd > /dev/null || die
- fi
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DWITH_ICONV=ON
- -DWITH_DOC=$(usex doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
- -DBUILD_WITH_QT4=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
- -DNO_SHIBBOLETH=$(usex !shibboleth)
- -DUNIT_TESTING=$(usex test)
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Documentation and man pages not installed"
- elog "Enable doc USE-flag to generate them"
- fi
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
deleted file mode 100644
index d8fb3b873c2d..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sys-fs/inotify-tools
- virtual/libiconv
- dolphin? (
- kde-frameworks/kcoreaddons:5
- kde-frameworks/kio:5
- )
- nautilus? ( dev-python/nautilus-python )
- samba? ( >=net-fs/samba-3.5 )
- sftp? ( >=net-libs/libssh-0.5 )
- shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
- !net-misc/ocsync
- !net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-tex/latexmk
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
- # Keep tests in ${T}
- sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
- if ! use nautilus; then
- pushd shell_integration > /dev/null || die
- cmake_comment_add_subdirectory nautilus
- popd > /dev/null || die
- fi
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DWITH_ICONV=ON
- -DWITH_DOC=$(usex doc)
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
- -DBUILD_WITH_QT4=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
- -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
- -DNO_SHIBBOLETH=$(usex !shibboleth)
- -DUNIT_TESTING=$(usex test)
- )
-
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- if ! use doc ; then
- elog "Documentation and man pages not installed"
- elog "Enable doc USE-flag to generate them"
- fi
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-misc/pmsvn/Manifest b/net-misc/pmsvn/Manifest
index f9760e8ac043..85517e9b411d 100644
--- a/net-misc/pmsvn/Manifest
+++ b/net-misc/pmsvn/Manifest
@@ -4,4 +4,4 @@ DIST pmsvn-1.0.7.tgz 7565 BLAKE2B 2af33cd57312ef9b6d3f46f429fe5ba9e103dba0b984a8
EBUILD pmsvn-1.0.5.ebuild 893 BLAKE2B 87b8c381bc1e48796c0b04858a9f8db77a7a9d5f85e8955a7deae624727125df018be21c233d974b442d66d909e14e067e00083c20d5db52aa79a23ff4ca6db3 SHA512 79218d8b8fb8bfbcbb2d752ca5fac74a8c6abc44443ae43d9e7b163c61ff0b4e1c88c2104abc614524e9f9c373b315f25bb538a574346ef112f353add5751ce7
EBUILD pmsvn-1.0.6.ebuild 846 BLAKE2B 7a1312790142dd0875256315b84ab28813adc10d0d284b9b78db5d90a33d1f187967ada1e5a79e93d27ea657cffcbdfb921c07ec8d8a33dea7eed1e24a8cf1ef SHA512 a3f698fe2a94a8ea97ef77b53e2dcf4bf6561d94e0e25e7b7694e4cb09f88042ab2a9211bf555d9f6ea17d1550e8beced4a516fd37acca20718e81ad5f419097
EBUILD pmsvn-1.0.7.ebuild 782 BLAKE2B af5fdce97b76f4c25b9fe39dbbe812c9b93b9913f3ee73bb2caa993e4c8df584ea33698101fbbdc0d3c7b04b0e0ac1b53f0d1b03bb3a12237ad5edde36be8638 SHA512 d3ebefd72550e338c5d67f9bcede8a339f528744da2de3e62fbb9f03f07b66987fd34a354fcc19f700c92ce310486466544a260c2b2f0d7be37f63f8c8ebaab2
-MISC metadata.xml 325 BLAKE2B b60a5288560a7937e89bae8aa67691628aeced6d84f12641a7f0fbf27543475c739cb03cf1529c4e7f3c582ebe03ac357abd611e5fc73deba9542be20d50ec48 SHA512 5c984349af76dff4b32c0268d0dfd6f3540e217aa33141a9276a27e0304e358f5f019a95986c23eceb2123398f7bf012c9a84745fc054978049bbb5e78ea7298
+MISC metadata.xml 242 BLAKE2B 33fe71c26297e4323da4bc063f8eb4578e77d7bb1a8c7f2044f4624680a2efb008596d45780c2abfbb867258c42051f955798279d57f51ee7083a25fc15549d6 SHA512 4b9a6787713f824e4d7b7f54a8c4031c97b519fc2d92856486799a8e6ca0c5231cbf2c781723d79a5a736949ebe7c81c667af61a64aba3483b3dc4c3d55c2465
diff --git a/net-misc/pmsvn/metadata.xml b/net-misc/pmsvn/metadata.xml
index 7861b3ffc82e..5abb80da9067 100644
--- a/net-misc/pmsvn/metadata.xml
+++ b/net-misc/pmsvn/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="sourceforge">pmsvn</remote-id>
</upstream>
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index 300cd816e1e7..2661989806ad 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,3 +1,3 @@
DIST qtm-1.3.18.tar.bz2 186137 BLAKE2B b405bc922246d5c8fe65fc68250b3eb401be3b17dd55cc81bfa70d6ddd72280398df25c850b2d71cc4383b9463e3aff6d641ce4080c100d10ae79f9002793055 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca
EBUILD qtm-1.3.18-r1.ebuild 1067 BLAKE2B 17f2d02385d6b3eadf1feef09dea8e882ca1a7a3a24acdecdfacbc97edf088640b2b70bd23d229615a5df0d75f2d126a0568e03feef0374068f7cfbdf59c7e0f SHA512 a41516a90aa8e5c692bce38e2101c3f0c4ae58aa06b8286aed98a22e83b708cd8022daa4a24f68a93000e855b693281cbf9df1f5931e1e86ee617ecc6e0726df
-MISC metadata.xml 493 BLAKE2B 060c074323a2f1a4e2b928714f593767298923856992d3f08aa9141ffced7283c27385605cb16889ad7cc3c8d18bcc40ad0fba3f73b7470441f979c295d3d88d SHA512 8445728ea4bfd9de955c5eb0dd5fb8daf79ed88512bf70e6bd610ad27b349c0a4b06b3d26a2cf79b2c95cab3730996d152f5ad88a26582b354e2bc75dff394bd
+MISC metadata.xml 382 BLAKE2B f06322dd6521d5ca81b3b9f409189f4c0a4e1e1e31dc04a8b5ec03c0b265fe947a377437e75cc906de5f9b8fb1783abd176fa812c5d193663febefe88699f22e SHA512 009632d82fedc2deb9796dba8a2de9910afd0b67617f5c1d9ecd14fc641f61839812815197089dc186a201a8848de3706d56802f12f33f22a3badad2cd99420f
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index c518c18a9063..714795566c77 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
<maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 70d1a5d87c1d..4e944dc1a26e 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -2,4 +2,4 @@ DIST sshpass-1.05.tar.gz 98362 BLAKE2B 59a48391cd41e467b7ef2fdd14dc1ba4aa7698689
DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
EBUILD sshpass-1.05.ebuild 408 BLAKE2B ad99bb2fb89dfd18afeb1e28ee9583a695dc08b7f73a22a171e712aab623635563ee6242c185f093879e75f6b7d257880a650a7d913aa729e2406098c16b422f SHA512 cc073ce58bca4f7191c878912e6198acfcd75f49bc49d59089014e2f5fc47cfbc1e5041f142cb9a6e923cdbe989826d051d8c2483565a6c0881eaeace9157871
EBUILD sshpass-1.06.ebuild 398 BLAKE2B 8feb5215a83009c7d7be398a9a80c5720398e70b0966a2b8984c89837cb18ca2b3f1d71d5e641d63708d04431d7d0cdccd88a868ebde546271688aa93af0f946 SHA512 9405313f06d315f04e5d353de12e010dd9b90fda1dd2b7ac8a8c3921039f9088048ddb82415150f08333fe346c4c8b4d2eef743b4e776e630bfa0bb8d1b330b5
-MISC metadata.xml 327 BLAKE2B 4372f574cb7a9bce016d62dfa780699418196ab0ffad970e554e887d0afd35a5ea59f96241e38874f42b11dd5b67b4824caae265a4072ea95b8538a2715a0f34 SHA512 0e867d2b6e48f24f6457b06b06ee5bff469e8d46542d3a4de66a76df53dc38120ca14327543a60c9d578540a3ff2eba0cde4bb8d0b6a5c90b03c1c09bd6318b3
+MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 5f237d0e61d1..3e556ccfad6d 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
+ <email>johu@gentoo.org</email>
+ <name>Johannes Huber</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">sshpass</remote-id>
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 7303692082e4..51c8da4e45e8 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -11,4 +11,4 @@ EBUILD streamlink-0.6.0.ebuild 1439 BLAKE2B 1a6306a4cfb1b1c316a9ca93b5b944a7549d
EBUILD streamlink-0.7.0.ebuild 1481 BLAKE2B 2a8f4ba7ed184a3b02c312da078b3e30b821aacdd66abe716da99ccb051d7f25e9b12126d6d50e18ad88890786b4720bbef84ba00ef2613d9f085248e7a4eda7 SHA512 d9fa66ff97771b07bcbf78800ec02ca3ad575a23228571b66ef45e674d379bfb55b2c11b71b5f6993d6108acf2d22a504c05f29c0948751290c02fc28ae21fa7
EBUILD streamlink-0.9.0.ebuild 1580 BLAKE2B 425851d87baf78adf1b50410361483d73f959d7f959702ee2d505ab05173b8dfc306a2bb4c28c14c94b8789c604191131618176a0a72853bd0b18729adfe4557 SHA512 854aa7667c70e74acf2aa62f143032957d0b5d0360a3d774328358be3b084d371a4d8de29a051c979291705862ab670ed1763f328bf128e36a5d6d55b25e3eac
EBUILD streamlink-9999.ebuild 1546 BLAKE2B 034d354005c4e72d769bc33de4068aa537d239050a64b83c3c260662ee1609d80a478fcb58bf42a94a50224e43a16ca2972d6ac7a2e9f31d54ddc1a643f5a235 SHA512 3c5f51958877bd15cd3c5f82c42c076bd8ff1ff52102702508d48a746b03b955520bccc14dbd13b80688f1824e68f79fb5a6fba565847a07e553bf42eb94b554
-MISC metadata.xml 443 BLAKE2B 8557851068cd831f7ba85676e7defbd7a3d990af985aac5e51c581cf56a47a137436a67236a194aa8d55c2f2eecc1b67bafdaf52f8315d796198be6edc3de0d5 SHA512 f5b30f24fc2574bdea1e1bbd0cf8dfd6173cdd56f913c018f6a93760d1df1e76e8f9a4730e2f2308b905b41688024fa48d7c9902a3dbb8dc8ac07fa439f32a9b
+MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/metadata.xml b/net-misc/streamlink/metadata.xml
index e6798e56f53a..aa35b1d35794 100644
--- a/net-misc/streamlink/metadata.xml
+++ b/net-misc/streamlink/metadata.xml
@@ -2,12 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>fdsfgs@krutt.org</email>
- <name>soredake</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>leio@gentoo.org</email>
+ <name>Mart Raudsepp</name>
</maintainer>
<upstream>
<remote-id type="github">streamlink/streamlink</remote-id>
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 290d42c91750..731daffc2270 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -3,4 +3,4 @@ DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058
EBUILD trackma-0.7.3.ebuild 1982 BLAKE2B 613d1ebeb5373c34ad15981ce91f3e7361da68083d18a3cf973c3aa97f60790c5ce350a7549707a1d3420fb14817d16c0da07fd5fe7ce0d9c700d113f846b213 SHA512 b4927b0864f1e94d3fafe92d731e9f835cea28cb1e84778a3571e51cd70338624b3b650fd5b6a6c1f0f8fc2e77068caefd41ec02cad6184dbb8949f482dc9217
EBUILD trackma-0.7.4.ebuild 1986 BLAKE2B 937c55c9391c0db9d35ffbc55fbe0928770e989aea9c0be7adc226f4da882f412cf97ecbeb8361358675bbcf94f81f191aa0dd28a92c2c1ac3e2689fb331aac9 SHA512 faf3ec4db84da619153a0dc4f126ea217af704a60d93f61dec00fd3500fa604ecd5a9f8eb0d15e62366c67432e13cf3a38e18e21a139161a772969adb9a07679
EBUILD trackma-9999.ebuild 1938 BLAKE2B 91c1a8d7483ebd947017faa670c67e83ecee7b0395a690291fd7decbe1f09f2fb442ba5e6c3d2b42c1f0b273d06aa01ce010de00faf42becf915f11882ead882 SHA512 93d96f916d9e7599033e1356e32125f754c70b07b6a94b51ccda9c2588e0cb0cdd6cc35e884d2a3b0c3db8a4a87c42897f9d4c0744081f89ea50ab998ea40945
-MISC metadata.xml 762 BLAKE2B 7afbf902c505ccd16ac2f86132084992453ab7ddfd4c70fdc6395487d2dc7daa236cd7ac9ad8196e4131eac1ee00e9a336687a911f151df5a907ff1c2643e1f4 SHA512 f8229d99e027ce81938d220325147dae3df9fdc5b0fa5619ba73d4f437b885cca474483a29ade8817fe4ab06ae225f3c11bc170408ea933779c04ffb49901733
+MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/metadata.xml b/net-misc/trackma/metadata.xml
index 70c3dfa9d170..4412ee5ffa5d 100644
--- a/net-misc/trackma/metadata.xml
+++ b/net-misc/trackma/metadata.xml
@@ -8,14 +8,7 @@
<flag name="cli">Enable cli version</flag>
<flag name="ncurses">Enable curses version</flag>
</use>
-<maintainer type="person">
- <email>fdsfgs@krutt.org</email>
- <name>soredake</name>
-</maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
<upstream>
<remote-id type="github">z411/trackma</remote-id>
</upstream>
diff --git a/net-misc/ttytter/Manifest b/net-misc/ttytter/Manifest
index 9450c9adca43..4e775cd9c374 100644
--- a/net-misc/ttytter/Manifest
+++ b/net-misc/ttytter/Manifest
@@ -1,3 +1,3 @@
DIST ttytter-2.1.00.txt 238320 BLAKE2B c12be49a7423a18da2da5b550bf899383115757f1045dac3166497a7a850adf2e195566845d18e5df10bb1d67e2a5570ba93751fd1445987f818f11ca8ca47b7 SHA512 06b52275c454b7ad772baddcc64c311633fa35cc038e5a62895bbe056bc117e60feaae5a3e83917ec506ca3411e66619c84fbcb8cc7db6428082d14182813cc4
EBUILD ttytter-2.1.00.ebuild 756 BLAKE2B 6ac35486c2731d7dc0e2b5bb823ae33f3599d5b34f238dd58de2aee2c2e15336f958624924238da6bffc4451b642ce376c42dc5ed0e7268cc3a22032cdbbdea7 SHA512 9de8e9208d1c02d914aa6d2cc100a3d31e3d3fb942214df8b9c089c2985689077447b1bd08ab2b5e432b05182fcb6c38ce946cab1b513e1172297a31ac58a7a5
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ttytter/metadata.xml b/net-misc/ttytter/metadata.xml
index 2028cee3c389..6f49eba8f496 100644
--- a/net-misc/ttytter/metadata.xml
+++ b/net-misc/ttytter/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index b5fbb74a06c7..15ca1214bf06 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
-DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
DIST whois_5.3.1.tar.xz 82920 BLAKE2B b4e58ae3f58c8e5de8bca5be3c0e753e0de91651bea1aa4789d389bc65e5155cddb1e87a2adc39340f33360533ef2b86eb9b7b13116a2d64e8a68496529e65e5 SHA512 4840ceecaef1d47bda436f8de8b539ff2b1446dd99ec0867d0bb2b478c13fac190a4a265ab31abb30a779f1a221062f298cd01a1b19ce873221b39dbd3a4a3d7
+DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
EBUILD whois-5.2.20.ebuild 1503 BLAKE2B c8f9f004b15d47af335cbb9ef8e8504fa5cf1e91c3c8dc35117df6772a3831081b51fd5379a93ed65119219f6657c6a2dbfade35dbdc39fa1080e203aabf82e7 SHA512 ef0fcf8e2a3d4b439644112a2b8e69f56e652f6afd19172d550c7669a34be8ee291944ae7bc74feb0fadaf346eadd9e64d192205b6d3b46a6efd1684268f2452
-EBUILD whois-5.3.0.ebuild 1590 BLAKE2B 3b648be6e2502e56ec753e97a444b81842fe6a79e16adfedbc650828a11013e82719b4ee3df4756efbaef706420cee5170ac782e86fa28bc80c34ccb26dc400e SHA512 9d143da77364034a848180148737efe53b579acbc97e33d941ce2061b0eaae5241659b399f1d608b74e2970638c96fbc9b1f586e4d158f26723c90310281f547
EBUILD whois-5.3.1.ebuild 1593 BLAKE2B c4831da66c7db8d7f7b04c1f7b3f4ed97cd84598778a240c74a6a1ee7d5909bc7e2692f57ce7c0903146ed6aea85bd9ceaa69586cfc5d5b1e251c064a89c5bfe SHA512 89c30e09ef96e1cb38aba09549c5993549563651cac4d67e63d8693ffb7105de7886fadc0f7a73a2ddd941cc910e45171198d5dc1eb3abf75bde7aaa0341d9ee
+EBUILD whois-5.3.2.ebuild 1593 BLAKE2B c4831da66c7db8d7f7b04c1f7b3f4ed97cd84598778a240c74a6a1ee7d5909bc7e2692f57ce7c0903146ed6aea85bd9ceaa69586cfc5d5b1e251c064a89c5bfe SHA512 89c30e09ef96e1cb38aba09549c5993549563651cac4d67e63d8693ffb7105de7886fadc0f7a73a2ddd941cc910e45171198d5dc1eb3abf75bde7aaa0341d9ee
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.3.0.ebuild b/net-misc/whois/whois-5.3.2.ebuild
index d04f5117a4da..27fc4102f0ca 100644
--- a/net-misc/whois/whois-5.3.0.ebuild
+++ b/net-misc/whois/whois-5.3.2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
inherit toolchain-funcs
-MY_P=${P/-/_}
+MY_P="${P/-/_}"
DESCRIPTION="improved Whois Client"
HOMEPAGE="https://www.linux.it/~md/software/"
SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
@@ -42,7 +42,7 @@ src_prepare() {
fi
}
-src_configure() { :;} # expected no-op
+src_configure() { :; } # expected no-op
src_compile() {
unset HAVE_ICONV HAVE_LIBIDN
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 36248d4e4e0a..f8d85c7dbc89 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,3 +1,3 @@
DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
EBUILD wol-0.7.1-r1.ebuild 401 BLAKE2B 6ff91aaa835637c8d15ca4dece6ce25b3572720a60bac41551a106c95091b212be200c693269c94762952ec9dcf6097a6a58121b6d45f6af27ce5b78316bbdf8 SHA512 cb1396eb681e2bd3b09ea4b3c5327995c12e58f608e8685de7507a393feba86011ab31b2564e8a660c60834691720e54d7293810a4b14703a8cfbab57e18e78c
-MISC metadata.xml 649 BLAKE2B 46629d4fa9f033a03bbff82eba0b84447401c6ddf130be5d17f74ad8c15727d546d1b1da1f5e920bd3840dbef4e33713b40981c4ab12bdff0aef1685f0c3d1e9 SHA512 b47517a4899bce138c8982dfce164496844d1a534a77f15c128b5321cd6ce41fa6ffed9e5267233ae7e8871a1c36b5861389fc5143c7ccae4badf73bbd21b388
+MISC metadata.xml 561 BLAKE2B 344241901a3c2bcf8e8ade94b85a82c7583c8d9cc6c29b4ebf98b65bea8b0bc8f31e9c52bd57d2a7333dd2822919072cd2c7321c5fcef15e148a3f3d2439eb48 SHA512 8aa78cfbac54569a85944717b43010ce99e69bc9e7af00132bae751d821a5239ca6a09f5640e38dc142c3758edfc6a58a9ba758a5f67cdb8d4a853a36ae5b163
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
index efb8e8ab0cb2..86ddb1d0fd53 100644
--- a/net-misc/wol/metadata.xml
+++ b/net-misc/wol/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
+ <!-- maintainer-needed -->
<longdescription>
wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant.
Consider you have a sleeping or turned-off computer and you want to remotely wake him up. Just type
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index c6fdb56d0cfd..a6c9cc86f51c 100644
--- a/net-nds/Manifest.gz
+++ b/net-nds/Manifest.gz
Binary files differ
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 022a3515cfa6..1d72363bfe26 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -25,6 +25,6 @@ DIST openldap-2.4.44.tgz 5658830 BLAKE2B 0d9101bbc159f78f23ffc5db78943dd60261065
DIST openldap-2.4.45.tgz 5672845 BLAKE2B e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab SHA512 1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
EBUILD openldap-2.4.44-r1.ebuild 27095 BLAKE2B 98571b53fb80a37fc47e7649500c569ac5d1d81dcf58d676ea6457184df7cedb7ec11f4e7aa93167fd6d3394e26c8df43d62ecd513dcd36d5da2b5aac04776b8 SHA512 838464d2f7be0776800e5575d0daf5dbdd7010499b8815a7dee654c5f76663c94232c474aa5f9d5858d251a5c7ac5269ae82dade5b1140d99bd2725a6b901065
-EBUILD openldap-2.4.44.ebuild 26425 BLAKE2B a4ec9d7e5810fae7e318bd8e9bb3c3557a7acea39649e455e7a8efe76dcc913d7bd46a01d57d33373f7bb0ec472bbf6809c73d55f960cb61f35296951ca91958 SHA512 a03ee643d9fb2835d6d7bac26eac392dbd848de762d5931eded614ccbe30b534b10949da1d42bb81bbd1a34519ef77db6513a451bb061a98146328752cbe3ea2
+EBUILD openldap-2.4.44.ebuild 26424 BLAKE2B d53202f60ca38acd154c966cea6278af456be8fe93665d21b7d84d58d9efadd5365e150dab285382158c1ae110eb1402769130fc5717e0d3cffbda5442a4f6aa SHA512 a46b7b14c437d5326fffb5ca27c582dea3602360edb771aab389f97dcfe25b4d3e950ea2c27677c94ba5c50fdde80740271f1f5ec6e9f295d413f4a602d2a1ab
EBUILD openldap-2.4.45.ebuild 27972 BLAKE2B cfb972518f219e88da531a0c324e61328a0a19aea5a50e4787eaea05603015fbc453d868dd284c0de91a03bddb6a3a3b5280216c489abd5db5369c431e81b2e7 SHA512 92f0ca3170e0ce040a31bff5769ebc05945aafa63c29a3b2f1a54190d04ac0bf061335abbede2bee6f24ef1c507b920185eb63cdd17a16906661aea480bc1c0e
MISC metadata.xml 922 BLAKE2B f99c4b3703f1a22dccbc0bbb109d11ba747c61229ebc811b036784dee829c4f7ce4bd85d4f5b8d7780cf20194d5175511129b9256416eea7daf4094e20d8c1a7 SHA512 fc9eb245cde878a93e08b8213f58b829266b2171ee73a74a39b47e700e506225da36e7d51952586f3d97ad6e0a3b3792fa59b5620bad0749afc87b8d59678ff9
diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index cf061b07f61f..6e0599b9c969 100644
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz
LICENSE="OPENLDAP GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE_DAEMON="crypt samba slp tcpd experimental minimal"
IUSE_BACKEND="+berkdb"
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 779c5032c867..5b952635424f 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
Binary files differ
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 2f065b8b8cb4..945df4977483 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -6,4 +6,4 @@ EBUILD rssguard-3.3.5.ebuild 1127 BLAKE2B b62e43c3f16a57b1101ab17b5bb150850a9722
EBUILD rssguard-3.4.1.ebuild 1086 BLAKE2B 39305735fac3ec19496fbd07639530d9ba8cde569f9774298b681f138ca91da1f9a68e713e9298158f14a6a6f3a23f2738fa90c2cbe0b51da3788177f42ba67a SHA512 e02f5f9f24b5198b793b319d16d2616e79c02f81d74d8209699801bb64cbf7a958daa02f7d024952bb21984b65d9b568a6280abb65783412017f442c9693c5df
EBUILD rssguard-3.5.5.ebuild 1226 BLAKE2B d8fac15df76f52d6ed4abbeabd6fac1cf078c323c907aa820dc31a39e01e4b65178bcc7479efee7254b4a6f7ff6de0b9997d4f71e91b97be295f0525626c6e8d SHA512 0303e730243ec58d5a2ded5d422682e8ef358a81a8a14afd2cdfb0cbd2c81d5bd99950fe62ee13e3ab60ba2ca4702076b09dbc0bbde19c4c7296664d8993f929
EBUILD rssguard-9999.ebuild 1211 BLAKE2B 4d73726c9c2a20d27ab660063ee2cb23f666082ed656fec103ae7e1590988e9dba6b641110707ed5f29b7a21a65e42f94fea5e9e1b5016f4a2184fcc64ff4dba SHA512 3142786150353926da88de1b06cc60a029906d860d13ba83441a7ff516f87e6450d4ca44ee2565879718837e7b98a307d71aca21afcec370572f546141a890f5
-MISC metadata.xml 549 BLAKE2B 1234c09aa8567f75c18f24dd092d605befe42ef67e1e488c43353036d3e85e9666cd946f64796be648a02621c666a134845604397c8f016afc41df58bded4613 SHA512 d94106344d205b98b1ae973fe7d159db2ad30437e7ef0e6c3fd6b7dc5fb50fb93567dc4595abcfc81fa0bfbf46c9f7314ff408e050f4999530b68c9c0195311c
+MISC metadata.xml 359 BLAKE2B 39ba3058386b88bd289077c592c99631c58e54a027c00afd6de5d27639019174039038f48323605071f5dc7184686675e337032866ec93fba5d769f975b2d43c SHA512 0a87ec4aa15bdd0932912f519be77ea3c9a524d26847397b0753b7624af73912b46c320c901304b8df128df75f517f7e7d920c87b840fcc31627c5e039700c5e
diff --git a/net-news/rssguard/metadata.xml b/net-news/rssguard/metadata.xml
index 45d5f9354eec..0728c0b6e44e 100644
--- a/net-news/rssguard/metadata.xml
+++ b/net-news/rssguard/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>fdsfgs@krutt.org</email>
- <name>soredake</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">martinrotter/rssguard</remote-id>
</upstream>
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 3d171b7784cd..2f07e203b223 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
Binary files differ
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 21b24a0256a7..7115efc1e270 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -8,6 +8,6 @@ DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c
DIST nzbget-20.0_pre2176.tar.gz 1923841 BLAKE2B ba6ba301013b160f4dcaf21257dc2c1ceac3c64c645bde556ed45e8dca5011b8d9b9ce76fbaf42b78f6400b530c4c0baa94ad34fe09daa86619506dd76333ca2 SHA512 7be68999cc284a53100c0892f7558e3e1d2ac7d83019c933ae0596de56a8c9bec78571aaf34983103a30563dcdd6387987f7a13404e0ffac48007e0d44efa525
EBUILD nzbget-14.1.ebuild 2575 BLAKE2B 2ca47cd82c33c026b36065f40ac656f4483fc234ef7821f20b9612a97f0a6f23c700891494b3659b13e231997f5fa46e18a1e1f0fd729923434d52e695d10db0 SHA512 a263b13e0884c4848a762d4bb739da5e8eae5b7dfac96feb5812fc4f81928d4e600d3cdb9dbf35c407dc81ed1dfa0ce1341bb595f488c4ece75c5feb967660d4
EBUILD nzbget-19.1.ebuild 2992 BLAKE2B 5359ddbae9897ebc1c657f0a760af6583f15e63ab3599834783975253bafd854255f6ecffbf6d59171ff35b144b5f704df3ae4ee0f4ae2cc87b66292d7755d61 SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1
-EBUILD nzbget-20.0.ebuild 3038 BLAKE2B ec711a4ba5770e810932c8f5a25110d01f4401d2e7a9ccf70a369728d135092ddab24bbf468b1b577aaddd8e8eae3a3a89f48b13ea7507505ab90c265115db81 SHA512 7d5df5d0cc8b92f166889b2c3d0b4f19a9dd19934d9d55b75d1c6334a5b94811e2967e589a2261074d4c87d2215b03be7596ce25a8e1f348b6f1ec930b68d011
+EBUILD nzbget-20.0.ebuild 3035 BLAKE2B b9b49511e8b6930088adf6e773ac13a013c45977d13984b0d2a35c0ac8bdd2048e45bcc0521b1db1db740ad9ffb46c1249a1870667f339d64ecee459eee88fe2 SHA512 0fd5bc0ca0baa55748b5103643a550b3b33241f28a7cda8c5df38eea0317700da2ec6b89746dd2ec2a5c68f4bdc5e3903ee83ffb440dd46de8efb724471b4b1b
EBUILD nzbget-20.0_pre2176.ebuild 3018 BLAKE2B 001272514d21c6e152e2ca363ca5dccc9c8af5c61df266399fedf44a1d91dff48b20466e2c0ca4a16ece3f5f2a7433e33cf945849278913f96f49b266a0cbc93 SHA512 538917bfdf9a27af39496e4046c98d1523ebc93e7b3b8e704c0db9408183e5f8768598b9530c2a35fa2d729c5b5684aab407c3579e8d6da2e73d038741b64d8f
MISC metadata.xml 729 BLAKE2B 41b592fbee92ce1e5d10eccc51296732bb8e6ee9aeba2cbf0207c649fc7c0c21ee6a550f01a5023d07fd2c007131641d9ef94275efe2a71e28b759cdc5579dd3 SHA512 93af36b9010a937f80c7c7ed2cf5379437e669c23dfc3e122a3b1699af42f2e9655ea639456e251bd1c04fefd60075543b6a7321e17cba8f82324f556f3f2125
diff --git a/net-nntp/nzbget/nzbget-20.0.ebuild b/net-nntp/nzbget/nzbget-20.0.ebuild
index d52bc80e3681..151a6856de96 100644
--- a/net-nntp/nzbget/nzbget-20.0.ebuild
+++ b/net-nntp/nzbget/nzbget-20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
IUSE="debug gnutls ncurses +parcheck ssl test zlib"
RDEPEND="dev-libs/libxml2:=
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 0c816cf50e92..3d1fed135479 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,3 +1,5 @@
DIST pan-0.142.tar.bz2 2302780 BLAKE2B 5360b24dc3939bd440ed72e0d7e95d005a8155c784e7fc003369750d13bf5971b5549b76ab9b558bc8d3ebe6f946b6986854e1224ee41e0feb3cdf8bc840f591 SHA512 285e140c2d24297bbe14d6bcd995fa0e736c21ae541348a726988d4d42cd92e563671eb607aefb54d12b2afdba311b9b55f88d5a7c61e782503ab894f85fd06a
+DIST pan-0.145.tar.bz2 2307162 BLAKE2B 09535013d8c2fb511b8c79ef185880b69a3f948d0e168b4fb8acc4d3d07d94fb756df171d003b12e1baef3201e2b8be22d583bb9ff551a5ae22f464feaa6f077 SHA512 3dc92d519158ddd480fc43250bf7a3ec67a877e58b0877c02b99f1dfd968bf18c9a20c3d8c4b6acab4132da89b6b91dd2992616ddf46c1c3f9aa0de8f8ee1949
EBUILD pan-0.142.ebuild 1151 BLAKE2B dc9de811f13f44b4ef41841cf43f480460e336790d4f6be76c80cef1002452c6978f1e5b530fb3e15b86b12ac7ed2cc1bb66fc582350d54b2006abd8598bd055 SHA512 f05d5fe9b37c446470dea50e3f377479663e0c52ee81974a0235427a9cad65599e0ae83748336c5a84e5432d7a148d5d1b092af26d643e94d43661af5822549f
+EBUILD pan-0.145.ebuild 1325 BLAKE2B 6e8d57f165542fb42af4b726aaf9753f884b9ded4200ee2e771c862531b0382dd33b889a3f19b4481d96e096b2d7e207600051b6b7b4b76fc0c4f44487c38c68 SHA512 5ed7d0ff3bfe135c922fae8415a12fcc76cd40042c562f7d86534bdba7ec48cfa5e5425f039b947128d67aba72eaba2a466f0c3f8ddef1ef0ed698b6f2c4245a
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-nntp/pan/pan-0.145.ebuild b/net-nntp/pan/pan-0.145.ebuild
new file mode 100644
index 000000000000..4dbc935e14a1
--- /dev/null
+++ b/net-nntp/pan/pan-0.145.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A newsreader for GNOME"
+HOMEPAGE="http://pan.rebelbase.com/"
+SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus gnome-keyring libnotify spell ssl"
+
+RDEPEND="
+ >=dev-libs/glib-2.26:2
+ dev-libs/gmime:2.6
+ >=sys-libs/zlib-1.2.0
+ >=x11-libs/gtk+-2.16:2
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 )
+ libnotify? ( >=x11-libs/libnotify-0.4.1:0= )
+ spell? (
+ >=app-text/enchant-1.6
+ >=app-text/gtkspell-2.0.7:2 )
+ ssl? ( >=net-libs/gnutls-3:0= )
+"
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ >=sys-devel/gettext-0.19.7
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # Wait for webkitgtk4 support
+ # gtk3 support is still not ready (follow what Fedora does)
+ # gmime:3.0 support claimed to be experimental still in 0.145, waiting with it until it's not experimental anymore or we work towards removing :2.6
+ gnome2_src_configure \
+ --with-yelp-tools \
+ --without-gtk3 \
+ --without-gmime30 \
+ --without-webkit \
+ $(use_with dbus) \
+ $(use_enable gnome-keyring gkr) \
+ $(use_with spell gtkspell) \
+ $(use_enable libnotify) \
+ $(use_with ssl gnutls)
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 115943e11fdd..3931a74b882c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
Binary files differ
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index f3091791ad8a..192f6b907b75 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -3,5 +3,5 @@ AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b
DIST airdcpp-webclient-2.2.1.tar.gz 845507 BLAKE2B 5d97fe5d25957d870cc5480153acb746ac20bc398e637ccf25a98e42cc905fb445bbc47c211174552e0ee23d1affb0a9265d8499389373bf6622b14428300bd5 SHA512 97c5b32e590b2fc735fe4978c1a173272c55f84fe97212f7cd1e8bd4a279553c1d992573185781aeceafbbe6bb51303ddb2cd164c748fa798993a661f3abfb81
DIST airdcpp-webclient-2.3.0.tar.gz 880508 BLAKE2B 426c0582ffad734cae2f66826aa04b2db791a110abc79629f4e3b71a69db354b56d213feae6d807f3b7a3f2906aac00fc50c49eaf3dc7d8e09783f59c99ef4e5 SHA512 b1f47c8f500aa684a8cabcff916b6a1e41230d949a35d57c80f13734f6f88f8c3a31d99f64cc1f6e316d26710da894670f130baf78fec5ecf3a70a70f0d7417a
EBUILD airdcpp-webclient-2.2.1.ebuild 1431 BLAKE2B 5a4ec19c01fd32862d96a415cfabd10576b4ae435a33d8788ba2a8ec1dc02e0e30f517a76c36d2392840ae239d7aa3ff9571b7625208c13e2d81c5741469284f SHA512 40fd30c487e3ac0eb2cc80ed3fc40bdda23adb9be229499a47b4abb12e2cff73fd95ab1cc2e920ae8f867d6f3b55cbd441ecee3396bd465b0dbfc0678ad1e902
-EBUILD airdcpp-webclient-2.3.0.ebuild 1440 BLAKE2B 1a2486c19ac9b0814b03811232d648553febaf1277f3b8d88dccf57f3af6078f34b5ed73f6ab14a9b32f822fdbb8ae9a583a8a09ebafbb9271b6641d5929e348 SHA512 1726caffeea7019c6b3ae244c29d787749871c309bafb83974d947c960f7137c51923ad9ef0feed8124055e326291bc2c00aeec938f7e3a6702e7a824475e8c2
+EBUILD airdcpp-webclient-2.3.0.ebuild 1442 BLAKE2B 1d7971f1b9f677e1bae2909b052054bb176da4583bcc36fafe0f5c38e98bc10d0f6138704209c3ec5106250dba44252e062215e73c39b72738417ba27781e9db SHA512 595e0d80ee5bd7551e25b729c17f6c19194b63618b49580239d0527ad0e69e7cee1671d074d3118728b186a5ccd3b31d1866bda72a1de73da54ab9016e0a85b8
MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.3.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.3.0.ebuild
index 9c72310e8ce0..8bb9603ef74f 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.3.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
inherit cmake-utils python-any-r1 user
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index e342dcd5ff1b..8a66bb6d4caf 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,5 +1,5 @@
AUX ktorrent-5.1.0-cmake-3.11.patch 412 BLAKE2B 4ee01320022113b981ff1a314f8ed73895e0606615a5b91967bc04e72a328554f2345952f8bfd5bb09ff08991657b662f7db6d5a778316fd5ea5f4da1c8aeb1f SHA512 d3c3020407aabf8166ff08a1cce16a20693f273de5a1da5a2c6c21f5359a32799247153ca5d9e22fba45790ffd56b86e53465e2d3d9b0ce986fd896d5eedd63e
-AUX ktorrent-5.1.0-qt-5.11.patch 1530 BLAKE2B ee30623e4d7316a31edcab06c4e1c862db0fd9a4d3a98ab966f4cfd113ee4b68ebfe2d9d256e38fa056048f2d5fe1884d5fdb6e457dfe5c17bd9762bcc1c6f8f SHA512 a89df9e7b624a759664f757a1b60e4ea4ef3f5aee25781bd35d67005f72350c379fccc1edbec1ca9770339781d9c88506d3d16f980da85d3ce773c753729fc7e
+AUX ktorrent-5.1.0-qt-5.11.patch 2249 BLAKE2B f6d27bc5ed7ccb55622412799df823e674b0e11d48a7fe91444e3f652a44fdffa17248e34446a54b197c1b177b333e85beeb73d0c0edcb62add96f7c65b3b98b SHA512 7482a3228794f36e368cf9ddadc9cb57f62cec0b87903a19a67572bc362fd8d63728400ac43626c5acc947b017c9e64886dc7c1ec949fed14a4fca401845b404
DIST ktorrent-5.1.0.tar.xz 2046916 BLAKE2B 865004b84d649774420e2bd0087c416c5de4df40dfe5800ec539049001d93f66925025780987060ad09e1ba2a20045bd6d92c9202c98c28ec68d87758a88af74 SHA512 7bfe3a04a2b0f62d68b41c946af34e9f6ead6aa4ff7818a9c0ce2e83629d311e9e9be5fb1689065ce2601c43bd576b27d8c6946b845d4cdf5fa6362d53e8dd25
EBUILD ktorrent-5.1.0.ebuild 3066 BLAKE2B afa0b164599cdb37394ae6460f140c4d731a88c0953503779c459cd6848fa2481bb0f5b430cd9ea0e5eb47e4fcd00b697255b86880fe1208fc528fbb0807112a SHA512 625f7977ab1bb4623b791fa193ff6d0826d3bbc6352586e1cd53b7a52d1c2a4f01402770a2964ba6b386e49a5590ffaf113ba20d9eae86fba87000f491491e92
MISC metadata.xml 1341 BLAKE2B 91b9b58b6df009f42960708b09f926b3bdf6849ebffd8d46114c28c7f2df2c0972a8b5460333ac6758f138729a7c689f6a61d4a58494bc44af2e364d1dbc3e05 SHA512 dfff24b08dba8615c983c1360fe10efcb60744651d5484a8bd1a7a731697b9dd4a10126b8d66276f96a8524352b1e4ba99b28b773d292362b3f7506a45da5a80
diff --git a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
index f59e074134c8..f0d69b82c893 100644
--- a/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
+++ b/net-p2p/ktorrent/files/ktorrent-5.1.0-qt-5.11.patch
@@ -50,4 +50,27 @@ index 667e7a82..4be6cd5c 100644
#include <QInputDialog>
--
2.16.2
+From c66233cd9f5b87f9e265beae0a16839d3a5645a3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
+Date: Fri, 4 May 2018 00:33:44 +0200
+Subject: Fix build against Qt 5.11 (missing includes)
+
+---
+ plugins/syndication/syndicationactivity.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/syndication/syndicationactivity.cpp b/plugins/syndication/syndicationactivity.cpp
+index 61e8039..5736d52 100644
+--- a/plugins/syndication/syndicationactivity.cpp
++++ b/plugins/syndication/syndicationactivity.cpp
+@@ -21,6 +21,7 @@
+ #include <QHBoxLayout>
+ #include <QInputDialog>
+ #include <QToolButton>
++#include <QAction>
+
+ #include <KMainWindow>
+ #include <KMessageBox>
+--
+cgit v0.11.2
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 7df5a1429c05..6691417cc790 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -4,4 +4,4 @@ DIST qbittorrent-4.1.1.tar.gz 7464014 BLAKE2B be005fbecd1d2c9ee977fbdc6782bbad97
EBUILD qbittorrent-4.0.4.ebuild 1362 BLAKE2B 075ce19a51f7b1e2c88ae7d02147cb9eecc6dc07dee37f67293b96ff888c72bc7a3ccd38cf0a15264e5fbc9c6fb73f7c66423d4312d4d68e7ca46351b0b20e89 SHA512 b3695c5cd4e4a15211f51237e835c6c1a75b44a61a4b1aa5811f5854d3182b00869061de266bd5ad149fa38d66919150c6919770dd3b65c66d39215be9e4e724
EBUILD qbittorrent-4.1.1.ebuild 1425 BLAKE2B 9ae1167d4559172a81256aedc125ea4020d07ef944633eb8d570ac6cf2e7dcd91a4b4094b70b2228bfa7010077c4c7b28401c412fcdd58cf8945370b71f70aa2 SHA512 d6f99855e4667dacbc705dece1cf557af4fb7961f92bc5f2b2a7849d30b2979daffa5b63c19d4951e8dffbcc54734c44a028dbe525639a9aaed0b4387a232f3a
EBUILD qbittorrent-9999.ebuild 1364 BLAKE2B ee21562083f3c8f44342caecd4d20e6cd0371d4be6f9dfd1e3e8b6962e8a8a39328eb3f2d4abab745791afb2d36b7e36452692f39a62e0433100840522804680 SHA512 08ee86525118858548fb54b56a9d1373a79e8f05518a2ac4c06b1d7ce31061cd2d8c24b33853cb61cc9ca7d22980505ecd5583be2d94e9422d147745e7e7c11d
-MISC metadata.xml 563 BLAKE2B 6d89c3d5aa80da7890adedb109ba687303b2e020eb1e31d5d3a037213ceea658f58a01cef23abdb138e5e3fd5ec5411451ab9f1991d028d8ddd02e71b41b607a SHA512 9efe0774285533c85696e167c50b347a2d85da43b09763c6df0cf4907b9c5aed3e2fb96805109097992588f94696d941ba222f6898099da32c4c28579da33f7d
+MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index dc29397a8466..cbe7b2209440 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -1,11 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>hwoarang@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
- <maintainer type="person">
<email>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
diff --git a/net-p2p/torrentinfo/Manifest b/net-p2p/torrentinfo/Manifest
index 9e7ba7e58715..1d77aff75c0e 100644
--- a/net-p2p/torrentinfo/Manifest
+++ b/net-p2p/torrentinfo/Manifest
@@ -1,5 +1,5 @@
AUX torrentinfo-1.8.6-fix-tests.patch 934 BLAKE2B 6204fd3d04f7c8ddd4f4e9b9c64683003a4eb19f06fe5d7b7f76d3cdcb356b279ca4ac2d226080422f7bf98711d591b6b054d25539f3aa4096ad25ba970d6ef8 SHA512 d878048fe01bea0260f6b3045e77f88a6fb94ed11e15996fa3389119d8315657f77d2434d2c67b3ab58c83d4741f11c22723f0e9abbd06f4ab0df82cffc1b064
DIST torrentinfo-1.8.6.tar.gz 22232 BLAKE2B 04159e4e54fbe979a1a73e1dee39c9b7f9def389c44e3886fd28707646a2bc4c6a4dfadd5494ef9283427959da1c36260828693a0008e09993786d8639813bcf SHA512 7f36f6c80876cbd70ea9e1331195c8a30a6546406f345402d4bec5c58afb9b03a3b60189b8d177a63a7047c3ede7fc18d8fc47ecb1bcbb726dd01b7cb2a6efb2
EBUILD torrentinfo-1.8.6-r1.ebuild 649 BLAKE2B 7ad6bb78cc377579cd02c61ed4d2817add13a7277b20aa418412a05501b86aaf5bde5c7705a299fc6a9aa61b1ee2f983242a34f023e96d0dfd42a57486a962ad SHA512 7003dab67bfb6884e9112ea4319deed0c2f05e3512139ac90d9e2dd71caa2f9f05b43e62dc1c3730c6d39ec347fe5b132e9fe5a7cf9708c3ff7a73aa70d70d8f
-EBUILD torrentinfo-1.8.6.ebuild 588 BLAKE2B ccc8ac40b0c7b05b49411024c4d4ccf97216ae5a63fab0c48c5b81031a4f75496eb61f3b3190da9b2c62d0a5de47fa91a7c59d3d54e5202575d8b1286e13a056 SHA512 d548e58d23b1db0621ee3bd48b2b56ac14a99bdf9c658cb203a9cd9d9962f9d168f94f99bf1bae911a513c195e4cce76c2da6096a1e0175c762055c2f68a2067
+EBUILD torrentinfo-1.8.6-r2.ebuild 654 BLAKE2B 0ec7e3f2d894f492608be8997886db39263fa798d7373ba94fff3756a749e769e0eddaa0ebaa0efc00141036c989b1f482802696e9b007743f60667cf20f7efb SHA512 6051b81e7c1830a775a43acd0c63d318a2db2aff9977649d50d74968e2a13d3ec349fc2a18661a98185e26980b3f795becc0352f5e55cd96a67a2a52a9d1b061
MISC metadata.xml 514 BLAKE2B 5369e1bd1e98a7f74671ee33fb82473ec8154c75352d6d3c605d847ba605e22da4946e72ecd4799012f098ba6d82d46eadd599122c6820c1fa854bd6b58ae24a SHA512 8f37c7e38771055becfa77f5f2bde1dbf2bbd16c9b469f0b4174f9db97c8ace9836bed9708f8e375538140e4d3e194caeb5829dd8219c176a3745dbb55f38dd5
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
index fd8cc74b4ddc..71e0fd696395 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
inherit distutils-r1
@@ -10,14 +10,18 @@ DESCRIPTION="A torrent file parser"
HOMEPAGE="https://github.com/Fuuzetsu/torrentinfo"
SRC_URI="https://github.com/Fuuzetsu/torrentinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="test"
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
python_test() {
- # tests sometimes fail, see bug #493682
nosetests test/tests.py || die "tests failed with ${EPYTHON}"
}
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 79066eb1f922..6172f2adfe4f 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -6,6 +6,6 @@ AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3a
DIST transmission-2.93.tar.xz 3363868 BLAKE2B 786a8daec548d96b05d90c238cc7b67d402dc0d828860bb1a79b8059c687de309288be17fd12fd51abeafa28d9630fd19be9513c76cbf091f81ce9a181596042 SHA512 7565893f67fc10f1b683814fa4d365d841ec833bc8dfdab731432fe68f1a38daeb4c9100653763f16bfb4336fba11c9b0b9730a9817e17a140704a7c4aa5c087
DIST transmission-2.94.tar.xz 3365952 BLAKE2B d0215a2c595dd3ebb2ed5c94cc3d380c78f62b98388557620534b88b9e2304bb6ac91960395541267f82d70800c4860d0e58125bca33dd158da992d19b4c0def SHA512 ee411743940f2897aa0bbc351ce79f11d860075d2e9e399d60301eae8cfc453e20426ef553fc62ee43019a07c052d512f5d7972cc4411fb57b1312c2c1558da7
EBUILD transmission-2.93.ebuild 4375 BLAKE2B dd60b643985afdb20cb782f229011535b1c6dd98554e1b28b32dc805ca6b4ffd25485d10ca3dcd0eaa7b0a498d40edbd5c5533965def675e3c7b93193a38acb6 SHA512 5afb734ad2ee190605e6d7204b59afd556cbfd50e3a8c5308d916f2d40fbaf81301c53f5e664ffc0db7bf701d37bb6e01d9b73027de527f1fe036b0638926e91
-EBUILD transmission-2.94.ebuild 4331 BLAKE2B 5017f6413789c8c9a42c845cff467424a4a5424b492cc10126b18519d4814d75e7497f251b78b64b08f67d1691be2e3b95411a0cb60f81eb7246173687e78971 SHA512 aba78a0d158f9b864fcd6bf7f11386d2ee9009f9a2c556e4071b9c19d13a1a72e56a38303bd8e02a54ba39a73b4c763114581e17378cffdde898c604fa090ea8
+EBUILD transmission-2.94.ebuild 4328 BLAKE2B fbd16023e8c77e0269e9840527b515476b23206220d0615e517dcb6893d90d8e99804c7f9f0e1b40bc7b0ffbaf720b64753c94061810e5936fa0ebd20ea22100 SHA512 3fa58bae899c3729fe5b4aa80d0bcd6dae2e5cd802e271831b8302563905348ed7f1bbad1dede63a8fe61de387212ac4edca752a30c8c796094c80646bf524e6
EBUILD transmission-9999.ebuild 3726 BLAKE2B ed8e5e8ddc738eddfbcd5d562f31f8ff62a7833fcbfac05ef8a9b0c157ec579eb8ad8ec471527371221f14dd00094ec4f5f429a831154a5d2cbc80425c4f2a64 SHA512 af09f34bd910244bea541f350fc8df64229cf1df57332a80d6b109190630b37ccebf835a85aff6f3803d12c00d25dee24ecee93bedd02d6f9a54a118c0fea4cf
MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/transmission-2.94.ebuild b/net-p2p/transmission/transmission-2.94.ebuild
index 37645783a92a..7577d88b5daf 100644
--- a/net-p2p/transmission/transmission-2.94.ebuild
+++ b/net-p2p/transmission/transmission-2.94.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.t
LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
SLOT=0
IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
RDEPEND=">=dev-libs/libevent-2.0.10:=
!libressl? ( dev-libs/openssl:0= )
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 63c7e7ff3629..02d26a5690fa 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -3,9 +3,13 @@ AUX xmr-stak-2.3.0.service 942 BLAKE2B a237a5273d6b1fc3a2dd69b121e1ca61471f9524c
DIST xmr-stak-2.4.3.tar.gz 335672 BLAKE2B 570fbb86144ba1a283c9a1733476e90caf24dcf0048733007ec189342a0e375f65cca74afb88ca7b08370a7db9a9a7d146f0c9a4a2cd57c480ec5b26928e98fa SHA512 a1e38c25827af8f88c1fdeed0fb3e731e92ac632d846f63dfe6fcb634eec0496e1d64b2745e6dc040dabc55a90963f587442e912c5aa72c9208cebffcc06db7c
DIST xmr-stak-2.4.4.tar.gz 337845 BLAKE2B d66e650aea8a299ec77c183b321330ca1a3faee11a17046e0d88e8a11bb4649f2305de1287d77f9346071e217762d2e6a44bd26a37173db05ab648ed1e20ba60 SHA512 3cd0bbf2b489458888aa02302a1652093ceae38c085a16441bc2f6e315a82e0e00755544df0c75178a66e567a44e9d7537056b0fa5f3e7c7aee9a13b013c2411
DIST xmr-stak-2.4.5.tar.gz 338482 BLAKE2B 4f51925d86baab4a7a78803b45264ad731ac51d837e7f84138f4e82e14cd13a57b7f870f6e66f8306a09df0211dd65ca6998bfa1b0a55e97020cb63287b70c9c SHA512 22cb3c97b9e85ec50091e093488256beb484a9bcdd0496185531095c5e64289814873ac659dc0c71d01adccacf1394019aeff33d7fab4e71af3ae65545219f04
+DIST xmr-stak-2.4.6.tar.gz 340081 BLAKE2B 10520af3e696632c938e753acc1bd3a0439b1f240837e60eba0402a2efabc9ae493b85310a3c6ec27c6fca914955546854f12bea915c808e9b809a1b9af83653 SHA512 9f32af76f3043abee0c8bd8a46e239b07459c1ed800fa3afb4db022a9751ce7c8023fb5cbd79564323d2e625796fa6e05203501123de7a83cd9e22da951ccec2
+DIST xmr-stak-2.4.7.tar.gz 340026 BLAKE2B c6f898201ee744dea4aebf9bb3541efa7e5b78b740158c03ab044136eb8bdc768edb2118fa9f0eb48024aa70d52da7f281eb0443a42d4765bf3b7e39e98601fc SHA512 91557c88ec36cc96eaacfa71474a5d9e5ac8815904221bd588417b0b077cddef15c28bac62cadea8b7701ce87af8d8a43a911e6523a0bbad99577398e2f0056e
EBUILD xmr-stak-2.4.3-r1.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
EBUILD xmr-stak-2.4.4.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
EBUILD xmr-stak-2.4.5-r1.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
EBUILD xmr-stak-2.4.5.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
+EBUILD xmr-stak-2.4.6.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
+EBUILD xmr-stak-2.4.7.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 8f1d2eb1b7bcb7fbdfd7a255723142b00814f549d86cb5c3396d413b1988ef60b212505494acf4e6189d684a183aeed4be6c9d56b3195717cc289b1edd24ba5f SHA512 dacc7a7fceddf6d18af7aa924e91a90e128027acec4d05a1975a35d950a774f5f06b35f380cedf08ad02c44d436907cc7d5147315e298e2af017c53eaef2de35
MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.6.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.6.ebuild
new file mode 100644
index 000000000000..8a521d6793d7
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.4.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+ EGIT_BRANCH="dev"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+ hwloc? ( sys-apps/hwloc )
+ opencl? ( virtual/opencl )
+ ssl? ( dev-libs/openssl:0= )
+ webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if ! use devfee; then
+ sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCUDA_ENABLE=$(usex cuda)
+ -DHWLOC_ENABLE=$(usex hwloc)
+ -DMICROHTTPD_ENABLE=$(usex webserver)
+ -DOpenCL_ENABLE=$(usex opencl)
+ -DOpenSSL_ENABLE=$(usex ssl)
+ -DLIBRARY_OUTPUT_PATH=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+ doinitd "${FILESDIR}"/${PN}
+ dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+ if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+ ewarn "To use xmr-stack:"
+ if use cuda || use opencl; then
+ ewarn "As root or as a user that is a member of the 'video' group,"
+ fi
+ ewarn "run:"
+ ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+ ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+ fi
+}
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.7.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.7.ebuild
new file mode 100644
index 000000000000..8a521d6793d7
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.4.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+ EGIT_BRANCH="dev"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+ hwloc? ( sys-apps/hwloc )
+ opencl? ( virtual/opencl )
+ ssl? ( dev-libs/openssl:0= )
+ webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if ! use devfee; then
+ sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCUDA_ENABLE=$(usex cuda)
+ -DHWLOC_ENABLE=$(usex hwloc)
+ -DMICROHTTPD_ENABLE=$(usex webserver)
+ -DOpenCL_ENABLE=$(usex opencl)
+ -DOpenSSL_ENABLE=$(usex ssl)
+ -DLIBRARY_OUTPUT_PATH=$(get_libdir)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+ doinitd "${FILESDIR}"/${PN}
+ dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+ if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+ ewarn "To use xmr-stack:"
+ if use cuda || use opencl; then
+ ewarn "As root or as a user that is a member of the 'video' group,"
+ fi
+ ewarn "run:"
+ ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config -C /etc/xmr-stak/pools.txt"
+ ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+ fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 1cae65ec106e..31c09f0bd3bb 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
Binary files differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 76bfe9d2e26c..62d37f827a4b 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,11 +1,10 @@
AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711a09a448cbf6fb61109c4de8562589c308f20859bab47e4821d0ea89e8b1531a7a1dd2a33bc7cec16b039276 SHA512 9d2b54f6ae24ae1112e53e845937052ba473789a6051b7854b2b36001203d351e4bf7fd5eb307aa33f65a0bce8b9b65cdea3e399301decf0d9351696cfc682d3
+AUX cups-filters-1.20.4-poppler-0.67.0.patch 826 BLAKE2B 0d85c9e27c588f2bd3c3535a6a7fc83ed8d5657e71fda0fb402da5f562b60c9810675251d70c12b8a2652038c5685e10efc1b9bb6b6a422ce0008ac1da40a829 SHA512 0c3e5857e90ed959df97b658cae43e17c5f943b88b6a86bdcd9a4d44f2a684810d8e317ad53d61dbca4802f2a45e2f783b527400d3c0f039ff2264d6f92df676
DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
-DIST cups-filters-1.20.3.tar.xz 1469468 BLAKE2B 4b76c751264cc87aaa4fed237ad577433ca2c5bb9f23d572466f0d81f3cd7ee4c78eb783269923603010f4edbf246353017e57ccdc75207855de9ae5f0fc5d4b SHA512 402a53bf1ea12b14e6f8aa46f8f5e91b2caf9da3a8f14759568b5a45b9309f379fec542c843da5560cbcec2c4860babfee7e9c2f0c62f5fa6254025e9d867b31
DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e
EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
-EBUILD cups-filters-1.20.3.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
-EBUILD cups-filters-1.20.4.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
+EBUILD cups-filters-1.20.4.ebuild 3566 BLAKE2B 707b47517505e6a359c5e4030ca80abcea579d307870785fef2bc7ca9c29de08fc605580f34b95d8392c900ed7ebc69822f46b4a2e3f0eb2991c4a488e7ed0cb SHA512 96aa7b19a197046ebacb0492ed86863abbdf1388c2df1ed75dc625d76b5dce400495630234e0ee5e893517f47c80a12e8fd66ff338d0da7e44942ab20b23fba7
EBUILD cups-filters-9999.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.20.3.ebuild b/net-print/cups-filters/cups-filters-1.20.3.ebuild
deleted file mode 100644
index be4ec7dfe0fa..000000000000
--- a/net-print/cups-filters/cups-filters-1.20.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit bzr autotools
- EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
- >=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
- >=app-text/qpdf-3.0.2:=
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/lcms:2
- >=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
- sys-devel/bc
- sys-libs/zlib
- dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
- jpeg? ( virtual/jpeg:0 )
- ldap? ( net-nds/openldap )
- pclm? ( >=app-text/qpdf-7.0_beta1 )
- pdf? ( app-text/mupdf )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
- test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
- default
- [[ "${PV}" == "9999" ]] && eautoreconf
-
- # Bug #626800
- append-cxxflags -std=c++11
-}
-
-src_configure() {
- local myeconfargs=(
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --enable-imagefilters
- --localstatedir="${EPREFIX}"/var
- --with-browseremoteprotocols=DNSSD,CUPS
- --with-cups-rundir="${EPREFIX}"/run/cups
- --with-fontdir="fonts/conf.avail"
- --with-pdftops=pdftops
- --with-rcdir=no
- --without-php
- $(use_enable dbus)
- $(use_enable foomatic)
- $(use_enable ipp_autosetup auto-setup-driverless)
- $(use_enable ldap)
- $(use_enable pclm)
- $(use_enable pdf mutool)
- $(use_enable postscript ghostscript)
- $(use_enable postscript ijs)
- $(use_enable static-libs static)
- $(use_enable zeroconf avahi)
- $(use_with jpeg)
- $(use_with png)
- $(use_with tiff)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_configure
- perl-module_src_compile
- popd > /dev/null
- fi
-}
-
-src_install() {
- default
-
- if use perl; then
- pushd "${S}/scripting/perl" > /dev/null
- perl-module_src_install
- perl_delete_localpod
- popd > /dev/null
- fi
-
- if use postscript; then
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
- dosym gstoraster /usr/libexec/cups/filter/pstoraster
- dosym gstopxl /usr/libexec/cups/filter/pstopxl
- fi
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
- cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
- if ! use zeroconf ; then
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
- fi
-
- doinitd "${T}"/cups-browsed
- systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
- emake check
-}
-
-pkg_postinst() {
- if ! use foomatic ; then
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
- ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
- fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index be4ec7dfe0fa..4774200f0269 100644
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.4.ebuild
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}
test? ( media-fonts/dejavu )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch"
+)
+
src_prepare() {
default
[[ "${PV}" == "9999" ]] && eautoreconf
diff --git a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
new file mode 100644
index 000000000000..69376e1c84d2
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
@@ -0,0 +1,28 @@
+From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 20 Jul 2018 15:20:11 +0200
+Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0
+
+This only fails with >=poppler-0.67.0 but the change to const was done
+in 0.64.0
+---
+ filter/pdf.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/filter/pdf.cxx b/filter/pdf.cxx
+index 206ccf88..665eab09 100644
+--- a/filter/pdf.cxx
++++ b/filter/pdf.cxx
+@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt)
+ }
+
+ FormField *ff = fm_text->getField();
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64
++ const
++#endif
+ GooString *field_name;
+ field_name = ff->getFullyQualifiedName();
+ if ( ! field_name )
+--
+2.18.0
+
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d1a4026492bd..538d8062feb2 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
Binary files differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 9a6b778e2670..efa29cc40429 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,6 +8,7 @@ DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81
DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11
DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561abecc78b2b58b285ebb4b0ae498753d236f3a243d3b5c1115a9ff6e5fe9392d428314a6342e2c1907d6886e09e4 SHA512 48ee30a1057e92971c041b088b6aef16d6843da9ecee9b738aaa64bb55d3c3b0be090a37bb5fc63ac42fe34ce994820349cc770756136c823051039fa6d01f74
+DIST haproxy-1.8.12.tar.gz 2059925 BLAKE2B 73893c8a0eaf5c1af2f12e4f8e9e53c70841f2ba60d1e004f90b90e1c829cbf76b01457384de777ea76a3a7ca0a5f6cbe33da8162525706f25d08a2c7cb60c42 SHA512 2b782a54988cc88d1af0e5f011af062910e8fac28eab13db7e05a58d0d23961f827da47e3871e8d081f5a2d222588480d81dec2e9f14ec9f54a1c3cb5bf3d56a
DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
EBUILD haproxy-1.5.14.ebuild 3269 BLAKE2B fed37e73d128612260d8266045891a5e271ba399ee61af005409ab07b089297f4ca39adb67c50e0721efa9b7cdc112f0d5d30a65cb60ac027684ddb69e606c9c SHA512 41d1cfec30d177661f4402143ccf1335f5407adeb9f1581ea866011b1ec26c99da67fb2edd33e71e96b64665fa9c62641fd4b5dc1cd1383cc49877a0ce4292b4
@@ -16,7 +17,8 @@ EBUILD haproxy-1.6.11-r2.ebuild 4672 BLAKE2B 74b3adb390a7fa1d596e8e91f4ca5fbb46d
EBUILD haproxy-1.6.14.ebuild 4608 BLAKE2B d85f4160498f8af8fcc05ccdbe68d771b9d8b5cc71412be2c7430cf769c091f75030d678bf29f56d3bbb432c04f26fd45686333c8b2e282c25ae2dee7eceeb00 SHA512 32ae8badac30ea423613301815c4ccb07a6b81368dc92dc561f13d7432cde041048735cc4790659b4f1827a77e7009120e7977a54a15d164229a41d54d1b1e1b
EBUILD haproxy-1.7.10.ebuild 4628 BLAKE2B 267e5228e4c1eb2386ab13a6f21d018e8f8643d9adcdb61851d150b281e2241eda97c701b4577fef8feee00c01409f8f2fc715a9681874fc05fc3f89c09da440 SHA512 941f9c3e0982ee44d51339b3feef43d93c7259413f2d77f8919e63056a0d0504468bd0637965141842af6c8dbb223f23155ffc0728f54bc1bbf539eef678c235
EBUILD haproxy-1.7.11.ebuild 4632 BLAKE2B 06dd613111ce7410ce9190b2cbd825f4b9acd16d3c9995ca507fda90a77696e6c931b2f2caeb916ed0f6894110edaa056df5923c204107230af6a4f596c061ab SHA512 bb080ed92cbef8e2851262648519b5e0563749e3bd92396707791775801bf19f029e57fbe4fa029ea240cbc8f55b14e91d5656e85101fb2dc1e8ae219d111d51
+EBUILD haproxy-1.8.12.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
EBUILD haproxy-1.8.8.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
-EBUILD haproxy-1.8.9.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
+EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
EBUILD haproxy-1.9.9999.ebuild 4889 BLAKE2B a40d2bf75ece4fcba6f0ac6e8bfcf81763ded4b315781183230a8b514f5931de4c383afbe8d4152f4d2d4d496fd2421f2f10d04e4240b52a7ab15f3c31bc0864 SHA512 2e132cd3018d845450a94857a544c0306a5cf0efe08d5102a7096a424355a4b628bf85c69f02f812577d134ebabef197aa2bb4ff6f5b8f8d3609d072a55af86e
MISC metadata.xml 2071 BLAKE2B 303b68ae0788743ec5a8d893e69a87fd2d22188b2166f75c23cd2a47c06e69bfe43745016fafd64b5b298f7b56453fcbfb6b4d9bfede1e08e0c603bce7b0955f SHA512 4ac7fd3dcae2293fa3cdb54fba7dfd9cfbc28f5fca33442dd970861ca26672a0b21d825d36099fbf234831a403fb41eabe02d48eca2a971eaef857516427394b
diff --git a/net-proxy/haproxy/haproxy-1.8.12.ebuild b/net-proxy/haproxy/haproxy-1.8.12.ebuild
new file mode 100644
index 000000000000..44131da836d2
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.12.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+ EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
+ EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+ pcre2-jit? ( pcre2 )
+ pcre? ( !pcre2 )
+ device-atlas? ( pcre )
+ ?? ( slz zlib )"
+
+DEPEND="
+ pcre? (
+ dev-libs/libpcre
+ pcre-jit? ( dev-libs/libpcre[jit] )
+ )
+ pcre2? (
+ dev-libs/libpcre
+ pcre2-jit? ( dev-libs/libpcre2[jit] )
+ )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[zlib?] )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ slz? ( dev-libs/libslz:= )
+ zlib? ( sys-libs/zlib )
+ lua? ( dev-lang/lua:5.3 )
+ device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+
+haproxy_use() {
+ (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+ usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+ enewgroup haproxy
+ enewuser haproxy -1 -1 -1 haproxy
+
+ if use net_ns; then
+ CONFIG_CHECK="~NET_NS"
+ linux-info_pkg_setup
+ fi
+}
+
+src_compile() {
+ local -a args=(
+ TARGET=linux2628
+ USE_GETADDRINFO=1
+ USE_TFO=1
+ )
+
+ # TODO: PCRE2_WIDTH?
+ args+=( $(haproxy_use threads THREAD) )
+ args+=( $(haproxy_use crypt LIBCRYPT) )
+ args+=( $(haproxy_use net_ns NS) )
+ args+=( $(haproxy_use pcre PCRE) )
+ args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+ args+=( $(haproxy_use ssl OPENSSL) )
+ args+=( $(haproxy_use slz SLZ) )
+ args+=( $(haproxy_use zlib ZLIB) )
+ args+=( $(haproxy_use lua LUA) )
+ args+=( $(haproxy_use 51degrees 51DEGREES) )
+ args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+ args+=( $(haproxy_use wurfl WURFL) )
+ args+=( $(haproxy_use systemd SYSTEMD) )
+
+ # For now, until the strict-aliasing breakage will be fixed
+ append-cflags -fno-strict-aliasing
+
+ emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ emake -C contrib/systemd SBINDIR=/usr/sbin
+
+ if use tools ; then
+ for contrib in ${CONTRIBS[@]} ; do
+ emake -C contrib/${contrib} \
+ CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ done
+ fi
+}
+
+src_install() {
+ dosbin haproxy
+ dosym ../sbin/haproxy /usr/bin/haproxy
+
+ newconfd "${FILESDIR}/${PN}.confd" $PN
+ newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+ doman doc/haproxy.1
+
+ systemd_dounit contrib/systemd/haproxy.service
+
+ einstalldocs
+
+ # The errorfiles are used by upstream defaults.
+ insinto /etc/haproxy/errors/
+ doins examples/errorfiles/*
+
+ if use doc; then
+ dodoc ROADMAP doc/*.txt
+ #if use lua; then
+ # TODO: doc/lua-api/
+ #fi
+ fi
+
+ if use tools ; then
+ has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+ has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+ has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+ has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+ has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+ has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+ has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+ fi
+
+ if use examples ; then
+ docinto examples
+ dodoc examples/*.cfg
+ dodoc examples/seamless_reload.txt
+ fi
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins examples/haproxy.vim
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+ ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+ ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+ ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+ if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+ einfo "Please consult the installed documentation for learning the configuration file's syntax."
+ einfo "The documentation and sample configuration files are installed here:"
+ einfo " ${EROOT}usr/share/doc/${PF}"
+ fi
+ fi
+}
diff --git a/net-proxy/haproxy/haproxy-1.8.9.ebuild b/net-proxy/haproxy/haproxy-1.8.9.ebuild
index 44131da836d2..92c291b81061 100644
--- a/net-proxy/haproxy/haproxy-1.8.9.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.9.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
HOMEPAGE="http://www.haproxy.org"
if [[ ${PV} != *9999 ]]; then
SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86"
+ KEYWORDS="amd64 arm ppc x86"
else
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 1-2).git/"
EGIT_BRANCH=master
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 8a0d3356dce1..0773c7d10f13 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
Binary files differ
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index d96adad6fc50..caa0229fd4a4 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,5 +1,5 @@
DIST openfortivpn-1.6.0.tar.gz 55606 BLAKE2B 649ca2a8112313fc7b63d89867efe33c4cf8e75cb4c2f7f19839e1f569ac04e3ace841b17ac0e7aa9b51a7e6d9b1f7910925761d5052cac6ef5aec1e257b93bc SHA512 547dca62022f56271717191a10a645b8a1c554568536f0695ef73d8c2883926e957dc070570648ed672786374a01b110de34b4ea19c4ae8cb2e3657c27716c69
DIST openfortivpn-1.7.1.tar.gz 61236 BLAKE2B b382ceac577e63ebb7a92ee3ca80c45e94f77eb95f8ea75f91a4c2ca2fb006f4d2e5e4c7bdf3974875cfb3611f34ef249218d194d58f66f3b51b30c8b90a3f82 SHA512 9c151ce3f914a7cba13be3e3b98e35d49329ac2c04410b653ce40dfb9fe1912c2e51d0322f9e37d5ed47bb28a46203a19ce87ab2fa670229f2b5ccf5b9bb6fc1
EBUILD openfortivpn-1.6.0.ebuild 766 BLAKE2B 3dfa3574c89f8101c5e10915118fccf5d5bf50954d411390e501d701fa746a6f58b89fb0b37140bb301c4baea697ec527cceb77b38107842f433b55139c907ef SHA512 f5e8bdac45457934df2e749c45eb91e15909edbdb3b3aab3891bef1a34732e6dfab2f739954c9240250d0e09a5cf5a93a378a5cc1b7d9e3770f1cf682f578704
-EBUILD openfortivpn-1.7.1.ebuild 767 BLAKE2B 80b75f28a23b3af0b2e60c35b73079bb71d3ac1489a4dc8296188386abc82a2f951b674f3d7ff9223c900bd4ab6483edc0ae38b851ed2bb2232c319e752ef51f SHA512 56d386a18c0363b1c35057cd6bca72da55b06671238a363e4f7ad3aac50207c6358d7118d864a5df6daa4aa03a9e544c4e7b757250ec1310b1e597653eed80b1
+EBUILD openfortivpn-1.7.1.ebuild 766 BLAKE2B 59675dd6afd568ef60fc345e96c401e462063bb570c4e5c094c4a2c5f4061e862e6b185763af143d34a79d817fbe61ff1783180a981611e9405875c19d8bbece SHA512 19abaec0e7981787d4f2995bfe905a0d24643d17cfdb651dec7d2dc4be2c80af6042876ef06d5196c953d3209c90bd8d9bea2650bfab650d2608609d211bd048
MISC metadata.xml 334 BLAKE2B f24aad8486bdfc65b3b679b17aee075a53b08cda8e80df8c6119cf224885d6ed25a23b14ca38bda9a1c8a651263d59e42d84719dd27749f25d109e7a6f8a3783 SHA512 383c645edf7e7baa6588a4639ec81290b4260d329f3839e540ecd506d7945a72a35bd039514b377454c0c81f23ecadaa9334c746e96aa91e0408712f112148fd
diff --git a/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
index bfc317510e66..edc56936ac07 100644
--- a/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
+++ b/net-vpn/openfortivpn/openfortivpn-1.7.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools linux-info
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${
LICENSE="GPL-3-with-openssl-exception openssl"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="libressl"
DEPEND="
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 69d94d49ff9a..71c7cfef72eb 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -5,13 +5,9 @@ AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c19
AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
DIST tor-0.3.1.10.tar.gz 6192183 BLAKE2B 4c1b57a3b19d18d735bb7362a08e4c2330350f2e31d52a8eb6d837cebc45ad6e64f3364e368f72d59bb8f51f652d4029a3e237a26efe580551811f5812e8dac4 SHA512 92af34a96bea2a99ab51d766d932da697409e404da4318ba6b3360ff0c2e9369b9afa652445a1651940f5a0502f4137141cc87cff14eba180539ea81be0c21a3
-DIST tor-0.3.2.10.tar.gz 6421984 BLAKE2B bab8031982f05ee29b14d22fdd9c4912e35342e6ac57a1c3fe1d5de3c4f394e0211607d20917b705a5f489109511a7ed7761e1dd7b4310c3d112c5e7cf9964bb SHA512 b916173b13fbca71a1b859d0cb1b090a063b27039ce88cedcf4b17ab282bfaa2edf0bb9f213fc20f82af856c880e0747a593e3d8fe1bc17319dc5cd8ac4490df
-DIST tor-0.3.3.8.tar.gz 6564878 BLAKE2B 1bb9adc4aaa6b207b544a98cb66349cce09a4d731a4e8908403da0d80b4b3ae3d4d5dabb9cd75bbecbac1b4f1233e06b235fb5c87bb2253a27a30a80f59074cf SHA512 b937f7f429690fa92d112d5bc48234c4b96f69614f319f04dab62e5b11b87e5e141d48642afac89e1dfe62a394d56b82ebf7fb1ac10de91923135a434a79718f
DIST tor-0.3.3.9.tar.gz 6563091 BLAKE2B 9bb2009c309005ad913aa8f3e175ef8500a571de6210ecaa1a17947633e201092dd819e30e95a55918dff54858b8c420039e960113e9096b2b4f43ca596bb3bd SHA512 3b1fd9926988233c605996281510cd966a08bc1008e1e4bf7e0ed76b40c1820b7789a85555d5a4d9c0b58db992366d7a62d5d3b20e818a0d68df3b2286d0df3d
-DIST tor-0.3.4.2-alpha.tar.gz 6634506 BLAKE2B f5fd597c0df5d49230d380b8a989cc1549d7e0249269fe5dad4cbc62dcd4f1bf03320f330591379be97a6ca19625f9c3813fb16728be9e8e0b9b446da6e127a4 SHA512 cec88017f1a36a74234eebfe83cca0d983ac698c5e27c6861d107e3776d89074b4dd654fdea943e325ed0ca81d7a64dfd80bda61f26a73d29ec75b940323a930
+DIST tor-0.3.4.5-rc.tar.gz 6643534 BLAKE2B 8e1f045ab2a3afbbdc1208e831848bcc6b9da1f1f2972213337ba9533d8d049ee8e1d50665c8a388a617fddc3878f210ab9f27b2545dca9f25ca52a8f9b175b0 SHA512 d58be09564f3ce59483f0672dffecd56a00c562add6ac4382699cffa568acb251c46dd9a2d5d08d6b8bcf52d28b4d42c832dfe34148ebf31acdea19ca465156f
EBUILD tor-0.3.1.10.ebuild 2018 BLAKE2B 5c001ed0ad1fd3f0d6a3dee6bcc53bc3590a90a5c0aa931c0e67e0cbceb000ef710fa33fe11b06fc08798c6286ffa877376ef6ebf2cbd426e7a26c94311e19c2 SHA512 65f6054ac7b50c46679d88ed1a5b556f5e3c40fe44e784e6b4de324bd317e3d118a8d0d4574ac62bcd17131412c3ad1cbdd0c27f4afd53568091ce400b171244
-EBUILD tor-0.3.2.10.ebuild 2088 BLAKE2B 5e238b5f899f3f899eef005466e79f2db41ee0c5b49d57182124e3e8ac8c8a59c55ef1c8b9a2072a9221e365af9004dcd3759c4ba5767fd69b7eb7adf3396723 SHA512 464962ecf54e706489cc2bc0c902f86db648a15854949865d8ce5e14187893499354de64d4458b2bef82b510fe1de97e676417706e45a16485305ed3beac8905
-EBUILD tor-0.3.3.8.ebuild 2274 BLAKE2B 350ecbd07a4ade222fe94c1d8d3d11f1d302897b8edf8f769d3fedd49f6d4ac298c0795541ff5acce6b1f23fa9eca3f67571637d3ded1192d9df56fd3315a26a SHA512 97cc47b829c5a0fc5ceb22190ba3cecca1a5307416e3b5944584f2cb056f15f69e219d3b018d2203c30ae1cd02ae0cb97ef9d7c0f35dc21c1e76ce6455540617
EBUILD tor-0.3.3.9.ebuild 2274 BLAKE2B 350ecbd07a4ade222fe94c1d8d3d11f1d302897b8edf8f769d3fedd49f6d4ac298c0795541ff5acce6b1f23fa9eca3f67571637d3ded1192d9df56fd3315a26a SHA512 97cc47b829c5a0fc5ceb22190ba3cecca1a5307416e3b5944584f2cb056f15f69e219d3b018d2203c30ae1cd02ae0cb97ef9d7c0f35dc21c1e76ce6455540617
-EBUILD tor-0.3.4.2_alpha.ebuild 2261 BLAKE2B df921bc4d42256443956133b20f35fd8f6bb9a5c096b10d0cca4e7b5799e021186386775eface12c880a41b1367859efdb251185f505273126a4ca97bc7ab457 SHA512 8d7a9de9a3ec18951cb416ad75c6bccc7771451b34286243ae8d8ed7675834d0903695fd76e56872c0ffc4ba296b83c4dde0fe408b0a70274f51f521950d2b36
+EBUILD tor-0.3.4.5_rc-r1.ebuild 2449 BLAKE2B a98e2721a4fe5e4048e99655b1eb14608d100f657731c7c8932fc3d291531542301908a423ea635762e06aa4686a050075dc44a9835c0da5035b06a642bb5df3 SHA512 1b1234b92f062c8b6bd9663d1fe1972c9605bd9c150e35e80303888438ae83378a0d3131d71f6e680accf777787b50446e740e1a82506061ee636ab9b7e7be56
MISC metadata.xml 594 BLAKE2B 006e1ebc9876f83cb7cc3dcb7cea9ff0dfc763e9eb47c025e38b7588e1e4fef7c26ab130c61cdd3200b8d3d9be886b3aab377585972be178c93b758aff48c4c3 SHA512 011f77654a507d13c0542e6983df8ec86c5f2cff7cd1408f99c9d4da9d00ffb4b432317b2fd21500e62131e6f7c9bc60235cf55f2b8082391b9fe3bcf924ab2b
diff --git a/net-vpn/tor/tor-0.3.2.10.ebuild b/net-vpn/tor/tor-0.3.2.10.ebuild
deleted file mode 100644
index 57655d96e0eb..000000000000
--- a/net-vpn/tor/tor-0.3.2.10.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
- app-text/asciidoc
- dev-libs/libevent[ssl]
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- lzma? ( app-arch/xz-utils )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )
- zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
- econf \
- --localstatedir="${EPREFIX}/var" \
- --enable-system-torrc \
- --enable-asciidoc \
- --disable-libfuzzer \
- --disable-rust \
- $(use_enable lzma) \
- $(use_enable scrypt libscrypt) \
- $(use_enable seccomp) \
- $(use_enable systemd) \
- $(use_enable tor-hardening gcc-hardening) \
- $(use_enable tor-hardening linker-hardening) \
- $(use_enable web tor2web-mode) \
- $(use_enable test unittests) \
- $(use_enable test coverage) \
- $(use_enable zstd)
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r8 tor
- systemd_dounit contrib/dist/tor.service
-
- keepdir /var/lib/tor
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.4.2_alpha.ebuild b/net-vpn/tor/tor-0.3.4.2_alpha.ebuild
deleted file mode 100644
index 2a7722eb02ef..000000000000
--- a/net-vpn/tor/tor-0.3.4.2_alpha.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic readme.gentoo-r1 systemd versionator user
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-# We need to keyword app-arch/zstd
-#KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="libressl lzma scrypt seccomp selinux systemd tor-hardening test web zstd"
-
-DEPEND="
- app-text/asciidoc
- dev-libs/libevent[ssl]
- sys-libs/zlib
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- lzma? ( app-arch/xz-utils )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( sys-libs/libseccomp )
- systemd? ( sys-apps/systemd )
- zstd? ( app-arch/zstd )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
- "${FILESDIR}"/${PN}-0.3.3.2-alpha-tor.service.in.patch
-)
-
-DOCS=( README ChangeLog ReleaseNotes doc/HACKING )
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_configure() {
- econf \
- --localstatedir="${EPREFIX}/var" \
- --enable-system-torrc \
- --enable-asciidoc \
- --disable-android \
- --disable-libfuzzer \
- --disable-module-dirauth \
- --disable-rust \
- --disable-restart-debugging \
- --disable-zstd-advanced-apis \
- $(use_enable lzma) \
- $(use_enable scrypt libscrypt) \
- $(use_enable seccomp) \
- $(use_enable systemd) \
- $(use_enable tor-hardening gcc-hardening) \
- $(use_enable tor-hardening linker-hardening) \
- $(use_enable web tor2web-mode) \
- $(use_enable test unittests) \
- $(use_enable test coverage) \
- $(use_enable zstd)
-}
-
-src_install() {
- default
- readme.gentoo_create_doc
-
- newconfd "${FILESDIR}"/tor.confd tor
- newinitd "${FILESDIR}"/tor.initd-r8 tor
- systemd_dounit contrib/dist/tor.service
-
- keepdir /var/lib/tor
-
- fperms 750 /var/lib/tor
- fowners tor:tor /var/lib/tor
-
- insinto /etc/tor/
- newins "${FILESDIR}"/torrc-r1 torrc
-}
diff --git a/net-vpn/tor/tor-0.3.3.8.ebuild b/net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild
index fd1ee6ae3935..03ddb1da8917 100644
--- a/net-vpn/tor/tor-0.3.3.8.ebuild
+++ b/net-vpn/tor/tor-0.3.4.5_rc-r1.ebuild
@@ -48,6 +48,8 @@ pkg_setup() {
}
src_configure() {
+ # We have to enable unit tests since they break the build.
+ # See: https://trac.torproject.org/projects/tor/ticket/26792
export ac_cv_lib_cap_cap_init=$(usex caps)
econf \
--localstatedir="${EPREFIX}/var" \
@@ -55,8 +57,11 @@ src_configure() {
--enable-asciidoc \
--disable-android \
--disable-libfuzzer \
+ --disable-module-dirauth \
--disable-rust \
--disable-restart-debugging \
+ --disable-zstd-advanced-apis \
+ --enable-unittests \
$(use_enable lzma) \
$(use_enable scrypt libscrypt) \
$(use_enable seccomp) \
@@ -64,7 +69,6 @@ src_configure() {
$(use_enable tor-hardening gcc-hardening) \
$(use_enable tor-hardening linker-hardening) \
$(use_enable web tor2web-mode) \
- $(use_enable test unittests) \
$(use_enable test coverage) \
$(use_enable zstd)
}
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 3f77884a0e91..97c16a70536d 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,4 +1,4 @@
-DIST WireGuard-0.0.20180708.tar.xz 271816 BLAKE2B f8f8dd0ae90cc23fc0e8b339c97808d1dc81b5f245e08ec85b356391e3a7a84a61aded30295751e0fd63961214424bc1719ab8d9f85e5aff54dbe270fcbf215a SHA512 91e4eb5c863f7070dc139739bbb5f6ce5b7ff9e8bd293a6217e6b9ac8dcacc710c01bac9386df50bd1226f0534c5332f8e1e2c50e9483e167eac6345a616f6f6
-EBUILD wireguard-0.0.20180708-r1.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
+DIST WireGuard-0.0.20180718.tar.xz 272072 BLAKE2B da18f6ff6fcbe9c226ddf39a7137d7648647ae49be311b3b239af845b864403feaf226de7f148b9a6d67c6426d7f96d6c077286fd332bbdb98c913a3039ecd8f SHA512 38d7fa90ab7528c0f29e93c4b37c357e51f33061353c180044c50fe05a37874652b3cb179c80f17b8fe9dddbcb224253723ad730e2ad5649cb17ec9d32e8f9ca
+EBUILD wireguard-0.0.20180718.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
EBUILD wireguard-9999.ebuild 4720 BLAKE2B 4de715d72ccd551ee68eeab051ff9905323fe57d475e6c17ad39542c3c50416d0ff6cfa27c994afe1edf6277bdbd6bab9b3351d74cfcae5921f24c2c93f0cb36 SHA512 e71251e953b6046149d69b1168af47e20ae705c3822f8c80542388571e8677ddfe299eb46808ec462c8a13764fc939eafe7f51dcfa0d7e3aca7c6e153ba14c7b
MISC metadata.xml 765 BLAKE2B 4b3a03aea5271da19dddddfc4f7fa180c4b3b846bbe434786c3b3e7bbfb51424cf3be55877cf6b2af60559a456978946ed68354600e43fbb461d2000bd655b70 SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805
diff --git a/net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild b/net-vpn/wireguard/wireguard-0.0.20180718.ebuild
index e7bf51b60e9c..e7bf51b60e9c 100644
--- a/net-vpn/wireguard/wireguard-0.0.20180708-r1.ebuild
+++ b/net-vpn/wireguard/wireguard-0.0.20180718.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c359fd041deb..4de28f390642 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
Binary files differ
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 1987bebdd149..0cf69baae8bb 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,10 +4,10 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd
DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
-DIST gnuradio-3.7.13.3.tar.gz 4544605 BLAKE2B f059e8af860b7c18573f0efa909f3bf2b36b4d7208e26dd18a1c9de8cbf40e0d9079336f4a5f48430790e28dc21f5150ad2294fa1d664889c07e849d236160a0 SHA512 e4bf63899678fd792bc08baa2db673b192dc823d6e586124538cbdf12e60a882847e72cfca7f52ef906d52038a9cb48a8b5891593c9db1cb172c4077a54d4056
+DIST gnuradio-3.7.13.4.tar.gz 4546663 BLAKE2B 82ac5fcf0318825dbdb78be3e5a11a8372b0d2f8e12b955a7e13f6f7e885fda8ac31acbc8cb0b81159b124bcda955e4b7b2cb141c8c0d780122abf7dd33b5aa3 SHA512 85c265851b43d4b62590869c91a9b7b262601dce233515096f1a1e68a14ea2710f08cc07859326efdfde29a2f156477d3bbd42e3bdd9b8ac13f6769637bf794b
EBUILD gnuradio-3.6.5.1-r2.ebuild 5339 BLAKE2B 6e54dbf3381eed4556a52c1536ca36def8f724da6375140b06ddda7549c857d65ad029aa774326ab587edc82a0a804e009a72a6d12214bdfcacd2101608278ca SHA512 e632918a4543ea97158dd205548310bf268b295a69bbc288d1129c076c982b2bb87784ea7b519c0fa6a4fc7852cef2adbc444b68099a98929862105ea2351c7c
EBUILD gnuradio-3.7.11-r3.ebuild 7029 BLAKE2B 3d38a4b4288ef2d5d12a7433ee2ec2bffbc2a5cfe6cd70eee57c3eaf701122712d618490a2b460d2110a283e81085c1c2a7ddb40fd7ef73f6045b5d7211fe36f SHA512 647158607c8137ffd4a09344da964d22b9b800d5fb10c63451548292f6e3a8d173dee9d140cd2e7405af06819bd9b136e9dfdca33971c16f7a97297391a6b98b
-EBUILD gnuradio-3.7.13.3-r1.ebuild 7031 BLAKE2B d7ac48d383cac34bf4d92745d2c9091fadad1b155aee585146b74ea8afbcd657b4fc99888428af13fc7ee62f34c5c5938a012e4fb12639d951aeedc98b2193a2 SHA512 78ea71e611f844d87ad6fb030df53757d63b883369789329708aa718f325fe4b4a634f067853b093385c10a26ba47a35557982363f441c58d1bed11cf59d8427
+EBUILD gnuradio-3.7.13.4.ebuild 7093 BLAKE2B 75240f63afb6e8256621656d218fd72bf4a1d4a8fc57aaff363acdc0e126178f47e5f6478f432aeff7f33ce340c4586460c1f6ca1290bc4f599a6bdb559d9b25 SHA512 9c7e5906de9ff3828f7d9f6a9f396b33b9221a70889874e8e307e0562aee40ed016af605b12eea7edcbf3eee723cc09ec871316b8e980e70ef568cf70fdc25cf
EBUILD gnuradio-3.7.9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
EBUILD gnuradio-3.8.9999.ebuild 6654 BLAKE2B 2ecf927d0469ecd721e929ba77db619949cac4e11f2a4ee62e292cbcc6ac5c0969d8eae1d01b52f67756e6cc5165cadde94b7907658c950e181dff0107d893d6 SHA512 3a839947f80f483dc6e78b9b453c1f455c4be58a7a67cbf2b116bba7f2364c53485c6695bb236704ff5286fc28310fa8324b6a428b7d55105b393087069e340e
EBUILD gnuradio-9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild
index 64d520389a3a..eb3fe3b2645d 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.3-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.4.ebuild
@@ -219,6 +219,7 @@ pkg_postinst()
if use grc ; then
xdg_desktop_database_update
+ xdg_mimeinfo_database_update
xdg_mime_database_update
for size in ${GRC_ICON_SIZES} ; do
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
@@ -238,6 +239,7 @@ pkg_postrm()
if use grc ; then
xdg_desktop_database_update
+ xdg_mimeinfo_database_update
xdg_mime_database_update
for size in ${GRC_ICON_SIZES} ; do
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 44b3acadf3b7..36b2f8f7f347 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,10 +6,10 @@ DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076d
DIST unifi-5.8.24.zip 80086706 BLAKE2B 00530b5e141e9444120efeb6ea5b3106781fb5b15a1ade44b71675a726ae7245221af694b36a922a4d047f78567a7bd9e1354d6dde442dfccd58a49f87079403 SHA512 cf7145eeeed779893c1c9709eef7364154503dd1232f88cce38facc748426d19c5422decbd5e3a80d857a2d82969258045944b491c7b228467d8e4a7c29a0ec1
DIST unifi-5.8.25.zip 80091828 BLAKE2B f675ff304c2e7a87da7ed02bd4873015a1155949e6b3b2b4561db06565197e1660512cbea118a50bd975de7d6268a090fad6742e3a82bb4fdf20f19f39099ae2 SHA512 4572ebe55971d14ca76f39cf298eedf879c4ad597ac87e4fe13167f8219b8f822f3478002ccda7ca1d72daba05efa52932e6d163c1e2b5ac5d289020e351044f
DIST unifi-5.9.12.zip 103000745 BLAKE2B 30613f8ee9bf832f5303d02cc2719cb91358a558afe4f998541b890be6c152a62171ad1711e78fd0f2e011161d03cdb9afa9c8dffc3b553b9c7b637f61f12b10 SHA512 0f8c549dfc390d71e3f8a58c05647b3cd062a55de248128267dda3c079f744a810a0138016616d5be6b2e05ecd34149172efd369c1cf4c1e24735ba982c266cb
-DIST unifi-5.9.4.zip 102808708 BLAKE2B 3b1479bd65837667f2abff594426ecc3491475d1cf6d842d07cdc8868cabf59facc857263fcfb1ef30fdb8dbb4c0a037b7e04736b8debf0f4f795494fc62ee26 SHA512 01e2d8c2d48a552e3b5d03cb97b0241e0561a4c88e52f13ec2d2a8a8b7d75ba7d9eb7878e37876efe5581e439afaac359ae6e3e7b2bb3d0719ebdbb10b06778c
+DIST unifi-5.9.16.zip 103019203 BLAKE2B 0108626a318a728757b3cebed20f55e6059a7c28ebedd7331d760e2a0b90226656cd5fd919b7759ebd7335f5f58c5cfdcf2775dd1f55bf960e41b136cf867a32 SHA512 dadac87b1f7c4c33b0df2f6593fd8de16d82876777b35df63da273741240e7881559b7ccea5a1dbc05d5d386bfd8fd8e908be09f390f044b2001b1b7d358a49f
EBUILD unifi-5.6.39-r1.ebuild 1729 BLAKE2B 77a4fb38b6e82763f83f072d595e3f39306aed4ce39f98bfe6783e85eb1c83ab0fc996e94d25b86cd4bad196ae898dace5eb7469147cb3394cda1699ffec1900 SHA512 4415d13c43c30238c756542f6931c12bb6cbcd0163cb6e2c522b6adef39f0c5d3c069d25facdb12575fc0463a8aa3fd479f3274009083a645139d656ce998ae2
EBUILD unifi-5.8.24-r1.ebuild 1842 BLAKE2B 8466414f125504262ead905b6d90ac645b3876a5f8bb53b1fb3fed1a221575ca4632b6b3388f8326d92d8c6fae072ad68c21bd85ddf17c0823b2e5db7abda936 SHA512 42bcec2f8f3193bbcaa6569461917fce094135640ea4139b84d9d858d7d992b9fababc4287911cf2d40f322abbf7ea7df2d07a521200e9167f01b98da7fe426d
EBUILD unifi-5.8.25.ebuild 1853 BLAKE2B dab351e3ae3b414f81d1b95bdef4d2a1fa406f804dc6d0331169e14138f5436d092803bb8ea86f7000b9d7a9b032dd1995da8130233c3f5db013a0e7bd7e1abf SHA512 cf2b4a2639c1bb4ef8cb73ca9bae37955f3d12e661f2fcf0187b1a880ff3eab67bab41b3292868940f27cf701eedc31a322cd19a0c80686e7bba5a9f7ebf2cc0
EBUILD unifi-5.9.12.ebuild 1728 BLAKE2B 6ace4dd6ad55debae44bb45cce168c18ed87f15c884c121e19c97369df163fba45dd41b342ea124e7a95d59e6b3258991d6bc948dd474a2f9ee6dff538a1081b SHA512 e4cfb1a314dc146bd6032a6e8f88781653a6f9c41c4c06fb94324955d89076673f868aabed117d0d933c5cc3a839ae2da5f40f1bc4cae66fd395666173074155
-EBUILD unifi-5.9.4-r1.ebuild 1727 BLAKE2B 8aca9dc5cd7ec20467bffd5f6d13a3818391383cb39b8bcc0f3b30fb4d4c26f8a3b92dfefc2c9b9b77d17a52a4d1bb1413ff51d6786f55cd910a666b13ebad96 SHA512 cd8b6b98ee2d203ae806572131c2985badf1e9252374ac7ef1051a97a99feb4b830bfe19ff60d09c450076c73f93948e9746a4115bd1285622e199bad4bc2926
+EBUILD unifi-5.9.16.ebuild 1727 BLAKE2B 892541030e230cf1eff9031e07a7ee31901b2d85ad0c21b8009bab3387fab1f84f4eecc2c841b5d36ca5f44e08e0f4b1b90a81a5f124eaeffc45d45e0424f3b1 SHA512 757ba4eee8b8d40af1d1153e7902ee23b5b632b1dc4eec8c92bb3f0800550ce54711c6a3e7881c26582fe16eefea794df735cafb34f4bff01eead51aad783238
MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.9.4-r1.ebuild b/net-wireless/unifi/unifi-5.9.16.ebuild
index c678667c4e7f..75e6ef934730 100644
--- a/net-wireless/unifi/unifi-5.9.4-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.9.16.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-b647df56b7"
+RC_SUFFIX="-23dd7b8e57"
inherit systemd user