gentoo resync : 18.11.2018

4 files changed, 51 insertions, 10 deletions

diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 577080bff785..622b32956a69 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-modplug-1.1.0.tar.gz 25619 BLAKE2B ca431badbfa6c7e765543b0e386895bce9ac7a2f6104e72713c146e5097e382ff8e56c1483e4688f1e373c2f6e97a76d95a78e2cab26141116c224a5c5f1e10b SHA512 38ddb6a86019cba493790df6a09de553fadec84943de98dd18dd8bc1b1741b498fc1e621adfb8d6b2dd983e7bd7014951cdcb8bd5d82c980594363c6626cff5e
-EBUILD kodi-audiodecoder-modplug-1.1.0.ebuild 699 BLAKE2B e4b2fe66fb8612fa4031ae9e6eb382bbb3f3f3af37fa193a8862bd5cf645d5da203f3dafa726bd3ae1b5069991325feaa47c54ef0638511f1106b4c1b9e746df SHA512 50286bf06eb6322ee3d3652bd5cab47d4c66ad3af736da8aac3a512c8b961ad7e185e83641f51e5dae4bd16b3174490f2578b168635953ffbeff7534e013a68b
-EBUILD kodi-audiodecoder-modplug-9999.ebuild 699 BLAKE2B e4b2fe66fb8612fa4031ae9e6eb382bbb3f3f3af37fa193a8862bd5cf645d5da203f3dafa726bd3ae1b5069991325feaa47c54ef0638511f1106b4c1b9e746df SHA512 50286bf06eb6322ee3d3652bd5cab47d4c66ad3af736da8aac3a512c8b961ad7e185e83641f51e5dae4bd16b3174490f2578b168635953ffbeff7534e013a68b
+DIST kodi-audiodecoder-modplug-2.0.0.tar.gz 30001 BLAKE2B 9ce90103a9b50a37c3f6c8671ecf9986f2b31320fc483dfee6d97331cb56829a9641c8cd1efe1fa9edf6ada360bc1b10bfcff0022022f4ba097a191b52dae0e6 SHA512 8f1cbd95b4fd6dcd560dc615c161e733d7b3413a80abf91c19eb59137e7acf250c9bfd5561a722ddeb52afcc4cf7e2ab0d4f6d8bc5143ef18e0b2c431635063a
+EBUILD kodi-audiodecoder-modplug-1.1.0-r1.ebuild 706 BLAKE2B 92862756b7b7044744599432610e183623d3cad30fa27d087951ee3cccc0a7cc2f429e573e2dd6e257b5d609c907b7be1a1ea82ed380e4430ab7646b3a46d6a2 SHA512 fafce743382edf211c6787e2da919df3ec0f22820e2df2c3f00de683d78a3c5f70a4ebf3f7b3dfeb9f9d744034064164cb2aaa6593eda8a2a9d1085843f9e0df
+EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
+EBUILD kodi-audiodecoder-modplug-9999.ebuild 749 BLAKE2B eff46be6ffcf76b252fe8c12c6848d65566ba80a59645dab903f31fe251715329b358b84cf1901b2e5017975179cb882c587e4e3c486dfaae9bcf5eefcc3ada4 SHA512 fa512443264705e12e8af26dde7f4227f9b38a66f6f1b90d857044513abd45b41cefcb969f5001feb27528932f08d0de850a62d1fc603de0ad47e6f648255ea8
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
index 276bbf03b5f6..eee4b14ab81d 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	=media-tv/kodi-17*
+	=media-libs/kodi-platform-17*
 	media-libs/libmodplug
 	"
 
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild
new file mode 100644
index 000000000000..e80d840de639
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Modplug decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	media-libs/libmodplug
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
index 276bbf03b5f6..78e9c1d36776 100644
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,10 @@ case ${PV} in
 	inherit git-r3
 	;;
 *)
+	CODENAME="Leia"
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
+	~media-tv/kodi-99999
+	~media-libs/kodi-platform-9999
 	media-libs/libmodplug
 	"