commit:     6163f6ced1479a5038505b6a75560361ccc1da48
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 20:08:50 2016 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 20:08:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6163f6ce

sys-cluster/lustre: Clean up unused options

Package-Manager: portage-2.3.0_rc1

 sys-cluster/lustre/lustre-2.8.0.ebuild | 11 ++++++-----
 sys-cluster/lustre/lustre-9999.ebuild  | 11 ++++++-----
 sys-cluster/lustre/metadata.xml        |  2 --
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys-cluster/lustre/lustre-2.8.0.ebuild 
b/sys-cluster/lustre/lustre-2.8.0.ebuild
index 3f1bc60..4a59000 100644
--- a/sys-cluster/lustre/lustre-2.8.0.ebuild
+++ b/sys-cluster/lustre/lustre-2.8.0.ebuild
@@ -25,12 +25,11 @@ 
EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +utils server liblustre readline tests tcpd +urandom"
+IUSE="client +utils modules server readline tests"
 
 RDEPEND="
        virtual/awk
        readline? ( sys-libs/readline:0 )
-       tcpd? ( sys-apps/tcp-wrappers )
        server? (
                >=sys-kernel/spl-0.6.1
                >=sys-fs/zfs-kmod-0.6.1
@@ -40,6 +39,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
        virtual/linux-sources"
 
+REQUIRED_USE="
+       modules? ( client )
+       modules? ( server )"
+
 pkg_setup() {
        filter-mfpmath sse
        filter-mfpmath i386
@@ -85,11 +88,9 @@ src_configure() {
                --with-linux-release="${KV_FULL}" \
                $(use_enable client) \
                $(use_enable utils) \
+               $(use_enable modules) \
                $(use_enable server) \
-               $(use_enable liblustre) \
                $(use_enable readline) \
-               $(use_enable tcpd libwrap) \
-               $(use_enable urandom) \
                $(use_enable tests)
 }
 

diff --git a/sys-cluster/lustre/lustre-9999.ebuild 
b/sys-cluster/lustre/lustre-9999.ebuild
index 3f1bc60..4a59000 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -25,12 +25,11 @@ 
EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +utils server liblustre readline tests tcpd +urandom"
+IUSE="client +utils modules server readline tests"
 
 RDEPEND="
        virtual/awk
        readline? ( sys-libs/readline:0 )
-       tcpd? ( sys-apps/tcp-wrappers )
        server? (
                >=sys-kernel/spl-0.6.1
                >=sys-fs/zfs-kmod-0.6.1
@@ -40,6 +39,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
        virtual/linux-sources"
 
+REQUIRED_USE="
+       modules? ( client )
+       modules? ( server )"
+
 pkg_setup() {
        filter-mfpmath sse
        filter-mfpmath i386
@@ -85,11 +88,9 @@ src_configure() {
                --with-linux-release="${KV_FULL}" \
                $(use_enable client) \
                $(use_enable utils) \
+               $(use_enable modules) \
                $(use_enable server) \
-               $(use_enable liblustre) \
                $(use_enable readline) \
-               $(use_enable tcpd libwrap) \
-               $(use_enable urandom) \
                $(use_enable tests)
 }
 

diff --git a/sys-cluster/lustre/metadata.xml b/sys-cluster/lustre/metadata.xml
index 0e27fb0..026d877 100644
--- a/sys-cluster/lustre/metadata.xml
+++ b/sys-cluster/lustre/metadata.xml
@@ -12,8 +12,6 @@ Lustre is a parallel distributed file system, generally used 
for large scale clu
     <flag name="client">Enable kernel client modules</flag>
     <flag name="server">Enable kernels server modules</flag>
     <flag name="utils">Enable lustre utils</flag>
-    <flag name="liblustre">Enable building of liblustre</flag>
     <flag name="tests">Enable installation of tests</flag>
-    <flag name="urandom">Enable use of urandom</flag>
   </use>
 </pkgmetadata>

Reply via email to