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 2396E1396D0 for ; Mon, 9 Oct 2017 19:04:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75CA8E0C11; Mon, 9 Oct 2017 19:04:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 48066E0C11 for ; Mon, 9 Oct 2017 19:04:28 +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 44A3533BF24 for ; Mon, 9 Oct 2017 19:04:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FAB8907B for ; Mon, 9 Oct 2017 19:04:25 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1507575857.fdaaded8f81ad0821ae1e53ebe9e25698cb17a3b.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/btrfs-progs-4.13.2.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild sys-fs/btrfs-progs/metadata.xml X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: fdaaded8f81ad0821ae1e53ebe9e25698cb17a3b X-VCS-Branch: master Date: Mon, 9 Oct 2017 19:04:25 +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-Archives-Salt: bcd74f9c-2869-4f88-b7b6-1057810081e4 X-Archives-Hash: 8bc2208c93d661ffc59bb81560bc6584 commit: fdaaded8f81ad0821ae1e53ebe9e25698cb17a3b Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Oct 9 19:04:07 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Oct 9 19:04:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdaaded8 sys-fs/btrfs-progs: add USE=reiserfs for automagic depend on reiserfsprogs, bug #632092 USE=static exposed automagic dependency on libreiserfscore.a. The change adds USE=reiserfs and makes dependency and configuration explicit. While at it tweaked live ebuild (added 'm4' directory to autoconf). Reported-by: Attila Tóth Closes: https://bugs.gentoo.org/632092 Package-Manager: Portage-2.3.11, Repoman-2.3.3 sys-fs/btrfs-progs/btrfs-progs-4.13.2.ebuild | 13 +++++++++++-- sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 15 ++++++++++++--- sys-fs/btrfs-progs/metadata.xml | 3 ++- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.13.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.13.2.ebuild index 397d271d38c..0dc40a977f4 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-4.13.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-4.13.2.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org" LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" -IUSE="+convert static static-libs" +IUSE="+convert reiserfs static static-libs" RESTRICT=test # tries to mount repared filesystems @@ -35,6 +35,9 @@ RDEPEND=" convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= + reiserfs? ( + sys-fs/reiserfsprogs + ) ) " DEPEND="${RDEPEND} @@ -49,6 +52,9 @@ DEPEND="${RDEPEND} convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] + reiserfs? ( + sys-fs/reiserfsprogs[static-libs(+)] + ) ) ) " @@ -60,7 +66,7 @@ fi src_prepare() { default if [[ ${PV} == 9999 ]]; then - eautoreconf + AT_M4DIR=m4 eautoreconf mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -75,6 +81,9 @@ src_configure() { --bindir="${EPREFIX}"/sbin $(use_enable convert) $(use_enable elibc_glibc backtrace) + # No whitespace due to 'ext2,reiserfs' being invalid + # for configure. TODO: Why it's not valid? + --with-convert=ext2$(usex reiserfs 'reiserfs' '') ) econf "${myeconfargs[@]}" } diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index fa7bc3eb6b3..0dc40a977f4 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-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 @@ -24,7 +24,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org" LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" -IUSE="+convert static static-libs" +IUSE="+convert reiserfs static static-libs" RESTRICT=test # tries to mount repared filesystems @@ -35,6 +35,9 @@ RDEPEND=" convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= + reiserfs? ( + sys-fs/reiserfsprogs + ) ) " DEPEND="${RDEPEND} @@ -49,6 +52,9 @@ DEPEND="${RDEPEND} convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] + reiserfs? ( + sys-fs/reiserfsprogs[static-libs(+)] + ) ) ) " @@ -60,7 +66,7 @@ fi src_prepare() { default if [[ ${PV} == 9999 ]]; then - eautoreconf + AT_M4DIR=m4 eautoreconf mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" @@ -75,6 +81,9 @@ src_configure() { --bindir="${EPREFIX}"/sbin $(use_enable convert) $(use_enable elibc_glibc backtrace) + # No whitespace due to 'ext2,reiserfs' being invalid + # for configure. TODO: Why it's not valid? + --with-convert=ext2$(usex reiserfs 'reiserfs' '') ) econf "${myeconfargs[@]}" } diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml index 57996067452..22d92c44458 100644 --- a/sys-fs/btrfs-progs/metadata.xml +++ b/sys-fs/btrfs-progs/metadata.xml @@ -15,6 +15,7 @@ Build ext2 conversion utility (btrfs-convert) - Build static binaries in addition to the dynamic ones + Enable reiserfs support in btrfs-convert tool. + Build static binaries in addition to the dynamic ones