From e2ee5a83d8cc47fe0b1034a00ba5d3d9934a126c Mon Sep 17 00:00:00 2001
From: Yury Martynov <email@linxon.ru>
Date: Sun, 24 Nov 2019 13:03:38 +0300
Subject: [PATCH] freediag: EAPI bump, fix errors while building

---
 app-misc/freediag/Manifest                    |  2 +-
 .../freediag-1.08_fix_scangui_compiling.patch | 12 ++++++
 app-misc/freediag/freediag-1.08.ebuild        | 37 ++++++++++---------
 app-misc/freediag/metadata.xml                | 11 ++++++
 4 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 app-misc/freediag/files/freediag-1.08_fix_scangui_compiling.patch
 create mode 100644 app-misc/freediag/metadata.xml

diff --git a/app-misc/freediag/Manifest b/app-misc/freediag/Manifest
index 9efbbd8d4..605bc03f3 100644
--- a/app-misc/freediag/Manifest
+++ b/app-misc/freediag/Manifest
@@ -1 +1 @@
-DIST freediag-1.08.tar.gz 1730044 SHA256 dd532af3fa1b0c1750e4bf92888488f8f6d8fcd4756b05e08ecb7a491cdb82ab SHA512 7ab772b7d940519929c0a083f043a24a8a859f29115eff41ca707e5b50764b464fafc3a16989f39390663d620bb3a6643e1b33568915e809e802585feb5e4028 WHIRLPOOL ddde97014401d64cdf0af7841779796aeb178568d57f87b0dc7269fb0b574ff8c265ca3bf861e2539aa14cd7f328ad8e9ea27e4701ab1b97ec01538cb19391ab
+DIST freediag-1.08.tar.gz 1730044 BLAKE2B 1ff9ef2910437fc832a031e2914ab8404683d6c6ba428a1ff82daa9cab2dc091e42229c1568ef8fdda9823f41979b1475ede687401d0685470f77224fc30939d SHA512 7ab772b7d940519929c0a083f043a24a8a859f29115eff41ca707e5b50764b464fafc3a16989f39390663d620bb3a6643e1b33568915e809e802585feb5e4028
diff --git a/app-misc/freediag/files/freediag-1.08_fix_scangui_compiling.patch b/app-misc/freediag/files/freediag-1.08_fix_scangui_compiling.patch
new file mode 100644
index 000000000..790b5148b
--- /dev/null
+++ b/app-misc/freediag/files/freediag-1.08_fix_scangui_compiling.patch
@@ -0,0 +1,12 @@
+diff -ur a/scangui/CMakeLists.txt b/scangui/CMakeLists.txt
+--- a/scangui/CMakeLists.txt	2016-11-04 01:08:33.000000000 +0300
++++ b/scangui/CMakeLists.txt	2019-11-24 12:26:15.602918154 +0300
+@@ -6,7 +6,7 @@
+ add_custom_command(OUTPUT scangui.cxx scangui.h
+ 		   COMMAND ${FLTK_FLUID_EXECUTABLE} -c ${CMAKE_CURRENT_SOURCE_DIR}/scangui.fl
+                    DEPENDS scangui.fl)
+-include_directories(${CMAKE_CURRENT_BINARY_DIR})
++include_directories(${CMAKE_CURRENT_BINARY_DIR} ${FLTK_INCLUDE_DIR})
+ 
+ add_executable(scangui ${SCANGUI_SRCS} ${SCANGUI_HEADERS})
+ target_link_libraries(scangui ${FLTK_LIBRARIES})
diff --git a/app-misc/freediag/freediag-1.08.ebuild b/app-misc/freediag/freediag-1.08.ebuild
index 86d47a9cd..64517fa17 100644
--- a/app-misc/freediag/freediag-1.08.ebuild
+++ b/app-misc/freediag/freediag-1.08.ebuild
@@ -1,42 +1,45 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils versionator
+inherit cmake-utils
 
-AVC=( $(get_version_components) )
+AVC=( $(ver_rs 1- ' ') )
 MY_PV="R${AVC[0]}_${AVC[1]}"
 
 DESCRIPTION="Free diagnostic software for OBD-II compliant motor vehicles"
 HOMEPAGE="https://github.com/fenugrec/freediag"
 SRC_URI="https://github.com/fenugrec/freediag/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
+KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
+IUSE="gui"
 
-DEPEND=""
+DOCS=( AUTHORS CHANGES COPYING README doc )
+
+DEPEND="gui? ( x11-libs/fltk:* )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-DOCS=( AUTHORS CHANGES COPYING README doc )
-
 src_prepare() {
-	sed -i -e 's:"README_v${PKGVERSIONMAJOR}_${PKGVERSIONMINOR}.txt"::g' CMakeLists.txt || die
-	default
+	eapply "${FILESDIR}/${P}_fix_scangui_compiling.patch"
+
+	sed -i \
+		-e 's:"README_v${PKGVERSIONMAJOR}_${PKGVERSIONMINOR}.txt"::g' \
+		CMakeLists.txt || die
+
+	cmake-utils_src_prepare
 }
 
 src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	use debug && CMAKE_BUILD_TYPE=Debug
-
 	local mycmakeargs=(
-		-DDBUILDGUI=ON
-		-DUSE_RCFILE=ON -DUSE_INIFILE=ON
+		-DBUILDGUI="$(usex gui)"
+		-DUSE_RCFILE=ON
+		-DUSE_INIFILE=ON
 	)
+
 	cmake-utils_src_configure
 }
diff --git a/app-misc/freediag/metadata.xml b/app-misc/freediag/metadata.xml
new file mode 100644
index 000000000..74f430c3d
--- /dev/null
+++ b/app-misc/freediag/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="gui">Enable scangui using <pkg>x11-libs/fltk</pkg> library</flag>
+	</use>
+</pkgmetadata>