gentoo resync : 21.06.2020

5 files changed, 17 insertions, 170 deletions

diff --git a/net-wireless/spectools/Manifest b/net-wireless/spectools/Manifest
index eed161c6b1e5..f8053cb32695 100644
--- a/net-wireless/spectools/Manifest
+++ b/net-wireless/spectools/Manifest
@@ -1,9 +1,5 @@
 AUX spectools-2011.08.1_p20140618-tinfo.patch 1502 BLAKE2B fb7e02e1218525173fac88fadd43ff0f545d2ce1f83e79f000c84a358117dbb673c106f7d67f3bc09cffd280ce0b66a2e7016cf6bf514255c41eaa37d0d4f09d SHA512 5e36ba51f10bd37dbfd2f5b398d3e1eaad5851cfff49767919136fd59516926a5a313ca23b205c281ccab722d304b533fc2baf8646d2127e7198a47b99071723
-DIST spectools-2011-08-R1.tar.gz 196001 BLAKE2B b1c1ba19090aaaf753ff161cafc80682ea2e42d40596613592f888e03df1cc8998291cd4c45cc784275d57a13c8a0e80eb2644ad166fc46453803718cacf2fbd SHA512 92c80b34049055cec6d677db165fb2d06d75fbff9f04d41ab81fa57900f639936e6a9a01f06165aea863b35760964016f0984f17816859d054bc9d14353e847b
-DIST spectools-2011-08-R1_p20140618.tar.xz 143644 BLAKE2B f3c106c380bb5545d05987a8e859cd5f5bc0cc3b51d5093b33c229ec9b02aa8359989f8b5f7c009d0975b0eb1b393bcc55d2ff09ea4335b79e4d50208c0abf34 SHA512 bf39953dc94815af1b670f079f7660d46cc8449adb379d0fc2755de5785c936730114aa66127f9cbd86f9a08b506382f5ec56f863d50d7d39f2597ba9b122330
 DIST spectools-2016-01-R1.tar.xz 120732 BLAKE2B ad937d7fc737729314ebce3c2615981ee33abee052778c7acebb15d7d33667062fce01515a8b41e18a15f3ca6214d0a818c79efe3b85929f67b18f1a06a78536 SHA512 59da488e08114018cd756d45f48541a26f643a3618bfbaec0e72c434c80e6cbc8b4f930476206c66af84ee574807e011489f884e96c7291c626b1b4e69619fad
