From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-886958-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 075AB13829C for <garchives@archives.gentoo.org>; Sun, 12 Jun 2016 19:56:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 517F5E0B6D; Sun, 12 Jun 2016 19:56:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E703CE0B6D for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2016 19:56:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA63234097F for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2016 19:56:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCDAB963 for <gentoo-commits@lists.gentoo.org>; Sun, 12 Jun 2016 19:56:41 +0000 (UTC) From: "Alexey Shvetsov" <alexxy@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" <alexxy@gentoo.org> Message-ID: <1465761392.7a55cd204b410bd7cb0784a03377655e2901b672.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/lustre/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/lustre/lustre-2.8.0.ebuild sys-cluster/lustre/lustre-9999.ebuild X-VCS-Directories: sys-cluster/lustre/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 7a55cd204b410bd7cb0784a03377655e2901b672 X-VCS-Branch: master Date: Sun, 12 Jun 2016 19:56:41 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 068e6ad4-8aab-40ad-b6e4-eaecda959011 X-Archives-Hash: 10d7bae92ff519626c494f4793c7f5fc 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() {