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

["Alexey Shvetsov" <alexxy@gentoo.org>]

commit:     596207ca6a24358be8bba0121b7b4c35239aa860
Author:     Alexey Shvetsov <alexxy <AT> omrb <DOT> pnpi <DOT> spb <DOT> ru>
AuthorDate: Mon Dec 11 18:31:15 2017 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 18:35:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=596207ca

sys-cluster/lustre: Version bump

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 .../{lustre-9999.ebuild => lustre-2.10.1.ebuild}   | 36 ++++++++++++----------
 sys-cluster/lustre/lustre-9999.ebuild              | 14 +++++----
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-2.10.1.ebuild
similarity index 79%
copy from sys-cluster/lustre/lustre-9999.ebuild
copy to sys-cluster/lustre/lustre-2.10.1.ebuild
index 3cf01dd73..b2b1d1b35 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-2.10.1.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=6
@@ -8,22 +8,24 @@ WANT_AUTOMAKE="1.15"
 WANT_LIBTOOL="latest"
 
 if [[ $PV = *9999* ]]; then
+	scm="git-r3"
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 	KEYWORDS=""
 	EGIT_BRANCH="master"
 else
+	scm=""
+	SRC_URI="https://dev.gentoo.org/~alexxy/distfiles/${P}.tar.gz"
 	KEYWORDS="~amd64"
-	EGIT_COMMIT="${PV}"
 fi
 
 SUPPORTED_KV_MAJOR=4
-SUPPORTED_KV_MINOR=1
+SUPPORTED_KV_MINOR=9
 
-inherit git-r3 autotools linux-info linux-mod toolchain-funcs udev flag-o-matic
+inherit ${scm} autotools linux-info linux-mod toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="Lustre is a parallel distributed file system"
 HOMEPAGE="http://wiki.whamcloud.com/"
-SRC_URI=""
-EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -69,17 +71,19 @@ src_prepare() {
 		epatch ${PATCHES[@]}
 	fi
 	eapply_user
+	if [[ ${PV} == "9999" ]]; then
 	# replace upstream autogen.sh by our src_prepare()
-	local DIRS="libcfs lnet lustre snmp"
-	local ACLOCAL_FLAGS
-	for dir in $DIRS ; do
-		ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/autoconf"
-	done
-	_elibtoolize -q
-	eaclocal -I config $ACLOCAL_FLAGS
-	eautoheader
-	eautomake
-	eautoconf
+		local DIRS="libcfs lnet lustre snmp"
+		local ACLOCAL_FLAGS
+		for dir in $DIRS ; do
+			ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir/autoconf"
+		done
+		_elibtoolize -q
+		eaclocal -I config $ACLOCAL_FLAGS
+		eautoheader
+		eautomake
+		eautoconf
+	fi
 }
 
 src_configure() {

diff --git a/sys-cluster/lustre/lustre-9999.ebuild b/sys-cluster/lustre/lustre-9999.ebuild
index 3cf01dd73..1f17955bb 100644
--- a/sys-cluster/lustre/lustre-9999.ebuild
+++ b/sys-cluster/lustre/lustre-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=6
@@ -8,22 +8,24 @@ WANT_AUTOMAKE="1.15"
 WANT_LIBTOOL="latest"
 
 if [[ $PV = *9999* ]]; then
+	scm="git-r3"
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 	KEYWORDS=""
 	EGIT_BRANCH="master"
 else
+	scm=""
+	SRC_URI="https://dev.gentoo.org/~alexxy/distfiles/${P}.tar.gz"
 	KEYWORDS="~amd64"
-	EGIT_COMMIT="${PV}"
 fi
 
 SUPPORTED_KV_MAJOR=4
-SUPPORTED_KV_MINOR=1
+SUPPORTED_KV_MINOR=9
 
-inherit git-r3 autotools linux-info linux-mod toolchain-funcs udev flag-o-matic
+inherit ${scm} autotools linux-info linux-mod toolchain-funcs udev flag-o-matic
 
 DESCRIPTION="Lustre is a parallel distributed file system"
 HOMEPAGE="http://wiki.whamcloud.com/"
-SRC_URI=""
-EGIT_REPO_URI="git://git.whamcloud.com/fs/lustre-release.git"
 
 LICENSE="GPL-2"
 SLOT="0"