gentoo resync : 08.06.2019

6 files changed, 42 insertions, 33 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index bc8263f2cbb6..a55fcb4290c3 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index ba53389fcbf2..9ac1b38f2d26 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -6,6 +6,7 @@ DIST kodi-inputstream-adaptive-2.3.16.tar.gz 709687 BLAKE2B 9462cc7d77c20f2b63ca
 DIST kodi-inputstream-adaptive-2.3.17.tar.gz 709839 BLAKE2B 55383716f7cd9e0b21b55cd86d2819b08fae7857ea88768311400401c90c1280a36b9dd404f769f30cff46eeb5d36b855064db1dd8c265d4d1231cc73bc0a1f2 SHA512 055fb4baccba713c7195fb7285053514006459ca3ba0197e0ca1bf507472161e4d449e30a8e6b77825c480c405dfee177ad6070f21f1ffacd6248e9e6288e18e
 DIST kodi-inputstream-adaptive-2.3.18.tar.gz 709886 BLAKE2B 5b96786aead7f51172f363018977a879c6ea7a490cb8908e6c201a64b6af88c0eb4ee2eac6fa8ca4305f7a2762f65cd5e9427e4de5c5c637ee60e4eb1cc501a4 SHA512 fbe281e9f89ce5987429231ca7ee2c42aec1016a9742a1783e9852a462ba6d209978096666536c9768cc580482abd1bb1767e3b63002329f90869206c4e297cc
 DIST kodi-inputstream-adaptive-2.3.19.tar.gz 712487 BLAKE2B df01185d734a3dd9f241e91fa392dd7696a37a34575715e46eb503fad82ffd5ceb1ded38531a8fa1a4055edcdd84a1b284fa3c7daf1b12106f7b6be390e87598 SHA512 a76c4a472fd4ecd756eb2936ebf0d1f49dad348747d40c80771bdaafb999bd6e9e32ca333d1d16fef3837e46ed60bef47ff68dccafcd4166e57e240a1d7b255c
+DIST kodi-inputstream-adaptive-2.3.20.tar.gz 712611 BLAKE2B 7771fd15e230e76cd9786348b86a0a561afbe250f7d78e2418f1fc189e52b46ee249316770fdd9aea7fb16c73df6f9579c73510e658a29aaa53c5c02c04bee9a SHA512 5a5bc68d6f10187d2ac8d7a0e196a6615b75642ffdae67efac16d7aa718a42c13df3f3485029876eff42fca415039549ead60db381477de9df2bde5fc7f34718
 EBUILD kodi-inputstream-adaptive-2.0.25.ebuild 799 BLAKE2B 49612b21ce2fce4f3fd32f5f15ef872ac3738bbee99210e68f68083e413c2bdc6a5eab012fde212e1ec6ab2fd998214a9ad30162ff60aebe52611892afb6ec4f SHA512 a088a71d77ced70bf1e697412f56f92ae3108d2e88a5a3cc1855b35ee89e2fd603f325e5efb70ceaf74af05b0003e9af55aa6511cede51195dcf9cb80e264336
 EBUILD kodi-inputstream-adaptive-2.3.13.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
 EBUILD kodi-inputstream-adaptive-2.3.14.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
@@ -14,5 +15,6 @@ EBUILD kodi-inputstream-adaptive-2.3.16.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7
 EBUILD kodi-inputstream-adaptive-2.3.17.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
 EBUILD kodi-inputstream-adaptive-2.3.18.ebuild 724 BLAKE2B 19f0d9d58d104d14b50b7691161378ef9621eaa162f08ada2a3d9f1d3de852a9e5024fc2947fe54802ccbaa224212c92501937774575109c21112111bfdeb8ef SHA512 35da00c5e89e54c8ba456a72ec02106652d2a873b556a54e98736927de12181a30dd67f45c487033917ec68a9e8edee1958e997c7ecacbbbf23d47910e797d4d
 EBUILD kodi-inputstream-adaptive-2.3.19.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
