gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-fs/dislocker: clean up ebuild, sync live

Browse Source 
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-05-09 06:28:54 +00:00
parent 26f770afdc
commit 8be9429fa0
2 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sys-fs/dislocker/dislocker-0.7.3.ebuild
View File

@@ -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
}

27
sys-fs/dislocker/dislocker-9999.ebuild
View File

@@ -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
}