From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BAA0A1382C5 for ; Sun, 9 May 2021 06:29:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0DACE0636; Sun, 9 May 2021 06:29:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD129E0636 for ; Sun, 9 May 2021 06:29:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61321340F03 for ; Sun, 9 May 2021 06:29:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA04074F for ; Sun, 9 May 2021 06:29:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620541747.8be9429fa01f4d74af99cec5339ed10d19b188c8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/dislocker/dislocker-0.7.3.ebuild sys-fs/dislocker/dislocker-9999.ebuild X-VCS-Directories: sys-fs/dislocker/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8be9429fa01f4d74af99cec5339ed10d19b188c8 X-VCS-Branch: master Date: Sun, 9 May 2021 06:29:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: adbac72a-ac2d-4762-a654-62424f815780 X-Archives-Hash: 628adcda3fa97e9d5dc90ce343062ccd commit: 8be9429fa01f4d74af99cec5339ed10d19b188c8 Author: Sam James gentoo org> AuthorDate: Sun May 9 06:28:54 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun May 9 06:29:07 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be9429f sys-fs/dislocker: clean up ebuild, sync live Signed-off-by: Sam James gentoo.org> sys-fs/dislocker/dislocker-0.7.3.ebuild | 22 ++++++++++------------ sys-fs/dislocker/dislocker-9999.ebuild | 27 +++++++++++++-------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sys-fs/dislocker/dislocker-0.7.3.ebuild b/sys-fs/dislocker/dislocker-0.7.3.ebuild index f568ccf9b76..59b0eed661e 100644 --- a/sys-fs/dislocker/dislocker-0.7.3.ebuild +++ b/sys-fs/dislocker/dislocker-0.7.3.ebuild @@ -5,15 +5,14 @@ EAPI=7 inherit cmake flag-o-matic -DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions." +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 - https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch" + SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -31,25 +30,23 @@ 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" ) - fi 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 + # 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 -# Do not process compressed versions of the manuals + # Do not process compressed versions of the manuals + #sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die 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 } src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake_use_find_package ruby Ruby) ) + cmake_src_configure } @@ -57,6 +54,7 @@ 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 90375bf7590..59b0eed661e 100644 --- a/sys-fs/dislocker/dislocker-9999.ebuild +++ b/sys-fs/dislocker/dislocker-9999.ebuild @@ -3,18 +3,16 @@ EAPI=7 -CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby" inherit cmake flag-o-matic -DESCRIPTION="Read BitLocker encrypted partitions" +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 - https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch" + SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -29,26 +27,26 @@ 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" ) - fi 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 "src/CMakeLists.txt" || die - sed 's:-D_FORTIFY_SOURCE=2::g' -i "src/CMakeLists.txt" || die + # 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 "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 "src/CMakeLists.txt" || die - sed -r 's:^(.+\.1\.gz):#\1:' -i "src/CMakeLists.txt" || die + # Do not process compressed versions of the manuals + #sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die + 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 } src_configure() { local mycmakeargs=( $(cmake_use_find_package ruby Ruby) ) + cmake_src_configure } @@ -56,6 +54,7 @@ src_install() { if ! use ruby; then rm "${S}/man/linux/${PN}-find.1" || die fi + find "${S}/man/linux" -name '*.1' -exec doman '{}' + || die cmake_src_install }