From 1576e7e4594a60da1c8303c86380f429ee7a925b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Thu, 21 Mar 2019 23:44:42 +0100
Subject: [PATCH] [net-im/spectrum2] sync with tree

---
 net-im/spectrum2/files/remove_debug_cflags.patch | 13 -------------
 net-im/spectrum2/spectrum2-9999.ebuild           | 16 ++++------------
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 net-im/spectrum2/files/remove_debug_cflags.patch

diff --git a/net-im/spectrum2/files/remove_debug_cflags.patch b/net-im/spectrum2/files/remove_debug_cflags.patch
deleted file mode 100644
index 86b0200..0000000
--- a/net-im/spectrum2/files/remove_debug_cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt	2018-04-27 12:27:02.000000000 +0200
-+++ b/CMakeLists.txt	2018-04-29 18:17:42.157170288 +0200
-@@ -399,10 +399,6 @@
- endif()
- 
- if(CMAKE_BUILD_TYPE MATCHES Debug)
--	if (CMAKE_COMPILER_IS_GNUCXX)
--		ADD_DEFINITIONS(-O0)
--		ADD_DEFINITIONS(-ggdb)
--	endif()
- 	ADD_DEFINITIONS(-DDEBUG)
- 	message("Debug             : yes")
- else(CMAKE_BUILD_TYPE MATCHES Debug)
diff --git a/net-im/spectrum2/spectrum2-9999.ebuild b/net-im/spectrum2/spectrum2-9999.ebuild
index e7ce569..6affad3 100644
--- a/net-im/spectrum2/spectrum2-9999.ebuild
+++ b/net-im/spectrum2/spectrum2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -14,7 +14,7 @@ if [[ ${PV} = "9999" ]] ; then
 else
 	RESTRICT="mirror"
 	SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="An open source instant messaging transport"
@@ -22,11 +22,11 @@ HOMEPAGE="https://www.spectrum.im"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="debug doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
+IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND="
-	dev-libs/boost:=
+	dev-libs/boost:=[nls]
 	dev-libs/expat
 	dev-libs/libev:=
 	dev-libs/log4cxx
@@ -67,11 +67,6 @@ DEPEND="
 	)
 "
 
-
-PATCHES=(
-	"${FILESDIR}/remove_debug_cflags.patch"
-)
-
 # Tests are currently restricted, as they do completly fail
 RESTRICT="test"
 
@@ -86,13 +81,10 @@ src_prepare() {
 	# Respect users LDFLAGS
 	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die
 
-	# Respect users CFLAGS, when compiling for debug mode
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	use debug && CMAKE_BUILD_TYPE="Debug"
-
 	local mycmakeargs=(
 		-DENABLE_DOCS="$(usex doc)"
 		-DENABLE_FROTZ="$(usex frotz)"