gentoo resync : 11.07.2019

30 files changed, 364 insertions, 36 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 1baab29e3c2a..6a09e1005925 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index aaa014a3b324..51d860b9aae3 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -6,5 +6,5 @@ DIST ffmpeg-4.1.3.tar.bz2 10689073 BLAKE2B 8486e21c8df116af802bb7f9208e702ec1fea
 DIST gst-libav-1.14.4-ffmpeg4-patchset.tar.xz 49428 BLAKE2B 74c3e0b25643bcfdf01d1d16514401fef4bb988ba3d1f306b647ba0cd6e89f0205cc33e6d144889d6b2f7fab9e4fae946e03821a85009fa95c68f3cedf25068a SHA512 1347424ed342f00c25ac4780670611a24eeaf708426b6efc6d9f6c6fa7bf91ef292302a5363afe9523c497265b8c0d7ad81374364cbecb2924b749e716819745
 DIST gst-libav-1.14.4.tar.xz 9036732 BLAKE2B 1c2e257912f61dac71e1d890f4cb650e0cdbbf4472cbd8dc6b73e471d1914409b71699bd198c154069e15e68364530e91f76619afb52b91e373e58c9237ab7cb SHA512 4a0e9a91c23cba82e6a6b8eb65ff42b9d80389dd232b08c22b3431d3942fb93a6a7e64be97083d11cbceb2abe5d45dc5b37d230f7552e1a7fb193610d0530717
 EBUILD gst-plugins-libav-1.14.4.3.4.5.ebuild 2440 BLAKE2B 61c9b14b905aefdac17cffc297fd6e2e6ef850ea7f0b980c468dbdb3f12b52d192134a51c623ed3294872fe74153d66d766dd0cdf8e8fa6eb2275ac4341c14d3 SHA512 b26cca92978671ac18d713c751a2087e0e86d6a05169626ce36b668920a58d98f354a3c151e00af408bf2cd09a02d46fec85ac7d01597b47ecd30eb6e3a3e328
-EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3167 BLAKE2B ae2008f5f67ba8b857856a602ae3c946a9ffa0f4c5d2ace719c46c5f764ccb20e2a096d1ef721cddd75d6dc6f49f368577e4e62eba61cbb7684f375b6309c0d9 SHA512 54177c1fba9539bdadf7267c4ccb66ef943508940e4f1255069fb9e4c62f6784f6c0bb2905b17d2df1de265375843b85b1526c733176e2bbc2375ed3343a3984
+EBUILD gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild 3166 BLAKE2B f5f6e91f441ecc71d79e3270d92310a3cac651bf5dfdd3d5038fcbe888c5af550de4d47f60141678450580cb2e64155216ee78e5de88ef611c983de9840018fe SHA512 5d26c96f33bde94b8a51edef0e996c5db46579ac4fb4587d8eb68df04808d9568c25996564b81d2bc0dfd279ee2c3d354b74697a0e255e95d3ac4e12f906e6b9
 MISC metadata.xml 435 BLAKE2B 8ee96f01d191e918656c2a80e8cacee47237740f7639d34f0205417815a06ae8dd5b0a27bd7bffac668f3a74ce8fc377112e3cbc369ad4fb34089b2975f3c733 SHA512 5c65497b650587ba929108974a18116b9fdea3ae175fc637c470725a39375defbaf962323f7062ce4287655fc47e8fd28ce4a1d8608fe7ea243bc6999a1bf753
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
index 86f21eee403c..5b24aa52b470 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.4.4.1.3_p20190329.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="libav +orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index 449c6afa52e2..b8b3b3cb34ee 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -1,5 +1,5 @@
 DIST libnice-0.1.13.tar.gz 912374 BLAKE2B ae8ac3af7b5f355e3c7b961bfa60759ba71c8cc6ddb6cb5faaf1c6fe347785f36340a9f8977a1689595c265349a1b34305f41288cf951fa938b0411cec3acc0d SHA512 c9bb81e8cd0b4e3673dba07ce08a16dd8821831339b44f1006510cdc09f9ae4c6eb7d43230711a2509867acb8d7df71821c411830dbf71c5a5d7e802f14a32c1
 DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3531ec42674648fda320eea6cd9348acf423571922bab4e338bf135f85b292046352ed6f5e4fefba736d787b1ff1 SHA512 60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c
 EBUILD gst-plugins-libnice-0.1.13-r100.ebuild 1395 BLAKE2B 4af1c036097bc514547c1b651fa32d9dd8ffd1546f851fd7bb459b8c10c0b9a74b175e0667fd60ead7d83e897901f1d7a5da7bec226f9ca38c081f6b34dd306e SHA512 8961d22ef8d2d8c2522d5047da6dc0f0b602a9b6edad8ad7f563407c99354f1516768d455fb05d386283b1a42869509468c507d2fd5a45a225e390cd7796aa75
-EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1695 BLAKE2B 2b686ec21dabdab0f0f7a9ee85fcf22e914167d5f85306a38aa02c5de10f587a5a2b4de268c02417940f0a8c20f087b1d27c102bccbdd85dd3c45a5229731a84 SHA512 c69d1f5cf336075db770e402f0d50e8e0c4f7444e2bad828a01068a8d5349c1691003522c9d4eef5e19701555eae042df00487f726c154742318847acf651eb3
+EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1694 BLAKE2B 7f9f59175327aea4444191322ffb7feb5033e4763094c9eabe2b781cda60bc5335c44eeb3812a3cd82a1d9316ec5965f33f66e8e21787184839883642461d2e5 SHA512 653f7f90e0b7ab6d3741c55bdffb9ceb453ec3344b51f82483e2a7702b82cf08a407e7e61bf0351fff6805d19cf8a89accd9f91a49d4fe87d6d3d99ea1a4b967
 MISC metadata.xml 372 BLAKE2B a8206f23c5130a6b0dce3f9e301a998c34401495b4b3fddabc622e99be062815f7174991383f5e4396a345876762f43bb497200496fc778ad45052cd64ed542c SHA512 39d91850c0c10c71afcc7771a7b813080b0a46be31879ab6c33b1b9265d1f85fae78f447b1560e3f3f63b5db78ed30b9d2d7d040d0cc11f31fb5a4398ab3711f
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
index 507088b6c33c..ffdbf3d3df1a 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index eac46b2cd3c5..966362c91d2c 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -1,3 +1,3 @@
 DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
-EBUILD gst-plugins-srtp-1.14.3.ebuild 385 BLAKE2B c01e17632de0f46e3a12e1f16fd8b86cee555bb4ea8c12a2b6e77f0e7327008e9265b6b070e40eca5a37118cac51e5eee6b2a496f3454bae5e83a0b3ab9b0af5 SHA512 7ee53f1d95a2d4b2706ffc4aa439b5a5fae49d2727528185ff6e3dbef8b6150ee39c9f71c705ce5578e0d30997ac489836d5ec43a230b7a2926d8a0cb91d2a15
+EBUILD gst-plugins-srtp-1.14.3.ebuild 384 BLAKE2B a0b20a08f635628ce245723bb97a6e9c028bf2321b28d35e4bac95590a628bc303ba35f9332d07b88a20828945a5be404d8c245591378a48318e7cf4cddf856b SHA512 9c563bc651d5d15aa6179887f23d0677d7c2c7e5d46e235f47f263b5a4f9980faab16ea2c88ea034acef834935bfc6e66d7968d573ab17d5aa4daf6c9b6cfa71
 MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
index 1a320902e36b..c1a9d377677f 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ppc64 x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/kodi-game-libretro-bnes/Manifest b/media-plugins/kodi-game-libretro-bnes/Manifest
index da2132d00a9e..0768b1c9212a 100644
--- a/media-plugins/kodi-game-libretro-bnes/Manifest
+++ b/media-plugins/kodi-game-libretro-bnes/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-bnes-9999.ebuild 882 BLAKE2B c7409aad6329cff6dff82b9d7f32054efc252e013b920494a81dca85faa626f54a54f4ae5f20f90e2e964c63cfc8d8b9d5cc56108c8db705d065a89fa47b1907 SHA512 f8a8f2d216bc642410c7918455228297314a896ac793fd7b1fd5952039f2c2c865179a3e1c85a88760fcc17099821ba0742faa87ff2d42567da64baebbbec4ad
+DIST kodi-game-libretro-bnes-0.83.0.3.tar.gz 809447 BLAKE2B 4efcc72c60ceb433f755afe39058cffc2c39f9ad3726bd407b832b39fc4e4eb85287f6fc25cdbbebfe1b21db4b567fcd260544c1de544ddff2a94ab190c643d8 SHA512 371830f91cf3f7f47b45cd86ec7438a697e0acf886881e87c6dc9218d599e983cac0a540065b6d45b9228b20dd2c1bc264345ee454b55f68d13c62e33944bfd4
+EBUILD kodi-game-libretro-bnes-0.83.0.3.ebuild 918 BLAKE2B c9c761aedbe59015af7a6fc15402c3c34a3a3e3c423267acb12d757a97050a96301c21c664aebe72d984e6a2b5e63595d789bc9cc034ae64cac93c19f6a300ca SHA512 8b1171895be885275766865df440a6308bf83af6b2a6ee491b18e0d64541be9094bba8f0bf1ac53d641b537462bfdaa9844ebf76953b07c11ada393160264963
+EBUILD kodi-game-libretro-bnes-9999.ebuild 919 BLAKE2B 9d2f6496eb711f031e755f08f7abeb65224d0c2b194cba1e74a91cfdfaafa83c27a65d54b9c65dd9da5b1dd885c0024020046d371d6e644f4ffce8a5f736d34f SHA512 fede4229be5f0fc1c176f81dca2584c27704bb535550fa9d7e9c5f35507b3ec60e8fd3772be5f832d8b318e2b9459611f1d57736de12d753a5635b451fe47fd0
 MISC metadata.xml 435 BLAKE2B 95279e9ee10da6bbfb0230876ffa825de81092b99616b91914710f9cb8f91b2db8ecac3c05f142f5b20d127775261fd474f504d57f6eec01d71e2a30c3617100 SHA512 90fd8905a33a079be3b487801b241b7e6c8ab7cb40c76136ab6ecd1edff19f60665ef74ed8d321db4c92b3fb8f821ec7a124b6882b10ba11bb78f5217b0d4c5b
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.3.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.3.ebuild
new file mode 100644
index 000000000000..960b86f16f9f
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-0.83.0.3.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="bNES GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.bnes"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.bnes.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.bnes/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.bnes-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-bnes
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
index 75ecc68d0df2..bdef35c1c517 100644
--- a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro.bnes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.bnes-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.bnes/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.bnes-${PV}-${CODENAME}"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-plugins/kodi-game-libretro-dosbox/Manifest b/media-plugins/kodi-game-libretro-dosbox/Manifest
index bebfb365f4df..3dc866f3f658 100644
--- a/media-plugins/kodi-game-libretro-dosbox/Manifest
+++ b/media-plugins/kodi-game-libretro-dosbox/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-dosbox-9999.ebuild 900 BLAKE2B d8bb6665e6ec706bb50af2cd382feee028881118653b9b2065f070485a82c6a578f45761f2515ce50c5cb25cdf2dccaf5a853aaac08af156751c692d326e0f25 SHA512 25cef03ca6a82c0412bed704491c7b45c787e708803dc18e93de90dbc0a1fae69113e675ffcbb4a04233f99041b1a343bf1d7a918bc030220bba25175a7999c3
+DIST kodi-game-libretro-dosbox-0.74.0.3.tar.gz 53861 BLAKE2B bba95d96c9a313a96df7e3774573fdf43040efd23629242f1400a5a5ca8c2ebe948b68fba7d780ccd4cb3ca7cc4db74e23fece9d192e6988493a89eec19cdca7 SHA512 e802f5bdb1c9b82c5fa3224138f1956e4210aa532bea3ead20fba1a9349ef780f52d966b334beb498ab3433bd3822df7ae9e5cdcddbbf5b97318a5b65f4fc277
+EBUILD kodi-game-libretro-dosbox-0.74.0.3.ebuild 936 BLAKE2B 1c14d09fdc0826fe59374b74ecbfe34d0bea34c7bc68311643aa0392de6a880b49ae01c2b0301f3fd71eff2cda3044250ab478635afa842e93b49c6d81d7d848 SHA512 c009b2dcc6c8e97cc41ff6b2c16757984d280e43813e1080cf535e75686c07d4fa3b73600795a954a1150de4c625813eb15a17fdf4d58afe99e401bd719986b7
+EBUILD kodi-game-libretro-dosbox-9999.ebuild 937 BLAKE2B 576962426c884f6dc83e1cfc5e4f0cae601a864f76953edc89b13d60921171bc125a96d2aaaf867ffa787274e8383d95af18481cabae85560729cf66c76ac3dd SHA512 5c000097c03656e34a99fb444414823852a0095b281d1f7e9471c542c2d0a703992d2eceea70dbffe9425dd50b5b73f335b66dec804a6e13604e2b3633da7932
 MISC metadata.xml 439 BLAKE2B 26e660170befb49f4f8cecc4e47a11a4edce7447eecfe8318dc00d5ce6aa4b1a54e6484a50ddf2004caefdaa8c56869e377c2607f2213e73cbcc95d67ae90fee SHA512 fc9f630ac1c8cb229608ac0ee16398a529e1698a254abaa79f786c9ffb543558577ae06c02f2142bd9f3d405457c73a0b8be0f46bf656af1d24c645704d2f560
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.3.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.3.ebuild
new file mode 100644
index 000000000000..8d15e745cc22
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-0.74.0.3.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="DOSBox GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.dosbox"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.dosbox.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.dosbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.dosbox-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-dosbox
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
index 44c31d728f6e..3e5fcb2608a7 100644
--- a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro.dosbox/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.dosbox-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.dosbox/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.dosbox-${PV}-${CODENAME}"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-plugins/kodi-game-libretro-fceumm/Manifest b/media-plugins/kodi-game-libretro-fceumm/Manifest
index d99285060657..100e748d20c0 100644
--- a/media-plugins/kodi-game-libretro-fceumm/Manifest
+++ b/media-plugins/kodi-game-libretro-fceumm/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-fceumm-9999.ebuild 903 BLAKE2B a449ab5727e1f9a963b463c01d8f6fd0b96479dc6644916c2c24cd8959cb567a4b6e2b4091d3fd353b9c96f325868dc7982a7b7ba0295df087a899ecc996f459 SHA512 3b33c441e3d0cfa1c72277f76c8da6fbb9fdcfb7aac88aab8a08278f77df66b0de0cc1c7c3181064325a71127f471da0e6ab6e3d8fd47149c83532d573375043
+DIST kodi-game-libretro-fceumm-0.0.1.9.tar.gz 778156 BLAKE2B a7a03d2df6cc4fbf89aa0a8b4320deb7ced5d452c045d3583fdd17dcdc2dbcf59a99ea323bc0b15355889522e2f3bf572d4b0c260dc381c2630bf58c8c7cd2ec SHA512 772b69afff01e26d04fcc33d06e35da0329a1315f0e3ef01b51cc8459d145af782b6dd72b5b460de8dd7a59e308bf4922b2d77b62be1c5561b9debf3bbe36b60
+EBUILD kodi-game-libretro-fceumm-0.0.1.9.ebuild 939 BLAKE2B 48ab5737ea23f7669568b95628117efa263cd71978374638d09909acd254b555baa3ea59e00c55f7877e358d9272177ef6a4ee18a9aa71fbf5ccaf59f9ecf3c5 SHA512 cb953d2002b8de35a222bc6e581899d560a615e9895edcf33d5f1c5e5d19d022447818d75bc58b9505b98ed4e5efb0e4dd0a9eabaed593c1ff615f60ae2a3756
+EBUILD kodi-game-libretro-fceumm-9999.ebuild 940 BLAKE2B 2d2caab71b14297b2a835c7c05a2895d2d223af07957595fc74c7333207128c7ed8b2ccf820e033b4e855d7c755b19ae7917ced1406ca1a23148e42c8ea91ae0 SHA512 ee17de7c977e863fd355e354e356c4dd9a1dbb97858132aa92e971bf8924a2a22ed9adc5470c1f82e32467fbbfe91c7063526041083b03b708f973cfbfde549b
 MISC metadata.xml 442 BLAKE2B 4667a846f933ec1e23c3ec051912d1ba46d1ee1ca41d082928efa5fe9cf89e9e1d50ccdb589e63426c2103f2580c782e4cbe0a59ca9396099c7a669838645dc5 SHA512 92e19b68682d05f6b51ba04e0478419d7f940ed29b28595f0698cbb2fef0c89c7aa44f30acaf90fa21121f8ebf018012391766e33563eea3bee606ca0532a76e
diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-0.0.1.9.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-0.0.1.9.ebuild
new file mode 100644
index 000000000000..2f5bc82a51b3
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-0.0.1.9.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="FCEU-Next GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.fceumm"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.fceumm.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.fceumm/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.fceumm-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-fceumm
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(FCEUMM_LIB NAMES fceumm_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-fceumm.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
index 803fb82b6ead..e80efcb5cc4f 100644
--- a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro.fceumm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.fceumm-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.fceumm/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.fceumm-${PV}-${CODENAME}"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-plugins/kodi-game-libretro-nestopia/Manifest b/media-plugins/kodi-game-libretro-nestopia/Manifest
index 1031b40cf200..46ab98b4c10b 100644
--- a/media-plugins/kodi-game-libretro-nestopia/Manifest
+++ b/media-plugins/kodi-game-libretro-nestopia/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-nestopia-9999.ebuild 918 BLAKE2B 96826d64d04ac564180233b46d0b7830c0d627d8d4089855926c2446691f8952932420a0ac98576fcdcd15c796c128daa542d84d4b2789409e7e275c6beb1a7f SHA512 b716465edab2743c902c7300f18af8067062eac65bdf513e6852a5c01208a03246f194a830e5ab405b1fda76bfe7187dfa63ea84e24e75cee33bef115d75c3cb
+DIST kodi-game-libretro-nestopia-1.50.0.3.tar.gz 793893 BLAKE2B 89015bb8c687685264e4a8c34cf1caad87cfa1a3611cbd67b540ddb31e9e75049eed328b51c69702e92e358a659d4e503ccdac1b52b7db70688e1236529536ad SHA512 4c41db8c77d24301f00b9d0283c948ae3c4176228e733a316fa5b2eba60ceea4dd094f48270d545008f144d3316cf5f8f190017f70e8378b9fbcbcdb2d8220e6
+EBUILD kodi-game-libretro-nestopia-1.50.0.3.ebuild 954 BLAKE2B b7551d165e179efe08fd9a61514b63930d61863f1680d32419882df58bc41a8798287955ea552581beec39627c56e78e63ddd6081be4af3d6335479eb8dc5cee SHA512 e49b56f835dcb3afcef6a5a4fa7e1afa74ac656cf978e6f7800b9a686d96aa69a813d501e9213110907a9a9efbcf757d78659b20b306a19369e213fa2d0e3628
+EBUILD kodi-game-libretro-nestopia-9999.ebuild 955 BLAKE2B 151a5f1b37ce54d2b6bf0203388e64c66ef777d02e3cd34a194546a136f74b0734cdcecb25720d1844f8451e4982b960db8d837d74ec2a0cdc57baae41ee3a0d SHA512 6359f6a364e4575dec5d6cfc4e566af5f845afba932935c91d8c27cdde24557b4cdb06841b5721fe1494404a014ba0b0d1217881dbd0c1abac1ed5d24832e32d
 MISC metadata.xml 443 BLAKE2B f63ddf38e72790cb7ca64c570672adf8d71bbd68d747c15f5c09b353af76eb4aa65c5eb3f3ce18f6bf93cec3657c9b01bae2958e03dcd658053fc314f97bc10b SHA512 c77d6255db65c02a2b74208198f1807982529ee6c7f2d4ba6538e5d35ccf0683757730c0e7b9a713712172ad059540eb6d4b614f9ff16293f1eaaa1631500d1a
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.3.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.3.ebuild
new file mode 100644
index 000000000000..49c4284c2283
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-1.50.0.3.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="Nestopia GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.nestopia.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-nestopia
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
index 532ff29f02e5..f57205d81698 100644
--- a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.nestopia-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.nestopia/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.nestopia-${PV}-${CODENAME}"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-plugins/kodi-game-libretro-snes9x/Manifest b/media-plugins/kodi-game-libretro-snes9x/Manifest
index d9b89491c79b..ef1ae6dc30bd 100644
--- a/media-plugins/kodi-game-libretro-snes9x/Manifest
+++ b/media-plugins/kodi-game-libretro-snes9x/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-snes9x-9999.ebuild 900 BLAKE2B 13a98165ce355746e3e8d0a2428903a59923fe5e86edf1da68c1835c291ff0fdc507f01e22fac63816c67b8cde79a9165244f3d331899cef0bc43a1178985890 SHA512 9f0bd59e7b422ab536f6eef8121ff040efac71ddc998913fbe66451c8473e3904b536765394b56d0411dc92e9ac6b6ab0a8c67e7feeaef06252c939f1f070e96
+DIST kodi-game-libretro-snes9x-1.58.0.6.tar.gz 1373392 BLAKE2B 6d17ac222eeae8e23aa76ab0b1aafe805f260b14c210715275afb370c2c52381013b48805477d01389fa1067e14f24465f35449dd95e309dfec7ac93b090df72 SHA512 3cc3b5eda830223a447dda4efb0438db679222200cae07d59f0879f95b1d252972186a241a74d0fa4668697a4ef8d2860923a43c7f4223af4ce794e937f255aa
+EBUILD kodi-game-libretro-snes9x-1.58.0.6.ebuild 936 BLAKE2B 07dbe84fc0d58fd3df1bfe6454b158affbcf427bb6956e84917e03c2dbc2dd9d82a1ab12bc845d77b273d23997047c8701b3555539997913d9a164a7379bcd68 SHA512 4506b2c017c187e1acd3b6768bfa7118a3b68200e414db52f396cc9ef9988ecaae3e0302284ae9afda2060316b5facee44d2ee9f502a146f8bc46dc23c84aab0
+EBUILD kodi-game-libretro-snes9x-9999.ebuild 937 BLAKE2B a78c39328e36a75286f8b6c96c85078c63f8c19247f69de5a12ab59cc87260b68d1d6659d17516ac309749e1a2a96b233c941e7af8ae125a4766b2d6724cc2b4 SHA512 029868005baedc33272ffa0f8b6de702c75ed0058e176b986e87d1e2f7c1b1a501313eca57f79c37e60783aeb68b33ce2464393f66dec36ed6e870fd77c2d4bd
 MISC metadata.xml 439 BLAKE2B 6cec6faa75fdb35edf1f33f2a47d370318b8ab96f2c712571b33d22bc30130826cade398c3f7b4aee986e78baf9c3161b342215457b38d09994a1793b8704fdc SHA512 e3c0f999e2123aa2b23b0b29d1d6d24da0d804e435351c5971a2c60390c33bc3bf001571025cfe4ea7a76680a45be27f18169b201d16c8d8dcad9dbb55e9ebcb
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.58.0.6.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.58.0.6.ebuild
new file mode 100644
index 000000000000..de406700e0d6
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-1.58.0.6.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="Snes9x GameClient for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.snes9x.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-snes9x
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+src_prepare() {
+	echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
index a3c02f28e235..7dee71b48dd0 100644
--- a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.snes9x-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.snes9x/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.snes9x-${PV}-${CODENAME}"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
index d15bcd3e5084..ad454b8a5a31 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 884 BLAKE2B 221adb0b192364183ac9d02af12c4eb52e854d7ab59dbdf20a5de48d8ac234b0defb974d0982d9a9c2d705e0ffe14b38fb5549f0cc11cff92507d4fb8a814309 SHA512 4e02cdafe6a26a98ae04e4f370f6a3b48be3c7d185fd51cb0a65f07bc2c72d462c65f98cd592821ca681e831b0ac885d200b90cb5c3ec7b20788d179680973dd
+DIST kodi-game-libretro-twentyfortyeight-1.0.0.106.tar.gz 94621 BLAKE2B 584e66eedb9956e75997fc8792652e0c5982150657169687976f0a52ecd07da1d50d2c43aed9379379a8cf1c668a1e9fda2c4c375910bbe02101d67f7813ff65 SHA512 2a30089b617bbbe62af7b17821e69d8c7bc8a393abbfdff5980b62753763595a93e6c326ee4ff17f4d48801399b325634d72c13ca22a30c4c490dfcc7c21952a
+EBUILD kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild 920 BLAKE2B 3835705d8c3b3ce2f4c5d55a148a3b6fa675f7abd41541c1fdff6db29dca6fb646831c28ec12b5949dbe7d1624661e2cbd2ee0d2619442951d1ac0cc1d130240 SHA512 e7c20cb44039fd2eeebbfe89f84fa29690eb6239f2ecf17dde8b3831c2f71cb493a3ee62ac29e767715e2722c2ed930b3e8546c76faf050d4d57e907c8a5afc8
+EBUILD kodi-game-libretro-twentyfortyeight-9999.ebuild 921 BLAKE2B 0a94bb2bb97930db926812cfd9689f82cf7c4d6dc3fd7db7b29243eb096c3016b3b46511ce885f2ccf8c037af054077a14192b25cb4b1ae4b5f5a368494e0b47 SHA512 6cffa64b7047b63ff251bd9efd5c126f6b0e05324e05192cb88e981865a0a4271a3a7a34de9e296ae98516fe02665e69de71d49e4a1a33211f6a0311a11ff761
 MISC metadata.xml 424 BLAKE2B ebec5842d30789985a87b437a5684959fbd41f0d93389726be3bf30b07e49fb851c095f0b1e2edcd6245241f83bf37668ce6494ebcbb90b7e9d6421cbd15ce03 SHA512 3b407c1fad96600c9f9ce0c1f8cf0f3695a5cb41d66762e79b0e0428ad36af0eca33a0ee421d364fb979b661fbe62a047f48ed10f71fbd963e64c205d0174b5e
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild
new file mode 100644
index 000000000000..b31e25621de2
--- /dev/null
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-1.0.0.106.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="2048 for Kodi"
+HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
+SRC_URI=""
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.2048.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	games-emulation/libretro-twentyfortyeight
+	"
+RDEPEND="
+	media-plugins/kodi-game-libretro
+	${DEPEND}
+	"
+
+src_prepare() {
+	echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
+	default
+}
diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
index 7a9f482f6a1b..a01c322557c3 100644
--- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
+++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,9 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro.2048-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro.2048/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro.2048-${PV}-${CODENAME}"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-plugins/kodi-game-libretro/Manifest b/media-plugins/kodi-game-libretro/Manifest
index d765a4568852..0714147695b0 100644
--- a/media-plugins/kodi-game-libretro/Manifest
+++ b/media-plugins/kodi-game-libretro/Manifest
@@ -1,2 +1,4 @@
-EBUILD kodi-game-libretro-9999.ebuild 708 BLAKE2B 40aafd9528df21545e74df20081cbff8e666499e701ddf6e5ae1d8a8bf77fe3b075b41ba685d5a17df40969f6aa486a1acd4f96005c7c03f987ee06310aba0f7 SHA512 153175819c71796d3aabedc16f3d623c64d33c8373ec6aa0fb7abebd3c2d691056e377d74fb0f1ce6efbbb0c4b9ed66f31b25029ae2b691e99768a564bae380e
+DIST kodi-game-libretro-1.1.0.tar.gz 101454 BLAKE2B 8fcd65c8221b0ec4d24a41361eebcf1a144906e86b46749625462d507ca2813b6fdd0cb63ef0fcbe29b1f11039dc5b9cdf3d24eae788e4c275200c93855eed7b SHA512 80cc868d57d4284085a7cd736930da6f1b2440cbd8667a20634c329c282e7f0b79158d4d510504a230427fae4d84d9ae29c7a76fab5e2a23820bfa72d75a8e91
+EBUILD kodi-game-libretro-1.1.0.ebuild 743 BLAKE2B bb123ac3ef9eddaa24ee8fe6f0bd1670705778107e1f72c7cfa951d0605b17b022810f92ac9beb943aa7ebf4f60558a5dea5ca7b5906e5e34a6488a25e5ff600 SHA512 fad956837ce81f71ea4329c9ef5df34e92ad1dc380ebe23329b537652180931bb4cb7d5ddb8653bbdd03cfbeb983eec6a3ca37ac22e6aaa85a1e4b5b2381aa8a
+EBUILD kodi-game-libretro-9999.ebuild 745 BLAKE2B 44e73ead231efe935fc1b9621d68a12610b862b3ca34e2eab70984dd02080d0b7b3c0e3addcdb6e468398bba74746f5e687a2a341107b5a3a607bf3815494742 SHA512 a406649f73ea82cd97d107316bd5b59a9464ddc597ff6153c8291f640f41d78ef29eb48979bcf4c25d3bf846609b7feb4b8ec87eb2885357b4764d1be5fe9a8b
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-1.1.0.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-1.1.0.ebuild
new file mode 100644
index 000000000000..54e24230f467
--- /dev/null
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/kodi-game/game.libretro"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-game/game.libretro.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	=dev-libs/libplatform-2*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
index 89eef4973a0e..5f5c3e528872 100644
--- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
+++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.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/kodi-game/game.libretro/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/game.libretro-${PV}"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/kodi-game/game.libretro/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/game.libretro-${PV}-${CODENAME}"
 	;;
 esac
 
@@ -27,8 +28,8 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
-	=media-tv/kodi-9999
-	=media-libs/kodi-platform-9999
+	~media-tv/kodi-9999
+	~media-libs/kodi-platform-9999
 	=dev-libs/libplatform-2*
 	"
 RDEPEND="
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index f01252c318f3..a7b2c49c9af4 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -8,6 +8,7 @@ DIST kodi-pvr-vuplus-3.22.0.tar.gz 184305 BLAKE2B 58d865950a7f24bf44293ff156a3cb
 DIST kodi-pvr-vuplus-3.23.0.tar.gz 185373 BLAKE2B 55b8cec3e5affa376acc5c1c7036d7a550acd00b70e80a85ec89c95f6e861fd67f6a5d4d19b9632ae3099c5353696c34874c23bd10f4614d3d60b475540e36f9 SHA512 c6feb79f91cfd9657e00e177de168389e3393cf201e9ecf0dffef79994894c5c115e1e9e65460978dd066ab1a583d1bfbffa1c4c3ddabad9143a31763f47ec05
 DIST kodi-pvr-vuplus-3.24.0.tar.gz 189303 BLAKE2B e1d1276b460d54722f80144d0e186be3956aa9a841a6e9af7854a883610ad5317a3114f21af5fbd7e3070a3f4bb81795814b4142fb03919c589ce288ba389862 SHA512 e3631a3ac1d207380f810f482697c48909d246ee8510463694fc157bd4af1d0a0539cd82f700e47f195ed7bef868d0e0d7392aa3f65418a69bc79f4e15f83761
 DIST kodi-pvr-vuplus-3.25.0.tar.gz 190314 BLAKE2B fba8e3438bc7475f0c4e4cf1afe02fc356b7cdc78c756c30cd541f71215c741fe56e436b934cc22ac0157ccf919159526f41625421995198157a1f0d8802366c SHA512 b94d6f846eb04cc241ae1a954f5d4fd07edd70b3389d9068bb9dc23083e3476bc46a17fd66e7f5d7ce04e361b1d9165672d7ada515f6251af86a5f3f18fa28b1
+DIST kodi-pvr-vuplus-3.26.0.tar.gz 192488 BLAKE2B 71909a13cc640c2509405a2ca954536b3ecf767dd607223fe0555860da270d710896fbb0e62922465dc7d22e817c39e183813c8064498e21783548aa85369744 SHA512 c0cb5e0fab716d20d7a6bbc81a8caaca5325938190742e15fc86fe475f93b915623cd3589b4990ebbd1caeb3924365d2872a598fd8e9dbe1822c37e3b2e288f8
 EBUILD kodi-pvr-vuplus-2.4.10.ebuild 703 BLAKE2B e0553ee884be358337c235140046d8268c38d2f1a3d324469e45999fc8e3376d48fdd22222ffc1655fe45a30738f828254a291fcbb1e0a3e9e36ab4e6362a21b SHA512 79b1c4362a9a0dd8e5d41f3e006bec07bf7799b5746804a0a9a47d9f343d76bd7fbd6a82ef4734d7ba596e402fcb5acf349c1de9787aa90286778a9524061667
 EBUILD kodi-pvr-vuplus-3.17.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.18.1.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
@@ -18,5 +19,6 @@ EBUILD kodi-pvr-vuplus-3.22.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d5
 EBUILD kodi-pvr-vuplus-3.23.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.24.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-3.25.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
+EBUILD kodi-pvr-vuplus-3.26.0.ebuild 720 BLAKE2B 4dbe8dcd163cf5a1c71500610e3a3d54698c6de17831eee997d8bbb195edd15c50adbb75797c28af626a7923f074cb330f84d6499f143943d1ec9c9a91f90944 SHA512 df9154ff386ef0e962f74bf06e0ff4702bab942c78a3f7408a2ca9dab104571395a41c3bb4227da6ef65b9cbf2ca9b967ac4f8ac9b077833375bf5dd9472adfb
 EBUILD kodi-pvr-vuplus-9999.ebuild 722 BLAKE2B 9f205d55328bb0a326bb099167a7a837104f853a978e6ea7c21c6863467bbc0f4053166c69a5a350a8faa26332e6be7711b6c54a1f06daf84cc201410b0b6c1d SHA512 a7868c1239630426628ca131c0dfd42a8d33e47709030489a56db0cdd8bfc241f83062d652a3578ebf3d081e8c95a84edc45ca2f00d9a272596343973696851a
 MISC metadata.xml 428 BLAKE2B ac264c6bbfc925ff772eda61b1b4069b52ed5bf12836af8d8e86a72fe42bd852be1d00f74056c1d6b925fa2a026ea7df57ee57e7434a797884741b70762ff173 SHA512 573f803447cb7a7d0095eb21caa9f55c41fa4fb68c0f40aabad63df2ee262ce168fc75f28f3a3ae6aa7bf41f258be771c6a6dd06d1f2e2486b3d557d89f28f4f
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.26.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.26.0.ebuild
new file mode 100644
index 000000000000..f77cda466527
--- /dev/null
+++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.26.0.ebuild
@@ -0,0 +1,39 @@
+# 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 VuPlus client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	dev-cpp/nlohmann_json
+	"
+
+RDEPEND="
+	${DEPEND}
+	"