* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2016-01-22 16:28 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2016-01-22 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 49fa180f34b8030fee0aba86ccadd8b86769a4a1
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 16:27:47 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:27:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49fa180f
sys-fs/dislocker: new ebuild written by me.
Package-Manager: portage-2.2.26
sys-fs/dislocker/dislocker-9999.ebuild | 43 ++++++++++++++++++++++++++++++++++
sys-fs/dislocker/metadata.xml | 15 ++++++++++++
2 files changed, 58 insertions(+)
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
new file mode 100644
index 0000000..53ea3b1
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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="~x86 ~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mbedtls polarssl ruby"
+REQUIRED_USE="|| ( polarssl mbedtls )"
+
+DEPEND="sys-fs/fuse
+ mbedtls? ( net-libs/mbedtls )
+ polarssl? ( net-libs/polarssl )
+ ruby? ( dev-lang/ruby:2.1 )"
+
+RDEPEND="${DEPEND}"
+
+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_install() {
+ find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+ cmake-utils_src_install
+}
diff --git a/sys-fs/dislocker/metadata.xml b/sys-fs/dislocker/metadata.xml
new file mode 100644
index 0000000..403e97f
--- /dev/null
+++ b/sys-fs/dislocker/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>nativemad@gentoo.org</email>
+ <name>Andreas Schuerch</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Aorimn/dislocker</remote-id>
+ </upstream>
+ <use>
+ <flag name="mbedtls">build with mbedtls</flag>
+ <flag name="polarssl">build with polarssl</flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2016-01-22 16:40 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2016-01-22 16:40 UTC (permalink / raw
To: gentoo-commits
commit: 75cba590c51805e3c284852029197ce213f384a6
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 16:39:36 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 16:39:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75cba590
sys-fs/dislocker: wrong ticks used... :-)
Package-Manager: portage-2.2.26
sys-fs/dislocker/dislocker-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 53ea3b1..9822c34 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -31,10 +31,10 @@ RDEPEND="${DEPEND}"
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 "${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
}
src_install() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2016-01-22 17:46 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2016-01-22 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 51990f4ccfc182aabeba2d895f9b508d4e81aaa0
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 17:45:33 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 17:45:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51990f4c
sys-fs/dislocker: some more quoting and escaping...
Package-Manager: portage-2.2.26
sys-fs/dislocker/dislocker-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 9822c34..ba8d583 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -34,7 +34,7 @@ src_prepare() {
# 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
}
src_install() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2016-01-25 20:05 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2016-01-25 20:05 UTC (permalink / raw
To: gentoo-commits
commit: bbd6778c05a11a1388c446ab30eb322968613696
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 20:03:45 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 20:04:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd6778c
sys-fs/dislocker: treat deps correctly
Package-Manager: portage-2.2.26
sys-fs/dislocker/dislocker-9999.ebuild | 13 +++++++++----
sys-fs/dislocker/metadata.xml | 4 ----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index ba8d583..e4497f2 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -19,12 +19,10 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="mbedtls polarssl ruby"
-REQUIRED_USE="|| ( polarssl mbedtls )"
+IUSE="ruby"
DEPEND="sys-fs/fuse
- mbedtls? ( net-libs/mbedtls )
- polarssl? ( net-libs/polarssl )
+ || ( net-libs/polarssl net-libs/mbedtls )
ruby? ( dev-lang/ruby:2.1 )"
RDEPEND="${DEPEND}"
@@ -37,6 +35,13 @@ src_prepare() {
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/metadata.xml b/sys-fs/dislocker/metadata.xml
index 71c868d..9cc8287 100644
--- a/sys-fs/dislocker/metadata.xml
+++ b/sys-fs/dislocker/metadata.xml
@@ -8,8 +8,4 @@
<upstream>
<remote-id type="github">Aorimn/dislocker</remote-id>
</upstream>
- <use>
- <flag name="mbedtls">build with mbedtls</flag>
- <flag name="polarssl">build with polarssl</flag>
- </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2016-01-26 9:15 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2016-01-26 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 5c490a2ad6a04f23c818b3abd6f23069940367e4
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 09:11:05 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 09:14:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c490a2a
sys-fs/dislocker: version bump to 0.5.2
Package-Manager: portage-2.2.26
sys-fs/dislocker/Manifest | 1 +
sys-fs/dislocker/dislocker-0.5.2.ebuild | 48 +++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
new file mode 100644
index 0000000..ffe4d7b
--- /dev/null
+++ b/sys-fs/dislocker/Manifest
@@ -0,0 +1 @@
+DIST dislocker-0.5.2.tar.gz 97928 SHA256 469a6a623c9477399c2b9ca5116724c03df4ce1889bbcfe3d5f57956b15c0643 SHA512 023145313417befa2b3b26ce158cce3b356e9533d2fb8ad8576e63a0b1e07b78de3a68d86999ab26984aac4f634bef13310cd5c4954bc994971a9e64c5508e61 WHIRLPOOL 751a49343e0dd53f0ae3e6424dba39a43e7780bddbebc39192ed1f6f09b351352aba253ac858aaff0db6fbdf1cdf8c28fb9f6511d38b9ccbeceee61c4412e43d
diff --git a/sys-fs/dislocker/dislocker-0.5.2.ebuild b/sys-fs/dislocker/dislocker-0.5.2.ebuild
new file mode 100644
index 0000000..e4497f2
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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="~x86 ~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ruby"
+
+DEPEND="sys-fs/fuse
+ || ( net-libs/polarssl net-libs/mbedtls )
+ ruby? ( dev-lang/ruby:2.1 )"
+
+RDEPEND="${DEPEND}"
+
+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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2016-04-15 12:57 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2016-04-15 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 836791a9f3ebbbe071cb96aa57c17661f85ba95a
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 12:55:50 2016 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 12:55:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836791a9
sys-fs/dislocker: version bump
Package-Manager: portage-2.2.26
sys-fs/dislocker/Manifest | 1 +
sys-fs/dislocker/dislocker-0.6.1.ebuild | 48 +++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index ffe4d7b..20bd7bc 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1 +1,2 @@
DIST dislocker-0.5.2.tar.gz 97928 SHA256 469a6a623c9477399c2b9ca5116724c03df4ce1889bbcfe3d5f57956b15c0643 SHA512 023145313417befa2b3b26ce158cce3b356e9533d2fb8ad8576e63a0b1e07b78de3a68d86999ab26984aac4f634bef13310cd5c4954bc994971a9e64c5508e61 WHIRLPOOL 751a49343e0dd53f0ae3e6424dba39a43e7780bddbebc39192ed1f6f09b351352aba253ac858aaff0db6fbdf1cdf8c28fb9f6511d38b9ccbeceee61c4412e43d
+DIST dislocker-0.6.1.tar.gz 99867 SHA256 e125e3b23d6c1cc2ee2b01958dceaaa15a28ae5616a7cb38b973c5befdb16ead SHA512 92c091d660219e1f65d734ed988e77242abedf2a503a976b050f129f208a1ba88edaf06c6028cd456d5ed9ce7c4ed54064e4e81d37d46915893a2df9d7cb65b9 WHIRLPOOL f14a2b9c101f7ad00445ced88920402519fd8cd5df759397de0c81a892535804d72e765cedf4050cd2ad6f4568e1536dc5f6faeeca353d610848b78dcc7f8e6d
diff --git a/sys-fs/dislocker/dislocker-0.6.1.ebuild b/sys-fs/dislocker/dislocker-0.6.1.ebuild
new file mode 100644
index 0000000..e4497f2
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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="~x86 ~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ruby"
+
+DEPEND="sys-fs/fuse
+ || ( net-libs/polarssl net-libs/mbedtls )
+ ruby? ( dev-lang/ruby:2.1 )"
+
+RDEPEND="${DEPEND}"
+
+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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2017-02-14 16:12 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2017-02-14 16:12 UTC (permalink / raw
To: gentoo-commits
commit: e53bf744754d3c120d96c6d123dfd754fde476f0
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 16:11:45 2017 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 16:11:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e53bf744
sys-fs/dislocker: bump to 0.7.1
Package-Manager: portage-2.3.3
sys-fs/dislocker/Manifest | 1 +
sys-fs/dislocker/dislocker-0.7.1.ebuild | 48 +++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 20bd7bc84a..d2cffaab25 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,2 +1,3 @@
DIST dislocker-0.5.2.tar.gz 97928 SHA256 469a6a623c9477399c2b9ca5116724c03df4ce1889bbcfe3d5f57956b15c0643 SHA512 023145313417befa2b3b26ce158cce3b356e9533d2fb8ad8576e63a0b1e07b78de3a68d86999ab26984aac4f634bef13310cd5c4954bc994971a9e64c5508e61 WHIRLPOOL 751a49343e0dd53f0ae3e6424dba39a43e7780bddbebc39192ed1f6f09b351352aba253ac858aaff0db6fbdf1cdf8c28fb9f6511d38b9ccbeceee61c4412e43d
DIST dislocker-0.6.1.tar.gz 99867 SHA256 e125e3b23d6c1cc2ee2b01958dceaaa15a28ae5616a7cb38b973c5befdb16ead SHA512 92c091d660219e1f65d734ed988e77242abedf2a503a976b050f129f208a1ba88edaf06c6028cd456d5ed9ce7c4ed54064e4e81d37d46915893a2df9d7cb65b9 WHIRLPOOL f14a2b9c101f7ad00445ced88920402519fd8cd5df759397de0c81a892535804d72e765cedf4050cd2ad6f4568e1536dc5f6faeeca353d610848b78dcc7f8e6d
+DIST dislocker-0.7.1.tar.gz 103194 SHA256 742fb5c1b3ff540368ced54c29eae8b488ae5a5fcaca092947e17c2d358a6762 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226 WHIRLPOOL 1f8b8769cac08be4df70c953f967c8408d44b34ebc8e7b0b09e400b827e01234b467990ca0f2cee80518cdea63fbf40cadc75faf4caacd723226a27ee6978fe6
diff --git a/sys-fs/dislocker/dislocker-0.7.1.ebuild b/sys-fs/dislocker/dislocker-0.7.1.ebuild
new file mode 100644
index 0000000000..44478c6659
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.7.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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="~x86 ~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ruby"
+
+DEPEND="sys-fs/fuse
+ || ( net-libs/polarssl net-libs/mbedtls )
+ ruby? ( dev-lang/ruby:2.1 )"
+
+RDEPEND="${DEPEND}"
+
+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
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2017-08-14 7:59 Andreas Schuerch
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Schuerch @ 2017-08-14 7:59 UTC (permalink / raw
To: gentoo-commits
commit: 9e23b72f99ee1a49e72cbd4f08857da8248fc6be
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 07:57:34 2017 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 07:57:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e23b72f
sys-fs/dislocker: remove old versions, remove polarssl #618364 and newer ruby #627148
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sys-fs/dislocker/Manifest | 2 -
sys-fs/dislocker/dislocker-0.5.2.ebuild | 47 ----------------------
sys-fs/dislocker/dislocker-0.6.1.ebuild | 47 ----------------------
...cker-0.7.1.ebuild => dislocker-0.7.1-r1.ebuild} | 6 +--
sys-fs/dislocker/dislocker-9999.ebuild | 8 ++--
5 files changed, 7 insertions(+), 103 deletions(-)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index d2cffaab25f..8daf9c55b2e 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,3 +1 @@
-DIST dislocker-0.5.2.tar.gz 97928 SHA256 469a6a623c9477399c2b9ca5116724c03df4ce1889bbcfe3d5f57956b15c0643 SHA512 023145313417befa2b3b26ce158cce3b356e9533d2fb8ad8576e63a0b1e07b78de3a68d86999ab26984aac4f634bef13310cd5c4954bc994971a9e64c5508e61 WHIRLPOOL 751a49343e0dd53f0ae3e6424dba39a43e7780bddbebc39192ed1f6f09b351352aba253ac858aaff0db6fbdf1cdf8c28fb9f6511d38b9ccbeceee61c4412e43d
-DIST dislocker-0.6.1.tar.gz 99867 SHA256 e125e3b23d6c1cc2ee2b01958dceaaa15a28ae5616a7cb38b973c5befdb16ead SHA512 92c091d660219e1f65d734ed988e77242abedf2a503a976b050f129f208a1ba88edaf06c6028cd456d5ed9ce7c4ed54064e4e81d37d46915893a2df9d7cb65b9 WHIRLPOOL f14a2b9c101f7ad00445ced88920402519fd8cd5df759397de0c81a892535804d72e765cedf4050cd2ad6f4568e1536dc5f6faeeca353d610848b78dcc7f8e6d
DIST dislocker-0.7.1.tar.gz 103194 SHA256 742fb5c1b3ff540368ced54c29eae8b488ae5a5fcaca092947e17c2d358a6762 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226 WHIRLPOOL 1f8b8769cac08be4df70c953f967c8408d44b34ebc8e7b0b09e400b827e01234b467990ca0f2cee80518cdea63fbf40cadc75faf4caacd723226a27ee6978fe6
diff --git a/sys-fs/dislocker/dislocker-0.5.2.ebuild b/sys-fs/dislocker/dislocker-0.5.2.ebuild
deleted file mode 100644
index 63aed83a9a9..00000000000
--- a/sys-fs/dislocker/dislocker-0.5.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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="~x86 ~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ruby"
-
-DEPEND="sys-fs/fuse
- || ( net-libs/polarssl net-libs/mbedtls )
- ruby? ( dev-lang/ruby:2.1 )"
-
-RDEPEND="${DEPEND}"
-
-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.6.1.ebuild b/sys-fs/dislocker/dislocker-0.6.1.ebuild
deleted file mode 100644
index 63aed83a9a9..00000000000
--- a/sys-fs/dislocker/dislocker-0.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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="~x86 ~amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ruby"
-
-DEPEND="sys-fs/fuse
- || ( net-libs/polarssl net-libs/mbedtls )
- ruby? ( dev-lang/ruby:2.1 )"
-
-RDEPEND="${DEPEND}"
-
-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.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
similarity index 92%
rename from sys-fs/dislocker/dislocker-0.7.1.ebuild
rename to sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index 78af63635c3..f0bc602be4d 100644
--- a/sys-fs/dislocker/dislocker-0.7.1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -20,9 +20,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="ruby"
-DEPEND="sys-fs/fuse
- || ( net-libs/polarssl net-libs/mbedtls )
- ruby? ( dev-lang/ruby:2.1 )"
+DEPEND="sys-fs/fuse:*
+ net-libs/mbedtls
+ ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) )"
RDEPEND="${DEPEND}"
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 63aed83a9a9..f0bc602be4d 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,9 +20,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="ruby"
-DEPEND="sys-fs/fuse
- || ( net-libs/polarssl net-libs/mbedtls )
- ruby? ( dev-lang/ruby:2.1 )"
+DEPEND="sys-fs/fuse:*
+ net-libs/mbedtls
+ ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2017-10-16 3:34 David Seifert
0 siblings, 0 replies; 20+ messages in thread
From: David Seifert @ 2017-10-16 3:34 UTC (permalink / raw
To: gentoo-commits
commit: bbca9cf1203daa34e0814c8299d51a84fa70ba54
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 03:25:45 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 03:25:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbca9cf1
sys-fs/dislocker: [QA] Add cmake-utils_src_prepare
Package-Manager: Portage-2.3.11, Repoman-2.3.3
sys-fs/dislocker/dislocker-0.7.1-r1.ebuild | 2 ++
sys-fs/dislocker/dislocker-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index f0bc602be4d..7c81c7f8a1c 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -27,6 +27,8 @@ DEPEND="sys-fs/fuse:*
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
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index f0bc602be4d..7c81c7f8a1c 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -27,6 +27,8 @@ DEPEND="sys-fs/fuse:*
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
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2018-08-26 20:35 Michał Górny
0 siblings, 0 replies; 20+ messages in thread
From: Michał Górny @ 2018-08-26 20:35 UTC (permalink / raw
To: gentoo-commits
commit: ad8805c7d0a19ca8876c2566e7e57e121d4fedc5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 20:18:43 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 20:34:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad8805c7
sys-fs/dislocker: Remove support for non-existent deps
sys-fs/dislocker/dislocker-0.7.1-r1.ebuild | 2 +-
sys-fs/dislocker/dislocker-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index 7c81c7f8a1c..6c245bbb7f6 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="ruby"
DEPEND="sys-fs/fuse:*
net-libs/mbedtls
- ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) )"
+ ruby? ( dev-lang/ruby:2.3 )"
RDEPEND="${DEPEND}"
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 7c81c7f8a1c..6c245bbb7f6 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -22,7 +22,7 @@ IUSE="ruby"
DEPEND="sys-fs/fuse:*
net-libs/mbedtls
- ruby? ( || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 ) )"
+ ruby? ( dev-lang/ruby:2.3 )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2019-04-08 17:43 Hans de Graaff
0 siblings, 0 replies; 20+ messages in thread
From: Hans de Graaff @ 2019-04-08 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 94ca9d421fa9e07efcb476916f5b938295d57160
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 17:37:56 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 17:42:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ca9d42
sys-fs/dislocker: use ruby24
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
sys-fs/dislocker/dislocker-0.7.1-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index 6c245bbb7f6..e0008c69780 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,7 +22,7 @@ IUSE="ruby"
DEPEND="sys-fs/fuse:*
net-libs/mbedtls
- ruby? ( dev-lang/ruby:2.3 )"
+ ruby? ( dev-lang/ruby:2.4 )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2019-07-15 15:28 Michał Górny
0 siblings, 0 replies; 20+ messages in thread
From: Michał Górny @ 2019-07-15 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 66fee29466f9b91ae64ff811e3d632628fd23384
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 15:26:53 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 15:26:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66fee294
sys-fs/dislocker: Sort KEYWORDS
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-fs/dislocker/dislocker-0.7.1-r1.ebuild | 2 +-
sys-fs/dislocker/dislocker-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index e0008c69780..5fa3c3fa942 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 6c245bbb7f6..c92236b7a12 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2019-11-18 20:49 Tim Harder
0 siblings, 0 replies; 20+ messages in thread
From: Tim Harder @ 2019-11-18 20:49 UTC (permalink / raw
To: gentoo-commits
commit: be15458353e3a959eb0c2d237a47aa5cb6c4fe66
Author: David Heidelberg <david <AT> ixit <DOT> cz>
AuthorDate: Tue Oct 8 14:37:18 2019 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 20:48:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be154583
sys-fs/dislocker: revbump to EAPI 7 & fixed fuse dep
Closes: https://github.com/gentoo/gentoo/pull/13212
Closes: https://bugs.gentoo.org/673666
Signed-off-by: David Heidelberg <david <AT> ixit.cz>
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
...{dislocker-0.7.1-r1.ebuild => dislocker-0.7.1-r2.ebuild} | 13 +++++++------
sys-fs/dislocker/dislocker-9999.ebuild | 13 +++++++------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
similarity index 90%
rename from sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
rename to sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
index 5fa3c3fa942..08e0e54087a 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
HOMEPAGE="https://github.com/Aorimn/dislocker"
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="ruby"
-DEPEND="sys-fs/fuse:*
- net-libs/mbedtls
- ruby? ( dev-lang/ruby:2.4 )"
-
+DEPEND="
+ sys-fs/fuse:0=
+ net-libs/mbedtls:0=
+ ruby? ( dev-lang/ruby:* )
+"
RDEPEND="${DEPEND}"
src_prepare() {
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index c92236b7a12..08e0e54087a 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
HOMEPAGE="https://github.com/Aorimn/dislocker"
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="ruby"
-DEPEND="sys-fs/fuse:*
- net-libs/mbedtls
- ruby? ( dev-lang/ruby:2.3 )"
-
+DEPEND="
+ sys-fs/fuse:0=
+ net-libs/mbedtls:0=
+ ruby? ( dev-lang/ruby:* )
+"
RDEPEND="${DEPEND}"
src_prepare() {
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2021-04-17 11:41 Andreas Sturmlechner
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2021-04-17 11:41 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2021-04-17 11:41 Andreas Sturmlechner
0 siblings, 0 replies; 20+ messages in thread
From: Andreas Sturmlechner @ 2021-04-17 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 3d68d66d417b3d1d265ef66ac9b0089458d8ed3c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 12:33:36 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=3d68d66d
sys-fs/dislocker: Drop 0.7.1-r2, cmake-utils--
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-r2.ebuild | 50 ------------------------------
1 file changed, 50 deletions(-)
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 08e0e54087a..00000000000
--- 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
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2021-05-09 6:29 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-05-09 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 8be9429fa01f4d74af99cec5339ed10d19b188c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 9 06:28:54 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2021-05-09 6:29 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-05-09 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 26f770afdc68a089f56006f107eb97a0cde7b02f
Author: Marco Leogrande <dark.knight.ita <AT> gmail <DOT> com>
AuthorDate: Sun Mar 28 01:21:25 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 9 06:29:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f770af
sys-fs/dislocker: bump to version 0.7.3
This version includes a fix to prevent dislocker from segfaulting when
reading bitlocker-encrypted partitions created by recent versions of
Windows 10: https://github.com/Aorimn/dislocker/issues/185
Closes: https://bugs.gentoo.org/766540
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Marco Leogrande <dark.knight.ita <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20157
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/dislocker/Manifest | 1 +
sys-fs/dislocker/dislocker-0.7.3.ebuild | 62 +++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 40ff38a7b8f..f50b11e8fd1 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,2 +1,3 @@
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
+DIST dislocker-0.7.3.tar.gz 111257 BLAKE2B ba8403facfef04f5194a22421d2010d472b073d6dce03c9f457d7661de11bb818782cc66bfee8cd88fe72af7ac127bbbcbe1a01c5c35f0cf054f282b3208c3ea SHA512 c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff
diff --git a/sys-fs/dislocker/dislocker-0.7.3.ebuild b/sys-fs/dislocker/dislocker-0.7.3.ebuild
new file mode 100644
index 00000000000..f568ccf9b76
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.7.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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
+ https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch"
+ 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}"
+
+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
+ 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
+ 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_use_find_package ruby Ruby)
+ )
+ 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_src_install
+}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2021-10-04 0:28 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2021-10-04 0:28 UTC (permalink / raw
To: gentoo-commits
commit: 0555f2950397a343572a66890215f7d351357358
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 4 00:28:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 00:28:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0555f295
sys-fs/dislocker: fix CMake MisplacedEclassVar
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/dislocker/dislocker-0.7.3.ebuild | 3 +--
sys-fs/dislocker/dislocker-9999.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-0.7.3.ebuild b/sys-fs/dislocker/dislocker-0.7.3.ebuild
index 59b0eed661e..645e524dff4 100644
--- a/sys-fs/dislocker/dislocker-0.7.3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.3.ebuild
@@ -3,6 +3,7 @@
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"
@@ -27,8 +28,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
src_prepare() {
cmake_src_prepare
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 59b0eed661e..645e524dff4 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -3,6 +3,7 @@
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"
@@ -27,8 +28,6 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
-
src_prepare() {
cmake_src_prepare
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2022-10-20 4:16 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-10-20 4:16 UTC (permalink / raw
To: gentoo-commits
commit: 225447bde4ec6b85f6ff426f72ed487b32b68e1b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 04:06:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:16:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225447bd
sys-fs/dislocker: drop 0.7.1-r3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/dislocker/Manifest | 2 -
sys-fs/dislocker/dislocker-0.7.1-r3.ebuild | 61 ------------------------------
2 files changed, 63 deletions(-)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index f50b11e8fd11..a1a495a1eb9d 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,3 +1 @@
-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
DIST dislocker-0.7.3.tar.gz 111257 BLAKE2B ba8403facfef04f5194a22421d2010d472b073d6dce03c9f457d7661de11bb818782cc66bfee8cd88fe72af7ac127bbbcbe1a01c5c35f0cf054f282b3208c3ea SHA512 c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
deleted file mode 100644
index 90375bf7590b..000000000000
--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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="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"
- 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() {
- 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
-
-# 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
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package ruby Ruby)
- )
- 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 '{}' + || die
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/
@ 2022-10-20 4:16 Sam James
0 siblings, 0 replies; 20+ messages in thread
From: Sam James @ 2022-10-20 4:16 UTC (permalink / raw
To: gentoo-commits
commit: 74bbc5b10a87ee07003821f48c3184323adb2998
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 04:06:57 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 04:16:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74bbc5b1
sys-fs/dislocker: fix unused eclass (flag-o-matic)
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/dislocker/dislocker-0.7.3.ebuild | 4 ++--
sys-fs/dislocker/dislocker-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-fs/dislocker/dislocker-0.7.3.ebuild b/sys-fs/dislocker/dislocker-0.7.3.ebuild
index 645e524dff46..16d0907613c8 100644
--- a/sys-fs/dislocker/dislocker-0.7.3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
+inherit cmake
DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions"
HOMEPAGE="https://github.com/Aorimn/dislocker"
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 645e524dff46..16d0907613c8 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
+inherit cmake
DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions"
HOMEPAGE="https://github.com/Aorimn/dislocker"
^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2022-10-20 4:16 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-09 6:29 [gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-10-20 4:16 Sam James
2022-10-20 4:16 Sam James
2021-10-04 0:28 Sam James
2021-05-09 6:29 Sam James
2021-04-17 11:41 Andreas Sturmlechner
2021-04-17 11:41 Andreas Sturmlechner
2019-11-18 20:49 Tim Harder
2019-07-15 15:28 Michał Górny
2019-04-08 17:43 Hans de Graaff
2018-08-26 20:35 Michał Górny
2017-10-16 3:34 David Seifert
2017-08-14 7:59 Andreas Schuerch
2017-02-14 16:12 Andreas Schuerch
2016-04-15 12:57 Andreas Schuerch
2016-01-26 9:15 Andreas Schuerch
2016-01-25 20:05 Andreas Schuerch
2016-01-22 17:46 Andreas Schuerch
2016-01-22 16:40 Andreas Schuerch
2016-01-22 16:28 Andreas Schuerch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox