gentoo resync : 15.10.2017

16 files changed, 138 insertions, 231 deletions

diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 54f788f105d4..e0b531b46f2b 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -2,7 +2,7 @@ DIST libmtp-1.1.12.tar.gz 776555 SHA256 cdf59e816c6cda3e908a876c7fb42943f40b8566
 DIST libmtp-1.1.13.tar.gz 801519 SHA256 494ee02fbfbc316aad75b93263dac00f02a4899f28cfda1decbbd6e26fda6d40 SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77 WHIRLPOOL ce0e63f07a60b7dd71e7d413d4ddafd215c78a4bf9782ce1f74777871d751f302f37da1a09a05c454c865dfcee7c4559a85f9602f95a7e0401af50a119b42c16
 DIST libmtp-1.1.14.tar.gz 804354 SHA256 3817d3e296be8f1bc527385585780e70984e8e0d6a0d00349240d67e3df412e8 SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1 WHIRLPOOL 52f67b1425979d37404ddbc0c14098849c66e2e21003b956094f629bba1f5f5ea3de4eca8e89bfebfd4c7d2347f8ac804a44f838776f542cc225e998b980ee91
 EBUILD libmtp-1.1.12.ebuild 1589 SHA256 62e5b863cc8780ecfd3b7af83a71bd01a390e1564644fbbed2f285b5b171f7a7 SHA512 878072bb351d6d5e0de55c534d495f7536d44af5b8c01644cecac86948f951d4801e84477e8ef5bd45bedb3de33b3115933bc5f808cd147821730416c03b1915 WHIRLPOOL 878ec4460a202c428cc75f2286728b6e35d24926232df197d4dd4b03a3783c8e72ef591828fe2b471b64cf0c93ee2baf957665b55b0c377f85be38ece74550cf
-EBUILD libmtp-1.1.13.ebuild 1597 SHA256 a23322cab933b452d90bdff89823c5c8a584a7f715706a89cfcaf653603495bb SHA512 cf11b08abd537b59f1e72b9086afa08bf6b742839a3ed8a77dbd068b7cb243b74e0bbe806b24e2a5623610decc226ed3744ed812c073561681af9d9269640fa7 WHIRLPOOL 2245fb6915e5de28c8df275efa0eeeb7b39fe13254739179f1d82a04523a07980f58e7cff9c4fe55455cd6a6840e28a839a9bf22add57d4d5228ce0d7bd85b66
+EBUILD libmtp-1.1.13.ebuild 1596 SHA256 dcbb05bebbed88a55866b9d9b9051fc7ac7ac5004c8253cb1f700b98f7410211 SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b WHIRLPOOL 824200c105378fb4f886a6b93769ad1001dad210e85410bcb8c4dc1414c30d89a7daa22a3f9feb54353a83b3fde2a9d82e3adf67966fee6bed2a2770e44f6893
 EBUILD libmtp-1.1.14.ebuild 1603 SHA256 9097a31a9573ebf98db3ca14de70d8d67b5dded382b45aff956dc6bfcb443044 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a WHIRLPOOL 8a7c58813173b7ab3e2c37a18abe1e24dd84ddac21080ee9ff7250bcf8e65ceabb11e673aebfc47b593edaf49b33df91b350b640d8b10601e13be25b49cecdca
 EBUILD libmtp-9999.ebuild 1603 SHA256 9097a31a9573ebf98db3ca14de70d8d67b5dded382b45aff956dc6bfcb443044 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a WHIRLPOOL 8a7c58813173b7ab3e2c37a18abe1e24dd84ddac21080ee9ff7250bcf8e65ceabb11e673aebfc47b593edaf49b33df91b350b640d8b10601e13be25b49cecdca
 MISC ChangeLog 5382 SHA256 2c9491576cb228e2773bbc7324c84a335ce77fd9475fc4ba188ae7e7e7dfd3f3 SHA512 debda09dc43c72bdc2136f461e502cda2a5ad2ca4a3624b7e95e03140a4f9c1ce9339e43bba108b375e3548712d6dca07c725365dcd96f72ddefef0db8be768a WHIRLPOOL 55e156830ddea5dab42bfd8a06d053033ad152390b304ea576028e01039174812f4dfa2c2f5568167d8bbaa4dd3a8c7d369b7e776b450f2a75e9a55a6424f3d4
