gentoo resync : 28.04.2021

4 files changed, 22 insertions, 75 deletions

diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 3948da5242bb..3761c86300bd 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,6 +1,5 @@
 DIST dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787dae36f5dd01f91cd435dfb9dbcfcb16f0f09cba7e73a3221c8b2f3843d0a68199fb9e38bdb91428fa784442659f7af53ab6d4dd SHA512 70f5a628659ef4645d757b899f3e6310e3a4d2ab89f429748c711177a0944e9b0eabf5341e394ab09216b0fa18e3c2b0832406b27f40c04510df937ffe5f65ef
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
-EBUILD dislocker-0.7.1-r2.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
-EBUILD dislocker-0.7.1-r3.ebuild 1703 BLAKE2B e5b61c9f2073fa2ae4e6b6d8c8e14ba6dd6a6de64f391522adfa216c4f7aa3bea18741c8cdcdd372e59df276b0e8a9b97ef5dd49eb2af8087fcb2f5fa046ceda SHA512 516beb16eadf29cafd5e4792bd4dfcd21b5b49d91faf0f58ce50500b8a945f509d176fe0cd8955afb037c8ef8b8901e66e056fd7dc90325b1a7239cae379a1db
-EBUILD dislocker-9999.ebuild 1703 BLAKE2B e5b61c9f2073fa2ae4e6b6d8c8e14ba6dd6a6de64f391522adfa216c4f7aa3bea18741c8cdcdd372e59df276b0e8a9b97ef5dd49eb2af8087fcb2f5fa046ceda SHA512 516beb16eadf29cafd5e4792bd4dfcd21b5b49d91faf0f58ce50500b8a945f509d176fe0cd8955afb037c8ef8b8901e66e056fd7dc90325b1a7239cae379a1db
+EBUILD dislocker-0.7.1-r3.ebuild 1668 BLAKE2B d409322717e5e4ee21b7d6a5dfd1493281bb49fce85f72c520d155fca17f2dee394179e37be226dbb34039c5de8f92f98bae75c52a315b4d733640b352b97249 SHA512 627b3097f121bc8990eb0fdfb42f225f2beba3ca6b152bf3159e1a87280c8e5e3f1ad6250f8efe7ae9f879b0478fb7064adc57708b1ee7e7c372f8543463b5d6
+EBUILD dislocker-9999.ebuild 1668 BLAKE2B d409322717e5e4ee21b7d6a5dfd1493281bb49fce85f72c520d155fca17f2dee394179e37be226dbb34039c5de8f92f98bae75c52a315b4d733640b352b97249 SHA512 627b3097f121bc8990eb0fdfb42f225f2beba3ca6b152bf3159e1a87280c8e5e3f1ad6250f8efe7ae9f879b0478fb7064adc57708b1ee7e7c372f8543463b5d6
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
deleted file mode 100644
index 08e0e54087af..000000000000
--- a/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index 73f3b33aa545..90375bf7590b 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 73f3b33aa545..90375bf7590b 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
 }