commit: fdaaded8f81ad0821ae1e53ebe9e25698cb17a3b Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Oct 9 19:04:07 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> 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 @@ </maintainer> <use> <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag> - <flag name="static">Build static binaries in addition to the dynamic ones</flag> + <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag> + <flag name="static">Build static binaries in addition to the dynamic ones</flag> </use> </pkgmetadata>
