| 1 |
commit: f81f95471c25e346bac4c489a058af14f4e9b68e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 21 10:10:16 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 21 10:16:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81f9547 |
| 7 |
|
| 8 |
sys-block/thin-provisioning-tools: Improved live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../thin-provisioning-tools-9999.ebuild | 31 ++++++++++++++-------- |
| 14 |
1 file changed, 20 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild |
| 17 |
index 96d1cf0b494..8b0eb97b216 100644 |
| 18 |
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild |
| 19 |
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild |
| 20 |
@@ -1,11 +1,9 @@ |
| 21 |
-# Copyright 1999-2018 Gentoo Foundation |
| 22 |
+# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
|
| 27 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 28 |
-EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git' |
| 29 |
-inherit autotools flag-o-matic $SCM |
| 30 |
+inherit autotools flag-o-matic |
| 31 |
|
| 32 |
DESCRIPTION="A suite of tools for thin provisioning on Linux" |
| 33 |
HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" |
| 34 |
@@ -13,6 +11,9 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" |
| 35 |
if [[ ${PV} != *9999 ]]; then |
| 36 |
SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 37 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 38 |
+else |
| 39 |
+ inherit git-r3 |
| 40 |
+ EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git' |
| 41 |
fi |
| 42 |
|
| 43 |
LICENSE="GPL-3" |
| 44 |
@@ -25,14 +26,20 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
static? ( ${LIB_DEPEND} ) |
| 47 |
test? ( |
| 48 |
- || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) |
| 49 |
+ || ( |
| 50 |
+ dev-lang/ruby:2.6 |
| 51 |
+ dev-lang/ruby:2.5 |
| 52 |
+ dev-lang/ruby:2.4 |
| 53 |
+ ) |
| 54 |
>=dev-cpp/gtest-1.8.0 |
| 55 |
dev-util/cucumber |
| 56 |
dev-util/aruba |
| 57 |
) |
| 58 |
dev-libs/boost" |
| 59 |
|
| 60 |
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch ) |
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch |
| 63 |
+) |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
default |
| 67 |
@@ -41,11 +48,13 @@ src_prepare() { |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
use static && append-ldflags -static |
| 71 |
- STRIP=true econf \ |
| 72 |
- --prefix="${EPREFIX}"/ \ |
| 73 |
- --bindir="${EPREFIX}"/sbin \ |
| 74 |
- --with-optimisation='' \ |
| 75 |
+ local myeconfargs=( |
| 76 |
+ --prefix="${EPREFIX}"/ |
| 77 |
+ --bindir="${EPREFIX}"/sbin |
| 78 |
+ --with-optimisation='' |
| 79 |
$(use_enable test testing) |
| 80 |
+ ) |
| 81 |
+ STRIP=true econf "${myeconfargs[@]}" |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
@@ -58,6 +67,6 @@ src_test() { |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
| 89 |
- emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install |
| 90 |
+ emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install |
| 91 |
dodoc README.md TODO.org |
| 92 |
} |
Archives