diff --git a/media-libs/libmtp/libmtp-1.1.13.ebuild b/media-libs/libmtp/libmtp-1.1.13.ebuild
index 43aab98b44c8..515e227cee7d 100644
--- a/media-libs/libmtp/libmtp-1.1.13.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.13.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 7ca82c29019f..f2bceee8963c 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,7 +3,7 @@ AUX libprojectm-2.1.0-multilib.patch 1245 SHA256 26466ef3983e7491b1cc49ca21edede
 AUX libprojectm-2.1.0-path.patch 593 SHA256 887ef4d5ef8c37dbbee6ef375f47e031c4ed7a95ab506b8bc8ee376069984631 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3 WHIRLPOOL 1965eb4fc9121f273ee2902d4b18ab05721246415286f4082a757013290d23238205526414dbb18a779c77d75bd42178e6abe7ddcafc56a6d21cf67a4a5a41ad
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
 EBUILD libprojectm-2.1.0-r1.ebuild 1487 SHA256 b3f652811648f9f98633ac7fba6cced100f67e41ccc223d0e620d14b69d8e557 SHA512 c193f1203dfc28da59eb4d953f172c5f47efaaa661d9d25401e83c9ef9c68c0a3740ee86bd533cbc71b19b0ddf2c62fc1cb02f1169e4c5d73e74de7d9e48df55 WHIRLPOOL 2ed1dd241c47562df31eb1020b00aa53d1e98bbbbcc7729466fb85bdeac1d64ee088a89075f1cfc4b07dde878bea69f4992afc6d8a8256c72de81635ad2eb853
-EBUILD libprojectm-2.1.0-r2.ebuild 1500 SHA256 c1030e5b61f5fd9ddd529eb61b2ac61894c0e58be351c2f66bbc979ffea530ac SHA512 96acaeafb588137a924ac7c3336ed7d6a5414644c0c737383a4b1095ecc405a86068739167a50f9aead2aa872dc1261215868bf2c119f9fc0388d3b1c10e7084 WHIRLPOOL 338ac5139ae6c7aaecb153e2c2475e3555897c2be1a8a669cfdc27c4c2d51a089b21da56a9f37f8cd214274d3f2b227275f83fccdbd12ae0dcbd2f67c687ea55
+EBUILD libprojectm-2.1.0-r2.ebuild 1498 SHA256 51c9aacb31be2a198c5a1d246e71d250badbc4d4ae5116cd4dcecdbd6de4d23a SHA512 e6b5b573b8e6536c8ae2076501ae6b50b30be2e26e69608ad85cd42510933b7661888a6c02413cd0db143861652d8541a8a8974afa7403cb00e18e2e1e78b902 WHIRLPOOL 690dce622fdc126343e141c24554ce7df12165d76ea7a89d1f1232628455f6b01f2e0fcc061c990115c096bbd12d12b8099eb04030b7530c94e244c3e2608807
 MISC ChangeLog 3306 SHA256 de2e37250d05afafe9dc7140acb819626d8097157529d375687f8cdf657ad3ac SHA512 88a66209f27a1b84a0c343b9d1191d83f412ab1a8afd9d071ef945ab3cf005f63dc60b5e0bbeeac0d5eba440dc45724c10986b1c4cd64e80eeeb7077393818b6 WHIRLPOOL 12f14de7ceae134005203b3047afbb235f45dce9e3b4c11131498db27d9c773b4711253f8c122c0f441d9958d5436fea031768b7e79479e82f4a6f18482fe1b6
 MISC ChangeLog-2015 8622 SHA256 78cd5658f1b616e8b74a9363b0316a9de9292dd1b841a3bc43dbfed51a69f8c5 SHA512 f72fc69541b07f8d832268350f3aa534c8d3916ec11a503d1a39841a312ce062848413132a2d0e6374f61259c30f909532f92cecdb8e5fec87000e3bd9b4089e WHIRLPOOL ff27c28a08dbaf3fabf131444473e80d680de96e75381b2511afc5304b85b79ef7df341a058b2ff340c90f36223bc88c205da6435c617324c27e993fec623a2e
 MISC metadata.xml 331 SHA256 7980d09ed08ac1b06efd12fa6022b052f892c81eb21e0af43115341b4bdfd1ff SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740 WHIRLPOOL 364e9e4036552c4311c7ea3f7ec078fc120ce2f2cb3c8476ffabf4cd18cae4dd49f8cb7335a32d0e75a5da5c81573b9bf581855fce96c987136400bb8fdc14f8
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
index 528900f6c3e7..4fa683b4edf4 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug openmp video_cards_nvidia"
 
 RDEPEND="media-fonts/dejavu
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 977d76505a5f..602946b8dce3 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -2,6 +2,7 @@ AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 SHA256 edea4de6720b9
 AUX libsamplerate-0.1.8-lm.patch 215 SHA256 e630a4aca5f8fbea177dd2dde5ca646d4c01540c6d857293796810ebff7a7025 SHA512 acc63d2b6a547d9b480c4752864b474b478a753c88bd535833a5b1ca745c54d1e323bbe985f96430158307c0f1d1d1cf1171ec00bdbb31e9e888b3ed2c55019a WHIRLPOOL 69b5762a048b4ce1ff269be504af3912f72e143f3969117d2cfdb7c5f8e2f0f743cf7b537d1fcd085676a0c546ff8e9226b82e4dc590f69d7618b466512ef8a7
 DIST libsamplerate-0.1.9.tar.gz 4336641 SHA256 0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1 SHA512 78596657963cbf06785e3e6e1190b093df71da52ca340e75bd8246a962cd79dd1c90fa5527c607cebcb296e2c1ee605015278b274e3b768f2f3fbeb0eadfb728 WHIRLPOOL 3591f08cd64f731a8bdd02daabec6b7bc6bcd9f6806bab4f687f3c120481d4cfbcf5fd7752052a6147358b7471549c99d963615bda89b9679b1e091b636e7b8e
 EBUILD libsamplerate-0.1.9.ebuild 1547 SHA256 351e344b36e99df811448cd3bd45d3d0b9bbebd7c7a0354efec16f53be322436 SHA512 35da5b5fcb387d32ee2dbaf09fc68a4bc6cfe3561fc2f2e363cd5eca4ae640bc7f2789c9bf5ae13ca8003b1ef70ac0532ee61943fec710b55d06f31d12264d34 WHIRLPOOL a2da718639a02766be835b0d4e6e462669e12408bfae05bcbf86971ff4c0d8bf3c9708349f78f84089e7b6c25c655206b6ca3c193724ea1009f708722d06578a
