zerochaos    14/08/27 03:15:51

  Modified:             gr-osmosdr-9999.ebuild ChangeLog
  Added:                gr-osmosdr-0.1.2-r1.ebuild
  Log:
  migrate to python-single-r1
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
DD11F94A)

Revision  Changes    Path
1.17                 net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild

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

Index: gr-osmosdr-9999.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gr-osmosdr-9999.ebuild      27 Aug 2014 01:32:39 -0000      1.16
+++ gr-osmosdr-9999.ebuild      27 Aug 2014 03:15:51 -0000      1.17
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.16 
2014/08/27 01:32:39 zerochaos Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild,v 1.17 
2014/08/27 03:15:51 zerochaos Exp $
 
 EAPI=5
-PYTHON_DEPEND="python? 2"
+PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python
+inherit cmake-utils python-single-r1
 
 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
 HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR";
@@ -24,31 +24,29 @@
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
-#IUSE="fcd hackrf iqbalance mirisdr osmosdr python rtlsdr uhd"
 
-#      osmosdr? ( net-libs/libosmosdr:= )
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[fcd?]
+RDEPEND="${PYTHON_DEPS}
+       >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
        bladerf? ( net-wireless/bladerf:= )
        hackrf? ( net-libs/libhackrf:= )
-       iqbalance? ( net-wireless/gr-iqbal:= )
+       iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
        mirisdr? ( net-libs/libmirisdr:= )
        rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
-       uhd? ( net-wireless/uhd:= )"
+       uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
        dev-python/cheetah"
 
-pkg_setup() {
-       python_set_active_version 2
-       python_pkg_setup
-}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
-       python_convert_shebangs -q -r 2 "${S}"
+       epatch_user
 }
 
 src_configure() {
        local mycmakeargs=(
                -DENABLE_DEFAULT=OFF
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+               -DENABLE_FILE=ON
                $(cmake-utils_use_enable bladerf)
                $(cmake-utils_use_enable fcd)
                $(cmake-utils_use_enable hackrf)
@@ -59,7 +57,11 @@
                $(cmake-utils_use_enable rtlsdr RTL_TCP)
                $(cmake-utils_use_enable uhd)
        )
-#              $(cmake-utils_use_enable osmosdr)
 
        cmake-utils_src_configure
 }
+
+src_install() {
+       cmake-utils_src_install
+       python_fix_shebang "${ED}"/usr/bin
+}



1.24                 net-wireless/gr-osmosdr/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog   27 Aug 2014 01:32:39 -0000      1.23
+++ ChangeLog   27 Aug 2014 03:15:51 -0000      1.24
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/gr-osmosdr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.23 
2014/08/27 01:32:39 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.24 
2014/08/27 03:15:51 zerochaos Exp $
+
+*gr-osmosdr-0.1.2-r1 (27 Aug 2014)
+
+  27 Aug 2014; Rick Farina <[email protected]> +gr-osmosdr-0.1.2-r1.ebuild,
+  gr-osmosdr-9999.ebuild:
+  migrate to python-single-r1
 
 *gr-osmosdr-0.1.2 (27 Aug 2014)
 



1.1                  net-wireless/gr-osmosdr/gr-osmosdr-0.1.2-r1.ebuild

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

Index: gr-osmosdr-0.1.2-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/gr-osmosdr/gr-osmosdr-0.1.2-r1.ebuild,v 
1.1 2014/08/27 03:15:51 zerochaos Exp $

EAPI=5
PYTHON_COMPAT=( python2_7 )

inherit cmake-utils python-single-r1

DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR";

if [[ ${PV} == 9999* ]]; then
        inherit git-r3
        SRC_URI=""
        EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
        KEYWORDS=""
else
        #git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > 
../gr-osmosdr-${PV}.tar.xz
        SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz";
        KEYWORDS="~amd64 ~arm ~x86"
fi

LICENSE="GPL-3"
SLOT="0/${PV}"
IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"

RDEPEND="${PYTHON_DEPS}
        >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
        bladerf? ( net-wireless/bladerf:= )
        hackrf? ( net-libs/libhackrf:= )
        iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
        mirisdr? ( net-libs/libmirisdr:= )
        rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
        uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
DEPEND="${RDEPEND}
        dev-python/cheetah"

REQUIRED_USE="${PYTHON_REQUIRED_USE}"

src_prepare() {
        epatch_user
}

src_configure() {
        local mycmakeargs=(
                -DENABLE_DEFAULT=OFF
                -DPYTHON_EXECUTABLE="${PYTHON}"
                -DENABLE_FILE=ON
                $(cmake-utils_use_enable bladerf)
                $(cmake-utils_use_enable fcd)
                $(cmake-utils_use_enable hackrf)
                $(cmake-utils_use_enable iqbalance)
                $(cmake-utils_use_enable mirisdr MIRI)
                $(cmake-utils_use_enable python)
                $(cmake-utils_use_enable rtlsdr RTL)
                $(cmake-utils_use_enable rtlsdr RTL_TCP)
                $(cmake-utils_use_enable uhd)
        )

        cmake-utils_src_configure
}

src_install() {
        cmake-utils_src_install
        python_fix_shebang "${ED}"/usr/bin
}




Reply via email to