gentoo auto-resync : 20:10:2022 - 07:59:49

4 files changed, 6 insertions, 70 deletions

diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 620a90cd6e5c..efc75b15e08f 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,7 +1,4 @@
-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
-EBUILD dislocker-0.7.1-r3.ebuild 1668 BLAKE2B d409322717e5e4ee21b7d6a5dfd1493281bb49fce85f72c520d155fca17f2dee394179e37be226dbb34039c5de8f92f98bae75c52a315b4d733640b352b97249 SHA512 627b3097f121bc8990eb0fdfb42f225f2beba3ca6b152bf3159e1a87280c8e5e3f1ad6250f8efe7ae9f879b0478fb7064adc57708b1ee7e7c372f8543463b5d6
-EBUILD dislocker-0.7.3.ebuild 1531 BLAKE2B 0b6dc0fe94f551235283852e79a767f0f1ba75d262cae1440b59f683529d19c5bbaeb90f54eef71df91d641dedc7c0f11a45cad420c1f8c4df88d9e100fe6b9c SHA512 a0afe4d31a538b1f4fc1c6e7055cc148ee7bd27864c60e42344fe1e756454a33232402ee3dab5639c299cfb9375e10315ec70fc4ade7791efdb513dc890f6e0a
-EBUILD dislocker-9999.ebuild 1531 BLAKE2B 0b6dc0fe94f551235283852e79a767f0f1ba75d262cae1440b59f683529d19c5bbaeb90f54eef71df91d641dedc7c0f11a45cad420c1f8c4df88d9e100fe6b9c SHA512 a0afe4d31a538b1f4fc1c6e7055cc148ee7bd27864c60e42344fe1e756454a33232402ee3dab5639c299cfb9375e10315ec70fc4ade7791efdb513dc890f6e0a
+EBUILD dislocker-0.7.3.ebuild 1518 BLAKE2B f59415a427abf1d4df5385a2c40ef1176279cde26a50adbdbaa8ec7a5fe8c649249a03daf90de81ee1b2a2c6e109427b0f38d5600e042dbe86e0163864111d11 SHA512 a4d9042c1791712cc708372cf28f3708e1b4dbfbbae2c5858b78241d8cc328013eadfb2e444347c9765b0525187ab1cdfc689c98c4eab4c0b37e164741c6334e
+EBUILD dislocker-9999.ebuild 1518 BLAKE2B f59415a427abf1d4df5385a2c40ef1176279cde26a50adbdbaa8ec7a5fe8c649249a03daf90de81ee1b2a2c6e109427b0f38d5600e042dbe86e0163864111d11 SHA512 a4d9042c1791712cc708372cf28f3708e1b4dbfbbae2c5858b78241d8cc328013eadfb2e444347c9765b0525187ab1cdfc689c98c4eab4c0b37e164741c6334e
 MISC metadata.xml 344 BLAKE2B fee12c30fc5c9d8114cac43943adcb3e8db8b2a978a300c64810c3027f7b9ccc53c4cad9ec8562f7a58618fca5c93f94d0693f65d2b0a3d0987aa2aa8ebc3480 SHA512 65969f086534ddfa44b7c82de50e012d0c2e9453e153d5b693f8e3a4f533149340c4b0ea5caf133b59395bd780641323d7e4f1b63fd0d3cb57355abb46789c24
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
-}
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"