commit: d9b31fb45d421f543d078dad1e75f17e7d2d3872
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 09:49:53 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 09:49:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d9b31fb4
net-wireless/gnome-bluetooth: Bump version to 3.18.0
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
...h-9999.ebuild => gnome-bluetooth-3.18.0.ebuild} | 26 +++++-----------------
.../gnome-bluetooth/gnome-bluetooth-9999.ebuild | 2 ++
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.0.ebuild
similarity index 78%
copy from net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
copy to net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.0.ebuild
index cc5586b..55733a8 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.0.ebuild
@@ -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,17 +13,14 @@ 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.38:2
>=x11-libs/gtk+-3.12:3[introspection?]
+ media-libs/libcanberra[gtk3]
virtual/udev
+ x11-libs/libnotify
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
"
RDEPEND="${COMMON_DEPEND}
@@ -47,34 +41,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 cc5586b..6057df2 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-9999.ebuild
@@ -26,7 +26,9 @@ fi
COMMON_DEPEND="
>=dev-libs/glib-2.38:2
>=x11-libs/gtk+-3.12:3[introspection?]
+ media-libs/libcanberra[gtk3]
virtual/udev
+ x11-libs/libnotify
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
"
RDEPEND="${COMMON_DEPEND}
