commit: 84992727ad259fa91fded60b2d03ca778e86d13e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 17:52:35 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 2 18:09:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=84992727
net-wireless/gnome-bluetooth: 3.14.1 → 3.16.1
...h-9999.ebuild => gnome-bluetooth-3.16.1.ebuild} | 30 +++++-----------------
.../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 6 ++---
2 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild
similarity index 73%
copy from net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
copy to net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild
index fb94cb4..e4cf444 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,9 +6,6 @@ EAPI="5"
GCONF_DEBUG="yes"
inherit eutils gnome2 udev user
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
HOMEPAGE="https://wiki.gnome.org/GnomeBluetooth";
@@ -16,16 +13,11 @@ HOMEPAGE="https://wiki.gnome.org/GnomeBluetooth";
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="2/13" # subslot = libgnome-bluetooth soname version
IUSE="+introspection"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
COMMON_DEPEND="
- >=dev-libs/glib-2.37.3:2
- >=x11-libs/gtk+-3.11.2:3[introspection?]
+ >=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.12:3[introspection?]
virtual/udev
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
"
@@ -47,34 +39,24 @@ DEPEND="${COMMON_DEPEND}
# eautoreconf needs:
# gnome-base/gnome-common
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.9 )"
-fi
-
pkg_setup() {
enewgroup plugdev
}
src_prepare() {
# 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
+ rm -v lib/bluetooth-client-glue.{c,h} || die
gnome2_src_prepare
}
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}
+ ITSTOOL=$(type -P true)
}
src_install() {
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
index fb94cb4..163d0a6 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -24,8 +24,8 @@ else
fi
COMMON_DEPEND="
- >=dev-libs/glib-2.37.3:2
- >=x11-libs/gtk+-3.11.2:3[introspection?]
+ >=dev-libs/glib-2.38:2
+ >=x11-libs/gtk+-3.12:3[introspection?]
virtual/udev
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
"
