gentoo resync : 06.08.2019

4 files changed, 13 insertions, 52 deletions

diff --git a/media-plugins/kodi-peripheral-joystick/Manifest b/media-plugins/kodi-peripheral-joystick/Manifest
index 18f5f1e6e3fa..6e8e833ad27e 100644
--- a/media-plugins/kodi-peripheral-joystick/Manifest
+++ b/media-plugins/kodi-peripheral-joystick/Manifest
@@ -1,10 +1,8 @@
-DIST kodi-peripheral-joystick-1.3.2.tar.gz 82787 BLAKE2B c3edcc037161e7f1b865b1761a1296e15d6428ac6f32907569f8b32d3a7ecd7e2c27103ce72079b92b4329818d6709209d8f7caea386223fef6e59df281774fd SHA512 9aa2e5d1af51b83abc0691fb9f6c7603d07c37b61fde898e2010d6370b9dca44275bd53caa2252479128360bc97eb8bd904d268a9c0cab7f2958c0b31f64ba1f
-DIST kodi-peripheral-joystick-1.3.3.tar.gz 84408 BLAKE2B 53ac931708319945c132c7a835fd37e4fcd2c003d64db32c7a888af116625746b96685563dd732873810f28adec20ff5dbed37bd66dcb6bff74cdd192f5a45bb SHA512 e566cfab838b471f4d5cd6d1bde48479868bf1e401e2d5512627f6cfad606c9ec359fade3612dc32424b4a5baffad82278d25906e59062bea9e8aea009754a78
 DIST kodi-peripheral-joystick-1.4.6.tar.gz 91142 BLAKE2B c80daf4e9a425c88ecb323d7f5ab7538aa5a8af06758723310f133f63ac65b74650f6374e4361e9086813474a6b84cf54bb8bc054d54eaec19c1ab32da5181e9 SHA512 ae42a295e548c6bda7a258d02d7a68ec3f34c66e88b1e3848181d8fb76da6ff83f19f8adc007e2697c096052fdd1ea9879b178aab9f8f4118f4d2d57691c2a7c
 DIST kodi-peripheral-joystick-1.4.7.tar.gz 90671 BLAKE2B 281a1d821586224ad155ac621fe5fd48c189733277c877799355bf432a580311967c7300cdd201ca9561f149b42b3327a320bd3641108d8c69cbfd27242ed4dc SHA512 89d9c993f598f7660fccfcc1926ad3b944d88586b0399b3e47524fe5a68665eec8fc7b196acd6d59e36488f830afef50c402ecd05d69cee75c21a69c538e9acd
-EBUILD kodi-peripheral-joystick-1.3.2.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
-EBUILD kodi-peripheral-joystick-1.3.3.ebuild 763 BLAKE2B 529b4ab8aad7d7dca87cafbfec5bfd153a625da49b7a4bdfaa45593b2043abf3a3d3c526e94a0fd179aa768e90a6eceb13db3271bc25dd160a3379c6f5950259 SHA512 b3e15fc2640315e8df3e45a5554dd61a893f668c5aec593b37d82b4f15676ddaeb8c681a7e9a721c8ddfee40ea5ad2cd3692a1525f164d4ad563751565aa5460
+DIST kodi-peripheral-joystick-1.4.8.tar.gz 90965 BLAKE2B b9bb3aa6e1a5531c304f2f3466bac8f00cffcd771065052d41645f48316c7b246fa07823395aeaa484ca9839d1b8025e6640e7cb504d29642d52c02a1fb21553 SHA512 4ca692589050c225bb9ec45b79f3532a4c572c57b3c2400dd4afa398c3d77194136ffde7bc85b7d24700d7eafb0f813cc3fce5dc48d4de51869fad0f68679939
 EBUILD kodi-peripheral-joystick-1.4.6.ebuild 730 BLAKE2B 76309930faf2294995b1df7eef268c6ee8fea244a129bdc2c2a65e30018cd6fa4e9afb32398eb5e17c8a8956cec8439d321a01eb4015058f54e52ad06be52b69 SHA512 6fabf1aae054025f89177e8bf00672ef62679e31238c048bf7598e92391d82b43fc5815356bc083f3986c0256762c40f85c6849bb00ff5ed4442f0ed4d39ce95
 EBUILD kodi-peripheral-joystick-1.4.7.ebuild 730 BLAKE2B 475b3113d4f0edf85c7221641e8253a20d5c571a890a7e88f6e5e0df7d4ce73bbc5863e6938b921191f721d7d88e293ea3040bff8027f8340a47c08992849106 SHA512 2d4b90e94341f6b0435589c62505a02369081557e6fd71c30b90602c1991da05e2c36c8bde04cdd1eb0f0376beced8e9217421d9c0991cbfa34f9e04d83d02c5
