[gentoo-commits] repo/gentoo:master commit in: net-wireless/inspectrum/, net-wireless/inspectrum/files/

[Richard Farina]

commit:     a269a7d862be9f4bfe5fc0d8201d889a1a656455
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  5 17:55:42 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Oct  5 17:56:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a269a7d8

net-wireless/inspectrum: backport fix for bug #562164 from upstream

Package-Manager: portage-2.2.22

 .../inspectrum/files/inspectrum-0.1-cxxflags.patch | 28 ++++++++++++++++++++++
 ...pectrum-0.1.ebuild => inspectrum-0.1-r1.ebuild} |  7 +++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch b/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch
new file mode 100644
index 0000000..b7b35a9
--- /dev/null
+++ b/net-wireless/inspectrum/files/inspectrum-0.1-cxxflags.patch
@@ -0,0 +1,28 @@
+From 6287ae4153231865c9d3cafaf8c80d488b8ba84e Mon Sep 17 00:00:00 2001
+From: Mike Walters <mike@×××××.net>
+Date: Mon, 5 Oct 2015 18:29:37 +0100
+Subject: [PATCH] Set default CXXFLAGS if none are set
+
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47e8faa..b788a24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,9 +15,13 @@ if (WIN32)
+        endif(NOT(MMAN))
+ ENDIF (WIN32)
+ 
++if (NOT CMAKE_CXX_FLAGS)
++    set(CMAKE_CXX_FLAGS "-O2")
++endif (NOT CMAKE_CXX_FLAGS)
++
+ # This only works in cmake >3.1
+ #set_property(TARGET inspectrum PROPERTY CXX_STANDARD 11)
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -O3")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+ 
+ list(APPEND inspectrum_sources 
+ 	main.cpp

diff --git a/net-wireless/inspectrum/inspectrum-0.1.ebuild b/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild
similarity index 85%
rename from net-wireless/inspectrum/inspectrum-0.1.ebuild
rename to net-wireless/inspectrum/inspectrum-0.1-r1.ebuild
index 9d93c62..e8001cf 100644
--- a/net-wireless/inspectrum/inspectrum-0.1.ebuild
+++ b/net-wireless/inspectrum/inspectrum-0.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit cmake-utils
+inherit cmake-utils eutils
 
 DESCRIPTION="a tool for analysing captured signals, primarily from software-defined radio receivers"
 HOMEPAGE="https://github.com/miek/inspectrum"
@@ -27,3 +27,8 @@ RDEPEND="sci-libs/fftw:3.0=
 	dev-qt/qtcore:5"
 DEPEND="virtual/pkgconfig
 	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cxxflags.patch
+	cmake-utils_src_prepare
+}