From ac780d0c1189249b4dd2e5b6913bbcd271107e4e Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Wed, 19 Apr 2017 21:50:00 +0800
Subject: [PATCH] freediag: convert to officail versioning: N.NN

---
 app-misc/freediag/Manifest                    |  3 +-
 app-misc/freediag/freediag-1.0.7.ebuild       | 52 -------------------
 ...diag-1.0.8.ebuild => freediag-1.08.ebuild} |  7 +--
 3 files changed, 5 insertions(+), 57 deletions(-)
 delete mode 100644 app-misc/freediag/freediag-1.0.7.ebuild
 rename app-misc/freediag/{freediag-1.0.8.ebuild => freediag-1.08.ebuild} (90%)

diff --git a/app-misc/freediag/Manifest b/app-misc/freediag/Manifest
index db335dc7f..9efbbd8d4 100644
--- a/app-misc/freediag/Manifest
+++ b/app-misc/freediag/Manifest
@@ -1,2 +1 @@
-DIST freediag-1.0.7.tar.gz 1733344 SHA256 df8f6b47158db9bf1dac6cccdc66b45fbe6c44f935c057e77bd743ad5b8fc69c SHA512 f463a955669fdd8b6ef89c2aacdc90037c723b4215c6bf733f34748a0c3677929ab5934d038f950d1bc29a3ce3c757c1186ca636958068d9e87b9323a580ed9f WHIRLPOOL 837e52a5d7adda0cafb26fdf5e1121f1ef41db972f8b3a1fd40a3521b89249b08674c0fdb4b12d652baaa47ef5a9279681fd7ef193b105b9bdff9dad74f9cc4b
-DIST freediag-1.0.8.tar.gz 1730044 SHA256 dd532af3fa1b0c1750e4bf92888488f8f6d8fcd4756b05e08ecb7a491cdb82ab SHA512 7ab772b7d940519929c0a083f043a24a8a859f29115eff41ca707e5b50764b464fafc3a16989f39390663d620bb3a6643e1b33568915e809e802585feb5e4028 WHIRLPOOL ddde97014401d64cdf0af7841779796aeb178568d57f87b0dc7269fb0b574ff8c265ca3bf861e2539aa14cd7f328ad8e9ea27e4701ab1b97ec01538cb19391ab
+DIST freediag-1.08.tar.gz 1730044 SHA256 dd532af3fa1b0c1750e4bf92888488f8f6d8fcd4756b05e08ecb7a491cdb82ab SHA512 7ab772b7d940519929c0a083f043a24a8a859f29115eff41ca707e5b50764b464fafc3a16989f39390663d620bb3a6643e1b33568915e809e802585feb5e4028 WHIRLPOOL ddde97014401d64cdf0af7841779796aeb178568d57f87b0dc7269fb0b574ff8c265ca3bf861e2539aa14cd7f328ad8e9ea27e4701ab1b97ec01538cb19391ab
diff --git a/app-misc/freediag/freediag-1.0.7.ebuild b/app-misc/freediag/freediag-1.0.7.ebuild
deleted file mode 100644
index 8f4731ead..000000000
--- a/app-misc/freediag/freediag-1.0.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils versionator
-
-AVC=( $(get_version_components) )
-MY_PV="R${AVC[0]}_${AVC[1]}${AVC[2]}"
-
-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"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DOCS=( AUTHORS CHANGES COPYING README doc )
-
-src_prepare() {
-	sed -i -e 's:DESTINATION doc:DESTINATION share/doc/'${P}':g' CMakeLists.txt || die
-	sed -i -e 's:DESTINATION . OPTIONAL:DESTINATION share/doc/'${P}' OPTIONAL:g' CMakeLists.txt || die
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		-DDBUILDGUI=ON
-		-DUSE_RCFILE=ON -DUSE_INIFILE=ON
-	)
-	cmake-utils_src_configure
-}
-
-#copied from arch, where the official mess was introduced
-src_install() {
-	cmake-utils_src_install
-#  emake DESTDIR="${D}" install
-#hax cleanup. CMakeLists.txt should really be fixed upstream for the next release
-	mkdir -p "${D}"/usr/share/freediag/carsim_examples
-	mv "${D}"/usr/bin/*.db "${D}"/usr/share/freediag/carsim_examples
-	mv "${D}"/usr/bin/scantool.ini "${D}"/usr/share/freediag/
-}
diff --git a/app-misc/freediag/freediag-1.0.8.ebuild b/app-misc/freediag/freediag-1.08.ebuild
similarity index 90%
rename from app-misc/freediag/freediag-1.0.8.ebuild
rename to app-misc/freediag/freediag-1.08.ebuild
index 7c3666490..86d47a9cd 100644
--- a/app-misc/freediag/freediag-1.0.8.ebuild
+++ b/app-misc/freediag/freediag-1.08.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils versionator
 
 AVC=( $(get_version_components) )
-MY_PV="R${AVC[0]}_${AVC[1]}${AVC[2]}"
+MY_PV="R${AVC[0]}_${AVC[1]}"
 
 DESCRIPTION="Free diagnostic software for OBD-II compliant motor vehicles"
 HOMEPAGE="https://github.com/fenugrec/freediag"
@@ -27,6 +27,7 @@ DOCS=( AUTHORS CHANGES COPYING README doc )
 
 src_prepare() {
 	sed -i -e 's:"README_v${PKGVERSIONMAJOR}_${PKGVERSIONMINOR}.txt"::g' CMakeLists.txt || die
+	default
 }
 
 src_configure() {