| 1 |
commit: edcb856801e88470339d0954fd87bade95a1a73b |
| 2 |
Author: Michael Vetter <jubalh <AT> iodoru <DOT> org> |
| 3 |
AuthorDate: Fri Mar 16 10:21:37 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 25 19:10:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edcb8568 |
| 7 |
|
| 8 |
app-backup/snapper: remove ext4, force btrfs |
| 9 |
|
| 10 |
Snapper's ext4 code does not work anymore. |
| 11 |
So we need to compile with --disable-ext4 by default. |
| 12 |
|
| 13 |
Also snapper does not seem to work without btrfs enabled, so we need to |
| 14 |
enable it by default. |
| 15 |
|
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/7473 |
| 17 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 18 |
|
| 19 |
app-backup/snapper/snapper-0.5.4.ebuild | 17 ++++++++--------- |
| 20 |
1 file changed, 8 insertions(+), 9 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-backup/snapper/snapper-0.5.4.ebuild b/app-backup/snapper/snapper-0.5.4.ebuild |
| 23 |
index 08667a65c08..0615011a39c 100644 |
| 24 |
--- a/app-backup/snapper/snapper-0.5.4.ebuild |
| 25 |
+++ b/app-backup/snapper/snapper-0.5.4.ebuild |
| 26 |
@@ -1,18 +1,18 @@ |
| 27 |
-# Copyright 1999-2017 Gentoo Foundation |
| 28 |
+# Copyright 1999-2018 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
|
| 33 |
inherit systemd |
| 34 |
|
| 35 |
-DESCRIPTION="Command-line program for btrfs and ext4 snapshot management" |
| 36 |
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management" |
| 37 |
HOMEPAGE="http://snapper.io/" |
| 38 |
SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2" |
| 39 |
|
| 40 |
LICENSE="GPL-2" |
| 41 |
SLOT="0" |
| 42 |
KEYWORDS="~amd64 ~x86" |
| 43 |
-IUSE="+btrfs ext4 lvm pam xattr" |
| 44 |
+IUSE="lvm pam xattr" |
| 45 |
|
| 46 |
RDEPEND="dev-libs/boost:=[threads] |
| 47 |
dev-libs/libxml2 |
| 48 |
@@ -20,10 +20,9 @@ RDEPEND="dev-libs/boost:=[threads] |
| 49 |
sys-apps/acl |
| 50 |
sys-apps/dbus |
| 51 |
sys-apps/util-linux |
| 52 |
+ >=sys-fs/btrfs-progs-3.17.1 |
| 53 |
sys-libs/zlib |
| 54 |
virtual/libintl |
| 55 |
- btrfs? ( >=sys-fs/btrfs-progs-3.17.1 ) |
| 56 |
- ext4? ( sys-fs/e2fsprogs ) |
| 57 |
lvm? ( sys-fs/lvm2 ) |
| 58 |
pam? ( sys-libs/pam ) |
| 59 |
xattr? ( sys-apps/attr )" |
| 60 |
@@ -32,8 +31,6 @@ DEPEND="${RDEPEND} |
| 61 |
sys-devel/gettext |
| 62 |
virtual/pkgconfig" |
| 63 |
|
| 64 |
-REQUIRED_USE="|| ( btrfs ext4 lvm )" |
| 65 |
- |
| 66 |
PATCHES=( |
| 67 |
"${FILESDIR}"/cron-confd.patch |
| 68 |
) |
| 69 |
@@ -47,13 +44,15 @@ src_prepare() { |
| 70 |
} |
| 71 |
|
| 72 |
src_configure() { |
| 73 |
+ # ext4 code does not work anymore |
| 74 |
+ # snapper does not build without btrfs |
| 75 |
local myeconfargs=( |
| 76 |
--with-conf="/etc/conf.d" |
| 77 |
--docdir="/usr/share/doc/${PF}" |
| 78 |
--disable-zypp |
| 79 |
--enable-rollback |
| 80 |
- $(use_enable btrfs) |
| 81 |
- $(use_enable ext4) |
| 82 |
+ --disable-ext4 |
| 83 |
+ --enable-btrfs |
| 84 |
$(use_enable lvm) |
| 85 |
$(use_enable pam) |
| 86 |
$(use_enable xattr xattrs) |
Archives