gentoo resync : 14.12.2020

6 files changed, 118 insertions, 58 deletions

diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index d2fb82b88850..bb32730231a2 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,8 +1,9 @@
 AUX wavemon-0.6.7-dont-override-CFLAGS.patch 295 BLAKE2B 367667b2d8db179c198f2bf02183f3e65afb5e32fdf0d0bc5229b1fda1e68280a2c8b4caa24204e13fae91d05e4b3c38c08f5eff5eeb81d9d458637305d1748f SHA512 1837707455d1718e3a067f5799e8c627f536d91ed75a9ab3c1cf432337776a41680214093be8863b158be5ddff305281fabac0b38d657bb9c3a1a9a72060c32e
 AUX wavemon-0.7.6-ncurses-tinfo.patch 669 BLAKE2B 78d027ef6ca14fda651cb6fa06563f9f60c339af8567b0e743dff2975b812198b4ad2166fa59fd28219dfd51c0983eb4890719718412459d733c78ae6154e0d9 SHA512 46e43f1eef87a4a81cf812f7e576f0c7d8e867fcda6494a81aaf5c45609ae0b4ef4f21f671cfc4d763700ae2eb198c7c8d3d52de95ec0416f9b1e675077de2a1
 AUX wavemon-0.8.0-build.patch 945 BLAKE2B 149355ed7a956d230014e8957efc71bff787d1c6890bd277fc64bfe83c8acdd8cb844d071cdabd0c470465443404b279a600d0dd02b9e8d136ed68d088a58015 SHA512 0c1463974431f51fea24ceb14de785012b89c7d8901d91a50979fdc07d2b11bf7980312b6006ec6f1d2bdaca768d2a947820b5fc6429d361dd6ad957b3798ac2
-DIST wavemon-0.7.6.tar.bz2 116194 BLAKE2B 3295214bbddb3dcc3b530691854d2b10797fcc2ede49edc810dec34779a25fbfe27db14b0bae05732d372389732f679c3bee9b308cff7e403188ba2aca8aa3a3 SHA512 95f47204e50c1a44a2230e2d8cbed90d76e53f5e674f6f54f64ba6c99590c90213d9422e62951d55bcf4c8e2325e63e6a7c0c7d1b14a4120d5f0d291dc36cd68
+AUX wavemon-0.9.1-build.patch 1407 BLAKE2B 55ab2df35083d2ce08c8a0b0a1a48605b0c7d62254cc0622a298cdd6bcbd61b3845f8175bdbb9505ec31032b3649fd4fb49cb2739c4456496f8366ff2df85422 SHA512 5364a9a35d7c4fc7dbf4822d177dfd39bb36405453aae5d5844a1b23291a3e83a7ffc4da9dcd7d7d5ae62ffd906626e47331148e4d1b5770626464b6865465e6
 DIST wavemon-0.8.0.tar.gz 196353 BLAKE2B 90d358d325b62ba9379ea525c4399e38c38043e67460b20188c4d81261d290e8e3f154a33240882f8b2611e4db1862d7bd33c87e168569be9d751d431602da81 SHA512 2df48eb300e9b30e0cb7a0ab41ba5e10b2a6e8170dbd11a4c978462c8cd6dc1171f79ceadfdb7344c495420a4e87b7dd723efea4f1af59a6d0312d93049ee798
