[gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/

[Andreas Sturmlechner]

commit:     68a682a2301bec17bfbd0dc887d9f490669471b0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 12:36:41 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 17 11:40:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a682a2

sys-fs/dislocker: Tidyup, DESCRIPTION w/o PN

- Unnecessary ${S}
- local mycmakeargs
- missing || die

Bug: https://bugs.gentoo.org/700784
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sys-fs/dislocker/dislocker-0.7.1-r3.ebuild | 21 ++++++++++-----------
 sys-fs/dislocker/dislocker-9999.ebuild     | 21 ++++++++++-----------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild 
b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index 73f3b33aa54..90375bf7590 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 inherit cmake flag-o-matic
 
-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+DESCRIPTION="Read BitLocker encrypted partitions"
 HOMEPAGE="https://github.com/Aorimn/dislocker";
 
 if [[ ${PV} == *9999* ]]; then
@@ -28,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
 src_prepare() {
        if use ruby && [[ ${PV} == "0.7.1" ]]; then
                PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
@@ -37,17 +36,17 @@ src_prepare() {
        cmake_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:Werror:Wno-error:g' -i "src/CMakeLists.txt" || die
+       sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die
 
-#      sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+#      sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" || die
 # Do not process compressed versions of the manuals
-       sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 
\2\\:' -i "${S}/src/CMakeLists.txt" || die
-       sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die
+       sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 
\2\\:' -i "src/CMakeLists.txt" || die
+       sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die
 }
 
 src_configure() {
-       mycmakeargs=(
+       local mycmakeargs=(
                $(cmake_use_find_package ruby Ruby)
        )
        cmake_src_configure
@@ -57,6 +56,6 @@ src_install() {
        if ! use ruby; then
                rm "${S}/man/linux/${PN}-find.1" || die
        fi
-       find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+       find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die
        cmake_src_install
 }

diff --git a/sys-fs/dislocker/dislocker-9999.ebuild 
b/sys-fs/dislocker/dislocker-9999.ebuild
index 73f3b33aa54..90375bf7590 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 inherit cmake flag-o-matic
 
-DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+DESCRIPTION="Read BitLocker encrypted partitions"
 HOMEPAGE="https://github.com/Aorimn/dislocker";
 
 if [[ ${PV} == *9999* ]]; then
@@ -28,8 +29,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
 src_prepare() {
        if use ruby && [[ ${PV} == "0.7.1" ]]; then
                PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
@@ -37,17 +36,17 @@ src_prepare() {
        cmake_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:Werror:Wno-error:g' -i "src/CMakeLists.txt" || die
+       sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die
 
-#      sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+#      sed 's:\.\./man:'../../${P}/man':g' -i "src/CMakeLists.txt" || die
 # Do not process compressed versions of the manuals
-       sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 
\2\\:' -i "${S}/src/CMakeLists.txt" || die
-       sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die
+       sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 
\2\\:' -i "src/CMakeLists.txt" || die
+       sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die
 }
 
 src_configure() {
-       mycmakeargs=(
+       local mycmakeargs=(
                $(cmake_use_find_package ruby Ruby)
        )
        cmake_src_configure
@@ -57,6 +56,6 @@ src_install() {
        if ! use ruby; then
                rm "${S}/man/linux/${PN}-find.1" || die
        fi
-       find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+       find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die
        cmake_src_install
 }