[gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/files/, sys-fs/dislocker/
commit: 8abbcea6c078df83ec27638f56e14bb46192b0b4
Author: Joonas Niilola gentoo org>
AuthorDate: Sun Nov 15 13:41:54 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Nov 15 15:31:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8abbcea6
sys-fs/dislocker: fix SizeViolation issue
Closes: https://bugs.gentoo.org/748222
Signed-off-by: Joonas Niilola gentoo.org>
sys-fs/dislocker/Manifest | 1 +
sys-fs/dislocker/dislocker-0.7.1-r3.ebuild | 5 +-
sys-fs/dislocker/dislocker-.ebuild | 5 +-
.../files/dislocker-0.7.1-fix-find-ruby.patch | 671 -
4 files changed, 7 insertions(+), 675 deletions(-)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 5765522a20e..40ff38a7b8f 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1 +1,2 @@
+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
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index a15c39558dd..73f3b33aa54 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == ** ]]; 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"
+ 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";
KEYWORDS="~amd64 ~x86"
fi
@@ -31,7 +32,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST}
FindRuby"
src_prepare() {
if use ruby && [[ ${PV} == "0.7.1" ]]; then
- PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+ PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
fi
cmake_src_prepare
diff --git a/sys-fs/dislocker/dislocker-.ebuild
b/sys-fs/dislocker/dislocker-.ebuild
index a15c39558dd..73f3b33aa54 100644
--- a/sys-fs/dislocker/dislocker-.ebuild
+++ b/sys-fs/dislocker/dislocker-.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == ** ]]; 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"
+ 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";
KEYWORDS="~amd64 ~x86"
fi
@@ -31,7 +32,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST}
FindRuby"
src_prepare() {
if use ruby && [[ ${PV} == "0.7.1" ]]; then
- PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+ PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
fi
cmake_src_prepare
diff --git a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
b/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
deleted file mode 100644
index b5659f062cc..000
--- a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
+++ /dev/null
@@ -1,671 +0,0 @@
-diff -Nuar a/cmake/FindPackageHandleStandardArgs.cmake
b/cmake/FindPackageHandleStandardArgs.cmake
a/cmake/FindPackageHandleStandardArgs.cmake1970-01-01
01:00:00.0 +0100
-+++ b/cmake/FindPackageHandleStandardArgs.cmake2020-03-04
11:38:51.062021412 +0100
-@@ -0,0 +1,258 @@
-+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
-+
-+# internal helper macro
-+macro(_FPHSA_FAILURE_MESSAGE _msg)
-+ if (${_NAME}_FIND_REQUIRED)
-+message(FATAL_ERROR "${_msg}")
-+ else ()
-+if (NOT ${_NAME}_FIND_QUIETLY)
-+ message(STATUS "${_msg}")
-+endif ()
-+ endif ()
-+endmacro()
-+
-+
-+# internal helper macro to generate the failure message when used in
CONFIG_MODE:
-+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-+ # _CONFIG is set, but FOUND is false, this means that some
other of the REQUIRED_VARS was not found:
-+ if(${_NAME}_CONFIG)
-+_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS}
(found
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/files/, sys-fs/dislocker/
commit: 4f2c7c42c3b24c86fcb599e0f2933d2ab7a64245
Author: Andreas Schuerch gentoo org>
AuthorDate: Mon Jul 27 14:49:08 2020 +
Commit: Andreas Schuerch gentoo org>
CommitDate: Mon Jul 27 14:50:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f2c7c42
sys-fs/dislocker: various fixes, bug 700784 & 732204
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Schuerch gentoo.org>
...ocker-.ebuild => dislocker-0.7.1-r3.ebuild} | 25 +-
sys-fs/dislocker/dislocker-.ebuild | 25 +-
.../files/dislocker-0.7.1-fix-find-ruby.patch | 671 +
3 files changed, 707 insertions(+), 14 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-.ebuild
b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
similarity index 56%
copy from sys-fs/dislocker/dislocker-.ebuild
copy to sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index 08e0e54087a..a15c39558dd 100644
--- a/sys-fs/dislocker/dislocker-.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
HOMEPAGE="https://github.com/Aorimn/dislocker";
@@ -27,24 +27,35 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
+
src_prepare() {
- cmake-utils_src_prepare
+ if use ruby && [[ ${PV} == "0.7.1" ]]; then
+ PATCHES=( "${FILESDIR}/${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
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
+# sed 's:\.\./man:'../../${P}/man':g' -i "${S}/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
}
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_find_package ruby Ruby)
+ $(cmake_use_find_package ruby Ruby)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
+ if ! use ruby; then
+ rm "${S}/man/linux/${PN}-find.1" || die
+ fi
find "${S}/man/linux" -name '*.1' -exec doman '{}' +
- cmake-utils_src_install
+ cmake_src_install
}
diff --git a/sys-fs/dislocker/dislocker-.ebuild
b/sys-fs/dislocker/dislocker-.ebuild
index 08e0e54087a..a15c39558dd 100644
--- a/sys-fs/dislocker/dislocker-.ebuild
+++ b/sys-fs/dislocker/dislocker-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
HOMEPAGE="https://github.com/Aorimn/dislocker";
@@ -27,24 +27,35 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
+
src_prepare() {
- cmake-utils_src_prepare
+ if use ruby && [[ ${PV} == "0.7.1" ]]; then
+ PATCHES=( "${FILESDIR}/${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
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
+# sed 's:\.\./man:'../../${P}/man':g' -i "${S}/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
}
src_configure() {
mycmakeargs=(
- $(cmake-utils_use_find_package ruby Ruby)
+ $(cmake_use_find_package ruby Ruby)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
+ if ! use ruby; then
+ rm "${S}/man/linux/${PN}-find.1" || die
+ fi
find "${S}/man/linux" -name '*.1' -exec doman '{}' +
- cmake-utils_src_install
+ cmake_src_install
}
diff --git a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
b/sys-fs/dislocker/files/d