+EBUILD kodi-inputstream-adaptive-2.3.20.ebuild 765 BLAKE2B cfe5860064cfc2b6c4731c60d2ac56431bb68395ba1ee9b63c0dff5ed0cf78487273530a22c6c84e561dc92b87feb382c7e20f6c30ad1100e1fbeea05cb7b674 SHA512 073856271b66d3e2754fba8d6b97efcde97ca3e22b6ceeb260f14495bf5ce7a029d13afb90159b2f79358131cc986942a87a01ddc56e965a596ae3370a8499e9
 EBUILD kodi-inputstream-adaptive-9999.ebuild 767 BLAKE2B b2900266ac7b915fde25ba54d771751a6943d60546fdef8fdad322a1f9aebe9a85ba0ceb6945bbe4316959059af6ec6ccdd261fd86ef080a07b483ef4d35d59f SHA512 e02c3aee34a8b06658f03300cc3fe0766e0acc1cb9b1c3eae49ae787288b9788547c9325572ed9671dbbea8ec95d6f98daccb980991d0bd6c0dfed9afa7b7852
 MISC metadata.xml 459 BLAKE2B eeb0ec3e241775f1953b2846edd160fcbe72d5990a256f5374e9aae5e45eef5f4c50225c72d371c0ca3d11a3b81eabd87a5de35952aa5f7676b4d7b79854ba71 SHA512 748df555db70e268d7f67b408428d949ecc04c49fcd143d984b47597c3c4ee86fd8066bf294598df926889525213f34182a790d442aced5fc2f39346f13e4d5c
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild
new file mode 100644
index 000000000000..039105147964
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.3.20.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/peak3d/inputstream.adaptive/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/inputstream.adaptive-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-libs/expat
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 4e1b3661a2ea..fa3f5e1c0a02 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,3 @@
-DIST qmmp-plugin-pack-1.2.4.tar.bz2 252589 BLAKE2B 562cacdc2e17e5e8163da4a545bda3398eaf638d3dc7a1a5426a9b8786b031e555106be9c82a306c0b8a3d12ee8dbf160fe76d9a3b1f4d776388e4da5bab6fb3 SHA512 10c1de2e5f5f84eb79eb1e2fb590ec07745e75fff103530057445021dbc2e00a58397533f076959a7e6ac569dbfad3876cbfb7c695808ec384de76993f77c01d
 DIST qmmp-plugin-pack-1.3.0.tar.bz2 230625 BLAKE2B a26926c81dee6e47c4a97cd40328329722fa3ccc9c244fddb962ef268337b6a9ea7db6b9568af83f469f88cbf4c60c2154b968276209b118f3124871a6764057 SHA512 5d320938cc5cdd540149f131e41c87c0eb5b4db79fa6f6706dcf30177ce988733c291d95c731e14df13a2d1f9af13916de060d8eaf38910bfcef42aac68bc900
-EBUILD qmmp-plugin-pack-1.2.4.ebuild 572 BLAKE2B 6f7b03728ac4910cb72b17567cfb73c2efb199a03fe37bd737c8abc9a31859502f230d3e44454df9e1c989077adcf6b374b89647766d1422f859a20ee4e38f0a SHA512 cecdad646405b5697109e4c62573076247a838910d75bd2220d383315063247435be70de9b5c8eda43ff1171cade74833abcff6da1bf8d41471ac3cad691305e
-EBUILD qmmp-plugin-pack-1.3.0.ebuild 553 BLAKE2B f1790c998325347da0730e4c83868342e4eea9d7cb1d6fda6cb3a52af8560025c8e08d774f909f13431db8eb14307d29663ee2ed4ebacc4f99af6957d56f5b47 SHA512 d17c636d85b0311e7a6cedabe30cd93e1bca941d54b327902cb5275a114e941dc84e5f59504756a69dce8bebd1f58760c7205a14e02e6148c74565af85f7c387
+EBUILD qmmp-plugin-pack-1.3.0.ebuild 552 BLAKE2B 44da88b3282066df70eaa9a06cc4268008fbc2953e65c63b943d2d2b8677e4f943449f81d274bdcdc604eb4c033e016f9f60205871223d6f0fba9315cf23b36e SHA512 786524ae52bb0213252826daf396efcaa3aa8d37582fcce5cf58525f5ad772263fdc11670d1916a4d5535fe6c494189de43a6b2df8cd51a45d485c701cf0bf6e
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.2.4.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.2.4.ebuild
deleted file mode 100644
index a1326457122e..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.2.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsamplerate
-	>=media-libs/taglib-1.10
-	media-sound/mpg123
-	=media-sound/qmmp-$(ver_cut 1-2)*
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	dev-qt/linguist-tools:5
-"
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
index 114f1fcb4ecd..3dce469db1a4 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://qmmp.ylsoftware.com/files/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="