From c9dff484b31356545905205a8349976feb427b68 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <it@startux.de>
Date: Tue, 11 Feb 2020 11:20:43 +0000
Subject: [PATCH] Fix regripper ebuild

---
 app-forensics/regripper/Manifest              |  4 +-
 .../regripper/files/plugins_folder.patch      | 12 ----
 app-forensics/regripper/regripper-2.8.ebuild  | 38 +++++++++++++
 app-forensics/regripper/regripper-9999.ebuild | 56 -------------------
 4 files changed, 40 insertions(+), 70 deletions(-)
 delete mode 100644 app-forensics/regripper/files/plugins_folder.patch
 create mode 100644 app-forensics/regripper/regripper-2.8.ebuild
 delete mode 100644 app-forensics/regripper/regripper-9999.ebuild

diff --git a/app-forensics/regripper/Manifest b/app-forensics/regripper/Manifest
index 1721101..c61cc64 100644
--- a/app-forensics/regripper/Manifest
+++ b/app-forensics/regripper/Manifest
@@ -1,2 +1,2 @@
-AUX plugins_folder.patch 377 SHA256 5c2307aba92de5727c3bb07f37318d4fb899b99dbf3f1ae6b980c5c8f5a4f123 SHA512 8e7ad82aeffc96cf195a83f540c5a4af80c56b28f365eefea40380708e571b21d0e78dfb1c7889339d616fa2eac40ab21b13a66dba937eeb0be257e095ce8a57 WHIRLPOOL 4f9e33d29474de5e22d09b97356bcc077a2092bf50fd1b6a74474009bcfad58c178fcf76f05069caec5697fc1fbefd5c97d01cb16a12ae254ae3c8e56a2fd8b1
-EBUILD regripper-9999.ebuild 1070 SHA256 0d460338f1b2a2db54a52e6034d90a02be51cff5ed24b90891b8a1cfcdfe5199 SHA512 ad29baacb73bc57627362adefc0063eadca84b477026669637d2e4dc37f90f9662dbfb7c6c93fa4af52f3b4526f3f70a72f5bd39f3a65f546ab04fdce2f4f711 WHIRLPOOL c9abaa6b2169f2dfeef361fc8d0c776ad4e7aae186ab83331ba9853af56794372b16cd5d67108c03aa94c86839af8f6315695af1b7344dca15ade030e612f3b3
+DIST master.zip 5432889 BLAKE2B 6ad705d39e23dd47921a5a00274be7e1967963196b63318b41b75f65d5082d7c67e8fab1fab3d32d8e7be6a520f756bf2404445d3f30475059aed399dc288d8d SHA512 cec3a4934a21aacfd6685cdde3e8158025deb36257fec085e8ec7a05d3fbba1a47202caf3e91c174c4629eb57aa553250be56a094dc6521d2667a67132ec095c
+EBUILD regripper-2.8.ebuild 716 BLAKE2B 51a750fa3f438241c81fbe36fa0d977a563e525c1d6ac3acc6f6dc7b8b219084d1ab066797428ed35d042408e874926005d111c463a22c33e5f8fcd9648b53eb SHA512 6189da50c6d8f3132e5a17904c9e54dc4e512ef665c7366926ccf4b609647bcb0366e362c79850c2920d1be962a6ecd32e823f3d2733b38596aa13c4ae35b99e
diff --git a/app-forensics/regripper/files/plugins_folder.patch b/app-forensics/regripper/files/plugins_folder.patch
deleted file mode 100644
index e0d2d4b..0000000
--- a/app-forensics/regripper/files/plugins_folder.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- rip.pl
-+++ rip.pl
-@@ -60,7 +60,8 @@ $str =~ s/($path[scalar(@path) - 1])//;
- #push(@INC,$str);
- 
- #my $plugindir = $str."plugins/";
--my $plugindir = File::Spec->catfile("plugins");
-+#my $plugindir = File::Spec->catfile("plugins");
-+my $plugindir = "/usr/share/regripper/plugins";
- #print "Plugins Dir = ".$plugindir."\n";
- # End code update
- my $VERSION = "2\.8_20130801";
diff --git a/app-forensics/regripper/regripper-2.8.ebuild b/app-forensics/regripper/regripper-2.8.ebuild
new file mode 100644
index 0000000..b2ef2ea
--- /dev/null
+++ b/app-forensics/regripper/regripper-2.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="Perl scripts to parse Windows registry files"
+HOMEPAGE="http://regripper.wordpress.com/"
+SRC_URI="https://github.com/keydet89/RegRipper${PV}/archive/master.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/dos2unix"
+RDEPEND="dev-perl/Parse-Win32Registry"
+
+S="${WORKDIR}/RegRipper${PV}-master"
+
+
+src_prepare() {
+	rm -rf *.exe *.dll
+}
+
+src_compile() {
+	dos2unix *.pl
+	sed -i 's|c:\\perl\\bin\\perl.exe|/usr/bin/perl -w|g' rip.pl || die
+}
+
+src_install () {
+	newbin rip.pl ${PN}
+
+	insinto /usr/share/regripper
+	doins plugins/*.pl
+}
diff --git a/app-forensics/regripper/regripper-9999.ebuild b/app-forensics/regripper/regripper-9999.ebuild
deleted file mode 100644
index fc468fd..0000000
--- a/app-forensics/regripper/regripper-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Perl scripts to parse Windows registry files"
-HOMEPAGE="https://regripper.wordpress.com/regripper/"
-
-if [[ ${PV} = 9999 ]]; then
-    EGIT_REPO_URI="https://github.com/keydet89/RegRipper2.8.git"
-    inherit git-2
-    KEYWORDS=""
-else
-    SRC_URI="https://regripper.googlecode.com/files/rrv${PV}.zip"
-    KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="app-text/dos2unix"
-RDEPEND="dev-perl/Parse-Win32Registry"
-
-S="${WORKDIR}/${P/_/}"
-
-
-src_prepare() {
-    rm *.exe rr.pl *.dll
-}
-
-src_compile() {
-    if [[ ${PV} = 9999 ]]; then
-        epatch "${FILESDIR}"/plugins_folder.patch
-        dos2unix plugins/*.pl
-    fi
-
-    dos2unix *.pl
-
-    sed -i 's|c:\\perl\\bin\\perl.exe|/usr/bin/perl -w|g' rip.pl || die
-}
-
-src_install () {
-    newbin rip.pl ${PN}
-    rm rip.pl
-
-    if [[ ${PV} = 9999 ]]; then
-        insinto /usr/share/"${PN}"
-        doins -r plugins
-    fi
-
-    dodoc regripper.pdf
-}