diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-24 11:12:03 +0000 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-24 11:12:03 +0000 |
commit | e4ae457a5cda27b48412ae08c6d27d0742e8a03b (patch) | |
tree | 4b9d8a93aa991b000ca4f24a60e3fe5be4dc9251 /net-wireless/gnome-bluetooth | |
parent | Add missing call to eclass in src_configure. (diff) | |
download | gentoo-2-e4ae457a5cda27b48412ae08c6d27d0742e8a03b.tar.gz gentoo-2-e4ae457a5cda27b48412ae08c6d27d0742e8a03b.tar.bz2 gentoo-2-e4ae457a5cda27b48412ae08c6d27d0742e8a03b.zip |
Version bump for Gnome 3.6. Switch to EAPI=5, ACL support for udev rules.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'net-wireless/gnome-bluetooth')
-rw-r--r-- | net-wireless/gnome-bluetooth/ChangeLog | 9 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules | 11 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild (renamed from net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild) | 68 | ||||
-rw-r--r-- | net-wireless/gnome-bluetooth/metadata.xml | 2 |
4 files changed, 52 insertions, 38 deletions
diff --git a/net-wireless/gnome-bluetooth/ChangeLog b/net-wireless/gnome-bluetooth/ChangeLog index bf0abcd9cb5b..3f14bb6f065b 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.121 2012/12/11 21:59:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/ChangeLog,v 1.122 2012/12/24 11:12:03 eva Exp $ + +*gnome-bluetooth-3.6.1 (24 Dec 2012) + + 24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> + +files/61-gnome-bluetooth.rules, -gnome-bluetooth-3.2.2.ebuild, + +gnome-bluetooth-3.6.1.ebuild, metadata.xml: + Version bump for Gnome 3.6. Switch to EAPI=5, ACL support for udev rules. 11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> gnome-bluetooth-2.32.0-r1.ebuild, gnome-bluetooth-3.2.2.ebuild: diff --git a/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules b/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules new file mode 100644 index 000000000000..506574082122 --- /dev/null +++ b/net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules @@ -0,0 +1,11 @@ +# Get access to /dev/rfkill for users +# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 +# +# Updated for udev >= 154 +# http://bugs.debian.org/582188 +# https://bugzilla.redhat.com/show_bug.cgi?id=588660 + +ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" +ACTION!="add|change", GOTO="gnome_bluetooth_end" +KERNEL=="rfkill", GROUP="plugdev", MODE="0664", TAG+="udev-acl" +LABEL="gnome_bluetooth_end" diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild index 37b5d16cf1c2..9001f5f5be14 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.2.2.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild @@ -1,26 +1,25 @@ # 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.2.ebuild,v 1.7 2012/12/11 21:59:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild,v 1.1 2012/12/24 11:12:03 eva Exp $ -EAPI="4" +EAPI="5" GCONF_DEBUG="yes" -# libgnome-bluetooth-applet.la is needed by gnome-shell during compilation -GNOME2_LA_PUNT="no" +GNOME2_LA_PUNT="yes" -inherit eutils gnome2 multilib user udev +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" -IUSE="doc +introspection sendto" -KEYWORDS="~amd64 ~x86" +IUSE="+introspection sendto" +KEYWORDS="~amd64 ~ppc ~ppc64 ~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 + >=x11-libs/libnotify-0.7:= + virtual/udev introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) sendto? ( >=gnome-extra/nautilus-sendto-2.91 ) @@ -28,54 +27,51 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.7:2 RDEPEND="${COMMON_DEPEND} >=net-wireless/bluez-4.34 app-mobilephone/obexd - virtual/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:2 + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.40.0 - virtual/pkgconfig >=sys-devel/gettext-0.17 + virtual/pkgconfig x11-libs/libX11 x11-libs/libXi x11-proto/xproto - doc? ( >=dev-util/gtk-doc-1.9 )" +" # 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-moblin --disable-desktop-update --disable-icon-update - --disable-schemas-compile - --disable-static" - DOCS="AUTHORS README NEWS ChangeLog" - - enewgroup plugdev + --disable-static + ITSTOOL=$(type -P true)" + gnome2_src_configure } 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 - - udev_dorules "${FILESDIR}"/80-rfkill.rules + udev_dorules "${FILESDIR}"/61-${PN}.rules } pkg_postinst() { @@ -83,6 +79,8 @@ pkg_postinst() { # Notify about old libraries that might still be around preserve_old_lib_notify /usr/$(get_libdir)/libgnome-bluetooth.so.7 - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to control bluetooth transmitter." + 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/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml index b0f4a0f404be..3c13ef1d7e8b 100644 --- a/net-wireless/gnome-bluetooth/metadata.xml +++ b/net-wireless/gnome-bluetooth/metadata.xml @@ -3,8 +3,6 @@ <pkgmetadata> <herd>gnome</herd> <use> - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> - for introspection</flag> <flag name="nautilus">Build the <pkg>gnome-extra/nautilus-sendto</pkg> plugin</flag> <flag name="sendto">Build the <pkg>gnome-extra/nautilus-sendto</pkg> |