Fix again dependency on media-libs/sdl-image

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

5 files changed, 25 insertions, 22 deletions

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index 361542b125f7..fc444a7f7607 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.10 2015/03/26 21:58:27 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.11 2015/03/29 09:15:41 tupone Exp $
+
+  29 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-14.1.ebuild,
+  kodi-9999.ebuild, metadata.xml:
+  Fix again dependency on media-libs/sdl-image
 
   26 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-14.1.ebuild,
   kodi-9999.ebuild:
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 00436915cbe9..d133aa470537 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 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
+EBUILD kodi-14.1.ebuild 7938 SHA256 6a3e736c990e25122703e5481f160471cd781979fe50d91d55980ea181450782 SHA512 4f7078276ded7ef237f8a8e693fca31ede5e218b24b78238864e705e9bbb6071f6d9925451c02cc230e71ca247919c3bfbb541ab78ab2fcc0d92058d7fc31e32 WHIRLPOOL 277a7df2ed88fed9a44318b966c6ef822e82f545207e5855faaa9abb3a70d03296e4905e056035f53b7562e990366d1932c805facb3df801626f7a3915c2490b
+EBUILD kodi-9999.ebuild 7778 SHA256 85dd7db500c571d6c18ef178754a6741e8162b21f4938716fcd4a99a32c56ddd SHA512 f2da8aea2b75d292ca720ce1a97ebb3c656ca70e419565d4cf31ebb885f23c47eabea1d6d7b3321fd4ef1c632e63d6033e49cd66a730e3b50a5a527bf482df4a WHIRLPOOL e64f5f28e431d5b84a4f6b375392415d8c3b93f3a9cc6506eb63a7f5b332f04a45546ce43894235396997a02f0085ada523a3c644dfa10fcab3bd6edf3463805
+MISC ChangeLog 2263 SHA256 9e7ac2644f517b550d38215356d5cf4af39187949b5be98bc4a4562c08a4659f SHA512 d67829a37ebcc8111f7a7f4d82cf9915c5bbff69b075f94bfaf753157b66b2a9890200f8dc48cc80ffb46cf3d36a825c3f8736fbe0734d1afc73ccda706202ab WHIRLPOOL 6ca8b626a5bcf45d36358bbda86e0dbaab739fe1e3bc9e1e9e3ecbb6c0ebb53385d4104e7df709922a4dbfc2c0235bc965f87558fa26191ca5cb607c68e26725
+MISC metadata.xml 1299 SHA256 e096bb3772d8198b7e2c79cb37aa1b09233f24a3696e670caaeb1f7a505dd537 SHA512 876f6733309983a4257a5377e06748292ed70aaac74926588556280f9468f1272f36570e5c8e0c515caa637372b8fb2f1eacffb9e01925986517efe1c5fe09e0 WHIRLPOOL 54b52cd853fc00ad47db307ef5dabffa1bd77417a452d66f2f861edc956047a9057444b1783509f8475fdc815c9b798d604546a7b3438a05a943de14f648429d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUUgQoACgkQIY77eQFFFC3rkwCdEGh5x561V3U4kQnFY3+p6pex
-mR0AoIT9tEzIA2vGrk4m5j44G8KmCM4f
-=k8BP
+iEYEAREIAAYFAlUXwsMACgkQIY77eQFFFC2kXwCgtLUAyx39qjC5JsR+EEswKY8L
+BBUAn36T1z2IKyqIa686BrHodddRX5mt
+=ITSr
 -----END PGP SIGNATURE-----
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index d28dfc461d37..b377bef4e3e2 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.5 2015/03/26 21:58:27 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v 1.6 2015/03/29 09:15:41 tupone Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ 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 sdl 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 +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
 	pvr? ( mysql )
 	rsxs? ( X )
@@ -78,10 +78,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpng
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
-	sdl? (
-		media-libs/libsdl2
-		media-libs/sdl-image
-	)
+	sdl? ( media-libs/libsdl2 )
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
 	media-libs/tiff
@@ -130,6 +127,11 @@ DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	dev-lang/swig
 	dev-util/gperf
+	texturepacker? (
+		media-libs/libsdl
+		media-libs/sdl-image
+	)
+	sdl? ( media-libs/sdl-image )
 	X? ( x11-proto/xineramaproto )
 	dev-util/cmake
 	x86? ( dev-lang/nasm )
@@ -229,6 +231,7 @@ src_configure() {
 		$(use_enable sftp ssh) \
 		$(use_enable usb libusb) \
 		$(use_enable test gtest) \
+		$(use_enable texturepacker) \
 		$(use_enable upnp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 774ff99ae7be..bf91f84fd3d7 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.10 2015/03/26 21:58:27 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.11 2015/03/29 09:15:41 tupone Exp $
 
 EAPI="5"
 
@@ -33,11 +33,10 @@ 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 sdl 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 sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
 	rsxs? ( X )
 	xrandr? ( X )
-	joystick? ( sdl )
 "
 
 COMMON_DEPEND="${PYTHON_DEPS}
@@ -76,10 +75,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/libpng
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
-	sdl? (
-		media-libs/libsdl2
-		media-libs/sdl-image
-	)
+	joystick? ( media-libs/libsdl2 )
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
 	media-libs/tiff
@@ -227,7 +223,6 @@ 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/metadata.xml b/media-tv/kodi/metadata.xml
index 80aa3c5fa795..003a87dc381e 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -17,6 +17,7 @@
  <flag name='raspberry-pi'>Enable support for the Raspberry Pi</flag>
  <flag name='rsxs'>Enable really slick X screensavers</flag>
  <flag name='sftp'>Support browsing files over SFTP</flag>
+ <flag name='texturepacker'>Support packing skin textures</flag>
  <flag name='webserver'>Enable internal webserver</flag>
  <flag name='xrandr'>Support X randr extension</flag>
 </use>