gentoo resync : 17.10.2017

4 files changed, 34 insertions, 2 deletions

diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 4b9fa995fc84..3de3f0c70b59 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,9 +1,10 @@
+AUX uhd-3.8.5-gcc6.patch 1084 SHA256 7ac7f5f8acc3e819782ef97ca1318cd232e01321afafa55af021b40de9545865 SHA512 bc5f0b61035b37190e75922fb39376ecc77d59ca708fccc0606a9686b2b8524ab40b1b718a937e59fa25a6e0b074436d4c87e554187637d578a89a691190e43d WHIRLPOOL 3d7771030e495c6fad84161bfc57db85f18b1e73e7c3a159002b732e0fc99ea0294b5acd4e7b5a5b1e736c846c2560eadbe99e467c17c0756f4c9e54c57b8d7f
 DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 SHA256 e0a36e64bffa7d06ac948fd8fc07ff3ce321e1efc3f7e8604b53e0c3ce842989 SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1 WHIRLPOOL 3516b74e247bbf6930cb25f639ff34eec2c95102d7c38ddcf7c892c80394ebd7c3e0c91d77277bb4c719c05d83cd6fc507449f9fd072371456843a3a12f6b778
 DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 SHA256 18218c78ce8c7d6d50fd04c3e0e3596948a3a9196f5c1d993da89f2e65f3e5ad SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1 WHIRLPOOL e5e46384d4470861b208bdda703604104ee20055ad41328934977021df2284ca6be16cc4f2f9709ffd0619f3410f68f3c04176cb4ec743912cc3baa031434253
 DIST uhd-images_003.008.005-release.zip 24897325 SHA256 e04e5b63dd550d8bba8db4c6138996c18a54533a158015cea301800da387e198 SHA512 4d3d60453320a05bf5008ffeddafdf01c08a906e6469a32ece9f1102072e03a8d140487febad7c392ba64f10fc3b94e2fdbe26e2e263a8fe1b1a29077a15e512 WHIRLPOOL 2493d969ae60b715592c7e47ee1648a418d808026b950cc524de492010de9b85087186f39c19d59c70e0d0cb1ebacf760e926ba9cf2edf608e95a6c3a7f30929
 DIST uhd-images_003.009.006-release.zip 26268656 SHA256 45d1abfb64b42dcb8a3a1b8bbe6ef79b47fba99d308c9abfd87c40382f2fc971 SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631 WHIRLPOOL 7653a97c6d5e17380bd831347badd59a7a3d870b258e7bd87fbd0b33ede33a66e4949d0cdecde77f192b5fda2d55278e0723171a4e31dae08360a0f2de5beef7
