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 AE4B713827E for ; Sun, 8 Dec 2013 21:46:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86715E0A84; Sun, 8 Dec 2013 21:46:31 +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 D5FB5E0A84 for ; Sun, 8 Dec 2013 21:46:30 +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 BEDB433F4FA for ; Sun, 8 Dec 2013 21:46:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 782D3E568A for ; Sun, 8 Dec 2013 21:46:28 +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: <1386538583.3bcc5e77759b56b37359ee6b73d0f793a6e114d7.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-wireless/gnome-bluetooth/ X-VCS-Repository: proj/gnome X-VCS-Files: net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild X-VCS-Directories: net-wireless/gnome-bluetooth/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 3bcc5e77759b56b37359ee6b73d0f793a6e114d7 X-VCS-Branch: master Date: Sun, 8 Dec 2013 21:46:28 +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: d6db3031-1b7e-4ac8-abd3-04292abd9aa2 X-Archives-Hash: c9dd149f426f1052212b30ce828b6a03 commit: 3bcc5e77759b56b37359ee6b73d0f793a6e114d7 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Nov 16 16:55:58 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Dec 8 21:36:23 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3bcc5e77 net-wireless/gnome-bluetooth: 3.8.2.1 → 3.10.0 --- .../gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild | 75 ++++++++++++++++++++++ .../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 51 ++++++--------- 2 files changed, 96 insertions(+), 30 deletions(-) diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild new file mode 100644 index 0000000..d45c23a --- /dev/null +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.10.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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/12" # subslot = libgnome-bluetooth soname version +IUSE="+introspection" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +COMMON_DEPEND=" + >=dev-libs/glib-2.36: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-5 + 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 + 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 +} diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild index 0a9993b..7ab9b35 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild @@ -1,41 +1,39 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="5" GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" -inherit eutils gnome2 multilib udev user +inherit eutils gnome2 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" +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 sendto" +SLOT="2/12" # subslot = libgnome-bluetooth soname version +IUSE="+introspection" if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" fi -COMMON_DEPEND=">=dev-libs/glib-2.29.90:2 +COMMON_DEPEND=" + >=dev-libs/glib-2.36: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" + x11-themes/gnome-icon-theme-symbolic +" DEPEND="${COMMON_DEPEND} !net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 @@ -43,7 +41,6 @@ DEPEND="${COMMON_DEPEND} 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 @@ -51,7 +48,6 @@ DEPEND="${COMMON_DEPEND} " # eautoreconf needs: # gnome-base/gnome-common -# dev-util/gtk-doc-am if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} @@ -72,17 +68,15 @@ 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" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - gnome2_src_configure + local myconf="" + [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" + gnome2_src_configure \ + $(use_enable introspection) \ + --enable-documentation \ + --disable-desktop-update \ + --disable-icon-update \ + --disable-static \ + ${myconf} } src_install() { @@ -92,10 +86,7 @@ src_install() { 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 + 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