[gentoo-commits] repo/gentoo:master commit in: net-wireless/osmobts/, net-misc/lcr/, net-wireless/openbsc/, ...

[Jason Donenfeld]

commit:     8db1fc902d345f1cb9280935e2239dd4d9a6fecf
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 16:18:11 2016 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 16:59:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db1fc90

net-wireless/osmocom: modernize

Package-Manager: portage-2.3.0

 net-libs/libosmo-netif/libosmo-netif-9999.ebuild | 23 +++++++++++++++++++++++
 net-libs/libosmo-netif/metadata.xml              |  8 ++++++++
 net-misc/lcr/lcr-9999.ebuild                     |  3 ++-
 net-wireless/openbsc/openbsc-9999.ebuild         |  1 -
 net-wireless/osmobts/osmobts-9999.ebuild         | 11 +++++------
 5 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/net-libs/libosmo-netif/libosmo-netif-9999.ebuild b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
new file mode 100644
index 00000000..2fb6bdf
--- /dev/null
+++ b/net-libs/libosmo-netif/libosmo-netif-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils git-2
+
+DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
+HOMEPAGE="http://bb.osmocom.org/trac/wiki/"
+EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+KEYWORDS=""
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="net-libs/libosmocore net-libs/libosmo-abis"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	eautoreconf
+}

diff --git a/net-libs/libosmo-netif/metadata.xml b/net-libs/libosmo-netif/metadata.xml
new file mode 100644
index 00000000..1570f89
--- /dev/null
+++ b/net-libs/libosmo-netif/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@g.o</email>
+		<name>Radio</name>
+	</maintainer>
+</pkgmetadata>

diff --git a/net-misc/lcr/lcr-9999.ebuild b/net-misc/lcr/lcr-9999.ebuild
index fd6b40b..8efd7d8 100644
--- a/net-misc/lcr/lcr-9999.ebuild
+++ b/net-misc/lcr/lcr-9999.ebuild
@@ -27,11 +27,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	sed -i 's:#!/usr/bin/env python:#!/usr/bin/env python2:' "${S}"/libgsmhr/fetch_sources.py
 	eautoreconf
 }
 
 src_configure() {
-	econf \
+	CXXFLAGS="$CXXFLAGS -I./include" CFLAGS="$CFLAGS -I./include" econf \
 		$(use_with asterisk) \
 		$(use_with ssl) \
 		$(use_with gsm-bs) \

diff --git a/net-wireless/openbsc/openbsc-9999.ebuild b/net-wireless/openbsc/openbsc-9999.ebuild
index a8b1130..8ba6088 100644
--- a/net-wireless/openbsc/openbsc-9999.ebuild
+++ b/net-wireless/openbsc/openbsc-9999.ebuild
@@ -9,7 +9,6 @@ inherit autotools git-2 eutils
 DESCRIPTION="OpenBSC, OsmoSGSN, OsmoBSC and other programs"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC"
 EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-EGIT_BRANCH="jolly/testing"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/net-wireless/osmobts/osmobts-9999.ebuild b/net-wireless/osmobts/osmobts-9999.ebuild
index 7f7a4e9..40f564b 100644
--- a/net-wireless/osmobts/osmobts-9999.ebuild
+++ b/net-wireless/osmobts/osmobts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,6 @@ inherit autotools git-2
 DESCRIPTION="Osmocom BTS-Side code (Abis, scheduling)"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OsmoBTS"
 EGIT_REPO_URI="git://git.osmocom.org/osmo-bts.git"
-EGIT_BRANCH="jolly/trx"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,12 +19,12 @@ DEPEND="net-libs/libosmocore net-libs/libosmo-abis"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	mkdir -p ../openbsc/openbsc/include/openbsc ../openbsc/openbsc/src/libcommon/ || die
-	wget -O ../openbsc/openbsc/include/openbsc/gsm_data_shared.h http://cgit.osmocom.org/openbsc/plain/openbsc/include/openbsc/gsm_data_shared.h?h=jolly/testing || die
-	wget -O ../openbsc/openbsc/src/libcommon/gsm_data_shared.c http://cgit.osmocom.org/openbsc/plain/openbsc/src/libcommon/gsm_data_shared.c?h=jolly/testing || die
 	eautoreconf
+	wget -O "${S}"/include/openbsc/gsm_data_shared.h http://cgit.osmocom.org/openbsc/plain/openbsc/include/openbsc/gsm_data_shared.h || die
+	wget -O "${S}"/src/common/gsm_data_shared.c http://cgit.osmocom.org/openbsc/plain/openbsc/src/libcommon/gsm_data_shared.c || die
+
 }
 
 src_configure() {
-	econf --enable-trx
+	econf --enable-trx --with-openbsc="${S}"/include/openbsc
 }