gentoo resync : 13.06.2020

3 files changed, 3 insertions, 47 deletions

diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index e4456e926fba..6401226708da 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,5 +1,3 @@
-DIST libspectrum-1.4.2.tar.gz 568052 BLAKE2B 84ffa5b2ac376c72d309c623610e5e30ebc98ab81a4505ffd88c8fc88145c6d63a112c60a57585c827b352e0a73ec330fc9f3601a714d1a6ad522cc40105d171 SHA512 391eb6fd805ab5a7ba5186ced8aa06be8b25973512860bfd0680585120a9617a1406f9327a7acb3ad7b7e473be8214c9b228d8b4adcf45a8bf3d3b6d27ee4d6f
 DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
-EBUILD libspectrum-1.4.2.ebuild 910 BLAKE2B 334a3b3005951bdebc9ed43cec776e0e09a7f059cf66665a4fdf6f2534c60692dd9ec95eaef3e888cd3358af813a22413339e9b000714aa3d2a4007b02df84cc SHA512 24c577692feff84a71731142e88f5937eb82a75ff7b3f60b5df4a7e8a0c10c9d307baaa312d0d8f519225d0f1a8abd17a3377f0922e6a59924d9a5440e06ae4e
-EBUILD libspectrum-1.4.4.ebuild 910 BLAKE2B 334a3b3005951bdebc9ed43cec776e0e09a7f059cf66665a4fdf6f2534c60692dd9ec95eaef3e888cd3358af813a22413339e9b000714aa3d2a4007b02df84cc SHA512 24c577692feff84a71731142e88f5937eb82a75ff7b3f60b5df4a7e8a0c10c9d307baaa312d0d8f519225d0f1a8abd17a3377f0922e6a59924d9a5440e06ae4e
+EBUILD libspectrum-1.4.4.ebuild 926 BLAKE2B 9ed5b4c42f0c7a37c5dae612d11c0797ce52067ba2dcdd370b84f6e5af247ab359f425372e113911ed599c9a20e03b2f2e4851bb6de89ffcdc1ba40987ac9549 SHA512 17f6ee52ce636a618161f098060acba77e4b079628a23d9a01b1ecbe74db7e611837e08c1916a3d8452d04f5e5d4b7b3abc8418e4d4c01c85b06a61f8c11b3ff
 MISC metadata.xml 941 BLAKE2B 7ac8ef35dfa24899f6990e5c92f5c2f70328575196308cd28f6dab967b9c39e73dabfea007c0cbf4a90bf73f5739d9c4a17b22cbe8c670b3a2d5531d47763520 SHA512 79cbe79daa7805ab944614d7d8370bc82e3ce6ecab7218112163ca118198bf176a1a06c87f8e24117f0a293d6dcc1cd0c02477e56655d66eb9b928c7ba7fabdc
diff --git a/app-emulation/libspectrum/libspectrum-1.4.2.ebuild b/app-emulation/libspectrum/libspectrum-1.4.2.ebuild
deleted file mode 100644
index 75e11f4bc844..000000000000
--- a/app-emulation/libspectrum/libspectrum-1.4.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spectrum emulation library"
-HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
-SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="audiofile bzip2 gcrypt zlib"
-
-RDEPEND="dev-libs/glib:2
-	audiofile? ( >=media-libs/audiofile-0.3.6 )
-	bzip2? ( >=app-arch/bzip2-1.0 )
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_with audiofile libaudiofile)
-		$(use_with bzip2)
-		$(use_with gcrypt libgcrypt)
-		$(use_with zlib)
-	)
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# check only builds test executable but doesn't run it
-	emake check
-	./test/test || die
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt *.txt
-}
diff --git a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
index 75e11f4bc844..7d6cd415f46a 100644
--- a/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local myconf=(
+		--disable-static
 		$(use_with audiofile libaudiofile)
 		$(use_with bzip2)
 		$(use_with gcrypt libgcrypt)