Fix autodetection of SDL and add missing dependency. Bug #540472

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 30 insertions, 13 deletions

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index c408b79ec9aa..361542b125f7 100644
--- a/media-tv/kodi/ChangeLog
+++ b/media-tv/kodi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/kodi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.9 2015/03/19 12:48:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.10 2015/03/26 21:58:27 tupone Exp $
+
+  26 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-14.1.ebuild,
+  kodi-9999.ebuild:
+  Fix autodetection of SDL and add missing dependency. Bug #540472
 
   19 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-14.1.ebuild,
   kodi-9999.ebuild, +files/kodi-14.1-no-arm-flags.patch,
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index b23de8954976..00436915cbe9 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -9,14 +9,14 @@ AUX kodi-9999-nomythtv.patch 1689 SHA256 b54e52be122890affca5eb726873817bfbaa1b5
 AUX kodi-9999-texturepacker.patch 470 SHA256 0d60b8da26ce018641701bea14c91f2f5a3436f9da7d3869adc7dd085ddaf696 SHA512 e6ffb87d66aad2f355f88f8cf78839f133f5d52ae56f17fac1baa9cab0315933aecd26ac78e672986b8614cda9d0a6313e1fa5389df63c82bd9b132265a18321 WHIRLPOOL 53cef8d806aae417fe589403ef2ea49bd758d5e1a3982cf68a44d503e45cf47fae0b84c1173e5d44e4e6c5ccd1963614dc8dec84b432da5252c5b6b6afa655c5
 DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a
 DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506
-EBUILD kodi-14.1.ebuild 7704 SHA256 411e0c0fa36a2741f62681507ac7fd1cdf33ca28a1b62a8cae559ccbac977a7d SHA512 b1d576fbccad3b7c8bbf7285d0a455afba2db5da08ef6ea0a87106372b7f065a8dd8ad1f501de34252a2104c15567f070343e93a67d8efd847e14c33fd2728ce WHIRLPOOL 0af3c3d095c618baa59acff20f886887cc1693ee1c48bbc3293608d3c4c0ebe18558fcdd9a6d29a65c2c73256f6f23a628c26ac1566eef6b465e7a0861616ec0
-EBUILD kodi-9999.ebuild 7777 SHA256 1f9f3311ff0143bb9f623b583c95ffe31108379381d542d45fca3f2ac781ac51 SHA512 a99d920ec7118d1d2688cae92f07b469ee5f1b5f60361cfd3693e52cc3f3a3db37ea0d1a3e8eb6d97e50e0fb46ecf9e3f4c4de609d86b3f792b4d176c6fb9651 WHIRLPOOL f3fd7c5a21c9f940ae3dd01449b69098435629c6e59558bbdedcc22e5dc0f71026d1d8da1f4aac8f650e0e04f9449d12e61138e4ce913bfdfd2ea61e754d303c
-MISC ChangeLog 1956 SHA256 732105cae110618121987b66e0aeee85d0633bb6c3029f1562f1901550845009 SHA512 a788e2a3ab0ba454e9dafb6975a7cfe0e868249cc67058bf5846cb4e124db2799021145e55f16ca4542781450f8fc10686dfd01a498d76e3d11cfaea0afc6deb WHIRLPOOL fdc6d354edb0ff2c9d956092e9dbbbda47e221e0c423f2a087000351d0b9490470ab646c6488655c63b8ef3cf80413dc5dde4a0570494bb5226dbcdf97b0bece
+EBUILD kodi-14.1.ebuild 7822 SHA256 6562695c7c4b2bf03c7be8d647fe55627570b64ac278e4123c8d75ad295c3cfd SHA512 3ffee62a58e6147f2d551a9c1c0b0e79376099b717b4da58f0c3182e7a8f33bab11edf06f9bbb8bfeb2d1ad974ee056150a3933508b73c58460dd6247b632baf WHIRLPOOL e85dee3167c3a77672882a71ed4d48381f06abdf10cd7737c190fca516d0c4682c24808b95b079daa900891223f52750db441634658d306821b04fecbf38c3de
+EBUILD kodi-9999.ebuild 7844 SHA256 951c431a5b259a1469ec3b6016f9d8cc6973edbea50d11bd55d09a0c805e304b SHA512 627392d85311c99bd814c74cd405911a89e5faeea224554a0807347a85927d716a3291cbb4c9f39e7beaa3300831bad0038b91b626b4a39945772dcbc23dbc2e WHIRLPOOL 7b305fa00ca17ea8238f293f2b33929986e24c1260fdca26c65bf56160e8934a99ac45d2f9f23ce7326e22a55cca132ec9c8d8790efb184c279e4773fb41c20d
+MISC ChangeLog 2113 SHA256 5d85e53f6909ef8aab91b2fe2ebbd1179e4391ff6b503d08840986692c1aff05 SHA512 3e0cb3fcc747c2a34185a692879d0ed21682484b263c7a23aefbc13650e3fd22085de94278f8ddba0591a476f8287a7e8be29027ae6987b954a3230bc84b327f WHIRLPOOL 6a14ca90b5cd18fe11545701b36b13e0573a3550fc350c3cb15287f20507025dc73fac99577ec0f324049d66a6a869588db408e4eed156cc3a95e0922a4478d2
 MISC metadata.xml 1234 SHA256 5fb643446f2efcf3a164c14c438bd9a6d58f060da69aac7669e1d9ce6e7541a8 SHA512 4cf23d3684a6c7c2affb0dc7218bdc6d8b7ae1d7e029f25898f8932ce21be53df6bacb19259b28e5126b02f0cc4af4145a0c37a11a79c4238e6238bfc752f098 WHIRLPOOL 7a819921c3cf9fb9ad342de1c13652870b3e179adf8e7d639046f422a4e898348a7c9e09d15f959ffb877332bc35683896ace0d72cac91cb9515d2bcace9d3ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUKxbgACgkQIY77eQFFFC1TGwCg4E/LS2K8nZNoKjFMgnwALI1x
