gentoo resync : 10.02.2019

3 files changed, 16 insertions, 44 deletions

diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index f4c8915675fa..5ab5cc753cdf 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,7 +1,5 @@
-DIST sidplayfp-0.3.3.tar.gz 454452 BLAKE2B d791698972bc8e4cc31c9c29b42f6af8a7024cb64bb9c3f24389bef01f1bd3d4c194eb84c82ebb85a73fd10e07a0fc2374afa38273aee0642a9ad3daaad59883 SHA512 f979af0c6ead38a9cd3a95cb27ebb26390506bbfbea192345f9873c62e064f18d7dc529ead22c35d46b4ebe8af6808d42f4d015d61ce48d7318daa1a7f613fbf
-DIST sidplayfp-1.1.0.tar.gz 221706 BLAKE2B d6c0b4a70872fab235a46783cf2ec077a5746c175fb6d2fcb5e057cb76f249a3a75c16ff0e3ebb0f2a2546e49ef8310b445c4b86c8ba262b6bef1d86895e6e48 SHA512 2e0986b9bb5b571e1e38c7e92b836a2e39f6dd84fd26161891b3117976c2d98e615e13819f68d0984094b085d50b53205a74a71b371ba005b1ddf3cb00d5274c
 DIST sidplayfp-1.4.0.tar.gz 181746 BLAKE2B ec21d900dbfaabe7d8e976acce0c4a53c60b4be8cfb6bc1e53005949f52a0dc28ff90e6087e57e77db571e987cdbc644eacbaaa3a78ef8868c4a48771e2c9603 SHA512 ac91cc26622b211408c50bcef14dcda78b8da81b43a8f334d91a02b89bd6dac0b3e3adaeb84545e6dbcef97354ba6c2dc555e4f0a2ff0298c6710fe1c6cbbd5f
-EBUILD sidplayfp-0.3.3.ebuild 732 BLAKE2B 7f4071bfa8e6d907327ac60c66b452b8527ff21ee15780db66c75ba30847fa8cafdf53a6273356034c5338bec23220e345a7fe24165ea46aaf4e320c244f2bee SHA512 b3c8dd5128140efd0cb3c80be09a2947aafa7d1c5bd446f02130ad24b4fca6fc6d80c8d7731ab69c3027b564849b509364d29fb49c558deef1132c978744a925
-EBUILD sidplayfp-1.1.0.ebuild 841 BLAKE2B c05d7b89aa0c31d1cb804afd82f145208440fce909fcf21c93fb61d9000258bd390a9766764c9c9cc2fa86ac7e41e2b17ba3127a53ed384aaa1ab50cda0ba930 SHA512 71904f83eb8679b3431329ad77cdb171cef0cd1a16f4cb86b8ee0b3a8428a563a2d4668c24ea0cbcc0c604873d52c3a91e5ecefbd331c50af5e6b540e4d575ad
+DIST sidplayfp-1.4.4.tar.gz 183711 BLAKE2B 31ff002d4cd54e827117e2b2f86d253ee1e0bc07fb6ac777653109585c059311205e141e339a8d8cde08209e1c35776d6f0a0ccf0ad754f78eb5e5f4bafd3cfb SHA512 8375a249da80a10d9c0ef55b35c5b047bf0249393026ad8ff25fb8a2660151f1d482fe581a85c6982b3c70ea257807ce17e1c6011874f10c64bec54a1982ec04
 EBUILD sidplayfp-1.4.0.ebuild 894 BLAKE2B 711fcd7d7e4593a836b8f87431a15c11c55031e17404ce8df9564f9a9a50dcafc1d07c1a019de05a90249d8da66cb2cc4b6a4626a65871f67a5c3f1a4be2199c SHA512 cc2cddba953f2e6bc010072cdc4c279e6b0962a90bcc3348f6d91be67e07c1c5f54f98f43b3fac16d6656941bfb2797f78234318c6343759f1eb4f0a1c661db3
+EBUILD sidplayfp-1.4.4.ebuild 880 BLAKE2B 4cd44b11980ba9ede820c59c0eddf795d7eda5bce49e351f1340c159b718f24a0e124c01d5279e9e9a0eeeaa211c1be781e8644a26e1f7845cf7a3867503ec59 SHA512 bed6279bea87e497e959af4ac3d6467fd79e4b2ab3f54747dc0d4f99fe2d434ef7299c0a6155580c58bc87962b1a14a445f48712e9f7d74e00ef64f0eecf9d4f
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild b/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
deleted file mode 100644
index 94a9199284b6..000000000000
--- a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa oss pulseaudio"
-
-RDEPEND=">=media-libs/libsidplayfp-0.3.8
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
-	local output=wav
-	use oss && output=oss
-	use alsa && output=alsa
-	use pulseaudio && output=pulse
-
-	econf --enable-driver=${output}
-}
diff --git a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild b/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
index eefcd503753a..40dc1277bbd0 100644
--- a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
+++ b/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
-DESCRIPTION="A sidplay2 fork with resid-fp"
+DESCRIPTION="Sidplay2 fork with resid-fp"
 HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+alsa oss pulseaudio"
 
-RDEPEND=">=media-libs/libsidplayfp-1.1.0
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=media-libs/libsidplayfp-1.8.0
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	oss? ( virtual/os-headers )"
 
 DOCS=( AUTHORS README TODO )
 
 src_prepare() {
-	use alsa || { sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die; }
-	use pulseaudio || { sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die; }
+	default
+	if ! use alsa; then
+		sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
+	fi
+	if ! use pulseaudio; then
+		sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
+	fi
 }
 
 src_configure() {