net-wireless/yatebts: bump

this is not any better, but it is newer

Package-Manager: Portage-2.3.24, Repoman-2.3.6

4 files changed, 9 insertions, 62 deletions

diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest
index aaaf7e5ad080..2c59509a7d16 100644
--- a/net-wireless/yatebts/Manifest
+++ b/net-wireless/yatebts/Manifest
@@ -1,2 +1 @@
-DIST yate-bts-4.0.0-1.tar.gz 3311644 BLAKE2B 9367179568970d968dc9556a7397535ecff207ab824f7f6f4d4ce4c0ad7811bcf9eb88b4ab981c2837db641d16afc811fa2d1ccb718f95a0a23e1a02d78b4b89 SHA512 802e765fb5dd1702b71c6e7a68f671dcfb82431d7c6defc4fea1494558b8824c0a4b61dc9b7b787bc8badf09752b12efb531d7435d6d32db60edd96fe32f850d
-DIST yate-bts-5.0.0-1.tar.gz 3352942 BLAKE2B 38b0449ab78fc97d91c9b695bbd216c7bd459cd84bf517ebce12797abf154a736d03e3ea1517c740064b3c487599b2cbb7559590cc752698042eb7a6bdca0174 SHA512 d893072f715f77dfe53e2d0a4332a02ffa441afb995a7280201d4ffb509b51d16888c961d753517f471915efdf03ec329707cd9d54f8bde6ecb9b2405d602939
+DIST yate-bts-6.0.0-1.tar.gz 2672036 BLAKE2B 3b538586786df32a2159002cc70f60ba6ed8ee3e82430f0e48652f9c2cb9602c229ad0e577f6445dae2225aab7fc047d40614a22f3eb995c93a870183856274b SHA512 dbff3ed5c801adc983a26e585186cc115e7c3d7a1d12d6bc6b0a08a48dfe6c4c1f15f5e731ca4c2ece04bd1784ab9af352b488e5b0f2c43f3c84204fce3ad3c7
diff --git a/net-wireless/yatebts/yatebts-5.0.0.ebuild b/net-wireless/yatebts/yatebts-5.0.0.ebuild
deleted file mode 100644
index fe1cf3ba12c8..000000000000
--- a/net-wireless/yatebts/yatebts-5.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic
-
-DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="http://www.yatebts.com/"
-ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-
-RDEPEND="
-	=net-voip/yate-5.5.0-r1:=[gsm]
-	bladerf? ( net-wireless/bladerf:= )
-	uhd? ( net-wireless/uhd )
-	virtual/libusb:1"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit subversion
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}5/yate-bts-${PV}-1.tar.gz"
-	S="${WORKDIR}/yate-bts"
-fi
-
-src_prepare() {
-	replace-flags -ggdb -g
-	replace-flags -ggdb3 -g
-	replace-flags -ggdb2 -g
-	replace-flags -ggdb1 -g
-	#epatch "${FILESDIR}"/${PN}-4.0.0-dont-mess-with-cflags.patch
-	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable rad1) \
-		$(use_enable usrp1) \
-		$(use_enable uhd) \
-		$(use_enable bladerf) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse41)
-
-}
diff --git a/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild b/net-wireless/yatebts/yatebts-6.0.0.ebuild
index 0f975f7cca82..3a932f78012c 100644
--- a/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild
+++ b/net-wireless/yatebts/yatebts-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
 
 RDEPEND="
-	=net-voip/yate-5.4.0-r1:=[gsm]
+	=net-voip/yate-${PV}:=[gsm]
 	bladerf? ( net-wireless/bladerf:= )
 	uhd? ( net-wireless/uhd )
 	virtual/libusb:1"
@@ -26,14 +26,14 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}4/yate-bts-${PV}-1.tar.gz"
+	SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz"
 	S="${WORKDIR}/yate-bts"
 fi
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+	#we need more patches or configure flags because things install in really wrong places per FHS
 	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
-	epatch "${FILESDIR}"/${PN}-bladeRF-transceiver_revert_init_order.patch
+	epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
 	eautoreconf
 }
 
diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild
index b06623ca8e60..3a932f78012c 100644
--- a/net-wireless/yatebts/yatebts-9999.ebuild
+++ b/net-wireless/yatebts/yatebts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,13 +26,14 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://yate.null.ro/tarballs/${PN}4/yate-bts-${PV}-1.tar.gz"
+	SRC_URI="http://yate.null.ro/tarballs/${PN}6/yate-bts-${PV}-1.tar.gz"
 	S="${WORKDIR}/yate-bts"
 fi
 
 src_prepare() {
 	#we need more patches or configure flags because things install in really wrong places per FHS
 	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+	epatch "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
 	eautoreconf
 }