gentoo resync : 29.08.2018

5 files changed, 137 insertions, 1 deletions

diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index 09358782b439..d06dff66ca4e 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -1,4 +1,7 @@
+AUX nload-0.7.4-Eliminate-flicker-on-some-terminals.patch 624 BLAKE2B acf0b86e62d7b243ecc96fb73bb84800b4c738761c976f02ad785ddcae27399c64e413b67c7bd1cbe5818da549f8e653c58e7854334157dc5cf17093cda43187 SHA512 f761605b66cdda1e17a508b9c2d532a3ea955a86f4eb4dc61ca00c2b51c162e57bb2d292d9232144ab67e52162cb58e73b6cd1e4bf6f1de003a2f72ac93e7199
+AUX nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch 2166 BLAKE2B f2c5ba5a5924bcaefe67665721ff9224944ee9af53be51869f0c0d45f447fdb7041181a5040bade84f01c3c22585865f3ac420a7c6a7320099a8b9cfc884d825 SHA512 c728d1fbf5aa3c97ff38fa9684230d5af3ccaac1240a915cbe603d5c04cd649a26ef4f2a37125514c7e4fd0afbb85404bbe412d783e934eed89ebad4fe718220
 AUX nload-0.7.4-tinfo.patch 264 BLAKE2B aa77538dd412c4956d61449e9c6494de70d42208d806e103a18d12e12751d7619483bb13dab1934b076e5aaf7ea7d3368c9a5b9403340dab7f03c5a0430b3bb0 SHA512 1191ef64ab895402a54d05e4b119627ddc6db884f8385493bf00c030d1c82b88fa77973e3d6ea0bf2e5e7211dc07ddec7d95e426a60d99f216b23b683fd8a83e
 DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af
+EBUILD nload-0.7.4-r1.ebuild 800 BLAKE2B c3280f3e60aca03eaf9e68520b9d46928391c6b54cf98ad335db8d230c86cf37f99a8e78bacd273c064174160a4790788e9c06691ee13ee7af514413adeadad0 SHA512 54bd673609ada21aedc8f691ba2c60004834f97de0c93167c88a37c2be09afae369021edb1dd1be812719dc54c615ddad52f73f44fe41b4d5f81f3744eac6439
 EBUILD nload-0.7.4.ebuild 673 BLAKE2B fe7f03aa294d9a7b2e3b977c3e5ecba64053010d62c3061903a86d83c706b8ddda54a2a1ded5158e39a67d48f545e4f33b5e90ecab8ffe63d4f7b2d845a261a9 SHA512 6b54b259b6abc6983d75091878ed82202015297c845aeff7933ed457f29c2abcacf7e0d5c03c8a56de467cfe908207d96c2d088d0084089dc63b9d54aa38c18d
-MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
+MISC metadata.xml 519 BLAKE2B 702f635b7c32996b4ce0dec2ab92b1fac1c8ccf196f8d0b70c877acc6c655bab342ccd633db3a8482832f18551c6c168ae46c8b7325520e9e49fed0580b2de69 SHA512 c80b5274a23376f9b3b78d2141c25310f06a5ba4764ddbe81cc539c0ebab04d536722205df8df04bd335958b25a5aa961ece41eaa89d8bab9a9a1880fb3302c6
diff --git a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch b/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch
new file mode 100644
index 000000000000..8d13545c786c
--- /dev/null
+++ b/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch
@@ -0,0 +1,26 @@
+From 8a93886e0fb33a81b8fe32e88ee106a581fedd34 Mon Sep 17 00:00:00 2001
+From: Roland Riegel <roland@roland-riegel.de>
+Date: Sun, 28 Jan 2018 16:59:39 +0100
+Subject: [PATCH 1/1] Eliminate flicker on some terminals like rxvt (thanks to
+ Alex Wilson)
+
+---
+ src/window.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/window.cpp b/src/window.cpp
+index bfa7701..2083fd0 100644
+--- a/src/window.cpp
++++ b/src/window.cpp
+@@ -108,7 +108,7 @@ void Window::refresh()
+ void Window::clear()
+ {
+     if(m_window)
+-        wclear(m_window);
++        werase(m_window);
+ }
+ 
+ // move and resize window
+-- 
+2.16.4
+
diff --git a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch b/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch
new file mode 100644
index 000000000000..705f92ea0e81
--- /dev/null
+++ b/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch
@@ -0,0 +1,65 @@
+From 04d5af489f998568553dc54f39c56ef740a27f1b Mon Sep 17 00:00:00 2001
+From: Andrey Mazo <ahippo@yandex.com>
+Date: Sun, 26 Aug 2018 00:00:35 +0300
+Subject: [PATCH 1/1] Makefile,spec: don't compress the man-page
+
+Package managers like to compress man-pages on their own,
+because the type of compression for man-pages is user-configurable.
+In particular, Gentoo [1] doesn't want packages to compress their man-pages.
+Gentoo Portage has workarounds for this,
+but this is not specified in Package Manager Specification and
+results in extra compression-decompression pass.
+
+RPM also compresses man-pages itself (in `brp-compress`)
+(and similarly recompresses them as needed)
+rather than relying on packages to install compressed man-pages.
+
+Automake can handle installation of man-pages without the explicit "install" target,
+so use the standard automake-provided way of installing man-pages.
+It's also smart enough to package `nload.1.in` automatically.
+
+Don't specify an explicit man-page extension in .spec file as recommended by Fedora.
+
+[1] https://github.com/gentoo/gentoo/pull/9543#issuecomment-415662844
+
+(cherry picked from commit 096df0d1282a8c8c535e730d28fe281ea290b58d)
+
+Upstream: https://github.com/rolandriegel/nload/pull/4
+---
+ docs/Makefile.am | 10 +---------
+ nload.spec.in    |  2 +-
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index 646d438..9032a02 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,11 +1,3 @@
+ ## Helder Correia <helder.correia@netcabo.pt>
+ 
+-man1_MAN = nload.1
+-
+-install:
+-	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
+-	$(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1
+-	gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1
+-
+-uninstall:
+-	rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz
++man1_MANS = nload.1
+diff --git a/nload.spec.in b/nload.spec.in
+index 36496fd..53f6f19 100644
+--- a/nload.spec.in
++++ b/nload.spec.in
+@@ -41,7 +41,7 @@ rm -rf %{buildroot}
+ %defattr(-,root,root)
+ %doc AUTHORS COPYING ChangeLog NEWS README
+ %attr(0755,root,root) %{_bindir}/%{name}
+-%{_mandir}/man1/%{name}.1.gz
++%{_mandir}/man1/%{name}.1*
+ 
+ 
+ %changelog
+-- 
+2.16.4
+
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
index 789a44405524..8e9e21d02085 100644
--- a/net-analyzer/nload/metadata.xml
+++ b/net-analyzer/nload/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>ahippo@yandex.ru</email>
+    <name>Andrey Mazo</name>
+  </maintainer>
   <maintainer type="project">
     <email>netmon@gentoo.org</email>
     <name>Gentoo network monitoring and analysis project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nload/nload-0.7.4-r1.ebuild b/net-analyzer/nload/nload-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..70abf3184dd5
--- /dev/null
+++ b/net-analyzer/nload/nload-0.7.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Real time network traffic monitor for the command line interface"
+HOMEPAGE="http://www.roland-riegel.de/nload/index.html"
+SRC_URI="http://www.roland-riegel.de/nload/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5.2:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-Eliminate-flicker-on-some-terminals.patch
+	"${FILESDIR}"/${P}-Makefile-spec-don-t-compress-man-page.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# --enable-debug means do not strip debugging symbols (default no)
+	econf --enable-debug
+}