From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63F4E138334 for ; Sun, 21 Apr 2019 10:16:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25DDBE0893; Sun, 21 Apr 2019 10:16:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF01EE0893 for ; Sun, 21 Apr 2019 10:16:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13E8E341BBC for ; Sun, 21 Apr 2019 10:16:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 818795BD for ; Sun, 21 Apr 2019 10:16:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1555841772.f81f95471c25e346bac4c489a058af14f4e9b68e.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/thin-provisioning-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild X-VCS-Directories: sys-block/thin-provisioning-tools/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: f81f95471c25e346bac4c489a058af14f4e9b68e X-VCS-Branch: master Date: Sun, 21 Apr 2019 10:16:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3bde8a89-ee68-4152-a667-3f155075eb0d X-Archives-Hash: 1ccadbd26f0732a295ba8af632c17f0b commit: f81f95471c25e346bac4c489a058af14f4e9b68e Author: Lars Wendler gentoo org> AuthorDate: Sun Apr 21 10:10:16 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Apr 21 10:16:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81f9547 sys-block/thin-provisioning-tools: Improved live ebuild. Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> .../thin-provisioning-tools-9999.ebuild | 31 ++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild index 96d1cf0b494..8b0eb97b216 100644 --- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild +++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-9999.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git' -inherit autotools flag-o-matic $SCM +inherit autotools flag-o-matic DESCRIPTION="A suite of tools for thin provisioning on Linux" HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" @@ -13,6 +11,9 @@ HOMEPAGE="https://github.com/jthornber/thin-provisioning-tools" if [[ ${PV} != *9999 ]]; then SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +else + inherit git-r3 + EGIT_REPO_URI='https://github.com/jthornber/thin-provisioning-tools.git' fi LICENSE="GPL-3" @@ -25,14 +26,20 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) test? ( - || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) + || ( + dev-lang/ruby:2.6 + dev-lang/ruby:2.5 + dev-lang/ruby:2.4 + ) >=dev-cpp/gtest-1.8.0 dev-util/cucumber dev-util/aruba ) dev-libs/boost" -PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch +) src_prepare() { default @@ -41,11 +48,13 @@ src_prepare() { src_configure() { use static && append-ldflags -static - STRIP=true econf \ - --prefix="${EPREFIX}"/ \ - --bindir="${EPREFIX}"/sbin \ - --with-optimisation='' \ + local myeconfargs=( + --prefix="${EPREFIX}"/ + --bindir="${EPREFIX}"/sbin + --with-optimisation='' $(use_enable test testing) + ) + STRIP=true econf "${myeconfargs[@]}" } src_compile() { @@ -58,6 +67,6 @@ src_test() { } src_install() { - emake DESTDIR="${D}" DATADIR="${ED%/}/usr/share" install + emake DESTDIR="${D}" DATADIR="${D%/}/usr/share" install dodoc README.md TODO.org }