bumping for some patches taken from suse thanks to roox, this seems to make yate much happier

Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

5 files changed, 176 insertions, 15 deletions

diff --git a/net-wireless/yatebts/ChangeLog b/net-wireless/yatebts/ChangeLog
index 30a689e922e5..91553b3a7608 100644
--- a/net-wireless/yatebts/ChangeLog
+++ b/net-wireless/yatebts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/yatebts
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/ChangeLog,v 1.6 2015/02/11 15:31:51 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/ChangeLog,v 1.7 2015/02/11 17:33:29 zerochaos Exp $
+
+*yatebts-4.0.0-r1 (11 Feb 2015)
+
+  11 Feb 2015; Rick Farina <zerochaos@gentoo.org>
+  +files/yatebts-bladeRF-transceiver_revert_init_order.patch,
+  +files/yatebts-sgsnggsn-inetutils-hostname-fix.diff, +yatebts-4.0.0-r1.ebuild:
+  bumping for some patches taken from suse thanks to roox, this seems to make
+  yate much happier
 
   11 Feb 2015; Rick Farina <zerochaos@gentoo.org> yatebts-4.0.0.ebuild,
   yatebts-9999.ebuild:
diff --git a/net-wireless/yatebts/Manifest b/net-wireless/yatebts/Manifest
index ea100b43a374..3667ceb045d9 100644
--- a/net-wireless/yatebts/Manifest
+++ b/net-wireless/yatebts/Manifest
@@ -2,25 +2,28 @@
 Hash: SHA256
 
 AUX yatebts-4.0.0-dont-mess-with-cflags.patch 434 SHA256 7acf78c645b5c797dce66d51d017aa6c26e228343651f998a0f3bd52a4fe6718 SHA512 9a8ce2aaaa3e5183a4d77b4ece5f53d71b2c1c59856d1f3054a8a552a547624585674f8d67cc068eb6546279a87a14e8471d99ca79fc7025c989e94aa03a3d25 WHIRLPOOL 9496ca5c1cf6090302f30ee25f1523295dc6be3cbe1664902f3e9eb50d7ba5ed8b8ecebf13f625a371d166cf1adf3ba0b5783742f018682029997f703ca89ee5
+AUX yatebts-bladeRF-transceiver_revert_init_order.patch 2636 SHA256 edf6738af36e8c1dd50e7492c2b7042430ef4917eb00cff8535712e87930af43 SHA512 30e59e6e6f565c74d2ed15c70aee09c783cc710701de3b2d5e2f6530486dcde0dc63b03e4475d8e525e83e6612b13015e5d901e76061394afb6179987f3efa80 WHIRLPOOL 7635e8dc08336da156ce595eefd52a508ae1365aba01ef2bca4b8673bbc75d2a82a737054c800e3182e983d1f695dc177cf6b3cc72183327a097ca845884365e
+AUX yatebts-sgsnggsn-inetutils-hostname-fix.diff 487 SHA256 b1b52354a5d8e7bb5baf2d2e8e552ef20c5c7b6ff30015a74ff3fb52c50d4ee5 SHA512 55a9ad165e00e8c9b5556c1f29e244286d3cdf425cdb94f1a3e49c1d27962c302bedbbec37e5ce4ce44867b7bd17587887dfe6cfd5fabffdba32066799bd86c6 WHIRLPOOL 5e230d4a47c81022f0baf956d92ceb36689f5b53a77d444f69c312faceda87c539ba6be0fbb022113c1437f780bc297882f6f39e0009b090cb4bd57c4d99cbe2
 DIST yate-bts-4.0.0-1.tar.gz 3311644 SHA256 0cf40839e81e1600b3bd7a184404249cca387d9a7413dda1db02f92d3b501c31 SHA512 802e765fb5dd1702b71c6e7a68f671dcfb82431d7c6defc4fea1494558b8824c0a4b61dc9b7b787bc8badf09752b12efb531d7435d6d32db60edd96fe32f850d WHIRLPOOL 67b983de759b0cf87ded1673c2fe41fef6f10ccb0848a5816cb37c9f20c48c6e11667f4098469d8b381a5e9a50d00c623d494d623227f879e0bf32e11bd447d3
+EBUILD yatebts-4.0.0-r1.ebuild 1285 SHA256 166cc299049075af8672b14028b6017a1c513c04f284dd22bd19301ac96154f7 SHA512 c27d9004fa1a4449e1a471bf73a27f2f5deb60f540bf3e671e3ecf97e77b6d9e303fc38bb9fd823fae20d32101e723bc89c02e6f31e6b7ba30c6d495e43bc209 WHIRLPOOL 8f7c1f3c2db93708ba170730bfe8fad339b9ca9ef84f689eeb2690bfb647287131d009d97ab3e80b8503b685af3068dc8f349ae45ad3caae1f5e7c8a4d24bff1
 EBUILD yatebts-4.0.0.ebuild 1145 SHA256 aaf4583f1f6b3f0bf3b353f280249aede003e1b35d9d099d915e44251f994a9c SHA512 0cef70e73d2abc5ffad069315cc3726898edac0276ffd5eafbb6a14cc8830963f9c4b9d0f719affefb2fb0eaa103553d4e39ab833eef0e7eabefb4c216c21ed5 WHIRLPOOL c0906226e7ed55c0b45e6aa3c2ffe0b47ffe10f3db932f2a38cb5e2d4c340e24280fe76ab54802884cfffd34c5c371c2f36bd1b553a9695c56820224928a2729
 EBUILD yatebts-9999.ebuild 1316 SHA256 7ffb7cb9539dbd17d27d0ecba2a552c050b3067efdc071f8d4761119fbed217c SHA512 c7e55011f4d022d34b100dabd2ff123189d2fe50a1d69b5453da568fa42417903b95882f2c14df55c454a9623ea264c4c8d7e1a07bd2a54c274c0a904158ceb1 WHIRLPOOL 20fa26f6dc0b15ad0b506e6e6129bdf9fd458a87421acc7b46f675263f1908ecba6f4b2fc88d4ffc3a1f69652f923f871991ee0b161a491dd661b1137dab4a68
-MISC ChangeLog 1163 SHA256 1591770f6c996dd63066e3e942a61b4722f24721b32b41377f0079bb07674cb2 SHA512 67ec93dba80eb91c83143474cb42a3b4d85b66806f1ce5aa577850f0685da741f6fe2f5963eafd40e4c76712e4d3a05c5d86c9b54ffcbeb8c9d4cb327bf113a9 WHIRLPOOL 9a164a94b3964133e65ffa9bb8ade41f8ffd0acb62e544b2b97aeafe2825c1dc599d220a119c44a84e10c43c82e57001278c1a02dfd3d2115fb16364ba5a0ad2
+MISC ChangeLog 1488 SHA256 7d74571240e7391830209b2f2fb02077871d3352476c444ca487e08de346b4f4 SHA512 81ce3a05bab47f3ec247319c7e27c3d180b2dfa41d83d2e45a8aa79d14d72b9fb50fe72e914c4ff2a44b532bda2fcd4366652f9423ac642bce6851f740cb8641 WHIRLPOOL 96e48f2aa450f22f95033a053a12cca1d87f35579d45715abb2686749fd8df1d1a60858a0462cc8cc5c4e2bc970e6ac83327d8a28397fae3beb232f4e612175d
 MISC metadata.xml 381 SHA256 5e809688499f49fb8cdc1658684acb9f1c2703ea5df1e611c1f56e49f30ccdf9 SHA512 779dfbfaf7e54881abd7d07e1201b0fd17bae74850f4ecb0a2eb8fac50e10e6a969e659a0da239f8348f04351a107135b559acf662578bb5b1f74e388051a985 WHIRLPOOL f89db54229479c3b55f75a5b42b203d071bb7fb62c705349dfd581bafd22e9a611fd5551d7f2201c89dadd1a7d4f30930e3ab7d8a0d4e88adeb2c0068963b2da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU23X4AAoJEKXdFCfdEflKrmEQAKsiljSgzp52kB3yhk/FOGLz
-Arcj3HnxJwOY45TNyX/EMYBMeCUAqCWRqDYVBD6aXN7MhHqAu44JrHDJ56jGMYcz
-thHjDT7pTUJDjUdmYtuA7txdtDwbxCjIs2G7WMJ5MjDr44idSvzJvwnfhw6fmpjn
-sUsrNBtJIQ+rkU+WeqYyEaVprinQRQLXbfAcT3s3JWW7vizkyNUS+0sXpBQW7DtB
-dJZ1S81RNVnT5YVO2jlYTEwYD6H2+Ud4kaA25GEmRJsn1LOku0FEH9bRhDCP3Xlt
-urujvoNZMPIxN5Cors149Sb+6sbgPUKN7GnWStVY60f5pRbM790Bc9NYNRifeo5c
-RqwTCd7Fdf5T7iB4nGo0BIpgU5p39tttX6gwnwcbLJGQoXtDtxjwkp9zueAFwPpD
-kY58eeELw1Aez7337KeHWYaFyixCncCmcdziRubNcHy2G+DKPxBzBDIQ8ylky4nR
-FihJV6kI4Ez0cWRRvPKIpJbkBcR/z/oj28YOit9hsDVkll/i3LGQJnTEfsP5owkC
-TbwzXcCk3TKwKG9GoOQfThjYFytzar1qw6meT1+iuI4niOi3xbjmdXEzUD/kYjPk
-9nah9t9k5RNqXUR1TA8v7SWL1VvSiQlFXeEXKo/OJQH8OFNUcQRybXGuten3Mx7P
-9eUYKISKYfN+AC0m3/ku
-=vqNn
+iQIcBAEBCAAGBQJU25J6AAoJEKXdFCfdEflKjiwP/A4p9YsDH2TpYWxWRnBj3kj8
+5nGQ+sUiqJcZhUE6MLDETRBgKDP642742Oqvmp5C9sFuiuIX9H6NIOOyf13NdLX1
+H+rmR2G4TJN4p2Wq9bk7E0QbxbjKtfdloUkloO94ARsQjPrd9lLWHB/NW8sDML5n
+sF683U/lRQtaICC5fB8IEIov70/NiBc9yprQzAORNha3efuY50cMC4jZoLLiblJE
+FzyfaUf2HMfQnLC7nnMiaLM2eEp9f3ZwIv2Xhg0vTeIwNZAUDn7xRFgMKCxKSL+2
+ij/tYrSZbK9YnnUXHpXuhJe+4+ZEr3sdpCr9s21s3qBvJheCyzy3XPe1qtMH+RzT
+NSQyplbHDjnRPC8Uy7/1VQl2XPFr0bI9ak4Rq9nrE7wtzNNQLBe+i8Tyf0irykJK
+pnzyWwPWxwJaSQOsIN0TMvCbANQmBPDAVz7OcSAH+1QeoHD7mWXlBxg+zwAbquKN
+49GalSZm2PBSjf00zwEclrgQjfaQ9kslMAemDd6GzOnK0XoTCjdMQsUzGxnNEELT
+qQ8wLT8ubmasCvlhRwIgxvgwV6xQKeAfL6Mn++jws8eQo77TZHnyyHbj7M7as1Re
+KV+HTTY6FP/6h+4iVkfPUAmuSCrOoHP9lTZAhABlmPc9ov3n4JEvAVhw6Nh5h4xN
+L5hUldCptzIxCiPwrAud
+=F7Nw
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch b/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch
new file mode 100644
index 000000000000..83da1d58d29d
--- /dev/null
+++ b/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch
@@ -0,0 +1,86 @@
+diff --git a/mbts/TransceiverRAD1/bladeRFDevice.cpp b/mbts/TransceiverRAD1/bladeRFDevice.cpp
+index a2a3346..cfdb977 100644
+--- a/mbts/TransceiverRAD1/bladeRFDevice.cpp
++++ b/mbts/TransceiverRAD1/bladeRFDevice.cpp
+@@ -35,7 +35,6 @@
+ 
+ #include <Logger.h>
+ 
+-
+ #define MIN_OVERSAMPLING 4
+ 
+ #define HEALTH_BAD 10
+@@ -128,7 +127,36 @@ bool bladeRFDevice::open(const std::string &args, bool)
+             << "." << ver.patch << " (" << ver.describe << ")";
+ 
+     uint32_t val = 0;
+-    bladerf_config_gpio_read(bdev, &val);
++
++       status = bladerf_sync_config(bdev,
++        BLADERF_MODULE_RX,
++        BLADERF_FORMAT_SC16_Q11,
++        DEFAULT_STREAM_RX_BUFFERS,
++        DEFAULT_STREAM_SAMPLES,
++        DEFAULT_STREAM_RX_XFERS,
++        DEFAULT_STREAM_TIMEOUT
++    );
++
++    if (status < 0) {
++        LOG(CRIT) << "Failed to intialize RX sync handle: " << bladerf_strerror(status);
++        checkHealth(mRxHealth, false);
++    }
++
++    status = bladerf_sync_config(bdev,
++        BLADERF_MODULE_TX,
++        BLADERF_FORMAT_SC16_Q11,
++        DEFAULT_STREAM_TX_BUFFERS,
++        DEFAULT_STREAM_SAMPLES,
++        DEFAULT_STREAM_TX_XFERS,
++        DEFAULT_STREAM_TIMEOUT
++    );
++
++    if (status < 0) {
++        LOG(CRIT) << "Failed to intialize TX sync handle: " << bladerf_strerror(status);
++        checkHealth(mTxHealth, false);
++    }
++
++       bladerf_config_gpio_read(bdev, &val);
+     val |= 0x10000; //enable timestamps, clears and resets everything on write
+     bladerf_config_gpio_write(bdev, val);
+     bladerf_config_gpio_read(bdev, &val);
+@@ -185,34 +213,6 @@ bool bladeRFDevice::open(const std::string &args, bool)
+     else
+         LOG(INFO) << "Actual bandwidth " << bw;
+ 
+-    status = bladerf_sync_config(bdev,
+-        BLADERF_MODULE_RX,
+-        BLADERF_FORMAT_SC16_Q11,
+-        DEFAULT_STREAM_RX_BUFFERS,
+-        DEFAULT_STREAM_SAMPLES,
+-        DEFAULT_STREAM_RX_XFERS,
+-        DEFAULT_STREAM_TIMEOUT
+-    );
+-
+-    if (status < 0) {
+-        LOG(CRIT) << "Failed to intialize RX sync handle: " << bladerf_strerror(status);
+-        checkHealth(mRxHealth, false);
+-    }
+-
+-    status = bladerf_sync_config(bdev,
+-        BLADERF_MODULE_TX,
+-        BLADERF_FORMAT_SC16_Q11,
+-        DEFAULT_STREAM_TX_BUFFERS,
+-        DEFAULT_STREAM_SAMPLES,
+-        DEFAULT_STREAM_TX_XFERS,
+-        DEFAULT_STREAM_TIMEOUT
+-    );
+-
+-    if (status < 0) {
+-        LOG(CRIT) << "Failed to intialize TX sync handle: " << bladerf_strerror(status);
+-        checkHealth(mTxHealth, false);
+-    }
+-
+     mRxGain1 = BLADERF_RXVGA1_GAIN_MAX;
+     mDcCorrect = true;
+     mRxMaxOffset = RX_OFFSET_ERROR * RX_AVERAGE_DAMPING;
+
diff --git a/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff b/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff
new file mode 100644
index 000000000000..46b4b1d1ba4d
--- /dev/null
+++ b/net-wireless/yatebts/files/yatebts-sgsnggsn-inetutils-hostname-fix.diff
@@ -0,0 +1,14 @@
+diff --git a/mbts/SGSNGGSN/iputils.cpp b/mbts/SGSNGGSN/iputils.cpp
+index 979ae3a..49bb0ff 100644
+--- a/mbts/SGSNGGSN/iputils.cpp
++++ b/mbts/SGSNGGSN/iputils.cpp
+@@ -466,7 +466,7 @@ EXPORT uint32_t *ip_findmyaddr()
+ 	const int maxaddrs = 5;
+ 	static uint32_t addrs[maxaddrs+1];
+ 	int n = 0;
+-	int fd = runcmd("|/bin/hostname","hostname","-I", NULL);
++	int fd = runcmd("|/bin/hostname","hostname","-i", NULL);
+ 	if (fd < 0) {
+ 		failed:
+ 		addrs[0] = (unsigned) -1;	// converts to all 1s
+
diff --git a/net-wireless/yatebts/yatebts-4.0.0-r1.ebuild b/net-wireless/yatebts/yatebts-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..d5d170d4b8bd
--- /dev/null
+++ b/net-wireless/yatebts/yatebts-4.0.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/yatebts/yatebts-4.0.0-r1.ebuild,v 1.1 2015/02/11 17:33:29 zerochaos Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+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.4.0[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}4/yate-bts-${PV}-1.tar.gz"
+	S="${WORKDIR}/yate-bts"
+fi
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+	epatch "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+	epatch "${FILESDIR}"/${PN}-bladeRF-transceiver_revert_init_order.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)
+
+}