* [gentoo-commits] gentoo-x86 commit in net-wireless/multimode: multimode-1.00-r2.ebuild multimode-9999.ebuild multimode-1.4_p20140831-r1.ebuild ChangeLog multimode-1.4_p20140831.ebuild multimode-1.00-r1.ebuild
@ 2014-09-25 2:26 Richard Farina (zerochaos)
0 siblings, 0 replies; only message in thread
From: Richard Farina (zerochaos) @ 2014-09-25 2:26 UTC (permalink / raw
To: gentoo-commits
zerochaos 14/09/25 02:26:28
Modified: multimode-9999.ebuild ChangeLog
Added: multimode-1.00-r2.ebuild
multimode-1.4_p20140831-r1.ebuild
Removed: multimode-1.4_p20140831.ebuild
multimode-1.00-r1.ebuild
Log:
we need some PYTHONPATH manipulation or this builds against the installed multimode_helper (or not at all) instead of the one we are installing
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path
1.12 net-wireless/multimode/multimode-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild?r1=1.11&r2=1.12
Index: multimode-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- multimode-9999.ebuild 24 Sep 2014 05:55:50 -0000 1.11
+++ multimode-9999.ebuild 25 Sep 2014 02:26:28 -0000 1.12
@@ -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/multimode/multimode-9999.ebuild,v 1.11 2014/09/24 05:55:50 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-9999.ebuild,v 1.12 2014/09/25 02:26:28 zerochaos Exp $
EAPI=5
PYTHON_COMPAT="python2_7"
@@ -27,6 +27,10 @@
=net-wireless/gr-osmosdr-9999:="
RDEPEND="${DEPEND}"
+src_compile() {
+ PYTHONPATH="${S}":"${PYTHONPATH}" emake
+}
+
src_install() {
newbin ${PN}.py ${PN}
insinto $(python_get_sitedir)
1.13 net-wireless/multimode/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/ChangeLog?r1=1.12&r2=1.13
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog 24 Sep 2014 05:55:50 -0000 1.12
+++ ChangeLog 25 Sep 2014 02:26:28 -0000 1.13
@@ -1,6 +1,15 @@
# ChangeLog for net-wireless/multimode
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v 1.12 2014/09/24 05:55:50 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/ChangeLog,v 1.13 2014/09/25 02:26:28 zerochaos Exp $
+
+*multimode-1.4_p20140831-r1 (25 Sep 2014)
+*multimode-1.00-r2 (25 Sep 2014)
+
+ 25 Sep 2014; Rick Farina <zerochaos@gentoo.org> +multimode-1.00-r2.ebuild,
+ +multimode-1.4_p20140831-r1.ebuild, -multimode-1.00-r1.ebuild,
+ -multimode-1.4_p20140831.ebuild, multimode-9999.ebuild:
+ we need some PYTHONPATH manipulation or this builds against the installed
+ multimode_helper (or not at all) instead of the one we are installing
24 Sep 2014; Rick Farina <zerochaos@gentoo.org> multimode-1.00-r1.ebuild,
multimode-1.4_p20140831.ebuild, multimode-9999.ebuild:
1.1 net-wireless/multimode/multimode-1.00-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.00-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.00-r2.ebuild?rev=1.1&content-type=text/plain
Index: multimode-1.00-r2.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-wireless/multimode/multimode-1.00-r2.ebuild,v 1.1 2014/09/25 02:26:28 zerochaos Exp $
EAPI=5
PYTHON_COMPAT="python2_7"
inherit python-single-r1
DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
LICENSE="BSD"
SLOT="0"
IUSE=""
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
inherit subversion
KEYWORDS=""
else
SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
S="${WORKDIR}"
fi
DEPEND=""
RDEPEND="${DEPEND}
>=net-wireless/gr-osmosdr-0.0.1
<net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
>=net-wireless/rtl-sdr-0.5.0"
src_compile() {
PYTHONPATH="${S}":"${PYTHONPATH}" emake
}
src_install() {
newbin ${PN}.py ${PN}
insinto $(python_get_sitedir)
doins ${PN}_helper.py
insinto /usr/share/${PN}
doins ${PN}.grc
python_fix_shebang "${ED}"/usr/bin
}
1.1 net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild?rev=1.1&content-type=text/plain
Index: multimode-1.4_p20140831-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/multimode/multimode-1.4_p20140831-r1.ebuild,v 1.1 2014/09/25 02:26:28 zerochaos Exp $
EAPI=5
PYTHON_COMPAT="python2_7"
inherit python-single-r1
DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
LICENSE="BSD"
SLOT="0"
IUSE=""
if [[ ${PV} == "9999" ]] ; then
ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
inherit subversion
KEYWORDS=""
else
#SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~x86"
fi
DEPEND=">=net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
>=net-wireless/gr-osmosdr-0.1.0:="
RDEPEND="${DEPEND}"
src_compile() {
PYTHONPATH="${S}":"${PYTHONPATH}" emake
}
src_install() {
newbin ${PN}.py ${PN}
insinto $(python_get_sitedir)
doins ${PN}_helper.py
insinto /usr/share/${PN}
doins ${PN}.grc
python_fix_shebang "${ED}"/usr/bin
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-25 2:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-25 2:26 [gentoo-commits] gentoo-x86 commit in net-wireless/multimode: multimode-1.00-r2.ebuild multimode-9999.ebuild multimode-1.4_p20140831-r1.ebuild ChangeLog multimode-1.4_p20140831.ebuild multimode-1.00-r1.ebuild Richard Farina (zerochaos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox