Add USE=sftp to control libssh dependency #437566 by candrews.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 27 insertions, 20 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index d391fdf54eb8..cb92d8276ba8 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.148 2012/09/24 18:02:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.149 2012/10/09 04:36:11 vapier Exp $
+
+  09 Oct 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  xbmc-9999.ebuild:
+  Add USE=sftp to control libssh dependency #437566 by candrews.
 
   24 Sep 2012; Mike Frysinger <vapier@gentoo.org> metadata.xml,
   xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index b3e673902f27..4668c8c70eb1 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -11,23 +11,23 @@ AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea7
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
 EBUILD xbmc-11.0.ebuild 6230 SHA256 cc9c8e0f4cbc99f6b02b8385f8ef08c9d7fe128a619eb650d4a627f8f7bbd391 SHA512 8a08020a237c0147163c5a8c57f1d23c5a3c0fdc1571ab640b3096eff49d28da60efbf86d42fa8139c88b6e073a9f689715b366cad9092d71ee2646165e91bc0 WHIRLPOOL 7a64f09945fc96f319b7869450eb4c1e7f74646c6f89d3a51f7908d3f56c99f9b185863b992f6fca8c929d7a53d6fea465f9ec9cfc977d113b83f8378f9957fb
-EBUILD xbmc-9999.ebuild 6006 SHA256 f72eca1d6d5d0c0a26db871e5a5a28509fcbdaa26fb36f550305bb45cb3ec816 SHA512 e42df2245d8311e3ff9f2c110324258f08f3d566f1942167b999bfe2d800d348134d502424a38b6498431657ed4b6069344015875d2744265086a4d2df4dcb34 WHIRLPOOL 0b14c3d0889b9474bce3cd058ec9d4b23a70de70c6c5c11da62c42689a2a7dd1446e944fe542fe4d5ed83fed816b36cfdb88dbad972e6e1034f956b8793368ae
-MISC ChangeLog 23620 SHA256 e643e2941d9d5a1c16d501387d70393f6c6065a03e3eebd7b9cc23bef5523a20 SHA512 3757b3843b75af8dc9fa7f1793bbd12069c25dcb57e61665e0f7b1c1d238851b48f87c3393edb0a21438d56cf336ad57725e435556eccdff2627d620b7661533 WHIRLPOOL 6600ec01d55698ce7f5f8d40df14cccd94479d0e027024ba381c8a674bb833647446fea2cc3c32548dd80e9bd6fa339d846c9af4fa0f3baef8ddf30c61122f48
-MISC metadata.xml 1055 SHA256 ed787aaaad022ed9386aa49031356c39e378c94651624d753a21891ea33ca4c1 SHA512 590c3d163bd7c5f8fa7867012b1248297424abce53802e21dfcf92e354b53ed8e90d1312df848a3004792c242cb0c8951acb638fffeffba563695dc53fc5b8c8 WHIRLPOOL b69700bf42a2ef988f335325740e9ae23ef738f27cc90af90c1a6f98ea1e44e5405f0b114a11bec57b6fcce6b846a6d4a95b3b9d58d970ca0e8098119f656bcc
+EBUILD xbmc-9999.ebuild 6065 SHA256 32a5f9a2df63d3c300d57090cc60e782bb6ef3b103aadb5d18c844fa84353ec3 SHA512 6ccf8880c6b5a3f7dec7b83d7771109ab52d5cd80b1dbcf66194fd1f86cd6e9e28175bac01aef30b2ad676e8835f002dbfdef40bfd05c290578698594c7a445c WHIRLPOOL efddccf3f549faea6a223a37e7b595532688552766375248f3f2d4457830fdae2e32b422fd133a14c63ec2f92bf4e28aa22cc1e78d71f33ebd6866297493f459
+MISC ChangeLog 23770 SHA256 c2d485c6de69e64b76e7cb194ca461a7ab062beaed85358edc023737d9b125e6 SHA512 b6fd626dd7b6927ba0cec6f348ac10acf9fe5f02dba2e9319ac72c2d8076cf925097179fdb11d3e7d05413ed6ebebf789258c064fc9eb77b392c23e2a924274a WHIRLPOOL d37a1ed91eafbc53977fa38f5222ba1ea7a63099877ce9b6c6b948efd9cf948cd9bb6d770f620c4d0e69009e9ab9c6dfdb106c4ca81f25d1a38665211b29745e
+MISC metadata.xml 1114 SHA256 65972016512588a4bcad7af03c77fd0a667e18cb5d2d6dcf05f2f0f1a62ff9c9 SHA512 a79f6c3f4aa6539a36e9b54f9f283828da8ccea0deb6eabda7d0186d8afd0b62e0c150ed9fdba0a8ce913d76843fffcdb0203c166d2d75a2ef702a5c0b63f06a WHIRLPOOL e5582d23318132bf6ee3dd6cc8e6a1aff2a08407b2eff203c9a8571fa5869e12055485b290c1d04e93a068df46e07a62aea873655135bb04c0335e9c63e81683
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQYKBrAAoJELEHsLL7fEFW5pkQAMZohzMTnOXBo1K5aYzQSKAd
-+XVQL9FCNBpZlK1RYAjrZ+xxtPrLlHaVUu/gxN3m0HnF08OwOnJFFifROijykjMb
-G1vZ/+IP8nY8gLw1EVgGT6ajCv9Sifobt5F3sgkDzJrcb3xvQBflwWyqlRNoFe7D
-FeeMUPfnNTCJOHs4HZUFwk1YTG0hhQPHxrZQN7OF1Q8pmp+xsTNVo7ciu/yZ/NrH
-167rp7Wo4Er/skE45LOKfSEGpV+NMfNkLGr6D6m+fi9OupRej/j+rp7zuQwvqBC3
-9vEtyZ+xg9zsv53A2VzmWDkHmSLbT2PYLI4YSfcxPs3ew1bR6kzzvqV5Eb6WVdBf
-bT8HyGdgMPQfi5ED+axOR1K18dU5FnS0v4Bn5/HgPk1vbSvwYF/GtOfa46f2czjq
-K13s8DbUTrdQVuhoyyUk5PiS8E9FXZisqcjYB0fUfAjI9wz4mvL0lJaJhEgfb4Qt
-oKOZp/kP9iypapL7uvOGY5FeF2Capi18kq2cByzhNhd4BPYCqsEBjtFxYKNLvBic
-XBlzMA/sQONY6S+y0PnU8SZqJrdZ7hTDvKUjdKKQh95zv+/lMSEPmam6InYnKszA
-qSGJBsZmwWFQjnMGwblTfTgMAmDQ/ZQOFcfYt0FIwm4pBd2VmWgQj09zqA1x4fSM
-2rVlkqyHx6KAMwDiq/bz
-=4/oi
+iQIcBAEBCAAGBQJQc6nWAAoJELEHsLL7fEFWgXYQAIxCeZ5NyHAUwzn5AZddP1vU
+bRELS4IIkSiuMF7Jv1nNyGabaTtI91XdsxCqfyZQysIS/ZKWhd4+ZZgM2kV2J52i
+xv5RYosUW3//LZqEmkGQj0loy7st9J/xl/LqVfvfZ8dgBnXGEd1Q6fVxbfWJDEAv
+gwwIIsjE4eWkj11XRzoym7+y51ahsr3J+2+4fKNuTRw6pzVggZF9Ucj/sVZmLS8G
+kuILAXaPfT01wxJJv6Voge333TKwQS8dORQtDGVAwm4q9a9ZbCQkuRMsMEfwVN59
+vDOMonVztC0qqXFvP+KZbgiwXyjn1SnVGwUKPu1yHXYe6f76luXVD0Eleny+i3/7
++MLkkaS211vJ0xJMJNfhOnDrta9c4HzY7F7DqcynIZ8RaGEhSVpw6MV5qK/vWRsA
+9AlmH0XXZsjyjpNGBCOQCDrIfKkt4VJ+5kJDLocX0CoRF+64NMXoAs4DnXcWBPS+
+hslv/AnVYbTpEXSv477YrDGeBwysy/LsNCR0ZEcNutdyHYj4kHlrf5Lpb3DXeZmR
+ewV51wCEdCpp3r9sduV41of3g/4k/oQOQSKsAuIgmhExrCGlXJiPmeZ4WU4onXrN
+4uVz9RytBCf59KNzbXnpzDLZ3aoMRp9AuyQnOSLr8nusMv6R/lWKf9PxDJgPu0MW
+LQfAZ/F9MDyPVwa872tn
+=y+CS
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 31f33b0660ab..31fdec34e514 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -11,8 +11,9 @@
  <flag name='nfs'>Enable NFS client support</flag>
  <flag name='projectm'>Enable projectM visualization plugin</flag>
  <flag name='pvr'>Enable MythTV support</flag>
- <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+ <flag name='rtmp'>Enable Real Time Messaging Protocol using librtmp</flag>
  <flag name='rsxs'>Enable really slick X screensavers</flag>
+ <flag name='sftp'>Support browsing files over SFTP</flag>
  <flag name='vaapi'>Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
  <flag name='vdpau'>enable support for Video Decode and Presentation API for Unix</flag>
  <flag name='webserver'>Enable internal webserver</flag>
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 566e4270cf0b..bed0c6fada0f 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.119 2012/09/24 18:02:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.120 2012/10/09 04:36:11 vapier Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev upnp vaapi vdpau webserver +xrandr"
+IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
 REQUIRED_USE="pvr? ( mysql )"
 
 COMMON_DEPEND="virtual/opengl
@@ -80,6 +80,7 @@ COMMON_DEPEND="virtual/opengl
 	avahi? ( net-dns/avahi )
 	nfs? ( net-fs/libnfs )
 	webserver? ( net-libs/libmicrohttpd )
+	sftp? ( net-libs/libssh )
 	net-misc/curl
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	bluetooth? ( net-wireless/bluez )
@@ -206,6 +207,7 @@ src_configure() {
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
+		$(use_enable sftp ssh) \
 		$(use_enable upnp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \