app-mobilephone/obexd isn't used, it uses bluez-5 provided one. Drop old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 11 insertions, 86 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index d2862de66b2a..d864f618a5d0 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.137 2014/03/09 12:04:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.138 2014/03/30 08:40:14 pacho Exp $
+
+  30 Mar 2014; Pacho Ramos <pacho@gentoo.org> -gnome-bluetooth-3.8.2.1.ebuild,
+  gnome-bluetooth-3.10.0.ebuild:
+  app-mobilephone/obexd isn't used, it uses bluez-5 provided one. Drop old.
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-bluetooth-3.10.0.ebuild:
   x86 stable, bug 499954
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 56d389d0d0eb..4efca8d26734 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -11,17 +11,15 @@ AUX gnome-bluetooth-2.32.0-pin-quirk.patch 812 SHA256 a1d703840e2c81d621225fd4b6
 AUX gnome-bluetooth-2.32.0-update-dtd.patch 800 SHA256 6bdbe47e15f89d61702a30ad9e5d1b6f569617e2d683833b698dbfb8ff8b0783 SHA512 d0bbe586c319ee78e4f0b39c56d0f4eced7fd83092a8e4bd90c4e4d2ff8cba1f97accf4718d4aec0d798df9fcd2243f1d4e33289d440ab2fba3e816d52cffc26 WHIRLPOOL 107b95615b1e6f4e7f42e377d9f91e42baef34d38f58238724326bb2bee97b621b69c67523bd6b3a0d17d1a7b188e820a9aa770858c32a686805a3a6e074ed83
 DIST gnome-bluetooth-2.32.0.tar.bz2 1231205 SHA256 57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 SHA512 ba4a301ba0f2f3010722af910082c805a0bfa7981e0c4b84e68437908fda5a8314db720418e21aca4fa4dcdb830cdcd6bdc9a591802e08dce167d415f72b52ec WHIRLPOOL 052faa04f4fefc769e797035a64aa14724cc2d0404066b2f74ddfb38ed27c9eac49fd3f14c19acb44a83723bc2d2459950fe85fb4d39366974a3b83e10c43735
 DIST gnome-bluetooth-3.10.0.tar.xz 1327852 SHA256 7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712 SHA512 49602dedaad43652e542c8ca3682158a80a1e4b1cc7c568946af71357dc209600be654977fb444e8561f87bc7d9df8179bd0a808ab1aebd0fb904fec83865c65 WHIRLPOOL 9eaf1b5e8b01f045d3c62cd4ecf73f0778947b13b09860014bb760159f1369febffdbc1b13bad94edec7d15de035aafe70bc0017bdf54035ec67476ba04edc08
-DIST gnome-bluetooth-3.8.2.1.tar.xz 1334744 SHA256 03bb2710beccb318740fe63663dc9ccef75d50a50ec557552f4c92ca13606074 SHA512 d0cb63df611b2bd56ae7a7d43d0cc8c992d64bd54eaed3034a74ac880f2ea59cd453b3f5048657df098c204f3b79475314750e4e58ff77f1d95291d574ff2ed3 WHIRLPOOL 38bc9cb6a5a5b454b02f37823ea133dec9c7c8c2ed49ab1bde16f0cd5a64907068a04ecf5168ec23d70e07f5a7d5b5c002d8d72746468fd6131248e9f64344bf
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
 EBUILD gnome-bluetooth-2.32.0-r1.ebuild 2920 SHA256 208e708fb88d55312516e27a7508efbe7d310ac8492e5514cfb2b7b3b385235a SHA512 80a206d359ffe61b497683c8ecc4d1104b84ad67f61b1916fdd36b0aa1f9ceb39e6a5e370c7c4d6f9ac4bb8f065599a7ff755fb32c1f3a2fcdfff9a7f27807fc WHIRLPOOL 78bf5e0cc6f3c85a5c1670c0edf34f258ad347ee05d9e558d96b38ba04848b9e28a42a595dddb168487ce284a35574e8e3f18225e36dc1ebd3d52cc912b1d653
-EBUILD gnome-bluetooth-3.10.0.ebuild 1894 SHA256 07546bb997d227b428d215653439db91ad042f5acc45dcf6cf6e32a6151560c0 SHA512 41c8f6879effd490ad34a6a03960774186600180261e6d72b472d4f49bf513b148e5ef8f591fc6cf83bc4eb287825e0d889c317249fdc6e0f3322a359e7772e0 WHIRLPOOL 0255f9411b869acdb0fede41da23426219c63e166b02d4113cd462c0c57980fc2e9b3308de4563623a31c440aa5a82cc657ea5edaaffcb9a46d5c5a6a6ba7269
-EBUILD gnome-bluetooth-3.8.2.1.ebuild 1925 SHA256 0b3913fe7f094071ad9faf0be886357ca584ac2441b154aae2983bcd06c1bbda SHA512 e7cff89ef8c3a005bc5a21be1c585dc5098f87c688afb8dd85cc5ddb3cd5c07b346f8555eb7f44b48eed7e52ef5c52c90a04785bdc579d852d710f6c77e83c8f WHIRLPOOL 1e002e34b391e87e9b55c5ce424b51002e68006d9fcb745b740d90182ae33f11181008446292a7523105ae99722922118683554f02bc8f125ccb564fe6929150
-MISC ChangeLog 23524 SHA256 bd720535e68ae75114775d3749f19ac8a64682927fa1f7d1abdcf5f2170da836 SHA512 bdb634da336d14e4bdc568e7da634a85371787c665e501366152cd86ba9fc853f87075c9facf64daa974464bec06ff73344cb4a8fd2b935864ceb7b24cf38f1b WHIRLPOOL fbcc35aa3126cb461562c3fa76e1c1b3caa38e15c060401ea30898aa03b22bcb83f5ec646376bbb4f658f3057dccc6d839b0ca59f66120b202ee0d3554793d53
+EBUILD gnome-bluetooth-3.10.0.ebuild 1871 SHA256 db996f7a59da83048f57f4c6a47aa812e9ed2f0a77de32170f599c06218ec94f SHA512 0ea52d0113e58b058e7abde0bd69448b2ee631788573ae08dbf461fce60fd37dc6c768f0145d8fe91d5ff1147a19985061b2122daa5bdad2480a806aa1eb4b59 WHIRLPOOL bc006e85220181e8b8cfb1d0a388a1e1338bec78f8be3a4bb19161798984f0eca674c975c5b09c669daa18e7b824807f6e65be594d3a832c8d8f2c72640a23ff
+MISC ChangeLog 23713 SHA256 fb4452ff65caf2dc7d1162560833c408e41500436cf1d00c64c420d04d20dbf3 SHA512 e3dd83f6ca8d04d4c3825f78453228488c11156ae8da621534276980fe08d829641f9114494454ddd54fe9bdbc9b818245125defabdc2c2553904e93fe4bc0c1 WHIRLPOOL 2591c89f6c967bbec70dc441af2fa68c6d587f091508866350668549025f9e5a7f595d68c3b6c4e0c1e2690cc4ecea999ea35c1d9892567f9660b3093b59149b
 MISC metadata.xml 259 SHA256 b1bdb095d7c18cb79fcea8cb8d0eb086ed22a02fd4aadbe2006049f313789cd2 SHA512 234c10dffce658a5277e61228489b58327f8b9a62a03a454d16945ce8d4ff8e2505fb0b781f1e4a58717168589c8ba91c96733d7ded2484f951e161b2f4f13d4 WHIRLPOOL 94edef0096a42ec354c88aa5a6ac235cfe8320963abda33a6a4d3d8acabe4ae377772aadd0b3a33c4850365820d15bb9a53c94ebecf94211442a82ba46c79657
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWLkACgkQCaWpQKGI+9SpEgCgg90QjRMO6DFUeYvaUfkhJ/u+
-FIoAnjPT/pxpa0ITfny+NPm+P/Ah6G8D
-=blcP
+iEYEAREIAAYFAlM32G8ACgkQCaWpQKGI+9RoFgCaA9SYqXmsZynbErbelreEvfyP
+DGUAn1tLoT9LhkgK4rpZk5wEjNF/tMcP
+=an0k
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild
index 3c1bfaf211c7..5bb7acfb736a 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild,v 1.5 2014/03/09 12:04:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild,v 1.6 2014/03/30 08:40:14 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -23,7 +23,6 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	>=net-wireless/bluez-5
-	app-mobilephone/obexd
 	x11-themes/gnome-icon-theme-symbolic
 "
 DEPEND="${COMMON_DEPEND}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild
deleted file mode 100644
index dc57d1617978..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild,v 1.5 2014/02/22 22:37:30 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2 udev user
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://wiki.gnome.org/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="2/11" # subslot = libgnome-bluetooth soname version
-IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.90:2
-	>=x11-libs/gtk+-2.91.3:3[introspection?]
-	virtual/udev
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=net-wireless/bluez-4.34
-	app-mobilephone/obexd
-	x11-themes/gnome-icon-theme-symbolic
-"
-DEPEND="${COMMON_DEPEND}
-	!net-wireless/bluez-gnome
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-proto/xproto
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Regenerate gdbus-codegen files to allow using any glib version; bug #436236
-	rm -v lib/bluetooth-client-glue.{c,h} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--enable-documentation \
-		--disable-desktop-update \
-		--disable-icon-update \
-		--disable-static \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	gnome2_src_install
-	udev_dorules "${FILESDIR}"/61-${PN}.rules
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version sys-auth/consolekit[acl] && ! has_version sys-apps/systemd[acl] ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to control bluetooth transmitter."
-	fi
-}