Version bump, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 23 insertions, 109 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index 34c048408585..95ec87d364f2 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.128 2013/06/30 21:18:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.129 2013/10/10 18:38:28 pacho Exp $
+
+*gnome-bluetooth-3.8.2.1 (10 Oct 2013)
+
+  10 Oct 2013; Pacho Ramos <pacho@gentoo.org> +gnome-bluetooth-3.8.2.1.ebuild,
+  -gnome-bluetooth-3.6.1.ebuild, -gnome-bluetooth-3.8.0.ebuild, metadata.xml:
+  Version bump, drop old
 
   30 Jun 2013; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-bluetooth-3.8.1.ebuild:
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild
deleted file mode 100644
index c5b7b248c068..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 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.6.1.ebuild,v 1.3 2013/02/02 23:09:06 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib udev user
-
-DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
-HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="2/11" # subslot = libgnome-bluetooth soname version
-IUSE="+introspection sendto"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND=">=dev-libs/glib-2.29.90:2
-	>=x11-libs/gtk+-2.91.3:3[introspection?]
-	>=x11-libs/libnotify-0.7:=
-	virtual/udev
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	sendto? ( >=gnome-extra/nautilus-sendto-2.91 )
-"
-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
-#	dev-util/gtk-doc-am
-
-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() {
-	# FIXME: Add geoclue support
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_enable sendto nautilus-sendto)
-		--enable-documentation
-		--disable-maintainer-mode
-		--disable-desktop-update
-		--disable-icon-update
-		--disable-static
-		ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}
-
-src_install() {
-	gnome2_src_install
-	udev_dorules "${FILESDIR}"/61-${PN}.rules
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	# Notify about old libraries that might still be around
-	preserve_old_lib_notify /usr/$(get_libdir)/libgnome-bluetooth.so.7
-
-	if ! has_version sys-auth/consolekit[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
-}
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild
index 59d4aec7319b..208219f87d2e 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2013 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.0.ebuild,v 1.1 2013/03/28 22:16:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.8.2.1.ebuild,v 1.1 2013/10/10 18:38:28 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2 multilib udev user
+inherit eutils gnome2 udev user
 
-DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
-HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
+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
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.90:2
 	>=x11-libs/gtk+-2.91.3:3[introspection?]
-	>=x11-libs/libnotify-0.7:=
 	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"
+	x11-themes/gnome-icon-theme-symbolic
+"
 DEPEND="${COMMON_DEPEND}
 	!net-wireless/bluez-gnome
 	app-text/docbook-xml-dtd:4.1.2
@@ -41,7 +41,6 @@ DEPEND="${COMMON_DEPEND}
 "
 # eautoreconf needs:
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 
 pkg_setup() {
 	enewgroup plugdev
@@ -54,16 +53,13 @@ src_prepare() {
 }
 
 src_configure() {
-	# FIXME: Add geoclue support
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		--enable-documentation
-		--disable-maintainer-mode
-		--disable-desktop-update
-		--disable-icon-update
-		--disable-static
-		ITSTOOL=$(type -P true)"
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-documentation \
+		--disable-desktop-update \
+		--disable-icon-update \
+		--disable-static \
+		ITSTOOL=$(type -P true)
 }
 
 src_install() {
@@ -73,7 +69,7 @@ src_install() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	if ! has_version sys-auth/consolekit[acl] ; then
+	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
diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml
index 3c13ef1d7e8b..65b59ddf7dce 100644
--- a/net-wireless/gnome-bluetooth/metadata.xml
+++ b/net-wireless/gnome-bluetooth/metadata.xml
@@ -5,7 +5,5 @@
 <use>
 	<flag name="nautilus">Build the <pkg>gnome-extra/nautilus-sendto</pkg>
 		plugin</flag>
-	<flag name="sendto">Build the <pkg>gnome-extra/nautilus-sendto</pkg>
-		plugin</flag>
 </use>
 </pkgmetadata>