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

[Andreas Schuerch]

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>