-EBUILD kodi-peripheral-joystick-9999.ebuild 706 BLAKE2B 13ca341650081a44e85af4ef28ae8cdf8dcdd971aea9afdbb827044a842b95975de84eaf6f5b016588d32e8dff033ba3dee9cc08cd36aa99cb787ca636d60aa1 SHA512 4c476cd6488070ca7edda5be0d9dd55121d45a2aa9ec9787e08698cf56a1284cdee65dd231985b0c6d170327a8abe46a37ef36d7ab074ef9ef25abba8f8ed80e
+EBUILD kodi-peripheral-joystick-1.4.8.ebuild 770 BLAKE2B 1abec17a88f9daa0bf27aac34a59e7be3aa4bfe9e46b58c1f8eb8f280a882723459945444da1e6291a8769f5582f9a95b4d21a710e8657efd6376033256b8d51 SHA512 4d76e61711b1523c3817c694d34fba20fde4b6a838c43849f9e8dd20120f25a6720ad1695e72ad3c97da2e735e17b594b7469db7ffa9e943ef97f8ef7a4ed7dd
+EBUILD kodi-peripheral-joystick-9999.ebuild 746 BLAKE2B 8587f64e5d25b69e37dca398f428cf136e61e44db423dc46592acd3980479dbd7d35d4f3b1ffd417aa47f1a53d6de9a3f52fc3461e6d11885e9fa68cd83daf90 SHA512 d55628f1f733d9b88d6958f889e8f40dfb159c116d4d75c9a5d250571915286e2f9c006006891d44b65c68f48580af6f38fe8af472f3a99be85be6af6ebf8edb
 MISC metadata.xml 439 BLAKE2B 4713d97899dd9cb12cf064f17d88b197f872a38952d435445b0097c9cacd297dface9c9efbe034eafe595c7cccc3a37773fbf025c0fc45fe3283ea406785c47d SHA512 1489ac3199dbc3033892af4d492e843fff379a18a93059e4c0e164e9140411f8f7756d275b70214c375f4ee649d48786255aa6500c2b6b218f843295ebd6c29e
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild
deleted file mode 100644
index 019a5d3f0305..000000000000
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
-HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/peripheral.joystick.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>media-tv/kodi-17.0.9999:0
-	=media-tv/kodi-17*:0
-	=media-libs/kodi-platform-17*
-	=dev-libs/libplatform-2*
-	dev-libs/libpcre
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.ebuild
index 019a5d3f0305..c7d5c665839c 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.3.2.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-1.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,9 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	>media-tv/kodi-17.0.9999:0
-	=media-tv/kodi-17*:0
-	=media-libs/kodi-platform-17*
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
 	=dev-libs/libplatform-2*
 	dev-libs/libpcre
 	"
diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
index db97e72f5d19..fd7b1226a274 100644
--- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
+++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils kodi-addon
 
@@ -17,8 +17,9 @@ case ${PV} in
 	;;
 *)
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/peripheral.joystick-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/peripheral.joystick/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/peripheral.joystick-${PV}-${CODENAME}"
 	;;
 esac