From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 833A6138334 for ; Wed, 27 Jun 2018 19:01:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F3DFE0928; Wed, 27 Jun 2018 19:01:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 339DDE0928 for ; Wed, 27 Jun 2018 19:01:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B3DF335CC1 for ; Wed, 27 Jun 2018 19:01:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1993A354 for ; Wed, 27 Jun 2018 19:00:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1530126021.89cd5c260da910b885f9c760b4e7d8b99ab1553d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/ubertooth/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild net-wireless/ubertooth/ubertooth-9999.ebuild X-VCS-Directories: net-wireless/ubertooth/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 89cd5c260da910b885f9c760b4e7d8b99ab1553d X-VCS-Branch: master Date: Wed, 27 Jun 2018 19:00:58 +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: b089571e-bc7a-41b4-ab9c-4acc440b623b X-Archives-Hash: 43efb3cf5a3cff3a2fa158245e652f59 commit: 89cd5c260da910b885f9c760b4e7d8b99ab1553d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 26 21:12:15 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 27 19:00:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89cd5c26 net-wireless/ubertooth: Drop USE=specan, depends on Qt4 Bug: https://bugs.gentoo.org/569948 Bug: https://bugs.gentoo.org/649576 Package-Manager: Portage-2.3.40, Repoman-2.3.9 ...h-9999.ebuild => ubertooth-2017.03.2-r1.ebuild} | 42 +++------------------- net-wireless/ubertooth/ubertooth-9999.ebuild | 42 +++------------------- 2 files changed, 10 insertions(+), 74 deletions(-) diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild similarity index 71% copy from net-wireless/ubertooth/ubertooth-9999.ebuild copy to net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild index de2e949b8cb..1341a9478aa 100644 --- a/net-wireless/ubertooth/ubertooth-9999.ebuild +++ b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild @@ -1,28 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 - -inherit multilib distutils-r1 cmake-utils udev +inherit cmake-utils udev HOMEPAGE="http://ubertooth.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="+bluez +specan static-libs +ubertooth1-firmware +udev" -REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+bluez static-libs +ubertooth1-firmware +udev" + DEPEND="bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-${PV}:=[static-libs?] - specan? ( ${PYTHON_DEPS} ) static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1=" RDEPEND="${DEPEND} - specan? ( >=dev-qt/qtgui-4.7.2:4 - >=dev-python/pyside-1.0.2[${PYTHON_USEDEP}] - >=dev-python/numpy-1.3[${PYTHON_USEDEP}] ) udev? ( virtual/udev )" MY_PV=${PV/\./-} @@ -42,17 +35,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex #readd firmware building, but do it right #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi -src_prepare() { - cmake-utils_src_prepare - if use specan; then - pushd python/specan_ui || die - distutils-r1_src_prepare - popd - fi -} - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DUSE_BLUEZ=$(usex bluez) -DBUILD_STATIC_LIB=$(usex static-libs) -DINSTALL_UDEV_RULES=$(usex udev) @@ -67,16 +51,6 @@ src_configure() { cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile - - if use specan; then - pushd python/specan_ui || die - distutils-r1_src_compile - popd - fi -} - src_install() { cmake-utils_src_install @@ -91,12 +65,6 @@ src_install() { fi popd - if use specan; then - pushd python/specan_ui || die - distutils-r1_src_install - popd - fi - elog "Everyone can read from the ubertooth, but to talk to it" elog "your user needs to be in the usb group." } diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild index de2e949b8cb..1341a9478aa 100644 --- a/net-wireless/ubertooth/ubertooth-9999.ebuild +++ b/net-wireless/ubertooth/ubertooth-9999.ebuild @@ -1,28 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_OPTIONAL=1 - -inherit multilib distutils-r1 cmake-utils udev +inherit cmake-utils udev HOMEPAGE="http://ubertooth.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="+bluez +specan static-libs +ubertooth1-firmware +udev" -REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+bluez static-libs +ubertooth1-firmware +udev" + DEPEND="bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-${PV}:=[static-libs?] - specan? ( ${PYTHON_DEPS} ) static-libs? ( dev-libs/libusb[static-libs] ) virtual/libusb:1=" RDEPEND="${DEPEND} - specan? ( >=dev-qt/qtgui-4.7.2:4 - >=dev-python/pyside-1.0.2[${PYTHON_USEDEP}] - >=dev-python/numpy-1.3[${PYTHON_USEDEP}] ) udev? ( virtual/udev )" MY_PV=${PV/\./-} @@ -42,17 +35,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex #readd firmware building, but do it right #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi -src_prepare() { - cmake-utils_src_prepare - if use specan; then - pushd python/specan_ui || die - distutils-r1_src_prepare - popd - fi -} - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DUSE_BLUEZ=$(usex bluez) -DBUILD_STATIC_LIB=$(usex static-libs) -DINSTALL_UDEV_RULES=$(usex udev) @@ -67,16 +51,6 @@ src_configure() { cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile - - if use specan; then - pushd python/specan_ui || die - distutils-r1_src_compile - popd - fi -} - src_install() { cmake-utils_src_install @@ -91,12 +65,6 @@ src_install() { fi popd - if use specan; then - pushd python/specan_ui || die - distutils-r1_src_install - popd - fi - elog "Everyone can read from the ubertooth, but to talk to it" elog "your user needs to be in the usb group." }