[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-user-share/

["NP Hardass" <np-hardass@gentoo.org>]

commit:     9df31f0112eacb7b9bdf2ee7d30bb33c2396fa3a
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 02:51:09 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 02:51:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df31f01

mate-extra/mate-user-share: Drop obsolete support for bluez4, per #564262.

Requires stabilization of 1.8-r1 to complete the drop.

Package-Manager: portage-2.2.26

 ...share-1.10.1.ebuild => mate-user-share-1.10.1-r1.ebuild} |  9 ++++-----
 ...-share-1.10.1.ebuild => mate-user-share-1.8.0-r1.ebuild} | 13 ++++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.10.1-r1.ebuild
similarity index 88%
copy from mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild
copy to mate-extra/mate-user-share/mate-user-share-1.10.1-r1.ebuild
index 09806cc..c9e9dac 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.10.1-r1.ebuild
@@ -19,9 +19,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="X bluetooth"
+IUSE="X"
 
-RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
+RDEPEND="
 	>=dev-libs/dbus-glib-0.70:0
 	>=dev-libs/glib-2.15.2:2
 	>=dev-libs/libunique-1:1
@@ -35,8 +35,7 @@ RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
 	>=x11-libs/libnotify-0.7:0
 	>=www-apache/mod_dnssd-0.6:0
 	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	virtual/libintl:0
-	bluetooth? ( >=net-wireless/bluez-4.18:0= )"
+	virtual/libintl:0"
 
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
@@ -49,7 +48,7 @@ src_configure() {
 	gnome2_src_configure \
 		--with-httpd=apache2 \
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		$(use_enable bluetooth) \
+		--disable-bluetooth \
 		$(use_with X x)
 }
 

diff --git a/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
similarity index 85%
rename from mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild
rename to mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
index 09806cc..3fe2309 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.10.1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
@@ -19,24 +19,23 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="X bluetooth"
+IUSE="X"
 
-RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
+RDEPEND="
 	>=dev-libs/dbus-glib-0.70:0
 	>=dev-libs/glib-2.15.2:2
 	>=dev-libs/libunique-1:1
-	>=mate-base/caja-1.10:0
+	>=mate-base/caja-1.8:0
 	media-libs/libcanberra:0[gtk]
 	>=sys-apps/dbus-1.1.1:0
 	>=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/gtk+-2.14:2
 	x11-libs/libX11:0
 	x11-libs/pango:0
 	>=x11-libs/libnotify-0.7:0
 	>=www-apache/mod_dnssd-0.6:0
 	>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	virtual/libintl:0
-	bluetooth? ( >=net-wireless/bluez-4.18:0= )"
+	virtual/libintl:0"
 
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
@@ -49,7 +48,7 @@ src_configure() {
 	gnome2_src_configure \
 		--with-httpd=apache2 \
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		$(use_enable bluetooth) \
+		--disable-bluetooth \
 		$(use_with X x)
 }