From 010119eba72a452e36ecdc7050ab0dfa7c0bd65c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 8 Dec 2019 12:13:51 +0100 Subject: [PATCH] net-wireless/blueman: Switch to new python-single-r1 API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- net-wireless/blueman/blueman-2.1.1-r1.ebuild | 15 ++++++++++----- net-wireless/blueman/blueman-9999.ebuild | 13 ++++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/net-wireless/blueman/blueman-2.1.1-r1.ebuild b/net-wireless/blueman/blueman-2.1.1-r1.ebuild index 4249d4afac6f..0dbede4768d8 100644 --- a/net-wireless/blueman/blueman-2.1.1-r1.ebuild +++ b/net-wireless/blueman/blueman-2.1.1-r1.ebuild @@ -15,6 +15,7 @@ if [[ ${PV} == "9999" ]] ; then KEYWORDS="" else SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz" + S=${WORKDIR}/${P/_/.} KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi @@ -25,15 +26,21 @@ SLOT="0" IUSE="appindicator network nls policykit pulseaudio" DEPEND=" - dev-python/pygobject:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') >=net-wireless/bluez-5:= ${PYTHON_DEPS}" BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )" RDEPEND="${DEPEND} - dev-python/pycairo[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + ') sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] @@ -65,8 +72,6 @@ RDEPEND="${DEPEND} !net-wireless/gnome-bluetooth " -S=${WORKDIR}/${P/_/.} - REQUIRED_USE="${PYTHON_REQUIRED_USE}" pkg_pretend() { diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild index c04d0676bc9c..0dbede4768d8 100644 --- a/net-wireless/blueman/blueman-9999.ebuild +++ b/net-wireless/blueman/blueman-9999.ebuild @@ -15,6 +15,7 @@ if [[ ${PV} == "9999" ]] ; then KEYWORDS="" else SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz" + S=${WORKDIR}/${P/_/.} KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi @@ -25,15 +26,21 @@ SLOT="0" IUSE="appindicator network nls policykit pulseaudio" DEPEND=" - dev-python/pygobject:3[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] + ') >=net-wireless/bluez-5:= ${PYTHON_DEPS}" BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext )" RDEPEND="${DEPEND} - dev-python/pycairo[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + ') sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] -- 2.26.2