zerochaos    14/08/25 17:42:12

  Modified:             ubertooth-9999.ebuild metadata.xml ChangeLog
  Added:                ubertooth-2014.04.1-r1.ebuild
  Removed:              ubertooth-2012.10.1-r1.ebuild
                        ubertooth-2014.04.1.ebuild
                        ubertooth-2012.10.1.ebuild
  Log:
  move firmware to appropriate location and ship the dfu image instead of the 
bin
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
DD11F94A)

Revision  Changes    Path
1.24                 net-wireless/ubertooth/ubertooth-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild?rev=1.24&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild?rev=1.24&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild?r1=1.23&r2=1.24

Index: ubertooth-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ubertooth-9999.ebuild       8 Apr 2014 13:45:05 -0000       1.23
+++ ubertooth-9999.ebuild       25 Aug 2014 17:42:12 -0000      1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.23 
2014/04/08 13:45:05 zerochaos Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.24 
2014/08/25 17:42:12 zerochaos Exp $
 
 EAPI="5"
 
@@ -88,13 +88,13 @@
 src_install() {
        cmake-utils_src_install
 
-       insinto /lib/firmware
+       insinto /usr/share/${PN}
        cd "${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 && doins 
ubertooth-one-firmware-bin/bluetooth_rxtx.bin
+               use ubertooth1-firmware && doins 
ubertooth-one-firmware-bin/${PN}-one-${PV}-bluetooth_rxtx.dfu
        fi
 
        if use udev; then



1.5                  net-wireless/ubertooth/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/metadata.xml?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/metadata.xml?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/metadata.xml?r1=1.4&r2=1.5

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml        8 Apr 2014 13:45:05 -0000       1.4
+++ metadata.xml        25 Aug 2014 17:42:12 -0000      1.5
@@ -9,7 +9,6 @@
        </longdescription>
        <use>
                <flag name="bluez">use bluez to support clock following and 
scanning</flag>
-               <flag name="clock_debug">support for clock following an 
existing local bluetooth connection with bluez</flag>
                <flag name="dfu">Install ubertooth-dfu (needed for read/write 
of firmware)</flag>
                <flag name="pcap">Use libpcap for packet capture and 
read/write</flag>
                <flag name="specan">Enable the ubertooth spectrum 
analyzer</flag>



1.25                 net-wireless/ubertooth/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ChangeLog?rev=1.25&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ChangeLog?rev=1.25&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ChangeLog?r1=1.24&r2=1.25

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog   8 Apr 2014 13:45:05 -0000       1.24
+++ ChangeLog   25 Aug 2014 17:42:12 -0000      1.25
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/ubertooth
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.24 
2014/04/08 13:45:05 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ChangeLog,v 1.25 
2014/08/25 17:42:12 zerochaos Exp $
+
+*ubertooth-2014.04.1-r1 (25 Aug 2014)
+
+  25 Aug 2014; Rick Farina <[email protected]>
+  +ubertooth-2014.04.1-r1.ebuild, -ubertooth-2012.10.1-r1.ebuild,
+  -ubertooth-2012.10.1.ebuild, -ubertooth-2014.04.1.ebuild, metadata.xml,
+  ubertooth-9999.ebuild:
+  move firmware to appropriate location and ship the dfu image instead of the
+  bin
 
   08 Apr 2014; Rick Farina <[email protected]> metadata.xml,
   ubertooth-9999.ebuild:



1.1                  net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: ubertooth-2014.04.1-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-2014.04.1-r1.ebuild,v 
1.1 2014/08/25 17:42:12 zerochaos Exp $

EAPI="5"

PYTHON_DEPEND="python? 2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"

inherit multilib distutils cmake-utils

HOMEPAGE="http://ubertooth.sourceforge.net/";

LICENSE="GPL-2"
SLOT="0"
IUSE="+bluez +dfu +specan +python +ubertooth1-firmware +udev"
REQUIRED_USE="dfu? ( python )
                specan? ( python )
                ubertooth1-firmware? ( dfu )
                python? ( || ( dfu specan ) )"
DEPEND="bluez? ( net-wireless/bluez:= )
        >=net-libs/libbtbb-2014.02.2:=
        net-libs/libpcap:="
RDEPEND="${DEPEND}
        specan? ( virtual/libusb:1
                 >=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 )
        dfu? ( virtual/libusb:1
                >=dev-python/pyusb-1.0.0_alpha1 )
        udev? ( virtual/udev )"

if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git";
        inherit git-r3
        KEYWORDS=""
        S="${WORKDIR}/${P}/host"
else
        MY_PV=${PV/\./-}
        MY_PV=${MY_PV/./-R}
        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"

#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 dfu; then
                        DISTUTILS_SETUP_FILES+=("${S}/python/usb_dfu|setup.py")
                        PYTHON_MODNAME="dfu"
                fi
                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
}

src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_enable bluez USE_BLUEZ)
                -DDISABLE_PYTHON=true
        )
        cmake-utils_src_configure
}

src_compile() {
        cmake-utils_src_compile

        use python && distutils_src_compile
}

src_install() {
        cmake-utils_src_install

        insinto /usr/share/${PN}
        cd "${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 && doins 
ubertooth-one-firmware-bin/${PN}-one-${PV}-bluetooth_rxtx.dfu
        fi

        if use udev; then
                insinto /lib/udev/rules.d/
                doins "${S}"/lib${PN}/40-${PN}.rules
        fi

        use python && distutils_src_install

        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
}




Reply via email to