diff options
Diffstat (limited to 'net-analyzer/nload')
| -rw-r--r-- | net-analyzer/nload/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch | 26 | ||||
| -rw-r--r-- | net-analyzer/nload/files/nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch (renamed from net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch) | 18 | ||||
| -rw-r--r-- | net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch (renamed from net-analyzer/nload/files/nload-0.7.4-tinfo.patch) | 4 | ||||
| -rw-r--r-- | net-analyzer/nload/metadata.xml | 3 | ||||
| -rw-r--r-- | net-analyzer/nload/nload-0.7.4-r1.ebuild | 34 | ||||
| -rw-r--r-- | net-analyzer/nload/nload-0.7.5_pre20180309.ebuild | 36 |
7 files changed, 50 insertions, 73 deletions
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest index ccef984f664b..492a7ee2de73 100644 --- a/net-analyzer/nload/Manifest +++ b/net-analyzer/nload/Manifest @@ -1 +1 @@ -DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af +DIST nload-0.7.5_pre20180309.tar.gz 43405 BLAKE2B b5d8aeffc5de52c8574a8d11f133b2c5a38d09fd5a1abb75e2a9ea99551b018947844348ab73a26d806c575a387f1d4a5354144612ac7ea0f45bab5bd7d05115 SHA512 5942d706ac1f8acf57c832ee832a6b96add3c3d80fb45d3a5f6eb2397d20d49c4cc52e754328259bb52b06bd4e4b15e92d86103a531ae4ac546fcb87e3e5131b 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 deleted file mode 100644 index 8d13545c786c..000000000000 --- a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.5_pre-Makefile-spec-don-t-compress-man-page.patch index 705f92ea0e81..ff97f7004f94 100644 --- 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.5_pre-Makefile-spec-don-t-compress-man-page.patch @@ -1,4 +1,6 @@ -From 04d5af489f998568553dc54f39c56ef740a27f1b Mon Sep 17 00:00:00 2001 +Upstream: https://github.com/rolandriegel/nload/pull/4 + +From 096df0d1282a8c8c535e730d28fe281ea290b58d 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 @@ -21,17 +23,13 @@ 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 +index 706636e..9032a02 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,11 +1,3 @@ @@ -41,19 +39,19 @@ index 646d438..9032a02 100644 - -install: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 -- $(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1 +- $(INSTALL_DATA) $(top_builddir)/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 +index 794e5e7..29ab486 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 + %doc AUTHORS COPYING ChangeLog README.md %attr(0755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1* @@ -61,5 +59,5 @@ index 36496fd..53f6f19 100644 %changelog -- -2.16.4 +2.43.0 diff --git a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch b/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch index dcab6ec324f4..caf67cc76b8e 100644 --- a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch +++ b/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch @@ -1,5 +1,5 @@ ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -70,6 +70,7 @@ esac diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml index e65b0f97552c..501eefa5b6cf 100644 --- a/net-analyzer/nload/metadata.xml +++ b/net-analyzer/nload/metadata.xml @@ -13,4 +13,7 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">rolandriegel/nload</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nload/nload-0.7.4-r1.ebuild b/net-analyzer/nload/nload-0.7.4-r1.ebuild deleted file mode 100644 index fd389da2dfc6..000000000000 --- a/net-analyzer/nload/nload-0.7.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 -} diff --git a/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild new file mode 100644 index 000000000000..0764502dec28 --- /dev/null +++ b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +GIT_REV="8f92dc04fad283abdd2a4538cd4c2093d957d9da" + +DESCRIPTION="Real time network traffic monitor for the command line interface" +HOMEPAGE="http://www.roland-riegel.de/nload/index.html https://github.com/rolandriegel/nload" +SRC_URI="https://github.com/rolandriegel/nload/archive/${GIT_REV}.tar.gz -> ${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}"/${PN}-0.7.5_pre-tinfo.patch + "${FILESDIR}"/${PN}-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch +) + +S="${WORKDIR}/${PN}-${GIT_REV}" + +src_prepare() { + default + sed -i \ + -e "/AC_INIT/ s/0\.7\.4/${PV} (Gentoo)/" \ + configure.ac \ + || die "Failed to patch configure.ac" + eautoreconf +} |