-EBUILD wavemon-0.7.6.ebuild 1223 BLAKE2B 8ec451c99e6df2aac7020c3e3c5a12da559982931d45b1812383387c88147429221ce5c744e02ef5370e8abe5cb37a68c4d5118ad9a6af7b240ccec08006d757 SHA512 a56ccb77b64e60b488c4ce8e23b53238fcf6f38441fd27969cfc75c5ae9dc76e0305d56a84a50408a5e66eb8a9824ef8ae85127ca354f57519cb31b29d5ac11b
-EBUILD wavemon-0.8.0.ebuild 1125 BLAKE2B b916b18a0e6d2122f723ee773fe4251b6490893c336005b67a2333e9c2593efa40df93c8f226f47cdab11854b3c866ead08d7ede651169ed77e5d65d0fcbe188 SHA512 5ae69e57b572b0e4dcae964e3a53a7559e3e375b22a5b636dfd6b2b90f94b116fae047e17f1bd443fb2594c32aa816d481bdd87b6c1426ab83b45ce14c03fcb8
-MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
+DIST wavemon-0.9.2.tar.gz 202575 BLAKE2B 0a1afe1081bbbeb2ba0fec4741df7da846b65bbf182e886b2185c5e406258a1ecf912509b1a8f4862f37ba92832240dc6db4305a8d5cfb6f4876f3e93b04ccc7 SHA512 f1ee2e4602e93f0639c10067d23df021101bfc0496e53b221cd1553ebc90876cdd963cd64d5ef503da6d4dc4fbcf640e78873df1bdf64272e70dfa3c53ec1706
+EBUILD wavemon-0.8.0.ebuild 1117 BLAKE2B d5579023a508f8439a2b39447214191a580ef50c8213d3d71ebd90d21f7264e5c94f8ce0c1aba9afa66f12d8ea205adf7189fb20d1343d85f026431d5e92527f SHA512 6780e4604e73619ff09aaa2902d84b51d137c476a70dee744bd14ccf2063e4e235b166065e4dda5fc178db949d2fbe8693bb5c326f4824c3c43a56f19d7a9d4b
+EBUILD wavemon-0.9.2.ebuild 1161 BLAKE2B aac1911ab095eeb2d41a95cd6db61376563dc88dcfbab5ad5cf80114233661ca81105746fae0cd9a7d9ff130a51c0a8a38efbdb44f7429ed2d9438145046b9cb SHA512 14001971ea214960261774f36fd52db37d42cddebbf23587c5eb2a8447cddd4367e37ee79338cf0b06747df250dbf8b043c83d8949eb4a5dbf745b5ce7a6d992
+MISC metadata.xml 445 BLAKE2B a794776afac9b415fbddd75844766c3ab9c93019e549b31c593f7389c1be40a5b47a558aba8f2b7193daa6946e96788be52a744de118a1d513552d20b345960e SHA512 8162bf5d00d03cca9b009ecab83aa0f28f770d8a1774b69767ea2747e095a0c650ea54595d4e6cc2fd1e03c3bef72dbfdd5a6fef067e4264b235d070c9954f2a
diff --git a/net-wireless/wavemon/files/wavemon-0.9.1-build.patch b/net-wireless/wavemon/files/wavemon-0.9.1-build.patch
new file mode 100644
index 000000000000..2a63694e10fc
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-0.9.1-build.patch
@@ -0,0 +1,48 @@
+--- a/configure.ac	2020-05-17 14:27:27.982637232 +0200
++++ b/configure.ac	2020-05-17 14:29:33.157206097 +0200
+@@ -8,8 +8,6 @@
+ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_FILES([Makefile])
+ 
+-CFLAGS="-O2 -Wall"
+-
+ # wavemon is only supported on Linux, warn user about futile compilations
+ AC_CANONICAL_HOST
+ case "$host_os" in
+@@ -22,12 +20,15 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ 
++PKG_PROG_PKG_CONFIG()
++
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS([ncurses.h fcntl.h netdb.h sys/ioctl.h sys/time.h unistd.h\
+ 		  net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
+ 		 [], [AC_MSG_ERROR($ac_header not found)])
++PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
+ 
+ # linux/if.h needs 'struct sockaddr'
+ # linux/wireless.h in turn depends on linux/if.h
+--- a/Makefile.in	2017-07-14 21:35:18.154423280 +0300
++++ b/Makefile.in	2017-07-14 21:35:34.613402738 +0300
+@@ -9,7 +9,7 @@
+ install-suid-root: exec_perms = 4755
+ 
+ CC	 ?= @CC@
+-CFLAGS	 ?= @CFLAGS@ @LIBNL3_CFLAGS@
++CFLAGS	 = @CFLAGS@ @LIBNL3_CFLAGS@
+ CPPFLAGS ?= @CPPFLAGS@
+ LDFLAGS  ?= @LDFLAGS@
+ DEFS	 ?= @DEFS@
+@@ -25,8 +25,7 @@
+ DOCS	= README.md NEWS THANKS AUTHORS COPYING ChangeLog
+ 
+ %.o: %.c $(HEADERS)
+-	@echo ' CC  ' $<
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
+ 
+ all: @PACKAGE_NAME@
+ @PACKAGE_NAME@: $(MAIN) $(OBJS)
diff --git a/net-wireless/wavemon/metadata.xml b/net-wireless/wavemon/metadata.xml
index 5b159fbcadd1..01ca45ef80d8 100644
--- a/net-wireless/wavemon/metadata.xml
+++ b/net-wireless/wavemon/metadata.xml
@@ -2,7 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
+		<email>alarig@swordarmor.fr</email>
+		<name>Alarig Le Lay</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">uoaerg/wavemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/wavemon/wavemon-0.7.6.ebuild b/net-wireless/wavemon/wavemon-0.7.6.ebuild
deleted file mode 100644
index 7ec63ce5a34d..000000000000
--- a/net-wireless/wavemon/wavemon-0.7.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
-HOMEPAGE="http://eden-feed.erg.abdn.ac.uk/wavemon/"
-SRC_URI="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc sparc x86"
-
-IUSE="caps"
-RDEPEND="sys-libs/ncurses
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.7-dont-override-CFLAGS.patch"
-	"${FILESDIR}/${P}-ncurses-tinfo.patch"
-)
-
-src_prepare() {
-	# Do not install docs to /usr/share
-	sed -i -e '/^install:/s/install-docs//' Makefile.in || die 'sed on Makefile.in failed'
-
-	# automagic on libcap, discovered in bug #448406
-	use caps || export ac_cv_lib_cap_cap_get_flag=false
-
-	# Respect CC, fix linking
-	tc-export CC
-	append-ldflags -pthread
-
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	# Install man files manually(bug #397807)
-	doman wavemon.1
-	doman wavemonrc.5
-}
diff --git a/net-wireless/wavemon/wavemon-0.8.0.ebuild b/net-wireless/wavemon/wavemon-0.8.0.ebuild
index 41c777d9a084..4bdefdd7cf5c 100644
--- a/net-wireless/wavemon/wavemon-0.8.0.ebuild
+++ b/net-wireless/wavemon/wavemon-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc sparc x86"
 
 IUSE="caps"
 RDEPEND="dev-libs/libnl:3
diff --git a/net-wireless/wavemon/wavemon-0.9.2.ebuild b/net-wireless/wavemon/wavemon-0.9.2.ebuild
new file mode 100644
index 000000000000..63fb2ad9d14b
--- /dev/null
+++ b/net-wireless/wavemon/wavemon-0.9.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
+HOMEPAGE="https://github.com/uoaerg/wavemon/"
+SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+IUSE="caps"
+RDEPEND="dev-libs/libnl:3
+	sys-libs/ncurses:0=
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( COPYING README.md THANKS )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-build.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~CFG80211_WEXT"
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Do not install docs to /usr/share
+	sed -i -e '/^install:/s/install-docs//' Makefile.in || die \
+		'sed on Makefile.in failed'
+
+	# automagic on libcap, discovered in bug #448406
+	use caps || export ac_cv_lib_cap_cap_get_flag=false
+
+	# Respect CC
+	tc-export CC
+
+	default_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	default_src_install
+	# Install man files manually(bug #397807)
+	doman wavemon.1
+	doman wavemonrc.5
+}