diff --git a/net-wireless/op25/op25-9999.ebuild b/net-wireless/op25/op25-9999.ebuild
index e1f2eb3ad..4b8bf2fe3 100644
--- a/net-wireless/op25/op25-9999.ebuild
+++ b/net-wireless/op25/op25-9999.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-20126 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils python-single-r1 flag-o-matic
 
 DESCRIPTION="software-defined analyzer for APCO P25 signals"
-HOMEPAGE="http://op25.osmocom.org/wiki"
-#osmocom is dead or close enough
-#inherit subversion
-#ESVN_REPO_URI="http://op25.osmocom.org/svn/trunk"
+HOMEPAGE="http://osmocom.org/projects/op25/wiki"
 inherit git-r3
-EGIT_REPO_URI="https://github.com/balint256/op25.git"
+#EGIT_REPO_URI="https://github.com/balint256/op25.git"
+EGIT_REPO_URI="https://git.osmocom.org/op25"
 
 LICENSE="GPL"
 SLOT="0"
@@ -26,3 +23,10 @@ DEPEND=">=net-wireless/gnuradio-3.7:=
 	dev-libs/boost
 	net-libs/libpcap"
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#workaround: compile with gcc
+	# -funsigned-char
+	append-cxxflags -Wno-narrowing
+	eapply_user
+}