[gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/

[Alexey Shvetsov]

commit:     7a55cd204b410bd7cb0784a03377655e2901b672
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 12 19:56:32 2016 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 19:56:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a55cd20

sys-cluster/lustre: More fixes

Package-Manager: portage-2.3.0_rc1

 sys-cluster/lustre/lustre-2.8.0.ebuild | 10 ++--------
 sys-cluster/lustre/lustre-9999.ebuild  | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/sys-cluster/lustre/lustre-2.8.0.ebuild 
b/sys-cluster/lustre/lustre-2.8.0.ebuild
index fccf13a..3f1bc60 100644
--- a/sys-cluster/lustre/lustre-2.8.0.ebuild
+++ b/sys-cluster/lustre/lustre-2.8.0.ebuild
@@ -50,9 +50,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-       if [ -z ${PATCHES[@]} ]; then
+       if [ ! -z ${PATCHES[@]} ]; then
                epatch ${PATCHES[@]}
        fi
+       eapply_user
        # replace upstream autogen.sh by our src_prepare()
        local DIRS="libcfs lnet lustre snmp"
        local ACLOCAL_FLAGS
@@ -64,13 +65,6 @@ src_prepare() {
        eautoheader
        eautomake
        eautoconf
-       # now walk in configure dirs
-       einfo "Reconfiguring source in libsysio"
-       cd libsysio
-       eaclocal
-       eautomake
-       eautoconf
-       cd ..
 }
 
 src_configure() {

diff --git a/sys-cluster/lustre/lustre-9999.ebuild 
b/sys-cluster/lustre/lustre-9999.ebuild
index fccf13a..3f1bc60 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-9999.ebuild
@@ -50,9 +50,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-       if [ -z ${PATCHES[@]} ]; then
+       if [ ! -z ${PATCHES[@]} ]; then
                epatch ${PATCHES[@]}
        fi
+       eapply_user
        # replace upstream autogen.sh by our src_prepare()
        local DIRS="libcfs lnet lustre snmp"
        local ACLOCAL_FLAGS
@@ -64,13 +65,6 @@ src_prepare() {
        eautoheader
        eautomake
        eautoconf
-       # now walk in configure dirs
-       einfo "Reconfiguring source in libsysio"
-       cd libsysio
-       eaclocal
-       eautomake
-       eautoconf
-       cd ..
 }
 
 src_configure() {