gentoo resync : 08.01.2021

3 files changed, 3 insertions, 42 deletions

diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 2587547bb41c..decd22e8f1f9 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -4,8 +4,6 @@ AUX xoscope-2.0-man_no_-Tutf8.patch 369 BLAKE2B 7deae1551cda55e640f65f51ecf0f5e4
 AUX xoscope-2.0-remove_bundled_gtkdatabox.patch 6577 BLAKE2B 4e76e0eabbd7125be9a3c28eda71a9aa8f77f0d47bef3aeb00a5256ffffe70f12294ffab4a5365a30fa801bb0f82e05a6ed187c99c2f3c96bc9760426c1f39c7 SHA512 1a64615e99cfd160d28d9e1da04a000fe538b52b770b77db6fcbd907306aa67172c6848edccb6467f2b2e008bd243fc2c12949c91087fc17deb7b9bbc3980b9a
 AUX xoscope-2.2-fno-common.patch 489 BLAKE2B 3496854eb8a9437181178e7e78724a8fec2f11bbe2db0404395ccc09563219ce0088a14aef6494a518ed007c7a1892d81212e49020d5804ac20abaeeaa543be1 SHA512 bbc722fd45b999415e912a35ecf0be0ab9f8ec3e0d8a046bf3a094256d85eeb655d4a358b8dd942b9bafbd8175d8e3d0dfc74acb9ae4fd4d74498827ace5f42a
 AUX xoscope-2.2-man_no_-Tutf8.patch 421 BLAKE2B b8ba8523d7d6d717de4e4fb1a60061c1f929b095cdb9349b624ad589b39abae48f59cef33aa67486c3550594945b0260b8be494a950c6fad73dd597d1826b99d SHA512 54b39e8565cd464e014d111441edc8d191d85d07d4bd04679df3c771b9e28b3d7b619ae90ee532dcf8ebda6e79b5a3452130fc7157f79619e74cc8b3600d398d
-DIST xoscope-2.0.tgz 334875 BLAKE2B 67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
 DIST xoscope-2.2.tar.gz 307319 BLAKE2B 860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec SHA512 77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd
-EBUILD xoscope-2.0.ebuild 799 BLAKE2B e9ef29f04f320d4114604bd1b82d850d39e8bcc9ae2970ebb8cfea4c7b031c359457b64a824354945d8f8a47176effecf0529c2648dc61495f3e2588472bdb85 SHA512 9242f5d321c33ed88e6e30aab6f8b5b05ea34e2cdcba82e164b16591b7b76e1c147543f6859490221faa0da2ceb46a41e6452869241150c9c7c992e3f95907dc
-EBUILD xoscope-2.2.ebuild 710 BLAKE2B d6bca429d5daa8bca20fa69b6218927cd4e7915dc925bda2bfe6461ee0c67839c084a8fc3390901e3d9d99560684c2faf1b3beede76b79ce6a14f7bd2fc84f49 SHA512 d0f8d1620eb722fa462f1b4c493d901b5a4437aacf1616e0f5060bad18db227390a1435b83ee62f1109d2e29d032e286ed120bba35872b3de4d51ba8eb10ac45
+EBUILD xoscope-2.2.ebuild 709 BLAKE2B 8cbf12a760576fa752ee9fafdbb379e696a54800fe005fa1213dd47184e9cf53f7534151787ab93688e052b13a0b0a63a7674f4488a815b5c749b0ee30a458a8 SHA512 45ec7be58c88d3e889ef7623b35a5447b02185e5df68d5b6ab585dff8f6aed5b92210d008141a8cc85ae6063686884e93feecea75935bae72b5ad6bb41e999ae
 MISC metadata.xml 346 BLAKE2B 8403235f2a8a0d9f4d447bd869be01c1d3c631058d17866a8123f4434d67e487da9cbaa26ae398921dd75e3bcea34279eef96a837dae37dc50597a1ed9baef09 SHA512 c274d9938f31775989e53e8a66c470ef2df048a52b7934be3e0f8107784feb19160e9d93d2f970c84ad3b9d19da857be6ccfd6ae547ee71c8920f2f9430a7943
diff --git a/sci-electronics/xoscope/xoscope-2.0.ebuild b/sci-electronics/xoscope/xoscope-2.0.ebuild
deleted file mode 100644
index 8a8fe1e077b8..000000000000
--- a/sci-electronics/xoscope/xoscope-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils linux-info
-
-DESCRIPTION="Soundcard Oscilloscope for X"
-HOMEPAGE="http://xoscope.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtkdatabox
-	virtual/man"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~!SND_PCM_OSS"
-ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-remove_bundled_gtkdatabox.patch \
-		"${FILESDIR}"/${P}-man_no_-Tutf8.patch \
-		"${FILESDIR}"/${P}-implicit_decls.patch \
-		"${FILESDIR}"/${P}-comedi_compile.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	emake -j1
-}
diff --git a/sci-electronics/xoscope/xoscope-2.2.ebuild b/sci-electronics/xoscope/xoscope-2.2.ebuild
index 24225336dfde..433adcd9e38d 100644
--- a/sci-electronics/xoscope/xoscope-2.2.ebuild
+++ b/sci-electronics/xoscope/xoscope-2.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	sci-libs/fftw:3.0=