gentoo resync : 20.03.2021

6 files changed, 28 insertions, 376 deletions

diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index 5516b113052d..8b85b52bd958 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,8 +1,6 @@
-AUX bwm-ng-0.6.1-fix-buildsystem.patch 3173 BLAKE2B 6484e256f77efdfcf7e52bb4137601d214a099c0ace750f326a2b3c21acce57e107354cc9fb4fb175b4b10c0ede098c88db7d1ab91aba1f0a15dcb764dc3e554 SHA512 5d58ef94633a65629485a6742b70e8eb819435957604c7877bcdeb1a842f6ad0a6cd99cf1d90572c9254ea6d9aaf431a4328cfab32809fa2654194486084520e
-AUX bwm-ng-0.6.1-static-inline.patch 9852 BLAKE2B df28ff66f2ccdac422803b119ddbd3385cabb615a8e50233162e82277e7a0ad6a99313e49689237ec82bd54c12edbbde2db6a72c90bcf0590397c8f21dd173bc SHA512 75c7f52121c8f05737f59c96c99c8e9f4fd72209007ea2b9884ac2aeaa151431475d70f312b41100993d6bd4f16e430b2a79628b37c249344be8ab4ed5f2d2ba
 AUX bwm-ng-0.6.2-tinfo.patch 274 BLAKE2B 9c4d5e5f94aab191fd6f68488a5ed48c08fec6520058c42e517f80dffae1bb15d063e32adbf1688929a21da5af78374e1966b4f0c29e0ad0b7b0b50c9844182d SHA512 47f601284da95f3148322157292a86f425cc4846d17547025fd5677e6ffc8b2f6f01cdf4403cf6ca5d701b0ab322ce9c345e26e3382afc6dea189afaa57b77aa
-DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd
 DIST bwm-ng-0.6.2.tar.gz 70079 BLAKE2B 4e0c5dd73bdcaabf5138ce842e5ce50709ba3bc0792f11ebee2640b6246f5bd740fcf8ad79b7dcffabdbc8f44c5ec2d925b20cf28609f8735e537f6920f92aba SHA512 4a7f141692f96dfab0c1729a7df36f5213a75ddb891b967b2cf951419daea7b84354c276705a0ee7c09f4ed26948ca068f65a04b8f9d18b2b8ed2df97b5e3b0a
-EBUILD bwm-ng-0.6.1-r1.ebuild 741 BLAKE2B fd85473caf7dd8e2e969ef87c0add7359ee90c32ccc92e5f69b77453976b5fa823756af1b45fce884ced51ad4f94d6d435a209c251869ab1a39952b5c8b8ba0b SHA512 8d816d7b53c86f03170db7753cbd5ecaddf7bf1c2e794aaad963116fb7caac698fdc5acc5e5077b61d2f7c54316e15c08ed20d650366d18c9af461f94f3da19f
-EBUILD bwm-ng-0.6.2.ebuild 702 BLAKE2B f254640c5d92d6c0117cc5cf466b3b4710c6ea4d9fbe2eea5d919f14b295c719fbd797decd1c72d75c71b1d6df1904d254906bfb18faf053b89d103abe67c159 SHA512 552032878a9f18660318a343b8fed3b0004b873cfe8d36b2dad7914b64f8c04b1ef55497f216ab01652cd2c4e8a118c4f9a436cd1cc33a6a3c2d31b229202b9b
-MISC metadata.xml 373 BLAKE2B 81fc968d44df8cb58d98e139757ec6290640c64702c7b184123cf6e9edcc330d7789099453bb6865d728779fcb674080be65b86c68f1f1cdeda2e05068d7ccd9 SHA512 cab403ed79bc8eedcbff2160e8cc0af1c9ef4e8a4311a81b51e201537b22344d1d2ee8f18d96b9fcb23118ba60443f87461c1b471aae42119ae99eeb6d440bc0
+DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8
+EBUILD bwm-ng-0.6.2.ebuild 699 BLAKE2B 6b4d4ba5ccc497d0193500eac4812a8927737f24c017a3e9e8de2ffa20e9bef87f10c06305d1712c4031653db870b04616f5c333244382dba8bb00d6184ae45d SHA512 3600129dc614250c3617f2c526605e9f8acabbd50d9bf03b8933f5325babdcaecaaeb8ed96b02838b082cbcbc13d5cbce638f45be50240bec8f664efcd8c6bd1
+EBUILD bwm-ng-0.6.3.ebuild 701 BLAKE2B 85e6fdb19c20230b7865e57399e8f247a9bf997ea9c80bb264b4155a9b22d04a8ce80d47e9d573d713f2820b5cce756e0a9f6a2801cc7fdf4edf9da7bb4064d0 SHA512 b1910b155acc1dc077e33aa395b10c0da314fd63dabe607596a7926073479568e147c75947760fbd0376c7aa4cffa7c5c9d20391a984d05132c5edc120ae1421
+MISC metadata.xml 463 BLAKE2B 1bbaff010b068efc83f690257a28b0a57b564c353f525f9b62764d2f241f8ebf43a10afab26eb2d787af2f4e0fde956df4c02ffea1529e7ec0fc1ccb5faf0a77 SHA512 af0924dc4db40f48722b0ff91c605f978d59166d51c0e7550ea460bcc9f498e9d0ec432d0e546ebdec39c8204c8c30caf6e5dd85d868eedaf7e1bac253312d74
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
index 23c71582d272..2b7bf683dc9e 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth
 HOMEPAGE="http://www.gropp.org/"
 SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+csv +html"
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild
index 51311ad80550..d7770f571f23 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
-SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
 HOMEPAGE="http://www.gropp.org/"
+SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="csv html"
+IUSE="+csv +html"
 
-RDEPEND="sys-libs/ncurses:0=
-	>=sys-apps/net-tools-1.60-r1"
+RDEPEND="
+	>=sys-apps/net-tools-1.60-r1
+	sys-libs/ncurses:0=
+"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-buildsystem.patch
-	"${FILESDIR}"/${P}-static-inline.patch
+	"${FILESDIR}"/${PN}-0.6.2-tinfo.patch
 )
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -33,6 +33,6 @@ src_configure() {
 	econf \
 		$(use_enable csv) \
 		$(use_enable html) \
-		--enable-ncurses \
+		--with-ncurses \
 		--with-procnetdev
 }
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
deleted file mode 100644
index 04c14392d66a..000000000000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-* Fix broken buildsystem
-* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
-https://bugs.gentoo.org/show_bug.cgi?id=561718
-
---- a/configure.in
-+++ b/configure.in
-@@ -3,7 +3,7 @@
- 
- AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng])
- AC_CONFIG_SRCDIR(src/bwm-ng.c)
--AM_INIT_AUTOMAKE([gnu])
-+AM_INIT_AUTOMAKE([gnu subdir-objects])
- AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR(./)
- AC_LANG([C])
-@@ -28,44 +28,12 @@
- AC_CHECK_TYPES(unsigned long long)
- 
- # Checks for libraries.
--CURSES_CHECKED="0"
-+AC_ARG_ENABLE([ncurses],
-+	AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
- 
--AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--    OLD_CPPFLAGS=$CPPFLAGS
--    if [ test $withval != "yes" ]; then
--        CPPFLAGS="$CPPFLAGS -I$withval"
--    fi
--    AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--    CURSES_CHECKED="1"
--else
--    CURSES_CHECKED="1"
--fi  
--])
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[
--if [ test $withval != "no" ]; then
--    OLD_CPPFLAGS=$CPPFLAGS
--    if [ test $withval != "yes" ]; then
--        CPPFLAGS="$CPPFLAGS -I$withval"
--    fi
--    AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
--    CURSES_CHECKED="1"
--else
--    CURSES_CHECKED="1"
--fi
-+AS_IF([test "x$enable_ncurses" != "xno"], [
-+	PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])])
- ])
--fi
--
--
--
--if [ test $CURSES_CHECKED != "1" ]; then
--AC_CHECK_LIB([curses],[initscr,timeout],,[
--	AC_CHECK_LIB([ncurses],[newterm,timeout])
--])
--fi
- 
- AC_CHECK_FUNCS([wattron])
- AC_CHECK_FUNCS([curs_set])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,12 +2,10 @@
- 
- bin_PROGRAMS = bwm-ng
- 
--bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c
-+bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
- 
--EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
--
--bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
--bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
-+bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@
-+bwm_ng_LDADD = @NCURSES_LIBS@
- 
- noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
- 
---- a/src/defines.h
-+++ b/src/defines.h
-@@ -48,7 +48,7 @@
- #define LIBSTATGRAB
- #endif
- 
--#if HAVE_LIBCURSES || HAVE_LIBNCURSES
-+#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES)
- #define HAVE_CURSES
- #endif
- 
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
deleted file mode 100644
index 88e15ecefe3f..000000000000
--- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Make all 'inline' functions 'static inline' such that
-the compiler can emit definitions when needed.
-http://www.greenend.org.uk/rjk/tech/inline.html
-
---- a/src/bwm-ng.c
-+++ b/src/bwm-ng.c
-@@ -26,7 +26,7 @@
- 
- /* handle interrupt signal */
- void sigint(int sig) FUNCATTR_NORETURN;
--inline void init(void);
-+static inline void init(void);
- 
- /* clear stuff and exit */
- #ifdef __STDC__
-@@ -98,7 +98,7 @@
- 	deinit(0, NULL);
- }
- 
--inline void init(void) {
-+static inline void init(void) {
- 	if_count=0;
- 	delay=500;
- #if EXTENDED_STATS	
---- a/src/help.c
-+++ b/src/help.c
-@@ -24,9 +24,9 @@
- #include "global_vars.h"
- #include "help.h"
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
- #ifdef LONG_OPTIONS
-     printf("  %-23s",long_c);
- #else
---- a/src/options.c
-+++ b/src/options.c
-@@ -30,12 +30,12 @@
- char *trim_whitespace(char *str);
- int read_config(const char *config_file);
- #endif
--inline int str2output_unit(char *optarg);
-+static inline int str2output_unit(char *optarg);
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg);
-+static inline int str2output_type(char *optarg);
- #endif
--inline int str2out_method(char *optarg);
--inline int str2in_method(char *optarg);
-+static inline int str2out_method(char *optarg);
-+static inline int str2in_method(char *optarg);
- 
- #ifdef CONFIG_FILE
-  /******************************************************************************
-@@ -65,7 +65,7 @@
- /******************************************************************************/
- #endif
- 
--inline int str2output_unit(char *optarg) {
-+static inline int str2output_unit(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"bytes")) return BYTES_OUT;
-         if (!strcasecmp(optarg,"bits")) return BITS_OUT;
-@@ -76,7 +76,7 @@
- }
- 
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg) {
-+static inline int str2output_type(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"rate")) return RATE_OUT;
-         if (!strcasecmp(optarg,"max")) return MAX_OUT;
-@@ -87,7 +87,7 @@
- }
- #endif  
- 
--inline int str2out_method(char *optarg) {
-+static inline int str2out_method(char *optarg) {
-     if (optarg) {
-         if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
- #ifdef HAVE_CURSES
-@@ -109,7 +109,7 @@
- }
- 
- 
--inline int str2in_method(char *optarg) {
-+static inline int str2in_method(char *optarg) {
-     if (optarg) {
- #ifdef PROC_NET_DEV
-         if (!strcasecmp(optarg,"proc")) return PROC_IN;
---- a/src/output.c
-+++ b/src/output.c
-@@ -25,13 +25,13 @@
- #include "output.h"
- 
- inline static const char *output_type2str(void);
--inline const char *input2str(void);
--inline const char *show_all_if2str(void);
--inline ullong direction2value(char mode,struct inout_long stats);
-+static inline const char *input2str(void);
-+static inline const char *show_all_if2str(void);
-+static inline ullong direction2value(char mode,struct inout_long stats);
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
- #endif
--inline char *dyn_byte_value2str(double value,char *str,int buf_size);
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size);
- char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size);
- 
- inline static const char *output_type2str(void) {
-@@ -59,7 +59,7 @@
- }
- 
- 
--inline const char *input2str(void) {
-+static inline const char *input2str(void) {
-     switch (input_method) {
- #ifdef SYSCTL
-         case SYSCTL_IN:
-@@ -121,7 +121,7 @@
-     return "";
- }
- 
--inline const char *show_all_if2str(void) {
-+static inline const char *show_all_if2str(void) {
-     switch (show_all_if) {
-         case 1:
- 				return " (all)";
-@@ -262,7 +262,7 @@
- }
- 
- 
--inline ullong direction2value(char mode,struct inout_long stats) {
-+static inline ullong direction2value(char mode,struct inout_long stats) {
-     switch (mode) {
-         case 0:
-             return stats.in;
-@@ -275,7 +275,7 @@
- }
- 
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-     switch (mode) {
-         case 0:
-             return (double)(stats.in/items);
-@@ -288,7 +288,7 @@
- }
- #endif
- 
--inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-     if (dynamic) {
-         if (value<1024)
-             snprintf(str,buf_size,"%15.2f  ",value);
-@@ -306,7 +306,7 @@
-     return str;
- }
- 
--inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-     if (dynamic) {
-         if (value<1000)
-             snprintf(str,buf_size,"%15.2f  ",value);
---- a/src/process.c
-+++ b/src/process.c
-@@ -26,19 +26,19 @@
- 
- short show_iface(char *instr, char *searchstr,char iface_is_up);
- #if HAVE_GETTIMEOFDAY
--inline long tvdiff(struct timeval newer, struct timeval older);
-+static inline long tvdiff(struct timeval newer, struct timeval older);
- float get_time_delay(int iface_num);
- #endif
--inline ullong calc_new_values(ullong new, ullong old);
-+static inline ullong calc_new_values(ullong new, ullong old);
- t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old);
- t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old);
- #if EXTENDED_STATS
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
- void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier);
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
- #endif
- 
- /* returns the whether to show the iface or not
-@@ -74,7 +74,7 @@
- 
- #if HAVE_GETTIMEOFDAY
- /* Returns: the time difference in milliseconds. */
--inline long tvdiff(struct timeval newer, struct timeval older) {
-+static inline long tvdiff(struct timeval newer, struct timeval older) {
-   return labs((newer.tv_sec-older.tv_sec)*1000+
-     (newer.tv_usec-older.tv_usec)/1000);
- }
-@@ -92,7 +92,7 @@
- #endif
- 
- /* basically new-old, but handles "overflow" of source aswell */
--inline ullong calc_new_values(ullong new, ullong old) {
-+static inline ullong calc_new_values(ullong new, ullong old) {
-     /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */
-     return (new>=old) ? (ullong)(new-old) : (ullong)((
- #ifdef HAVE_LIBKSTAT
-@@ -133,13 +133,13 @@
- 
- #if EXTENDED_STATS
- /* sub old values from cached for avg stats */
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-     values->in-=data.in;
-     values->out-=data.out;
-     values->total-=data.total;
- }
- 
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-     values->in+=data.in;
-     values->out+=data.out;
-     values->total+=data.total;
-@@ -148,7 +148,7 @@
- 
- /* put new-old bytes in inout_long struct into a inouttotal_double struct 
-  * and add values to cached .value struct */
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-     data->in=calced_stats.in*multiplier;
-     data->out=calced_stats.out*multiplier;
-     data->total=(calced_stats.in+calced_stats.out)*multiplier;
-@@ -198,13 +198,13 @@
- }
- 
- /* add current in and out bytes to totals struct */
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-     stats->in+=new_stats_values.in;
-     stats->out+=new_stats_values.out;
- }
- 
- /* lookup old max values and save new if higher */
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-     if (multiplier*calced_stats.in > stats->in)
-         stats->in=multiplier*calced_stats.in;
-     if (multiplier*calced_stats.out>stats->out)
diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml
index 7d30b17df0f1..95c98a2c1a89 100644
--- a/net-analyzer/bwm-ng/metadata.xml
+++ b/net-analyzer/bwm-ng/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use>
-<flag name="csv">Enable csv output</flag>
-<flag name="html">Enable html output</flag>
-</use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="csv">Enable csv output</flag>
+		<flag name="html">Enable html output</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">vgropp/bwm-ng</remote-id>
+	</upstream>
 </pkgmetadata>