[gentoo-commits] repo/gentoo:master commit in: sys-fs/dislocker/

[Andreas Schuerch]

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