+EBUILD libsamplerate-9999.ebuild 1328 SHA256 4ea9c1270cb70b5f7ed7dff54d2b72be07caa2a81dc7b6952d69262fca818937 SHA512 e1628a69023daae1bd4a50fbc1b4b63e8438dcb56a7c2ca1a991fd5c3e0388d0d3e4ea68df3c9788f21ac2b2afa48053767810fb0098da58be832900e1be8f24 WHIRLPOOL 39a2434fb3635e0af45ae13b889a8f8aa21ba59195bb619f5d08fd6aa8a7a102583ff512384f7f7c2c6e7ce8ea678fc927584383840276c82a5dcf5e77834d5c
 MISC ChangeLog 2723 SHA256 047a7ab7ebbdfc3b79074fbc2ea2cae8975cf41bd2f693128a204d90c43a41d4 SHA512 646e5f4da0e337f72dcd18392766222be5e541640ab28e34a48bea8dc8f37ab6634f05b55d862c8a82538bd244dec098a0e9534f88d38e074b59e4925665fcaf WHIRLPOOL d4374da55d6e7c8536b866f32f1aef2344f646e9412c9910cc9fe119341ab67c6ef52b8f5c31fca4124a99970ed0bb162d1bf6b81e70f296fd229e829bed7927
 MISC ChangeLog-2015 12116 SHA256 c836ce2b3f9f8d49a6f5f8c4dc2b93548917566ca89d3e188448545abde9d6ae SHA512 5e356946bb6795d1e8b0f8d2599448eedb5702f4fef29a98496ddd64f6cf629ac24a718e2c10bcf4f268ae7f03915aad9f6d56bd2951f4e23d6065fd6106af10 WHIRLPOOL bb2763cd89cbb34a2f16e109c04c1fca8bca29236fb539302adc17b2dd4aeb7f51d829e14b26210b92d7b2f3d589a35b91367fb804c9825016ff57b6430e6886
 MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-libs/libsamplerate/libsamplerate-9999.ebuild b/media-libs/libsamplerate/libsamplerate-9999.ebuild
