From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 708B71381F3 for ; Mon, 24 Dec 2012 11:12:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83B14E0675; Mon, 24 Dec 2012 11:12:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E76A0E0675 for ; Mon, 24 Dec 2012 11:12:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D0EA633D866 for ; Mon, 24 Dec 2012 11:12:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 71150E543C for ; Mon, 24 Dec 2012 11:12:04 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356347323.2d64fc7f97c4d9f622e099519230f93d55b47131.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-wireless/gnome-bluetooth/files/, net-wireless/gnome-bluetooth/ X-VCS-Repository: proj/gnome X-VCS-Files: net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules net-wireless/gnome-bluetooth/files/80-rfkill.rules net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild net-wireless/gnome-bluetooth/metadata.xml X-VCS-Directories: net-wireless/gnome-bluetooth/files/ net-wireless/gnome-bluetooth/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 2d64fc7f97c4d9f622e099519230f93d55b47131 X-VCS-Branch: master Date: Mon, 24 Dec 2012 11:12:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f8e9a9da-536e-4b2e-9eaf-f3d8c44da05a X-Archives-Hash: 79d66752540db960c540b082d0658dd4 commit: 2d64fc7f97c4d9f622e099519230f93d55b47131 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Dec 24 11:08:43 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Dec 24 11:08:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2d64fc7f net-wireless/gnome-bluetooth: moved to gx86 * Sync live ebuild with gx86 changes. * Add metadata.xml. --- .../gnome-bluetooth/files/61-gnome-bluetooth.rules | 11 ++ net-wireless/gnome-bluetooth/files/80-rfkill.rules | 5 - .../gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild | 97 -------------------- .../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 39 +++++---- net-wireless/gnome-bluetooth/metadata.xml | 11 ++ 5 files changed, 44 insertions(+), 119 deletions(-) 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 0000000..5065740 --- /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/files/80-rfkill.rules b/net-wireless/gnome-bluetooth/files/80-rfkill.rules deleted file mode 100644 index 61f9ca5..0000000 --- a/net-wireless/gnome-bluetooth/files/80-rfkill.rules +++ /dev/null @@ -1,5 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# network -KERNEL=="rfkill", GROUP="plugdev", MODE="0664" - 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 3652f7a..0000000 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.6.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 multilib udev user -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -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" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 - >=x11-libs/gtk+-2.91.3:3[introspection?] - >=x11-libs/libnotify-0.7.0 - 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/intltool-0.40.0 - dev-util/gdbus-codegen - >=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 - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools" -fi - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - DOCS="AUTHORS README NEWS ChangeLog" - # 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-schemas-compile - --disable-static" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - - # Regenerate gdbus-codegen files to allow using any glib version; bug #436236 - if [[ ${PV} != 9999 ]]; then - rm -v lib/bluetooth-client-glue.{c,h} || die - fi - - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - udev_dorules "${FILESDIR}"/80-rfkill.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 - - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to control bluetooth transmitter." -} diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild index 3652f7a..556b565 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" @@ -16,8 +16,9 @@ HOMEPAGE="http://live.gnome.org/GnomeBluetooth" LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" SLOT="2" -IUSE="doc +introspection sendto" +IUSE="+introspection sendto" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" @@ -25,7 +26,7 @@ fi COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 >=x11-libs/gtk+-2.91.3:3[introspection?] - >=x11-libs/libnotify-0.7.0 + >=x11-libs/libnotify-0.7:= virtual/udev introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) @@ -39,14 +40,15 @@ DEPEND="${COMMON_DEPEND} !net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 dev-libs/libxml2:2 - >=dev-util/intltool-0.40.0 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 - doc? ( >=dev-util/gtk-doc-1.9 )" +" # eautoreconf needs: # gnome-base/gnome-common # dev-util/gtk-doc-am @@ -54,6 +56,7 @@ DEPEND="${COMMON_DEPEND} if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} app-text/yelp-tools" + doc? ( >=dev-util/gtk-doc-1.9 ) fi pkg_setup() { @@ -61,7 +64,14 @@ pkg_setup() { } src_prepare() { - DOCS="AUTHORS README NEWS ChangeLog" + # Regenerate gdbus-codegen files to allow using any glib version; bug #436236 + if [[ ${PV} != 9999 ]]; then + rm -v lib/bluetooth-client-glue.{c,h} || die + fi + gnome2_src_prepare +} + +src_configure() { # FIXME: Add geoclue support G2CONF="${G2CONF} $(use_enable introspection) @@ -70,21 +80,14 @@ src_prepare() { --disable-maintainer-mode --disable-desktop-update --disable-icon-update - --disable-schemas-compile --disable-static" [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - - # Regenerate gdbus-codegen files to allow using any glib version; bug #436236 - if [[ ${PV} != 9999 ]]; then - rm -v lib/bluetooth-client-glue.{c,h} || die - fi - - gnome2_src_prepare + gnome2_src_configure } src_install() { gnome2_src_install - udev_dorules "${FILESDIR}"/80-rfkill.rules + udev_dorules "${FILESDIR}"/61-${PN}.rules } pkg_postinst() { @@ -92,6 +95,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 new file mode 100644 index 0000000..4150212 --- /dev/null +++ b/net-wireless/gnome-bluetooth/metadata.xml @@ -0,0 +1,11 @@ + + + + gnome + + Build the gnome-extra/nautilus-sendto + plugin + Build the gnome-extra/nautilus-sendto + plugin + +