[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

["David Seifert" <soap@gentoo.org>]

commit:     45355c81d9b974cc43838ed666480ff874bbeaf4
Author:     Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Wed Oct 26 20:08:48 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 18:45:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45355c81

media-tv/kodi: Allowing building with FEATURES="network-sandbox"

Gentoo-bug: 598150
Closes: https://github.com/gentoo/gentoo/pull/2668

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-tv/kodi/Manifest                                           | 3 +++
 .../kodi/{kodi-17.0_beta4.ebuild => kodi-17.0_beta4-r1.ebuild}   | 9 +++++++++
 media-tv/kodi/kodi-9999.ebuild                                   | 9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 4d198da..5448b44 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -8,3 +8,6 @@ DIST kodi-16.1-generated-addons.tar.xz 38988 SHA256 9e5187b26e9aa5e273ae84a2435d
 DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d
 DIST kodi-17.0b4-generated-addons.tar.xz 57024 SHA256 57da0a403fea4aed9a921ccec40d5fb6e2c4de8857308f9f46ce1339c8e6bd23 SHA512 78a786f6414ed38c6d89ae29537964586f7b5df28f08b0de3df209baa13905d35045dfcc71b40bf36dfbf29825892ed2b96cfee7365e56e5a13aa88abceddaf3 WHIRLPOOL bc582bc195637dd38ea0663c29decc5f30ed7b13586578d667191bd0fce696d6d7a934026a4be3f077fedcaef7611939ef3e74a0d5e9161ae65f4dd51d3bab87
 DIST kodi-17.0b4.tar.gz 54924547 SHA256 ace9a50e1552bf38633d92d6ef6af9a4489c5ecfda6c36e76f1d36d77d383308 SHA512 dadf34ca53f967db5fdefa95e551fc0a0be6f48bee641a431ab3a39efc324d8096bafb223f98939e2008cc1fa8d384ea6a6d63d1f7af65f2601f313ed2f6d773 WHIRLPOOL 3a45f73dec832232125eeca2ae76c8f66f6e534e1f65a3cf15e046f03159cb791575db99ab38a6fe1230cdb97e4f479d616bf1f2a7863bff799cfa99b196534a
+DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
+DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
+DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a

diff --git a/media-tv/kodi/kodi-17.0_beta4.ebuild b/media-tv/kodi/kodi-17.0_beta4-r1.ebuild
similarity index 89%
rename from media-tv/kodi/kodi-17.0_beta4.ebuild
rename to media-tv/kodi/kodi-17.0_beta4-r1.ebuild
index b38f7f5..51aef40 100644
--- a/media-tv/kodi/kodi-17.0_beta4.ebuild
+++ b/media-tv/kodi/kodi-17.0_beta4-r1.ebuild
@@ -10,6 +10,9 @@ PYTHON_REQ_USE="sqlite"
 
 inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
 
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
 CODENAME="Krypton"
 case ${PV} in
 9999)
@@ -23,6 +26,9 @@ case ${PV} in
 	MY_PV=${MY_PV//_rc/rc}
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+		https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+		https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
 		!java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
 	KEYWORDS="~amd64 ~x86"
 
@@ -153,6 +159,9 @@ pkg_setup() {
 
 src_unpack() {
 	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	cp "${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdcss/libdvdcss-master.tar.gz" || die
+	cp "${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdread/libdvdread-master.tar.gz" || die
+	cp "${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdnav/libdvdnav-master.tar.gz" || die
 }
 
 src_prepare() {

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index b38f7f5..51aef40 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,6 +10,9 @@ PYTHON_REQ_USE="sqlite"
 
 inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
 
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
 CODENAME="Krypton"
 case ${PV} in
 9999)
@@ -23,6 +26,9 @@ case ${PV} in
 	MY_PV=${MY_PV//_rc/rc}
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+		https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+		https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
 		!java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
 	KEYWORDS="~amd64 ~x86"
 
@@ -153,6 +159,9 @@ pkg_setup() {
 
 src_unpack() {
 	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	cp "${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdcss/libdvdcss-master.tar.gz" || die
+	cp "${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdread/libdvdread-master.tar.gz" || die
+	cp "${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz" "${S}/tools/depends/target/libdvdnav/libdvdnav-master.tar.gz" || die
 }
 
 src_prepare() {