-RZQAnjzeoLKMaxD4DTbr8WMgpR8HThUz
-=qen6
+iEYEAREIAAYFAlUUgQoACgkQIY77eQFFFC3rkwCdEGh5x561V3U4kQnFY3+p6pex
+mR0AoIT9tEzIA2vGrk4m5j44G8KmCM4f
+=k8BP
 -----END PGP SIGNATURE-----
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index 4b1107ddfd0d..d28dfc461d37 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v 1.4 2015/03/19 12:48:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v 1.5 2015/03/26 21:58:27 tupone Exp $
 
 EAPI="5"
 
@@ -33,11 +33,12 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sdl sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
 	pvr? ( mysql )
 	rsxs? ( X )
 	xrandr? ( X )
+	joystick? ( sdl )
 "
 
 COMMON_DEPEND="${PYTHON_DEPS}
@@ -47,10 +48,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	app-i18n/enca
 	airplay? ( app-pda/libplist )
 	dev-libs/boost
+	dev-libs/expat
 	dev-libs/fribidi
 	dev-libs/libcdio[-minimal]
 	cec? ( >=dev-libs/libcec-2.2 )
 	dev-libs/libpcre[cxx]
+	dev-libs/libxml2
+	dev-libs/libxslt
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
 	dev-libs/yajl
@@ -74,7 +78,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpng
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
-	joystick? ( media-libs/libsdl2 )
+	sdl? (
+		media-libs/libsdl2
+		media-libs/sdl-image
+	)
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
 	media-libs/tiff
@@ -218,6 +225,7 @@ src_configure() {
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
+		$(use_enable sdl) \
 		$(use_enable sftp ssh) \
 		$(use_enable usb libusb) \
 		$(use_enable test gtest) \
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 429b36e5fa6d..774ff99ae7be 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.9 2015/03/19 12:48:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.10 2015/03/26 21:58:27 tupone Exp $
 
 EAPI="5"
 
@@ -33,10 +33,11 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs raspberry-pi rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs raspberry-pi rtmp +samba sdl sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
 	rsxs? ( X )
 	xrandr? ( X )
+	joystick? ( sdl )
 "
 
 COMMON_DEPEND="${PYTHON_DEPS}
@@ -75,7 +76,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpng
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
-	joystick? ( media-libs/libsdl2 )
+	sdl? (
+		media-libs/libsdl2
+		media-libs/sdl-image
+	)
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
 	media-libs/tiff
@@ -223,6 +227,7 @@ src_configure() {
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
+		$(use_enable sdl) \
 		$(use_enable sftp ssh) \
 		$(use_enable usb libusb) \
 		$(use_enable test gtest) \