gentoo resync : 04.05.2019

3 files changed, 2 insertions, 64 deletions

diff --git a/media-libs/fmod/Manifest b/media-libs/fmod/Manifest
index e9668d8003ff..db9d763cf759 100644
--- a/media-libs/fmod/Manifest
+++ b/media-libs/fmod/Manifest
@@ -1,7 +1,4 @@
-DIST fmodapi43800linux.tar.gz 21990250 BLAKE2B 7a2d26cb0c9eb9fe3d229cf5e5314ab13190209214c1676193f204954802ceaef958671f9c3ea3d8880d4f3bab28e6f10cdec7297c0f8210e320877c038c290d SHA512 009297a708fa445576dc89a258e4049d2c0d1eed2cb4bff7981dc29353feb0c1b02ccd7ef9402172659a7f5705af3f9af2e469c4cec0b0ae6ac01aa6f201f0ef
-DIST fmodapi43800linux64.tar.gz 22276575 BLAKE2B 652cd504e7bae1429a8fcde93cbefcf8787c04062535ed4052e017bda50c6e1758a6f70e34e86664ccc957923a5bd38c836ad3df89f4e8518d985f2186523701 SHA512 d2485e3dba3a1b23927f2d324c1b9a6ac3e324820ce6f9acaba36d6a1c109965507d306db55c623cfaf72ff456487ec67af877ace253e773d6bdb9180df7fe0b
 DIST fmodapi43802linux.tar.gz 21992247 BLAKE2B e0bb112ca47649390c7aba33a1cd75cb7b13c9a2d4cc5eb5c9a6bad02af9ae4958bdd8d458bd4fcc76eb42f5e09f8f989206c971bd7cbcb05359aaeab392fe38 SHA512 6a3f0f62acc71e24e48f8aaa03270d95ce09ace6d37f75a40452c84788b06f4cd6889772e9a6c00fc4799020c046905a9185d08900bc3b573a28b42cbb7f45b5
 DIST fmodapi43802linux64.tar.gz 22282269 BLAKE2B 733b3531f9e107332ab2c91e07f39363810f748e72fdbdcc865b87d86bee766859c01eb2357b5169cb79cad490d6186227d481335a1114968a1cbe2ab6e33ae6 SHA512 95b8688bbf54e19c2471f508d7ed9fbb93f6c88eaadc090813b02a86082e15dc7578220a40ae2b39358f8a4dfcacb4cb78823f4577f5ce9bc3d53af2f591d558
-EBUILD fmod-4.38.00.ebuild 1618 BLAKE2B 84dda179833fc68824f41e1931ee12f27eebc6d7fc77c381dff9ffed5fe85b368b45aee032fbff80cfb3f0764b7a22bedfb6c241d5d4dccfb398a4f93c20f7a2 SHA512 33f236d08e96784d53c1c560badbdc030d7f33e258ef58b2bc9f819942f3ceb23258116c55d3cfcbb1119b9f4497c5d37d1664384842a6392e955808355463ad
-EBUILD fmod-4.38.02.ebuild 1616 BLAKE2B 5cef5a33687a8cfabebfa6c7a0244d08d74b2a5095d8ed6940342f634148920be9b739fd5415aeb891be38d4c72c8951ba778739369ecb40ebc6045b77c62dcd SHA512 a3dcf8b251aaef998528c4be3f48ce3cd6156b7e9ec9b263a50a79857b4b82db0acc1d8aa90a23479202406ee50d412248b1ebfe89299554a6ed6835b760ee5b
+EBUILD fmod-4.38.02.ebuild 1615 BLAKE2B 1dbf98382b28e8713b802904330529ad073b0ba7c416ae1f1796b0ee7d8e7cb416350797c50379f0939edc127fefaef45c804ac9c435c41d6fc6c982bc6f7748 SHA512 bfb573babc258de7e405e47fce8070893e8f56559d92a5a5921cd225c47c748f8e44379f096477b22960947f6540dfe722fb50f5f3e8403a19d5d13ee8a224cb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/fmod/fmod-4.38.00.ebuild b/media-libs/fmod/fmod-4.38.00.ebuild
deleted file mode 100644
index 59008bd38de3..000000000000
--- a/media-libs/fmod/fmod-4.38.00.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit versionator
-
-MY_P=fmodapi$(delete_all_version_separators)linux
-
-DESCRIPTION="music and sound effects library, and a sound processing system"
-HOMEPAGE="http://www.fmod.org"
-SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
-	amd64? ( http://www.fmod.org/index.php/release/version/${MY_P}64.tar.gz )"
-
-LICENSE="BSD BSD-2 fmod"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RESTRICT="strip test"
-
-QA_FLAGS_IGNORED="opt/fmodex/tools/fsbanklib/.*"
-
-QA_TEXTRELS="opt/fmodex/fmoddesignerapi/api/lib/*
-opt/fmodex/api/lib/*"
-
-src_compile() { :; }
-src_install() {
-	dodir /opt/fmodex
-
-	local fbits=""
-	use amd64 && fbits="64"
-
-	local fsource="${WORKDIR}/${MY_P}${fbits}"
-
-	cd "${fsource}"/api/lib
-
-	cp -f libfmodex${fbits}-${PV}.so libfmodex.so.${PV} || die
-	ln -sf libfmodex.so.${PV} libfmodex.so || die
-	ln -sf libfmodex.so.${PV} libfmodex.so.4 || die
-
-	cp -f libfmodexL${fbits}-${PV}.so libfmodexL.so.${PV} || die
-	ln -sf libfmodexL.so.${PV} libfmodexL.so || die
-	ln -sf libfmodexL.so.${PV} libfmodexL.so.4 || die
-
-	cp -dpR "${fsource}"/* "${D}"/opt/fmodex || die
-
-	dosym /opt/fmodex/api/inc /usr/include/fmodex || die
-
-	use examples || rm -rf "${D}"/opt/fmodex/{,fmoddesignerapi}/examples
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins "${fsource}"/documentation/*.pdf
-	dodoc "${fsource}"/{documentation/*.txt,fmoddesignerapi/*.TXT}
-	rm -rf "${D}"/opt/fmodex/{documentation,fmoddesignerapi/*.TXT}
-
-	echo LDPATH="/opt/fmodex/api/lib" > "${T}"/65fmodex
-	doenvd "${T}"/65fmodex
-}
diff --git a/media-libs/fmod/fmod-4.38.02.ebuild b/media-libs/fmod/fmod-4.38.02.ebuild
index 18d0fe0d9053..6a75cfb9a8b3 100644
--- a/media-libs/fmod/fmod-4.38.02.ebuild
+++ b/media-libs/fmod/fmod-4.38.02.ebuild
@@ -14,7 +14,7 @@ SRC_URI="x86? ( http://www.fmod.org/index.php/release/version/${MY_P}.tar.gz )
 
 LICENSE="BSD BSD-2 fmod"
 SLOT="1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RESTRICT="strip test"