From 846791e2e6ec91e7f3ad512e23573113fd96bd57 Mon Sep 17 00:00:00 2001 From: Richard Farina Date: Sun, 3 May 2015 19:10:56 +0000 Subject: [PATCH] update to distutils-r1 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xDD11F94A --- net-wireless/ubertooth/ChangeLog | 5 +- net-wireless/ubertooth/Manifest | 30 +++++----- net-wireless/ubertooth/ubertooth-9999.ebuild | 61 +++++++++----------- 3 files changed, 45 insertions(+), 51 deletions(-) diff --git a/net-wireless/ubertooth/ChangeLog b/net-wireless/ubertooth/ChangeLog index 623b918d3d98..279d5640aa4a 100644 --- a/net-wireless/ubertooth/ChangeLog +++ b/net-wireless/ubertooth/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-wireless/ubertooth # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.29 2015/05/03 04:45:41 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.30 2015/05/03 19:10:49 zerochaos Exp $ + + 03 May 2015; Rick Farina ubertooth-9999.ebuild: + update to distutils-r1 03 May 2015; Rick Farina ubertooth-9999.ebuild: changed from python dfu to C dfu implementation diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest index 92d205740f38..ce1b34af07ce 100644 --- a/net-wireless/ubertooth/Manifest +++ b/net-wireless/ubertooth/Manifest @@ -6,23 +6,23 @@ DIST ubertooth-2014-04-R1.tar.xz 1762456 SHA256 0881b4bde755acea557851852bc830c1 DIST ubertooth-r534.tar.gz 2959832 SHA256 5e227872ee8c088fe2cdac936c4a30d1e12b8f7c6ac781c96004ad7528b44730 SHA512 b3e150b8f8a4335f65fd8b7b629316eae08cf0560269991af6632d48e360f17dd98742da975df33852760140cd5f4571f72f36d973fa5e6d8df47932561acfa6 WHIRLPOOL 7d7ea0db033b34cbf16f963ea42d05db9bf8f82f41d5d26dd6510a95ffe339dae3fef54f5cef5d71bfedb1e05531bf33998cbcabe88af611feeaecf1e22a7b10 EBUILD ubertooth-0.0_p534.ebuild 3146 SHA256 8833b94bfe8e4b42910300207f48db53a5c088236eaa4e58c7d2b860c28cde54 SHA512 f53a0b2cdead288a5cb41721cfd933dae8307d3eb2f41c875a68c013a59a4733b299f3f041654f2074c8c4808e3787e0b97994662563c38afb89108202ca66dd WHIRLPOOL a3e66d0743063a088901f53be569d0d2d4ae8c21c68b5bcb8f0733cf44570efe4cc11e4f44709e6e9e2b4de7c56656f2b80722a07857b7b8dc76213f7c8c4c6c EBUILD ubertooth-2014.04.1-r1.ebuild 3071 SHA256 3231343ba17039001dec14ef9fdb2110373c42f9ccb03b944ce511940831f727 SHA512 ebc80265a2dfa97554091d48ddc1f5e1c860989f65a5af37d3e7d52701ac4ec3d952b9a63c0f9c639f184b353966b806b1cadf8fcb51b6256bf33b930dcd98db WHIRLPOOL e39ae101af16d58845cd35b6e82d45e81d3fc088dfe4adbfbab50853eed40c5e4fd2a57303b66271f38296d166ae6564d04113468080fab490234bfb8fc7ae5d -EBUILD ubertooth-9999.ebuild 2962 SHA256 d025429a8c74c30a88f7b2bd34d40e7dc8218e215834ea00570fedbb72d298ec SHA512 88af85cd6a98323764f43ff2f3463b4d5ed2d2d753102740b1752c82a931427a6a437036c0bc6f1ad24002f8611bdb42874873109f83758108c6c59570c74028 WHIRLPOOL 7e805c790cf59c49c3ccdf7cf9c9200188e0267dd7483da1e8f036c57387103441ef26b6a411a1351f41d3d930a74c2f09fb3535c1846f99e1315d9d388e97bb -MISC ChangeLog 4957 SHA256 42f13dfd3ae7ebf8d803dc4151e0000ba36c69da6d8898b434b701aa03c7cdf6 SHA512 ca1dff6fc3727d23fc9064c57d9f0a10fa61ae6ccb0abdfd82cf7f0c326db7a7abdaa763af3e7cbff17d392dbe9917a3eb108b5fa6e1ed1bc71685baf8d16fd8 WHIRLPOOL 6b24664a7e0f2937a65be9e4708e9f28b6ce6247a181793f493680c20a68a68724cdec4dd43ac9a25495d6e7750cf227d4f5946a7b9663b8d221b79d0af15a46 +EBUILD ubertooth-9999.ebuild 2754 SHA256 dba95762822f095276a3189bf6fecb3513fde8803a695ba6e5c6c2c3519a4495 SHA512 69773a1c77b8c692e0ed3aa7f3f9ddce1efb5e0a561335acd83a83deb48a810127c066ed8b87c7250b505e642de66fa530eeb96012ce05735e58d1cb92f7492c WHIRLPOOL 9bc63fcd58aaee1fa76c38aaa09d9a93541e93b4c86c415b0d674cd8e1073f0a753e387285d2a903c023a32650e9a9f1e19827f16c68a040b62c26137d208933 +MISC ChangeLog 5056 SHA256 c3ddff7289f1d3be2039b9101be7c4ffcc1cca25c8f92c9c503b5b8cdba8b51a SHA512 df4d994a622482501f05f13316675abbef9345be935471a86d217b340575927ebc4be805edb90d650a091150e9e3408fb03ff3673e6f84e41985fe94877ac5c8 WHIRLPOOL d321208c7e1eb586252f86d832dcb5d12ffcd455c324edad3e751dd3b61219dc16cb38d6d1dd3df98c0db7ee2d971420cb39f88b20cc51313cc5beaaa071c859 MISC metadata.xml 753 SHA256 e3b7faa33746664cf24f317a0f76b56d4d2f410e11f4a7bb2f20eeeebb5f4787 SHA512 c0716724de8eeac4caa55fe224036b9b6b8ec8b8bd81f6e61365b83a7a51ce0a8d500b99b216af79da507ace24238b551cf4a61c38c32f86a66bec75def46a79 WHIRLPOOL a4122aaab045cea78cfcd592c40931dab667ae1efe1fee1f62a4247bb582956d1262010e442f1c6fa57afd20f755af63ff4f52a2ef51ecbe3f5b615b0caa71bb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVRagDAAoJEKXdFCfdEflKMXUP/2Ti6wxO7GFW52f9WwO0XFOg -nH8+vBlMlO2fejJcvTNyihsvDh7duueBt6yw3TO0TsVSGoLBvgI3XuAsROIIsJzl -Y3rEam42+Wc4Bfl0tJFHZ3FvuMV+v6E8I7kJp1+2z8fEp0cHiXllcC+UyE9XErIk -x5UclL1jWTN1vagpLOL+NPPbJhwj5Xi0M4SMWxOsPIv4s/f0jlXvGwXczzjhXoRn -UU9hHBAXGET4mpYcJ/kdJ0vHBw0ZLJGmG2wL20DmtPRUd1e3dQQTCgOmX7s6SuDM -8trTL08GkJpmoAVqCIJ325K7q6IQkhSFE0VRxCFKicKjViEh7Om06qCye+owQwkE -DGpJqws57A7PcGfxx9xHzIzitcTI5j4NFW5hqNQZDfZUkjoZB99fNQlhbIXlbEGb -SpTYO9TSpjJVhiNxleGmyU9JfraTfcr9Fd1VEm1/SrxpGxhNgVKYCX4Ahchfy2jP -U9JhhMUeAjQl6m/NgIlBXtxq2vW1JdgORtJjr0cyWOtMZwSbmAY8LWet1j/rNDQl -/e/if5+XhjWLadu5aqWyFIR/2BHid4sHTGRF2kUcngr2k9w9BSlVl0DiTnjH8vhE -OmZI81RmzmUS1TL2NqCW/wLqe+/zTwqUWHRLVJXL9XTLX3jfjraicfEMtgNfXiWo -N9bYiMwTmoO0yZ10Bb7H -=DBJm +iQIcBAEBCAAGBQJVRnLIAAoJEKXdFCfdEflKF9cP/jSCzHvOFyMoXbf0TdLNmnml +8XMcgMUO5lWeKKnp3TM+ex1QgxTz37OUvynC8HjBCKjL1zfORwwWSeoPvJ1WDHxC +kX1wEfeNEprIis4WyAEvkm/myBNoGHQra/K00MWBe1Tr5NOETQnyYXvfBmanh/3V +g/DsK+cxs/xdR/CP8qMddWLvtGqyIyvRfEQXD+jw26RmpqJmMHx5p+fv6nbe4obx +RT/YlxhN8yrQ4Fu/AcH5ZG+vkeQuo4PXAHngHffjq3tNC6El12U2VNm5aITGttEx +aEYG+7hIRaO9hpkngCWb3gov4GBL2g+Hyogyv7M/WaPqwB0FPybi7hrvfp0xiH8r +U4nOGh7R2hSpBxka4i3VqZMlwc9eZHqJP0vqqi2NmBvkwDo+PNPeJY3EyBs3VfyM +MGsuHdzi03JT0aNdhc+1154vbmHwgjSwrkZRlUlM1TY9bgRPE+xINt87W/FyvwRT +mVtvi2Uge9nsdKUeXDzmBtd+7CH4UpM+h63czkQY6YftAQHP2qiMHwKl6PzUT7jM +PBF8YhaDItB4dTC7Q1fdGi7WP7prutIJeHkcmRjOvSTYH9gQAsRYADLSiiPxUkSg +xsA8vaM2J4DOg8r4jEJZJlrleN0u4xmRENPKFWycVi4t/m92pYd7NvGEBAYXKgk0 +mLoxK0XfJtuttckxLrYt +=Dx/4 -----END PGP SIGNATURE----- diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild index b823609adc4a..e6a582525536 100644 --- a/net-wireless/ubertooth/ubertooth-9999.ebuild +++ b/net-wireless/ubertooth/ubertooth-9999.ebuild @@ -1,31 +1,29 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.28 2015/05/03 04:45:41 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.29 2015/05/03 19:10:49 zerochaos Exp $ EAPI="5" -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_OPTIONAL=1 -inherit multilib distutils cmake-utils udev +inherit multilib distutils-r1 cmake-utils udev HOMEPAGE="http://ubertooth.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="+bluez +specan +pcap +python +ubertooth1-firmware +udev" -REQUIRED_USE=" specan? ( python ) - python? ( specan )" +IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev" +REQUIRED_USE=" specan? ( ${PYTHON_REQUIRED_USE} )" DEPEND="bluez? ( net-wireless/bluez:= ) >=net-libs/libbtbb-${PV}:= pcap? ( net-libs/libbtbb[pcap] ) + specan? ( ${PYTHON_DEPS} ) virtual/libusb:1=" RDEPEND="${DEPEND} specan? ( >=dev-qt/qtgui-4.7.2:4 - >=dev-python/pyside-1.0.2 - >=dev-python/numpy-1.3 - >=dev-python/pyusb-1.0.0_alpha1 ) + >=dev-python/pyside-1.0.2[${PYTHON_USEDEP}] + >=dev-python/numpy-1.3[${PYTHON_USEDEP}] ) udev? ( virtual/udev )" MY_PV=${PV/\./-} @@ -38,7 +36,6 @@ if [[ ${PV} == "9999" ]] ; then else S="${WORKDIR}/${PN}-${MY_PV}/host" SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz" - #re-add arm keyword after making a lib-only target KEYWORDS="~amd64 ~arm ~x86" fi DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation" @@ -46,20 +43,13 @@ DESCRIPTION="An open source wireless development platform suitable for Bluetooth #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 -pkg_setup() { - if use python; then - python_pkg_setup; - DISTUTILS_SETUP_FILES=() - if use specan; then - DISTUTILS_SETUP_FILES+=("${S}/python/specan_ui|setup.py") - PYTHON_MODNAME+=" specan" - fi - fi -} - src_prepare() { cmake-utils_src_prepare - use python && distutils_src_prepare + if use specan; then + pushd python/specan_ui || die + distutils-r1_src_prepare + popd + fi } src_configure() { @@ -81,31 +71,32 @@ src_configure() { src_compile() { cmake-utils_src_compile - use python && distutils_src_compile + if use specan; then + pushd python/specan_ui || die + distutils-r1_src_compile + popd + fi } src_install() { cmake-utils_src_install insinto /usr/share/${PN} - cd "${WORKDIR}/${PN}-${MY_PV}" || die + pushd "${WORKDIR}/${PN}-${MY_PV}" || die if [[ ${PV} == "9999" ]] ; then ewarn "Firmware isn't available for git releases, we assume you are already" ewarn "on the latest and/or can build your own." else use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu fi + popd - use python && distutils_src_install + 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." } - -pkg_postinst() { - use python && distutils_pkg_postinst -} - -pkg_postrm() { - use python && distutils_pkg_postrm -} -- 2.26.2