-EBUILD uhd-3.8.5.ebuild 1821 SHA256 86f1853bf0536b112390f3b457a7175e31f53546cdd51937f67a09734ddbc55c SHA512 440140c4854545095a11ae4133281b165d4ec6e3c63237894312d1db32c236faf6934e3ab62e6b390842754004dcd8f5dad1dddb7a18ad392847fa5448c676ab WHIRLPOOL 1c1c65dbe2ef5f38946ee0849b8f352836f88f2ffb162fd7d1732b83e1f002f416bea48a652333d383ec714ce85d105440b9ab702bc9a0a6114fc8995fcac31e
-EBUILD uhd-3.9.6.ebuild 1838 SHA256 3721dcadb91dab21854773eaeac6dfc1f0215d58147d561095265d24c6cb9af5 SHA512 2b484b15b7db7af8ad5a90675179bf699261e5271151085bd993dd47bd0571a112a99976975d5b536e7a0c114fea1c7f68fb4e25959f3b0fe1483856af0ebeec WHIRLPOOL 6b5c2c526f0ccdaf973624a428bff09d7c26fbc90244fa92ef03ea40037600654a21b713c4a86ae4e7c6b205065fd06dd56df75b1f6640435b4a6576db216147
+EBUILD uhd-3.8.5.ebuild 1890 SHA256 94bfa8c20fd36757c9e16ce930cec1a2c727aa5e9e7c5aea0108d0fbd4cbc241 SHA512 3a7be78cc24276f2e98375765994a28d18a1e8b2de6c637b0c2026f17dc3466829b8903d2f1a79f7bbd705d87288a0889c0d87b646ebd135c4c8b8114e1b9c78 WHIRLPOOL 8e2eeaa8f53590a185cbd203ff7dff076860155ff5d7d14899e3c00ab469dd7d310bf29901d51fd8d31ae49d23032c830173a09223d38cf70bb5e19b851b6df9
+EBUILD uhd-3.9.6.ebuild 1864 SHA256 36fca6f7d641d05393719053d7e810f01c392332f3f5e585a17514eb79fde4e8 SHA512 4040ee39d8567068ac1da6b64cb1fbc9f4692ad390df0b6b7e778de283849b2a4a36edc235f3d7476a5a74c10079971d7cdd0803af9c6006909f3487e9782abc WHIRLPOOL e5483f6a9f5b6ddd8c9a5a98c4b738aea541a5ae9505124d4185a5844e3f3f9505d6e712d0f3c3bb700c64769a576e99db1b3c827eb260b53e92f8fca2bdd3b7
 MISC ChangeLog 2661 SHA256 1c6222b79da8d982e54a4fdfb445679c79cd15da01f692970aec3ec2deae9129 SHA512 551ab26032390f936b7e10ae3bf8f6d5dc129f032755411519f003bd64557f1584497bdc89cfebf49411329c6b2931b0676d6b4181521c935c0c7aa915030ff6 WHIRLPOOL 6c1bf798452d1bc0aadd124a84e94205a0a76b31db3aa2f7d874af0ded50627de1979fab9b5ac5f0c0a63e960ba7b061b3fd132195eeee438dcff4d5af79ee69
 MISC ChangeLog-2015 2743 SHA256 9ad0161d0518e07b3dab0184e675b8d6b3bd23bc6a4a41d52c64e4c536f338d6 SHA512 63f3eed4f7856aaf3911f4cd595bef00fbe1893c15cb7d85b4bbdb2d9264edc24032f671b732202af11a384d603e227c42a48bdef716a0c48fb0720bf49f6904 WHIRLPOOL 6de965f873bb886767a58eaa1bf0ede4fbb84ac3b63e44c32475f5d00172a1887600c7908aa9064b0ab02a9e2b692c9609ca0fc67792989a78bd4ff3432de175
 MISC metadata.xml 539 SHA256 52e1812a3d9f0dbbd216aaa11537ae39ca0777c490ca570718894d18561381d0 SHA512 b5e66134c30244fa689a554543686eac535908aed543eb6179a8c51a98c11d0f1d204518a40e0f79990dba2806b027ea97f6edac382a5bb76fb041231eb61451 WHIRLPOOL 1bc9b2ecfad7bde40db4c42daf72bb5af5f42314f7b46b99c284c97970c201b921422f420cdba7708164e3c73cc5ea18f51b95390ac0ee9e0e858b1412b74770
diff --git a/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch
new file mode 100644
index 000000000000..c2e5e00f70d6
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-3.8.5-gcc6.patch
@@ -0,0 +1,25 @@
+Bug: https://bugs.gentoo.org/611680
+Backported from: https://github.com/EttusResearch/uhd/commit/b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab
+
+--- a/host/lib/usrp/dboard/db_cbx.cpp
++++ b/host/lib/usrp/dboard/db_cbx.cpp
+@@ -38,7 +38,7 @@ sbx_xcvr::cbx::~cbx(void){
+     /* NOP */
+ }
+ 
+-void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, std::vector<boost::uint32_t> &regs)
++void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> &regs)
+ {
+     BOOST_FOREACH(boost::uint32_t reg, regs)
+     {
+--- a/host/lib/usrp/dboard/db_sbx_common.hpp
++++ b/host/lib/usrp/dboard/db_sbx_common.hpp
+@@ -225,7 +225,7 @@ class sbx_xcvr : public xcvr_dboard_base{
+         /*! This is the registered instance of the wrapper class, sbx_base. */
+         sbx_xcvr *self_base;
+     private:
+-        void write_lo_regs(dboard_iface::unit_t unit, std::vector<boost::uint32_t> &regs);
++        void write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> &regs);
+         max287x_iface::sptr _txlo;
+         max287x_iface::sptr _rxlo;
+     };
diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild
index 1474f296e8ca..d6787b88c5f4 100644
--- a/net-wireless/uhd/uhd-3.8.5.ebuild
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild
@@ -34,7 +34,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
 
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
+
 src_prepare() {
+	cmake-utils_src_prepare
+
 	gnome2_environment_reset #534582
 
 	#this may not be needed in 3.4.3 and above, please verify
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
index f1f73a61cafb..57e303285555 100644
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	gnome2_environment_reset #534582
 
 	#this may not be needed in 3.4.3 and above, please verify