Make samba support optional now that upstream allows it to be disabled #383759 by BT.

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

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index e88c273920d43d9c4b98b5161a031778fa9fb72b..6cd9019ea153ee5cbd71f359a8943c0020a93d38 100644 (file)
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.99 2011/09/29 04:12:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.100 2011/09/29 04:16:39 vapier Exp $
+
+  29 Sep 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Make samba support optional now that upstream allows it to be disabled
+  #383759 by BT.
 
   29 Sep 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
   metadata.xml:

diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index f638ea437e701e0019d2569962129ca893ba3f31..2768fee57a082fafff552859e3ad9aab5f6362d2 100644 (file)
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -7,13 +7,13 @@ AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46
 AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 EBUILD xbmc-10.1.ebuild 5463 RMD160 571dac42271ecd8bbd48ff3b384110e2fe73a13c SHA1 a878f814b6ce4a166a763382baf5c4ee7be33899 SHA256 b840faf7b9a81148474c2584985f85592756217bd839259c23481519c2f82fba
-EBUILD xbmc-9999.ebuild 4981 RMD160 3d67c89d075f082d907e6fc54af911b4f197b504 SHA1 5f3b2000dfb8dbac68eb4df9bfc9b5632d3c0bfb SHA256 cdb16013d8681db1e5ccf6ee7fafef7b22570b029b9b6c0ab5c75795f89b84da
-MISC ChangeLog 15698 RMD160 18ffe9006208959f61d5a49dfa852fbc19d91bec SHA1 63c633d9e03a6481a0aecd7b01fdbe12229bdab6 SHA256 9a6b40520c22bc669890ff9f6cd5120b0d1e9b05314e892969da6e811083ed62
+EBUILD xbmc-9999.ebuild 4998 RMD160 aae01ef9d6f9393109cc6a2ac1f8da71a2fbaa2e SHA1 60cd1a3be1c8db7b5c1e42227e680d099272767e SHA256 1e8bac74b3124e91723554b16c6eb60a0b91cacad0418e6f80b395a46bb37287
+MISC ChangeLog 15858 RMD160 b6dc4677345eec8c105be0afcd31e396a352b26a SHA1 01aa3bddf0a3d90e20d5b85447676e7242ec203e SHA256 bd07327f46719c9cb09c488d7b502209c874f569600f94cfae217bd756e913d9
 MISC metadata.xml 707 RMD160 37ba89d83c88a9d3d6ef0334e0c08735f67b9db8 SHA1 6f18e41ef2e33d1954e935304a4f89259e3477af SHA256 be0f5c38d2cd448800aa0ffce6158de7d259b505d82d06eebe4de12d9daa721d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6D8E8ACgkQaC/OocHi7JbUgwEAkZWrm5y+uLNI4bBglkjOUh8E
-9/4pMGOi7zpRrx4jTVwA/3vAlfFrxdP6lAjQ7RHpUXJ3yzCvOvkhxwfnGW2kKpH7
-=MCVO
+iF4EAREIAAYFAk6D8S4ACgkQaC/OocHi7JbObgEAntN8W5oONYCyYIpo/Dt13vma
+bSUzW/NrG5d2zvhNnBkA/1Bh+frU2a/vPMQOt5BWcKLZIM2ny7RyYmfg0uQqubg6
+=crEp
 -----END PGP SIGNATURE-----

diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index f37576e34b3673bdafd5666284991d41007851c2..f94d20a813c0622899972eaa0a1cac888c9d12ea 100644 (file)
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.88 2011/09/29 04:12:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.89 2011/09/29 04:16:39 vapier Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa altivec avahi bluray css debug joystick midi profile pulseaudio +rsxs rtmp sse sse2 udev vaapi vdpau webserver +xrandr"
+IUSE="alsa altivec avahi bluray css debug joystick midi profile pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
 
 COMMON_DEPEND="virtual/opengl
        app-arch/bzip2
@@ -70,7 +70,7 @@ COMMON_DEPEND="virtual/opengl
        avahi? ( net-dns/avahi )
        webserver? ( net-libs/libmicrohttpd )
        net-misc/curl
-       || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
+       samba? ( >=net-fs/samba-3.4.6[smbclient] )
        sys-apps/dbus
        sys-libs/zlib
        virtual/mysql
@@ -173,6 +173,7 @@ src_configure() {
                $(use_enable pulseaudio pulse) \
                $(use_enable rsxs) \
                $(use_enable rtmp) \
+               $(use_enable samba) \
                $(use_enable vaapi) \
                $(use_enable vdpau) \
                $(use_enable webserver) \