new file mode 100644
index 000000000000..e92848835512
--- /dev/null
+++ b/media-libs/libsamplerate/libsamplerate-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
+HOMEPAGE="http://www.mega-nerd.com/SRC/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/erikd/libsamplerate.git"
+else
+	SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="sndfile static-libs test"
+REQUIRED_USE="test? ( sndfile )"
+
+RDEPEND="
+	sndfile? (
+		media-libs/libsndfile:=[${MULTILIB_USEDEP}]
+	)"
+# Alsa/FFTW are only consumed
+# by tests, not by the main library.
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable sndfile) \
+		$(use_enable static-libs static) \
+		$(use_enable test alsa) \
+		$(use_enable test fftw)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index af214132ace1..6d838affc580 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,6 +8,7 @@ DIST libsndfile-1.0.28.tar.gz 1202833 SHA256 1ff33929f042fa333aed1e8923aa628c3ee
 EBUILD libsndfile-1.0.26.ebuild 2692 SHA256 ef280ea735df622463f0bc6f903259f17e3787a8e0c6d9d5e374113878fc7b94 SHA512 94cd99345b65b581616bbf44a6218359c9e10ed2378b651616b240e05dbfce60cddd53cbbbdf369b70d54e4f90480e97d6b858836a21f130c82e51f7340e73d9 WHIRLPOOL aa5c4a6f2cfb3d706e9871bde49c7e714e9ebb0ebc6b3711b552767d76aba32fe0b68dece177463a1de7197341e4bb0c9a1afafe11629df0eec199338989d590
 EBUILD libsndfile-1.0.27-r1.ebuild 1912 SHA256 4bcaf142b5ffc70de136bd314ac6ad07130d2d00c9db347cacfa60d539795d3f SHA512 67f8f3d757dad12c5a087cc49a54b6b6d93be7d89fad9ef5e9fe7c89fb013d3f11688517574c08e258a50cade576dae82b1ca9b996243c84d97ae85987706f00 WHIRLPOOL 9b59c050d342a660601ae7c7b45c07bac9791a212342c50fdfe98c562e57d6c9ff6b7df3904f9ec97a50e4b4ac682839bcb44e09a2999756fe99dd197eea9ae8
 EBUILD libsndfile-1.0.28-r1.ebuild 1664 SHA256 254e40bf34d5a0b00e205af0f08bf5412c5433f994929c8defb1ce791b8385e5 SHA512 49446be5c9f84afa4ffaae7b1dade1140bb98de0e91fc88d0ffe2cd1e782cc56b9f879f00a255b2b109cab77280ad99acb5c12a9b564ce56f0b57acca119e2bd WHIRLPOOL 558187e2fa1f51d507c4c1bd7a650f94ec175d9c638d828c59cf856bda7a55280b23f0d9610fb0b9e183375ff6c4d1559e91ef7effe0af4ae056368f6be8a00e
+EBUILD libsndfile-9999.ebuild 1745 SHA256 df117ff9c07b7de0e81341680362d4b660dacf6d1a2c12602b20d2851d3bbce2 SHA512 37a4087046ba8fe41abd09bc16f485e8ca9ce1938021281ff09a5b2b953ed88f935389d13a9b1f6286bd3d35ebf727b4708cb117c7510ef4067f6fb39758adc7 WHIRLPOOL 3bdcdecff0580e96c9bec4f4a590c407243831fa4c9dc8fbaf03a38eac3f73784db824b49f81c615e6d82554451438ba1f0ed64f5fdcdd30778d2b9766df2a25
 MISC ChangeLog 5750 SHA256 9d1d7328d23be213d42365977269e84f81041297c5776063d1864cb0af9a7327 SHA512 a0f8be5c80ab861bcd5defb11ad32c90c64f9679af0476322d979aaa8bd4f088deb985e298e8c5640e6fc75cf68c2a229062c77d558fc6d685b36458146d5a32 WHIRLPOOL 1aff80e5eeb64493716cf32bd5e058db706a501124d3dad23ac0e3ca6e864986dca6a882d41c76f3e0caf561aa37a942c4ce1924d5a07703ae792748ae3f8ef3
 MISC ChangeLog-2015 22119 SHA256 fa4675ddab48c3377fd1292e3abfb2ec820857a4a14844748fe2f63352c82370 SHA512 9c8978c4608e8b7c042050e6eda234db8541c246168670b6247c8f9a946967bc34b68cbc8abfe10046aca483f5faa1b7cdd28988a350d6782b730d8e2802dea7 WHIRLPOOL b314308b8409737eca0adfd7e255983ec4db1e3c64850165a56c7f2ca56eccf8a74dd7a7cda30b3346b22af0e2c5d2b9acd8e1bed4272ef45da074494e0e7da0
 MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
new file mode 100644
index 000000000000..eb28af81fd55
--- /dev/null
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+inherit python-any-r1 multilib-minimal
+
+DESCRIPTION="A C library for reading and writing files containing sampled sound"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/erikd/libsndfile.git"
+
+	DEPEND="
+		${PYTHON_DEPS}
+		sys-devel/autogen"
+else
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa minimal sqlite static-libs test"
+
+RDEPEND="
+	!minimal? (
+		>=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib )
+	sqlite? ( >=dev-db/sqlite-3.2 )"
+DEPEND="
+	${DEPEND}
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	if use test || [[ ${PV} == *9999 ]]; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-octave \
+		$(use_enable static-libs static) \
+		$(use_enable !minimal external-libs) \
+		$(multilib_native_enable full-suite) \
+		$(multilib_native_use_enable alsa) \
+		$(multilib_native_use_enable sqlite) \
+		PYTHON="${EPYTHON}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 1a3b4b80dcea..5b012828dacb 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -11,7 +11,7 @@ EBUILD openjpeg-1.5.2.ebuild 1974 SHA256 01988d07b71b18f2885c9b6f09f85e1cdb41b63
 EBUILD openjpeg-2.1.1_p20160922.ebuild 4088 SHA256 ac71ea606718abdb2b6af8a5afbfabc9994a87fe1dada0f800f5442cf485f14b SHA512 47b2f5438a3cf8faeb541abe3f635bb2292543417dda4329e2628a187d9644a2330542f6d6477af2f86f3396240954e4dec5201cfe7a0869e7ab6fbef22e722f WHIRLPOOL dc8edf8a299c3ed7075b3ffc0ade49c537e2cde7124ee0e5dc6a327f410939a1e15274e3e3c862825bae2c0003c2faaf687ee575ffc490427dff90dc35c346ae
 EBUILD openjpeg-2.1.2.ebuild 3997 SHA256 5eb3069223fcc3c3f7d9b83cc3df3a5110480bbd86c7c9d84170c7bfdc03a02d SHA512 565340cbb50143209c30ed3296784d9f42ea48c821abf6bf15045d0b906f08793cb7f0027192279f0e868758f093cf4fcaefcc5528d45f044c345fa1ad892491 WHIRLPOOL 2c58b6d1064eb2097f8274f5d7a9d8c8a2d5fc2a5c9b6fe9616e37f6370a964ae6cf6a47c2e59df0b99b1e551f740da4654b3c2685155c84fae7524f26e8362c
 EBUILD openjpeg-2.2.0.ebuild 3992 SHA256 06f5d4020f9a99839ce9322e22bc2e4fbcec64ec2c898e40dfab338f9db8d2fc SHA512 b11dca2fc9fa15236f0e4b8489d5ae3ea4bc72a536f438e22da5b5e65f79946798b90392acd8a435bc1c74c4da4bedc0851cbbd868da00ded31a636328cba693 WHIRLPOOL 5ebbf9cc48307885f8d0936c2454ccedba814a388c9a36e26dab122eb3c048652a7324603c33ffc2c9188ab5ef5febea742e440d02e40bc39157c006d64d1172
-EBUILD openjpeg-2.3.0.ebuild 4110 SHA256 d1fb80f46fe6ed096085be8150a8be375dcb39f13c224a00d3f47069a46b05c0 SHA512 5f5fdde101b30b024067d3d4e11cf3df2f39b2afc4616382443a98f0963edb82e96b1216c811a3785f349f48f698c34b10577b51328d8fc1979792858fdf0256 WHIRLPOOL 55ab2b9916473fa1fcb766a888acd15dc220b7b14219129c8d3a90640c4f23cb45030941649280a0fb7d569ef21a22a637d877a833e4f295bf44815eaee509bd
+EBUILD openjpeg-2.3.0.ebuild 4109 SHA256 bcdf514d9a2fcd31ddd826e500e64021a8140d5f03f607d5e340731582808754 SHA512 a1690159509251189d26e2c738d801e3c6093dac998fcb167e2628b2f6b2c7efeab45c4e997f7c1ae7045f78f05cc68df9c5bd448598c5b8c0bf24aaa523f75e WHIRLPOOL b07ab26aaa221c19e10af78880eaec0a956bc3ca1957ac59a70553a6d662201f2fe231882a9094eaa63f0e6fd243d38067df197bf72915356c3ad6bae60a2cc0
 MISC ChangeLog 7107 SHA256 ab91aa79e988c8ada9fdcd3eb581d62b34f06a4d104898fe6a0692b3822a4841 SHA512 34c554fb7c5b542c4a18b851f5aa9ccdcc47f41ca9815d8a5ebfef6fae9ae65b7265de897980c5adf7a57b1b6fcf7bd6ac0a37b945861a317a578b22b2869e7c WHIRLPOOL 75abb312e47fdf966b704d3dafafa73601a44d32930d243a32e50af0013bb9e286d08777abd2b6a0ba965749d39c94d61a8dd29751fd5d49a14b58446985359b
 MISC ChangeLog-2015 16632 SHA256 16e64b73b25390f6136c6685474f98e28e09511117c2cfd3e80199cadb59e362 SHA512 73cc1e6014a2a2bb5941d794d5b8b8f295ce8a207ecf532d67504ef219eb28ecb722d2fc913de8543abbd94dbeca89193bbb68d9dfb9a1dd774c1018efa0c37d WHIRLPOOL 4297848b013d0c4d5e65238759d36e610010e7e3ea7c4467d5e495fd3c88ce989d78170ff17b2ff69cb991fdb2d1a5772cdb32af952e694691e2a079e0da39a7
 MISC metadata.xml 455 SHA256 b4fd557d0fea3afd283e339e0c37bfa73e89d3e9b5714b218c610c1a50db0fa4 SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d WHIRLPOOL a020c98df36a2844fcd319067e6778dc07558368421706da6220a591ad8c21bedc4e572ae959e09a7e48d4adf4dd26a0f6bfedfe1e763068882ef8ec871a03c2
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 75a932201b83..704ebbed817d 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index 6737950888f4..db2c23e585bd 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -1,7 +1,5 @@
-DIST oyranos-0.9.5.tar.gz 1801954 SHA256 7cf8d41c3019e91608837cc40de801348b35963853e6d62b3e6dcd46bf24cafa SHA512 836bb7324cd300608cb13381704b6b28aae93485140d2e3f6c7dc21f1d35f9acc44427c861814b13c60cc499ba5495068b1069f6843909744f18ac8998d17ae9 WHIRLPOOL 69b676c6cae8eb878b5e0ea73358ffc59ba78541c9de89d10667a52141d0b37399ea733e1e2aa69bf90208a12e93c63b0b8bb63e6eb2efccc0151b745469491f
 DIST oyranos-0.9.6-patches.tar.xz 11680 SHA256 f4db721a57f9b05c843e2f0739b3b699914240ac9ef985d58131fbf4d5950854 SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 WHIRLPOOL 6f9361e87a07130d4af1c4f53f5626cdb36c3764edf82b68b1cfd716f713cb14de73baf3444a0b4c4a99eecffd6217d12d8b9044117a0d4f09b26a615481d29d
 DIST oyranos-0.9.6.tar.gz 2247841 SHA256 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 WHIRLPOOL cd1c1143f02be89d8a45a98e98cbc6ee9cb54036ec7526f3987f141618cb4bb498720b315b891eaa54e081e2c7067fcded063487d9b248d87354618f51ec959d
