From 0dfd2e2979d02ce50bd2bccc95495a3dbe96a219 Mon Sep 17 00:00:00 2001
From: Yury Martynov <email@linxon.ru>
Date: Mon, 24 Feb 2020 11:10:51 +0300
Subject: [PATCH] reglookup: EAPI bump (closes:
 https://github.com/pentoo/pentoo-overlay/issues/579)

---
 .../reglookup/files/1.0.1-cflags.patch        |  5 ++--
 app-forensics/reglookup/metadata.xml          |  8 ++++++
 .../reglookup/reglookup-1.0.1-r1.ebuild       | 21 ++++++++-------
 app-forensics/reglookup/reglookup-9999.ebuild | 26 ++++++++++---------
 4 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 app-forensics/reglookup/metadata.xml

diff --git a/app-forensics/reglookup/files/1.0.1-cflags.patch b/app-forensics/reglookup/files/1.0.1-cflags.patch
index 9575fc819..d08362274 100644
--- a/app-forensics/reglookup/files/1.0.1-cflags.patch
+++ b/app-forensics/reglookup/files/1.0.1-cflags.patch
@@ -1,5 +1,6 @@
---- SConstruct.orig	2011-07-22 10:05:25.000000000 +0800
-+++ SConstruct	2017-01-11 20:18:52.022609874 +0800
+diff -ur a/SConstruct b/SConstruct
+--- a/SConstruct	2011-07-22 06:05:25.000000000 +0400
++++ b/SConstruct	2020-02-24 10:57:40.928869698 +0300
 @@ -3,7 +3,8 @@
  sys.dont_write_bytecode = True
  from regfi_version import REGFI_VERSION
diff --git a/app-forensics/reglookup/metadata.xml b/app-forensics/reglookup/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/app-forensics/reglookup/metadata.xml
@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>
diff --git a/app-forensics/reglookup/reglookup-1.0.1-r1.ebuild b/app-forensics/reglookup/reglookup-1.0.1-r1.ebuild
index 4d943fa6a..808eec50c 100644
--- a/app-forensics/reglookup/reglookup-1.0.1-r1.ebuild
+++ b/app-forensics/reglookup/reglookup-1.0.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit scons-utils distutils-r1
 
@@ -13,21 +13,24 @@ SRC_URI="http://projects.sentinelchicken.org/data/downloads/${PN}-src-${PV}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~x64-macos ~x86-macos"
-IUSE=""
+KEYWORDS="~amd64 ~x86 ~x64-macos ~x86-macos"
 
-RDEPEND="sys-libs/talloc
+RDEPEND="
+	sys-libs/talloc
 	virtual/libiconv"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/1.0.1-cflags.patch
-	mv pyregfi-distutils.py setup.py
+PATCHES=( "${FILESDIR}"/${PV}-cflags.patch )
 
+src_prepare() {
+	mv pyregfi-distutils.py setup.py || die
+	distutils-r1_src_prepare
 }
+
 src_compile() {
 	escons
+	distutils-r1_src_compile
 }
 
 src_install() {
diff --git a/app-forensics/reglookup/reglookup-9999.ebuild b/app-forensics/reglookup/reglookup-9999.ebuild
index 442ed269a..91b7da151 100644
--- a/app-forensics/reglookup/reglookup-9999.ebuild
+++ b/app-forensics/reglookup/reglookup-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-SONAME_PV="1.0.1"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit scons-utils distutils-r1 subversion
 
 DESCRIPTION="An utility for reading and querying Windows NT/2K/XP registries"
@@ -15,25 +14,28 @@ ESVN_REPO_URI="https://code.blindspotsecurity.com/dav/reglookup/trunk/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-RDEPEND="sys-libs/talloc
+RDEPEND="
+	sys-libs/talloc
 	virtual/libiconv"
 
+S="${WORKDIR}/${PN}-src-${PV}"
+
+src_prepare() {
+	mv pyregfi-distutils.py setup.py || die
+	distutils-r1_src_prepare
+}
+
 src_compile() {
 	escons
+	distutils-r1_src_compile
 }
 
 src_install() {
 	distutils-r1_src_install
 	dobin bin/reglookup-timeline src/reglookup src/reglookup-recover
 	dolib.so lib/libregfi.so
-	dolib.so lib/libregfi.so.1
-	dolib.so lib/libregfi.so."${SONAME_PV}"
-	#fix me, add Doxygen
-#	doman doc/*.1.gz
-	#Upstream bug: https://github.com/pentoo/pentoo-overlay/issues/145
-#	escons install
+	doman doc/*.1.gz
 	dodir /usr/include/regfi
 	insinto /usr/include/regfi
 	doins include/*.h