add tagged version, as well as tecla support and notes for upstream fixes

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

4 files changed, 87 insertions, 9 deletions

diff --git a/net-wireless/bladerf/ChangeLog b/net-wireless/bladerf/ChangeLog
index 02fffe3c30dd..2ea3c9dedf5c 100644
--- a/net-wireless/bladerf/ChangeLog
+++ b/net-wireless/bladerf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bladerf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf/ChangeLog,v 1.1 2014/07/25 03:46:40 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf/ChangeLog,v 1.2 2014/07/25 04:36:31 zerochaos Exp $
+
+*bladerf-2014.09_rc2 (25 Jul 2014)
+
+  25 Jul 2014; Rick Farina <zerochaos@gentoo.org> +bladerf-2014.09_rc2.ebuild,
+  bladerf-9999.ebuild, metadata.xml:
+  add tagged version, as well as tecla support and notes for upstream fixes
 
 *bladerf-9999 (25 Jul 2014)
 
diff --git a/net-wireless/bladerf/bladerf-2014.09_rc2.ebuild b/net-wireless/bladerf/bladerf-2014.09_rc2.ebuild
new file mode 100644
index 000000000000..516b59d88342
--- /dev/null
+++ b/net-wireless/bladerf/bladerf-2014.09_rc2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf/bladerf-2014.09_rc2.ebuild,v 1.1 2014/07/25 04:36:31 zerochaos Exp $
+
+EAPI=5
+
+inherit cmake-utils udev
+
+DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
+HOMEPAGE="http://nuand.com/"
+
+#lib is LGPL and cli tools are GPL
+LICENSE="GPL-2+ LGPL-2.1+"
+
+SLOT="0"
+
+#maintainer notes:
+#fix tecla, right now -tecla doesn't actually disable anything
+#add doc use flag, looks like it can't be disabled right now and will
+#	always build if pandoc and help2man are installed
+IUSE="+tecla"
+
+MY_PN="bladeRF"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
+	KEYWORDS=""
+else
+	MY_PV=${PV/\_/-}
+	S="${WORKDIR}/${MY_PN}-${MY_PN}-${MY_PV}"
+	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+CDEPEND=">=dev-libs/libusb-1.0.16"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	tecla? ( dev-libs/libtecla )"
+RDEPEND="${CDEPEND}"
+PDEPEND=">=net-wireless/bladerf-firmware-1.7.1
+	>=net-wireless/bladerf-fpga-0.0.6"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable tecla TECLA)
+		-DTREAT_WARNINGS_AS_ERRORS=OFF
+		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index efef6f020301..45ecddf069fc 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-9999.ebuild
@@ -1,31 +1,49 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf/bladerf-9999.ebuild,v 1.1 2014/07/25 03:46:40 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bladerf/bladerf-9999.ebuild,v 1.2 2014/07/25 04:36:31 zerochaos Exp $
 
 EAPI=5
 
-inherit git-r3 cmake-utils udev
+inherit cmake-utils udev
 
 DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
 HOMEPAGE="http://nuand.com/"
-EGIT_REPO_URI="https://github.com/Nuand/bladeRF.git"
 
 #lib is LGPL and cli tools are GPL
 LICENSE="GPL-2+ LGPL-2.1+"
 
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+
+#maintainer notes:
+#fix tecla, right now -tecla doesn't actually disable anything
+#add doc use flag, looks like it can't be disabled right now and will
+#	always build if pandoc and help2man are installed
+IUSE="+tecla"
+
+MY_PN="bladeRF"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
+	KEYWORDS=""
+else
+	MY_PV=${PV/\_/-}
+	S="${WORKDIR}/${MY_PN}-${MY_PN}-${MY_PV}"
+	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PN}-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 CDEPEND=">=dev-libs/libusb-1.0.16"
 DEPEND="${CDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	tecla? ( dev-libs/libtecla )"
 RDEPEND="${CDEPEND}"
-PDEPEND="net-wireless/bladerf-firmware
-	net-wireless/bladerf-fpga"
+PDEPEND=">=net-wireless/bladerf-firmware-1.7.1
+	>=net-wireless/bladerf-fpga-0.0.6"
 
 src_configure() {
 	mycmakeargs=(
+		$(cmake-utils_use_enable tecla TECLA)
 		-DTREAT_WARNINGS_AS_ERRORS=OFF
 		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
 	)
diff --git a/net-wireless/bladerf/metadata.xml b/net-wireless/bladerf/metadata.xml
index 1681f5f93bc5..f278f118e32f 100644
--- a/net-wireless/bladerf/metadata.xml
+++ b/net-wireless/bladerf/metadata.xml
@@ -8,4 +8,7 @@
 </maintainer>
 <longdescription lang="en">
 </longdescription>
+<use>
+<flag name="tecla">use libtecla for command line editing, tab completion, and history</flag>
+</use>
 </pkgmetadata>