gentoo resync : 15.02.2018

4 files changed, 11 insertions, 65 deletions

diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest
index 203a56a50bae..e6cf93a8ccb6 100644
--- a/net-wireless/yatebts/Manifest
+++ b/net-wireless/yatebts/Manifest
@@ -2,9 +2,7 @@ AUX yatebts-4.0.0-dont-mess-with-cflags.patch 434 BLAKE2B 132c4fd0fbd52257d66265
 AUX yatebts-5.0.0-gcc6.patch 1125 BLAKE2B 20d2fa8431238c888d5841c6895a84b7fd2b914f6fdc22238b12f78b1758ffeb810cf0d37bb917439b6098c78f7fd141fbf2e6442eed5da4fb2a2a7b34afc4d8 SHA512 e2a575d1e4a31f884b2af95439ce077a811d655cfcb646b20652638a353a9e730999134128003829a538b880ca07ea23e125a9b21073e46a7aae05b1eeb9baf1
 AUX yatebts-bladeRF-transceiver_revert_init_order.patch 2636 BLAKE2B ac1175836fdf844c93075003231d2a3092ad047a52b7bea5130e3bac622a5bc1b16aae85cc2cdda919adc2e031affc719752503c80e94e297314dbbb46a61150 SHA512 30e59e6e6f565c74d2ed15c70aee09c783cc710701de3b2d5e2f6530486dcde0dc63b03e4475d8e525e83e6612b13015e5d901e76061394afb6179987f3efa80
 AUX yatebts-sgsnggsn-inetutils-hostname-fix.diff 487 BLAKE2B f7d2b114259363c4eba833ac74185545678bba67db709abf2e097aec308e3aba1312ca6f35a78ab3e6ebc2f422ab397c81806b7e7ebdd78f3f27b1e11164205e SHA512 55a9ad165e00e8c9b5556c1f29e244286d3cdf425cdb94f1a3e49c1d27962c302bedbbec37e5ce4ce44867b7bd17587887dfe6cfd5fabffdba32066799bd86c6
-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
-EBUILD yatebts-4.0.0-r3.ebuild 1167 BLAKE2B d3ef87e5fc48d9a9c702a1974d9cd17168f9245fa6058184228907aad52f4956aab30067b3225d8ddc97dd6efc4c5fd49daf173a444902fa27ee3e2ae35fd69c SHA512 d1c0265d91797fcf917d76d8b7bf39a422e67a136bff6d79e73163598093e6faaea7203635ba3fb89ae083948564aa42eb3ba61500a80d2358d04704f16d34a2
-EBUILD yatebts-5.0.0.ebuild 1253 BLAKE2B faeb40f3ae93fe239af54ea6b22e52fbb398e0a5dcae33a55cae31e23eebab36f59d0790e6fcacf596cbcfcdf5f2a5b52ed4a6b942d2fdc6409eead8c8a58d9b SHA512 009a384d5ac89b9d01ac7e111fe0f162e5633804904495829c54bcb3f3010f92d1fa98cd41eb535c72dc9731ad1ee9270f6ff7e22d9c2b5d86c39512df3cefaa
-EBUILD yatebts-9999.ebuild 1133 BLAKE2B acc329d7fad9df427d8ce26cc7ced043e563ebc430ad3600bab12c40f1da260ccb1c153bee693002bcd0cdc03d6da935635c6959370f71f7cbaa6bb68aec46e2 SHA512 e4b6e3754ea7cd06ffa67e20d4340eda83a7eb1c79c15b576d3051a60692f054e724825fcb46d7adf91ceda692e1a04755444f83381731bc35d93670da16cfdb
+DIST yate-bts-6.0.0-1.tar.gz 2672036 BLAKE2B 3b538586786df32a2159002cc70f60ba6ed8ee3e82430f0e48652f9c2cb9602c229ad0e577f6445dae2225aab7fc047d40614a22f3eb995c93a870183856274b SHA512 dbff3ed5c801adc983a26e585186cc115e7c3d7a1d12d6bc6b0a08a48dfe6c4c1f15f5e731ca4c2ece04bd1784ab9af352b488e5b0f2c43f3c84204fce3ad3c7
+EBUILD yatebts-6.0.0.ebuild 1178 BLAKE2B 6f5644dcff8c94e5383bd60450389f71f4f212cef8d1633d99fbe7d5bf8c5840aef5a8ca6868bbdc3eb06d6ed38fbca9458313474fb43594b2cf1d9a46796f3d SHA512 aa9a26f89c5322e7ddacf2d31b7789d07ffee26c770a7b3380223bfe3308469fdbd744d04ada8a7ada8b9cb918d9fa7b1099757254f6b3eaf7bbe8060ffa4484
+EBUILD yatebts-9999.ebuild 1178 BLAKE2B 6f5644dcff8c94e5383bd60450389f71f4f212cef8d1633d99fbe7d5bf8c5840aef5a8ca6868bbdc3eb06d6ed38fbca9458313474fb43594b2cf1d9a46796f3d SHA512 aa9a26f89c5322e7ddacf2d31b7789d07ffee26c770a7b3380223bfe3308469fdbd744d04ada8a7ada8b9cb918d9fa7b1099757254f6b3eaf7bbe8060ffa4484
 MISC metadata.xml 459 BLAKE2B e4a03862c2298c785666d3a38a642840831781f99a8e0bf196d8a91012ccbbae187b1c9b5e7d0c4d33de68bf06929ecfa4929431b551da759f1fe88be17aba1a SHA512 e5cb7b858684817bfc6f4ce03dc6ad7c3743d649d96dc8bc2c68aa663a834593cb81081d72e7775bdafed38c932684985e37a7af82c39bd38d72e01dd8b30b60
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
 }