Version bump, improves PIN handling; .la files no longer needed with gnome-shell-3.4. Drop old.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

2 files changed, 15 insertions, 26 deletions

diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog
index ab7bdb4a4859..3b0d36e7c77a 100644
--- a/net-wireless/gnome-bluetooth/ChangeLog
+++ b/net-wireless/gnome-bluetooth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/gnome-bluetooth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.108 2012/05/04 06:41:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.109 2012/05/13 23:38:51 tetromino Exp $
+
+*gnome-bluetooth-3.4.0 (13 May 2012)
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-bluetooth-3.2.1.ebuild, +gnome-bluetooth-3.4.0.ebuild:
+  Version bump, improves PIN handling; .la files no longer needed with
+  gnome-shell-3.4. Drop old.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-bluetooth-2.32.0.ebuild,
   gnome-bluetooth-2.32.0-r1.ebuild, gnome-bluetooth-3.2.1.ebuild,
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild
index 4c63c579661b..b42906546e47 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.1.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2012 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.2.1.ebuild,v 1.4 2012/05/04 06:41:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.4.0.ebuild,v 1.1 2012/05/13 23:38:51 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
-# libgnome-bluetooth-applet.la is needed by gnome-shell during compilation
-GNOME2_LA_PUNT="no"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 multilib
 
@@ -17,10 +16,9 @@ SLOT="2"
 IUSE="doc +introspection sendto"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND=">=dev-libs/glib-2.25.7:2
+COMMON_DEPEND=">=dev-libs/glib-2.29.90:2
 	>=x11-libs/gtk+-2.91.3:3[introspection?]
 	>=x11-libs/libnotify-0.7.0
-	>=dev-libs/dbus-glib-0.74
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	sendto? ( >=gnome-extra/nautilus-sendto-2.91 )
@@ -30,17 +28,16 @@ RDEPEND="${COMMON_DEPEND}
 	app-mobilephone/obexd
 	sys-fs/udev
 	x11-themes/gnome-icon-theme-symbolic"
-# To break circular dependencies
-PDEPEND=">=gnome-base/gnome-control-center-2.91"
 DEPEND="${COMMON_DEPEND}
-	!!net-wireless/bluez-gnome
+	!net-wireless/bluez-gnome
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/gnome-doc-utils
 	app-text/scrollkeeper
 	dev-libs/libxml2
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
+	dev-util/gdbus-codegen
 	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-proto/xproto
@@ -54,8 +51,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable introspection)
 		$(use_enable sendto nautilus-sendto)
+		--enable-documentation
 		--disable-maintainer-mode
-		--disable-moblin
 		--disable-desktop-update
 		--disable-icon-update
 		--disable-schemas-compile
@@ -65,24 +62,9 @@ pkg_setup() {
 	enewgroup plugdev
 }
 
-src_prepare() {
-	# Add missing files for intltool checks
-	echo "sendto/bluetooth-sendto.desktop.in" >> po/POTFILES.in
-	echo "wizard/bluetooth-wizard.desktop.in" >> po/POTFILES.in
-
-	gnome2_src_prepare
-}
-
 src_install() {
 	gnome2_src_install
 
-	local la
-	for la in gnome-bluetooth/plugins/libgbtgeoclue.la \
-			 control-center-1/panels/libbluetooth.la \
-			 libgnome-bluetooth.la; do
-		rm -v "${ED}/usr/$(get_libdir)/${la}" || die
-	done
-
 	insinto /$(get_libdir)/udev/rules.d
 	doins "${FILESDIR}"/80-rfkill.rules
 }