summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-09-29 04:16:39 +0000
committerMike Frysinger <vapier@gentoo.org>2011-09-29 04:16:39 +0000
commitf245f5b982388249daa307772460124ea671bc0b (patch)
tree6e043b5caf92ba5f305bc62dae425edd4a31f505 /media-tv
parentMake slick screensavers optional #383785 by BT. (diff)
downloadgentoo-2-f245f5b982388249daa307772460124ea671bc0b.tar.gz
gentoo-2-f245f5b982388249daa307772460124ea671bc0b.tar.bz2
gentoo-2-f245f5b982388249daa307772460124ea671bc0b.zip
Make samba support optional now that upstream allows it to be disabled #383759 by BT.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xbmc/ChangeLog6
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index e88c273920d4..6cd9019ea153 100644
--- 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/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index f37576e34b36..f94d20a813c0 100644
--- 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) \