-EBUILD spectools-2011.08.1-r2.ebuild 1513 BLAKE2B 07c3bb2ae1f70ef729db2c5fc0ce103a0092a545c544abeaaccae46fca44d7e0d128058a9b0375ed3c52c6d38049ff401f043076434f8d77b09368ebce3a9e8d SHA512 b4802c9763633c1cdf43007d5473f6c5632418d59b8eff1b65bed8c9bdb4c1adbb8c05c1de4a9e29f599267fa3b28a9b15262bed81284b1f955f46b43f5e2115
-EBUILD spectools-2011.08.1_p20140618-r1.ebuild 1727 BLAKE2B aece3fac5fd6df48e0326f0d9a1d89bf2ec2fe64593f64d388a1f47f6e0e6df327f293848aa6df20cdc12258d948ad39b2bfb45c1df643b034796fedaa9f08c2 SHA512 552a01d6d0d428b40b404ecdc6c2e2118bddaed0c14fcc665d99d66eecd8a43d4d0cacb9a90944cba5f0fc5f4fc8df76e2175c71dca8035f3e9602ea5d092937
-EBUILD spectools-2016.01.1.ebuild 1803 BLAKE2B 01ef6edb4a745d9fdec4ecb94c5dcfec59546caa4bbf4f20dcc93cfae270d08077fdac4d7de92c8a28aab087459f4c3361157018a6a35b6a7aa3a67ebc613ae9 SHA512 66441e3d7e51ce035c576f37ebb01387e4de4d71d7e44e764ce5c1043cc667932796a016413a1db8132b60e9bfd7e53332f81992071f24bcddd74142c7a068ff
-EBUILD spectools-9999.ebuild 1752 BLAKE2B af75fcdbbd14118bebe4e0b1af517378e0d4cc95310cdaea7d5cb5e717cd437789150ddf068da1dea47dbb2c7b57f58c414d4d7d9749a95fd30196785610e242 SHA512 a67d95443639ea64ad0f52dd2e347e9cccbc72a5b4dcdda094bd59ae4e7d11a5d647b8886fca19e401ff025791d29f9f577140a00057f0244f78fe7da9e9ef75
+EBUILD spectools-2016.01.1.ebuild 1841 BLAKE2B 0c9d7c4cfdec476fa67721d166d3d9b4a35b3e5a670bdbf4b13901508b4762a19fb2de11eacafeebf6251860cbe2836b1e510fd87da8b9f8673ccd3868a7e28b SHA512 3b3bb0b9654ac3810dedf39dc5f69677b9295884893fbaf5eeae1db995e949bbe16bea2b4b6bf148526d83e41a6f0df08c20ff05aa7743a1f67f2c2aa442cde7
+EBUILD spectools-9999.ebuild 1844 BLAKE2B b6348106f2a8812fc8f56f2f668d5221addef5a4672eef08bff68dbb814ecc6b16fa2dca7aaf60d3dd06b6b48e0cc7a7935c46f38ce1982357b9ce7143a85b50 SHA512 e00f0bad2abe1723c61aff08a8115dcab6a7e08efefba2cd9572c2a1d11f687dae30e8fd0be6b89bd6d6eabdfd0b23c5e878a6a15bf9b697823cfe1ad50171d5
 MISC metadata.xml 763 BLAKE2B 17a241b031619853a4929e392966d66038176dd23adcc0c1b76dd7ee31967f20d0ead6ee743b0c91d09c9e648c6a33fbb3d64d83399282c94622b5192de25113 SHA512 1c91361852fe2e5970a64ad1185c6fb751fa80ad89bcdfba9b8d6235172369649a124c702464f54f25c0bebd25b642a0d77f3e71b94bf2f689f28f40df11d553
diff --git a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild b/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
deleted file mode 100644
index 68f222743b44..000000000000
--- a/net-wireless/spectools/spectools-2011.08.1-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit udev toolchain-funcs
-
-MY_PN=${PN}
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-MY_P="${MY_PN}-${MY_PV}"
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.kismetwireless.net/code/svn/tools/${PN}"
-		inherit subversion
-		KEYWORDS=""
-else
-		SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.gz"
-		KEYWORDS="amd64 arm ~ppc x86"
-fi
-
-DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
-HOMEPAGE="https://www.kismetwireless.net/spectools/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ncurses gtk"
-
-RDEPEND="virtual/libusb:0
-	ncurses? ( sys-libs/ncurses )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream has still not migrated to the libusb-1 line.
-# Maemo: Add hildon and bbus
-
-# Please note that upstream removed the --with-gtk-version option
-# and GTK is now automagical. GTK1 support was also removed.
-src_compile() {
-	emake depend
-
-	emake spectool_net spectool_raw
-
-	if use ncurses; then
-		emake spectool_curses
-	fi
-
-	if use gtk; then
-		emake spectool_gtk
-	fi
-
-	#if use maemo; then
-	#	emake spectool_hildon usbcontrol \
-	#		|| die "emake spectool_hildon usbcontrol failed"
-	#fi
-}
-
-src_install() {
-	dobin spectool_net spectool_raw
-	use ncurses && dobin spectool_curses
-	use gtk && dobin spectool_gtk
-
-	udev_dorules 99-wispy.rules
-	dodoc README
-
-	#if use maemo; then
-	#	dobin spectool_hildon
-	#	dosbin usbcontrol
-	#fi
-}
diff --git a/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild b/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild
deleted file mode 100644
index 06dea1eb6b58..000000000000
--- a/net-wireless/spectools/spectools-2011.08.1_p20140618-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic toolchain-funcs udev
-
-MY_PN=${PN}
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-MY_P="${MY_PN}-${MY_PV}"
-S=${WORKDIR}/${MY_P}
-
-if [[ ${PV} == "9999" ]] ; then
-		EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
-		inherit git-r3
-		KEYWORDS=""
-else
-		SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${MY_P}.tar.xz"
-		KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-DESCRIPTION="Spectrum Analyzer for Meta-Geek Wi-Spy and GSG Ubertooth hardware"
-HOMEPAGE="https://www.kismetwireless.net/spectools/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug +ncurses +gtk"
-
-RDEPEND="
-	virtual/libusb:0
-	ncurses? ( sys-libs/ncurses:0= )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream has still not migrated to the libusb-1 line.
-# Maemo: Add hildon and bbus
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -std=gnu89
-	default
-}
-
-# Please note that upstream removed the --with-gtk-version option
-# and GTK is now automagical. GTK1 support was also removed.
-src_compile() {
-	emake depend
-
-	emake spectool_net
-
-	use debug && emake spectool_raw
-
-	use ncurses && emake spectool_curses
-
-	use gtk && emake spectool_gtk
-
-	#if use maemo; then
-	#	emake spectool_hildon usbcontrol \
-	#		|| die "emake spectool_hildon usbcontrol failed"
-	#fi
-}
-
-src_install() {
-	dobin spectool_net
-	use debug && dobin spectool_raw
-	use ncurses && dobin spectool_curses
-	use gtk && dobin spectool_gtk
-
-	udev_dorules 99-wispy.rules
-	dodoc README
-
-	#if use maemo; then
-	#	dobin spectool_hildon
-	#	dosbin usbcontrol
-	#fi
-}
diff --git a/net-wireless/spectools/spectools-2016.01.1.ebuild b/net-wireless/spectools/spectools-2016.01.1.ebuild
index 97fef673112a..afc2d7508c68 100644
--- a/net-wireless/spectools/spectools-2016.01.1.ebuild
+++ b/net-wireless/spectools/spectools-2016.01.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils flag-o-matic toolchain-funcs udev
+inherit autotools eutils toolchain-funcs udev flag-o-matic
 
 MY_PN=${PN}
 MY_PV=${PV/\./-}
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${MY_PV}"
 S=${WORKDIR}/${MY_P}
 
 if [[ ${PV} == "9999" ]] ; then
-		EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
+		EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
 		inherit git-r3
 else
 		SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
@@ -37,14 +37,15 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 # Upstream has still not migrated to the libusb-1 line.
+# Maemo: Add hildon and bbus
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch
+	eapply "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch
 	mv configure.{in,ac} || die
 	eautoreconf
-
 	# fix bug 577466 by restoring pre-GCC5 inline semantics
 	append-cflags -std=gnu89
+	default
 }
 
 # Please note that upstream removed the --with-gtk-version option
diff --git a/net-wireless/spectools/spectools-9999.ebuild b/net-wireless/spectools/spectools-9999.ebuild
index 4ad586a2983e..15ba5751de9d 100644
--- a/net-wireless/spectools/spectools-9999.ebuild
+++ b/net-wireless/spectools/spectools-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils toolchain-funcs udev
+inherit autotools eutils toolchain-funcs udev flag-o-matic
 
 MY_PN=${PN}
 MY_PV=${PV/\./-}
@@ -12,9 +12,8 @@ MY_P="${MY_PN}-${MY_PV}"
 S=${WORKDIR}/${MY_P}
 
 if [[ ${PV} == "9999" ]] ; then
-		EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
+		EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
 		inherit git-r3
-		KEYWORDS=""
 else
 		SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
 		KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
@@ -41,9 +40,12 @@ DEPEND="${RDEPEND}
 # Maemo: Add hildon and bbus
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch
+	eapply "${FILESDIR}"/${PN}-2011.08.1_p20140618-tinfo.patch
 	mv configure.{in,ac} || die
 	eautoreconf
+	# fix bug 577466 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
 }
 
 # Please note that upstream removed the --with-gtk-version option