From be15458353e3a959eb0c2d237a47aa5cb6c4fe66 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@ixit.cz>
Date: Tue, 8 Oct 2019 16:37:18 +0200
Subject: sys-fs/dislocker: revbump to EAPI 7 & fixed fuse dep

Closes: https://github.com/gentoo/gentoo/pull/13212
Closes: https://bugs.gentoo.org/673666

Signed-off-by: David Heidelberg <david@ixit.cz>
Signed-off-by: Tim Harder <radhermit@gentoo.org>
---
 sys-fs/dislocker/dislocker-0.7.1-r1.ebuild | 49 -----------------------------
 sys-fs/dislocker/dislocker-0.7.1-r2.ebuild | 50 ++++++++++++++++++++++++++++++
 sys-fs/dislocker/dislocker-9999.ebuild     | 13 ++++----
 3 files changed, 57 insertions(+), 55 deletions(-)
 delete mode 100644 sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
 create mode 100644 sys-fs/dislocker/dislocker-0.7.1-r2.ebuild

diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
deleted file mode 100644
index 5fa3c3fa942f..000000000000
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
-HOMEPAGE="https://github.com/Aorimn/dislocker"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ruby"
-
-DEPEND="sys-fs/fuse:*
-	net-libs/mbedtls
-	ruby? ( dev-lang/ruby:2.4 )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
-#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
-	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
-
-	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_find_package ruby Ruby)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
-	cmake-utils_src_install
-}
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..08e0e54087af
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+HOMEPAGE="https://github.com/Aorimn/dislocker"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ruby"
+
+DEPEND="
+	sys-fs/fuse:0=
+	net-libs/mbedtls:0=
+	ruby? ( dev-lang/ruby:* )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
+#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
+	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
+
+	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_find_package ruby Ruby)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+	cmake-utils_src_install
+}
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index c92236b7a126..08e0e54087af 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
 HOMEPAGE="https://github.com/Aorimn/dislocker"
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ruby"
 
-DEPEND="sys-fs/fuse:*
-	net-libs/mbedtls
-	ruby? ( dev-lang/ruby:2.3 )"
-
+DEPEND="
+	sys-fs/fuse:0=
+	net-libs/mbedtls:0=
+	ruby? ( dev-lang/ruby:* )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-- 
cgit v1.2.3-65-gdbad