3 files changed, 14 insertions, 42 deletions
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index b4bb7102e0e1..0ae98c67b375 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,9 +1,7 @@
-DIST libsidplayfp-0.3.8.tar.gz 682303 BLAKE2B 28bc2f611979f9b9dbbab1764fda99e9f17bf868f20e4513322f4b9852bef102b9a4654167a8251f2e5d1b48fe8ebc562bb35dacc8bbb8f6e54f7b05a1210ef4 SHA512 5a4cae8e7ca6c9ae514b7018b27c125e17dc6773db036dca7140e51d3021a4274348b791d72e6e277ac0d1fa3b20ba2b3a04bbccf574db178b1b28428f2099cc
 DIST libsidplayfp-1.1.0.tar.gz 620228 BLAKE2B 4e51092d84817c6c90ebb0327ba1816c6dae42868f6296f269cdeee1cdf8c226e71e799ab5d7a8609546cb07669dd80f5bd1fb70e14ef594ac128c43a5c7bf51 SHA512 fb0ce00d220772aaf97fc88b7ba3e764f1c94439c9d35713743726872cf6bc6524893489c5909be538f0630896bd328560c6b189d6d2d09932457671080ed76f
-DIST libsidplayfp-1.8.0.tar.gz 669469 BLAKE2B 9a5b2da9a696d7b18aacf7dcf9693290d73f22582a5ed3db728f326d1e1ef1b6d0c4258253db51aa6739c471ccbe33b8abeec5c327c131d48453d0fd5ba84b44 SHA512 37af2e0f2a4b635797ce289cba33e0bbe9dea0ec2378da8b4e886f94a34fe09d2941c9deda9568e5325f7da6423f4a9820c814ec8d2970987f3cd03965147c52
 DIST libsidplayfp-1.8.1.tar.gz 669478 BLAKE2B af6657ba2eceb40585f9900a72605455b50dc3afb36f091e05b8d9b557ae7dca13c2feb36ecf4a9dbab63e82d3d986a21008034b30189b5e9618518b68385284 SHA512 54731b33071a6bb7300b50c4d899706b71779977d8999302f7aae17d6a9406c9ec407baf87788cae073b04ce6b3f516d90af365b5d95d9dc5525c00cacf79ffd
-EBUILD libsidplayfp-0.3.8.ebuild 660 BLAKE2B 2e292e7b1d7729c67170717511f9a82d47a4305d53d2b6aba53c63b55bf2970394698b1847dc760531a87e4e3801e04e2f341a0e8981500be40a54f3ff1cae21 SHA512 f4fc579f6aa9a51beaf55f5d99dfde94434e1eebbd5601192854fc7d26cfd43a9e691d4a69bb1e7dbb5aef986afe19c11e2ba10ec95e6d80dbeaeb2c66fadc08
+DIST libsidplayfp-1.8.8.tar.gz 673522 BLAKE2B 2d31955e08b0b2b9558e033eff5d959acda08cdc5a3c2bb8c0aacb07c4b8c105812b4faa0af07dbc51255c72cfdf4893ce0da4d642dfc0f89ebc6ec96c51db51 SHA512 84fb24dcf6680dd0e2ec9cc39ddaf30707e4beb5136b7b496b1b85bf11580b1080fbb59b6ec3c1dc7b829fa0cd933db89ee3968518f23ef1a35d9253707d6392
 EBUILD libsidplayfp-1.1.0.ebuild 726 BLAKE2B 5886610a6039945303e0d1b4dbadf7424e0847cd110f9bfdb73a7867f75a9d5cfccfae6b0e901ec8029722e0dffadf4a9ce208a1b9621a7a68d01c78e3d41ae3 SHA512 26bbeecb97ffc460c236f33527c0be1ccaf1605192e553ffa8a45553a66903e1a5e1d90634bb974b54511f8358aaea2a626c614690968cc770db32bdf71e2c1a
-EBUILD libsidplayfp-1.8.0.ebuild 781 BLAKE2B 25cc4de5fd19d9bae9a8ae5cedb53790998549c1a9289efb1f6ed09c499ac4acec615ff948a25c8a06e65b73a99dd0f0e22523fe64edc520e5cf760a547edc57 SHA512 a772177d0a6715dc7ace15202e2412df626613edff0af146c99472d82aff95518fd8d33a1769e83ca3883f8c4778f14b7df03cbdf0e4adf5bec676b88351dc60
 EBUILD libsidplayfp-1.8.1.ebuild 854 BLAKE2B 992f610326914148cf7798751843bc29061709d9841aa22b0b098ff57c265fc2e58d2a4529749dbe31fee5338860a4a7172028370a514e803ead8ee5ffa8fd6b SHA512 fb4d338382c2264514f9da873fe3f6a16a0e198cad7fa79a98330b133317d9320bbffe6438487e6371c2b059a9346444a37d3acb29555ef40fe13aaa592abbe4
+EBUILD libsidplayfp-1.8.8.ebuild 839 BLAKE2B d986f320473dc555b7e6d4b2e132cbd5ea230a10b081bf517fa3957d8ef921eab62c3031670baa6b2e8e126e42a7f99e97a7433854619f25b3603bdd52f4bab0 SHA512 b6793f915a34922af72d81edf1c9194b82706f6b4b97c530ca9135d1d19b731ba4dbcd58665d877ecc51ab326649809fdc7a47339907f9f1e8c6e032a8ade6d0
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-libs/libsidplayfp/libsidplayfp-0.3.8.ebuild b/media-libs/libsidplayfp/libsidplayfp-0.3.8.ebuild
deleted file mode 100644
index dd7b626bcebd..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-0.3.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A library for the 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="static-libs"
-
-DOCS=( AUTHORS NEWS README TODO )
-
-src_prepare() {
-	# fix automagic. warning: modifying .ac triggers maintainer mode.
-	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.8.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
index 8d0ef050961a..bf0faa527c68 100644
--- a/media-libs/libsidplayfp/libsidplayfp-1.8.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils versionator
+EAPI=7
 
-DESCRIPTION="A library for the sidplay2 fork with resid-fp"
+inherit flag-o-matic
+
+DESCRIPTION="Library for the sidplay2 fork with resid-fp"
 HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
-DOCS=( AUTHORS NEWS README TODO )
-
 src_prepare() {
+	default
 	# fix automagic. warning: modifying .ac triggers maintainer mode.
 	sed -i -e 's:doxygen:dIsAbLe&:' configure || die
 }
 
 src_configure() {
+	# relies on undocumented "uint" type in libstdc++
+	# bug 649832
+	append-cxxflags -std=c++14
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable cpu_flags_x86_mmx mmx)
@@ -28,5 +32,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }