net-wireless/yatebts: remove eutils, use eapply, use HTTPS, remove unused patches

Closes: https://bugs.gentoo.org/651328
Closes: https://github.com/gentoo/gentoo/pull/7258

diff --git a/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch
deleted file mode 100644 (file)
index b10eb57..0000000
--- a/net-wireless/yatebts/files/yatebts-4.0.0-dont-mess-with-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur yate-bts/configure.in yate-bts-sane/configure.in
---- yate-bts/configure.in      2014-07-25 10:28:44.000000000 -0400
-+++ yate-bts-sane/configure.in 2014-07-25 17:38:23.550069064 -0400
-@@ -36,9 +36,6 @@
- AC_PROG_CC
- AC_PROG_AWK
- 
--# Delete -g as we handle debug info at build time
--CFLAGS=`echo "$CFLAGS" | sed 's/-g[[0-9]]* *//' 2>/dev/null`
--
- # Helper to check by pkgconfig including local paths
- function pkgconfig_check()
- {

diff --git a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
index c6827eb90952c48d6705eba2dbde348c6a44c690..8768164cfa635d8a4b5a4cc5a1082db570eae028 100644 (file)
--- a/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
+++ b/net-wireless/yatebts/files/yatebts-6.0.0-dont-mess-with-cflags.patch
@@ -1,5 +1,5 @@
---- configure.ac       2017-09-07 10:21:08.000000000 -0400
-+++ configure-sane.ac  2018-02-16 15:26:43.884257256 -0500
+--- a/configure.ac
++++ b/configure.ac
 @@ -38,9 +38,6 @@
  AC_PROG_CC
  AC_PROG_AWK

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
deleted file mode 100644 (file)
index 83da1d5..0000000
--- a/net-wireless/yatebts/files/yatebts-bladeRF-transceiver_revert_init_order.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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/yatebts-6.0.0.ebuild b/net-wireless/yatebts/yatebts-6.0.0.ebuild
index 8dd83f84e584cd814294c58f5138e52550e727d7..cac2e275abd1ec12498613a941d3ad1156e7a806 100644 (file)
--- a/net-wireless/yatebts/yatebts-6.0.0.ebuild
+++ b/net-wireless/yatebts/yatebts-6.0.0.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="http://www.yatebts.com/"
+HOMEPAGE="https://yatebts.com"
 ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
 
 LICENSE="GPL-2"
@@ -30,11 +30,14 @@ else
        S="${WORKDIR}/yate-bts"
 fi
 
+#we need more patches or configure flags because things install in really wrong places per FHS
+PATCHES=(
+       "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+       "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
+       "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+       )
+
 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
-       epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
        default
        eautoreconf
 }

diff --git a/net-wireless/yatebts/yatebts-9999.ebuild b/net-wireless/yatebts/yatebts-9999.ebuild
index 8dd83f84e584cd814294c58f5138e52550e727d7..cac2e275abd1ec12498613a941d3ad1156e7a806 100644 (file)
--- a/net-wireless/yatebts/yatebts-9999.ebuild
+++ b/net-wireless/yatebts/yatebts-9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="The Yate GSM base station"
-HOMEPAGE="http://www.yatebts.com/"
+HOMEPAGE="https://yatebts.com"
 ESVN_REPO_URI="http://voip.null.ro/svn/yatebts/trunk"
 
 LICENSE="GPL-2"
@@ -30,11 +30,14 @@ else
        S="${WORKDIR}/yate-bts"
 fi
 
+#we need more patches or configure flags because things install in really wrong places per FHS
+PATCHES=(
+       "${FILESDIR}"/${PN}-sgsnggsn-inetutils-hostname-fix.diff
+       "${FILESDIR}"/${PN}-5.0.0-gcc6.patch
+       "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
+       )
+
 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
-       epatch "${FILESDIR}"/${P}-dont-mess-with-cflags.patch
        default
        eautoreconf
 }