-EBUILD oyranos-0.9.5-r1.ebuild 3074 SHA256 7bde1215d9bcc28ac02f490f122bb06f79e7fffe5090dd187cc08bd09e4494f2 SHA512 fded025785efed89cb066877e3c7724b04a5e93225da4b2563abab0db72541c867cdd53a1aa5a33eb458602dee3704faf46390b62ccd19f45c4f904e5b70c79a WHIRLPOOL eb7a292cd6b81c34d9784c032ab8a140aaa3c6018f205c4cb44d5f946601a911ea91370c6bc969f965bf7d6a33a15bc8e89199c317bb1cf80d218dfe7eeb79bc
 EBUILD oyranos-0.9.6.ebuild 3443 SHA256 693e59d5a3636d213f7bced34a3906e96dbbac89b0d6ca8c75b9a2e97c474882 SHA512 ec59c4e2b25da6772e49ab6f8c20001e1a182e8fadc5c4266b02fadd23045c6ea1e44dca96e2a2d33ef7f22c9bc54efd0f7e90bc46dad3ba6829192c7c0b0c28 WHIRLPOOL 01526ce600a8809d39b039b627d523ad70823ae57a715db03758fc01b8f7330d81c8e8c52e45a4915debb67e9dd955a8db9b99f8dfadd3141314ca4cc2774b1c
 EBUILD oyranos-9999.ebuild 3346 SHA256 032bbac4d1dc421113617374ea23fb6e2e11df59fbd1aec3ce2d94ce6ed3b354 SHA512 dc2d59a795b8def1cba06826fa56391092c1ec9315b172abe3b62949d96e9f3ee5ab75b1a04c197e8580f044f408a4a67d3e52407f69e6f103250988beff7936 WHIRLPOOL c1d8d418130b651e069db3ec19dde5af512d9f88f0c7bfc04cc83f5c51be439974257c33267a8ddb9ddcde4424de5253e32ae0a16cc39a6cb0976de779a3f011
 MISC ChangeLog 6333 SHA256 c2da21f3df29063fc8664281487950e6407464813034f3b6b01e54008d262f03 SHA512 d27edba60e4bac2518c94407ab0f4d2afb6adc2d975ff027a1b6cb2ec051e9faab43f176e6acb7f3d56e8f85ec16118db65a0b754fae76484dfd4d86b0709eb4 WHIRLPOOL dc50825132e1ce84cd6a94ab137b4cd303e54c5fcb5bc2a931d02348ede486158a0320ea4dd51aeb27f2c89da7633a5be6340b75a5b69dfc57642b45a1b80340
diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
deleted file mode 100644
index 4b23bcc6606b..000000000000
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic cmake-utils cmake-multilib
-
-DESCRIPTION="Colour management system allowing to share various settings across applications and services"
-HOMEPAGE="http://www.oyranos.org/"
-SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
-
-#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
-
-COMMON_DEPEND="
-	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
-	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}]
-	>=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] )
-	exif? ( >=media-gfx/exiv2-0.23-r2:=[${MULTILIB_USEDEP}] )
-	fltk? ( x11-libs/fltk:1 )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5
-	)
-	!qt5? (
-		qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	)
-	raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/icc-profiles-basiccolor-printing2009
-	media-libs/icc-profiles-openicc"
-
-DOCS=( AUTHORS ChangeLog README )
-RESTRICT="test"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/oyranos-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/oyranos/oyranos_version.h
-)
-
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindFltk FindXcm FindCUPS"
-
-src_prepare() {
-	einfo remove bundled libs
-	rm -rf elektra* yajl || die
-
-	if use fltk ; then
-		#src/examples does not include fltk flags
-		append-cflags $(fltk-config --cflags)
-		append-cxxflags $(fltk-config --cxxflags)
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DUSE_SYSTEM_ELEKTRA=YES
-		-DUSE_SYSTEM_YAJL=YES
-		-DUSE_Qt4=$(usex '!qt5')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif')
-		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg')
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw')
-		-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff')
-		-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X')
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index a6896f122c17..65ff220fea67 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -6,10 +6,7 @@ AUX taglib-1.9.1-bytevector-simpler.patch 3685 SHA256 89992db2dd7201bfe1862c1cd1
 AUX taglib-1.9.1-missing-deletes.patch 1194 SHA256 263fbfce5accbcb635b42ae5b7af988a0a8a8d0f2dfdbb6dfd96ebf39421b3fc SHA512 1cc2796401dc1291b19245bd9a6bde9d77549d7ddab96b99b8e0f95c331a1ba7296f7107bd99f6f789cd04dd412d6e330db099ab49344c4dd1a10ccfef203fd1 WHIRLPOOL 8cced81a118f56e36943b1e45aadb234dcd20aa58378bbb5d30a97943b6f0ca4e37ea8381a02d77f8c3f4058fd2598cf450122574420e4627d1b9cedf08b343d
 AUX taglib-1.9.1-order-big-endian.patch 884 SHA256 cc3bd7acfb1c1bbbe0f8299107112bdf572bd716aa3623605f26e4312856ff2f SHA512 4f2c751f03e976da64fc1480e369443d724c420198600ae1a5e9e9cab3172289c73d15b66ec0c95165da30e52dff1d956314fd71fb067e10a11c350566671bd3 WHIRLPOOL dce49ba2b65b4f71a0867104ac81ac3e10cb09e48bf866306d813b03b472e758bc8339dd6135c18b6232a9f6b36369a44c7a6c10a513df537f75f43764fcdc48
 DIST taglib-1.11.1.tar.gz 1261620 SHA256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 WHIRLPOOL 243cafaf238303eb2dcdca415ced4dbfb49d4890ba4ad5baec25aff9175bc33e3a20835518d461be946805b7b438c50c86d3999dc98fa648d177ac32a4a0b062
-DIST taglib-1.9.1.tar.gz 654074 SHA256 d4da9aaaddf590ff15273b9b2c4622b6ce8377de0f40bab40155d471ede9c585 SHA512 17523b7ebdd089520289ae817b07f291be93fd0b9d3b2891eb4860a24e45943e94d25b99250c1ac477de5e51b08c39887ca13fdcc2dce17867eb60d1edb26154 WHIRLPOOL 962ec0508d8256a54ea686d4fb8d366f23f82bf10df6406c8012295ceda8416a5f23db6e450551b685798d628623eb5247e6ab7b658f955d897b86340baa5e8e
 EBUILD taglib-1.11.1-r1.ebuild 1394 SHA256 f9b549f00463a60e0194619241b1ecfc4e5360120644db541af8b4b90b957ed1 SHA512 6dc269c47c6f869eb5f0e3e547e6d90f77fd7f81f7170bafe59824a4c1d75d6fab5e4c4fcfa22cea96fb6d8ddbf6da8e9acfe8a2089034484b0215f7f0cdcbac WHIRLPOOL a65fbc88d4e79bdff9b2eb8721b8651735590ebc54ab7c10ad95a003e4f41093f7f1986127a84a44f066470975903bf54bf667838c069170e64935edf2107d00
-EBUILD taglib-1.11.1.ebuild 1360 SHA256 4fa0caebd13d0ef1bb93f0caaf8e7999d674ba9f4dda93358d5441494311a9ae SHA512 8c7dd2aa123e56a94b2799fdea76bca1ee02534c770b3e367317eed4594f40a5ab3a38f13e53e35b9284fd5d80e3db27ff5feadf6262bdfda28d1fc9637f26d6 WHIRLPOOL 69d2d704893a3ecf49a1ccd9677f0be7acd60dd9c1a0da3237834fec6a50f8c4008758357ab63d49d9850731c5d79d3c8e5c4c2f9bbfa23f72e861abf47995fc
-EBUILD taglib-1.9.1-r2.ebuild 1847 SHA256 16a7e7a708a28bc819fb358afbba2757c741705c40b7802c9e4f690336674b2a SHA512 d62e4500fdfd5a4ed713e5c9dcfb6a70b04d658df844a548220e63ebc7fde771c34934a44bd9109c519cbc2374e5b81200ddf5695194ffe53c65e803ed7abd49 WHIRLPOOL ee5b34ba07be0fe160992da2b555867f69d9c64a78d18eb8bc98ca7f232f7664175e4e73bf69d293293eab878ede67b5bec5f422bb01829c2a1811927ac4b7d5
 MISC ChangeLog 3798 SHA256 2d9609463502b43ce4d9cc52606aacfb6b41b10dc8efe8d0db6dfc32b0d211f3 SHA512 8720c7e6d323d656ca8c9862b14285682792d4eb87bfa31d78f6c8ee8acac4fb7b5fbf82ec145a76e41dac68cdb5e8c48987e343f985c1123763bd44e745b57f WHIRLPOOL c17222811035b3d57e691d3fbee7049bf960721c22bc6e33dac0039f73983bbeb7745984b0914d1511ac4c4c4e338bbec17fcb2c4e6362883f30c88205265a41
 MISC ChangeLog-2015 19514 SHA256 669deb727b8b32ccde8fc5de4c54fdb49f02c89077217eedb66571577f7e0cfe SHA512 4ede1ed611e1df9a71e9550888183ace3a7eee4ec443e68a4c7ff3a8db88b93583eafedd0b1f3d3aa06a64cf548614da666f61257a95b680052bc019e5a88689 WHIRLPOOL 23ea9a5a684a9c895245c99c2c4a74e26764d98ebc6ea67c1b23fdf51dd4727a313b3d94fc264f67cd66849aaaac3a64b904ccc43eb0d179b204676277513949
-MISC metadata.xml 526 SHA256 d0fbdcdc8ffb2c1aeabc9f35307a2f2564502bd66603bdc9d25dd85e22c3280f SHA512 2441e8b6de28b8e3c098732e411b0ac0cfe8db518b920f1a247855f0759e36a4d47889c04e9ef8f5e9bb82d00d2cd4b6b7f91efcc51971644fa3284b13e56a1a WHIRLPOOL 5e44172d6ee0b73c88751fd99bdd2fc0d1c903c2407b8ee4a0595748c397839e300cd43f0ef1ae289d3f177e742fb56ceba5465d8a140c9fb38fd4c7f547f054
+MISC metadata.xml 425 SHA256 02f90e390da8a3bf142f71e90b5ee45d9114fc2755e4b0f92dc4cd80e33cdb03 SHA512 31bd061f371cc8f300a22c150b86ef163f0cdd1d5e6b1c0ef0652038a2a1a5372a2910e201df28a70cb57f87945636b1ad352858f75714f3889068f94391c4d0 WHIRLPOOL 709b214bdef1438e1d08c25a642a8d245a9526ada7f47d64ef586a3e1d2b38f9467bd5575fa034b67c2892e4770b9505fd71e7c089a1e477174c92f30c798063
diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index 6322822c7534..cabb8e8cf5a6 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
 		<flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag>
 	</use>
 	<upstream>
diff --git a/media-libs/taglib/taglib-1.11.1.ebuild b/media-libs/taglib/taglib-1.11.1.ebuild
deleted file mode 100644
index d064b14e30f0..000000000000
--- a/media-libs/taglib/taglib-1.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="boost debug examples test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.11-install-examples.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \
-		-i CMakeLists.txt \
-		-i ConfigureChecks.cmake || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		$(cmake-utils_use_find_package boost Boost)
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
diff --git a/media-libs/taglib/taglib-1.9.1-r2.ebuild b/media-libs/taglib/taglib-1.9.1-r2.ebuild
deleted file mode 100644
index 807331a20de0..000000000000
--- a/media-libs/taglib/taglib-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A library for reading and editing audio meta data"
-HOMEPAGE="https://taglib.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-SLOT="0"
-IUSE="+asf debug examples +mp4 test"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-install-examples.patch
-	"${FILESDIR}"/${P}-missing-deletes.patch
-	"${FILESDIR}"/${P}-order-big-endian.patch
-	"${FILESDIR}"/${P}-abi-breakage.patch
-	"${FILESDIR}"/${P}-bytevector-simpler.patch
-)
-
-DOCS=( AUTHORS NEWS )
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/taglib-config
-)
-
-multilib_src_configure() {
-	mycmakeargs=(
-		$(multilib_is_native_abi && cmake-utils_use_build examples)
-		$(cmake-utils_use_build test TESTS)
-		$(cmake-utils_use_with asf)
-		$(cmake-utils_use_with mp4)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# ctest does not work
-	emake -C "${BUILD_DIR}" check
-}
-
-pkg_postinst() {
-	if ! use asf; then
-		elog "You've chosen to disable the asf use flag, thus taglib won't include"
-		elog "support for Microsoft's 'advanced systems format' media container"
-	fi
-	if ! use mp4; then
-		elog "You've chosen to disable the mp4 use flag, thus taglib won't include"
-		elog "support for the MPEG-4 part 14 / MP4 media container"
-	fi
-}