gentoo resync : 24.12.2018

5 files changed, 61 insertions, 22 deletions

diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 5ebe49c9b277..6e91a76a205f 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,9 +1,9 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 AUX snapper-0.5.0-gcc6.patch 482 BLAKE2B e7291ba147c9118eeaa8aafe6e7e0b3c821530db452704da073185c49bbb9085ee0d24101d303d3d40573b0a8b79f0237ff7d6a15c76eaa09652c8db17ac745a SHA512 b512cff8a9cd7038f8ad39eaadaed7092278f9b2dadb31a6ba449d05dfab38513507779576fedf52333ebe6b0d8158722ff15afa2b43cd13cfdc25c7917bfa0c
-DIST snapper-0.5.0.tar.bz2 571716 BLAKE2B 3eb1db265566d0129c3177dcf8d62848108df918eb705ae149672664e215a17b760279e35d1ac658b18bb6e6fa05f5102d05c3a00e45fbfe73093b073fc3f8f9 SHA512 37487a1230825dc5d533e5c864965d9d05c2a3f4e12e5ae910f2721ef2497be2dafedcd13148d7246896551eae11cbcb925e04b58f799ea3d644eea329d3da29
-DIST snapper-0.5.4.tar.bz2 579172 BLAKE2B ce23b56047b818946f1b885308abd21ce6df216b890f784c3b57d8bd44a0a26bebf992b4d2a8ff36e11e096b0d589197e81bf223dd018feb9dcbeaa04c03a904 SHA512 fed417ef817526ab8c2110a70f5e9750642d7f427619efa52c2ed2e3adb83ff47314cdd8843e6331ce1c37fca79367a0a5ff8c6ba394602b24399eb5e6b97cd0
+AUX snapper-0.5.6-swap.patch 852 BLAKE2B 89b05a268d3fed009665c9db6e43d5552023940b14c5afb58521582ba10c9ce332cf2aa07dcb336dd8cb825e5063a553aa6fcb84f597e380831bf0d507b7a96b SHA512 7ec3a471ece6e24c6e225f45401635317197a8d4daebb32817df64b035df3a7df02f0af85677a37d7a2b69af1afc785d70bcfe42252cc7453bc7eb2f7aa2740b
 DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
-EBUILD snapper-0.5.0.ebuild 1583 BLAKE2B b32c38f849fd77202d3557e8aae208bb2e9d304cd042d1f32f5760aa73365e8a7b694b83e9db860478eb4f0c14ac103367981219819106d5963205fd8a270c01 SHA512 052e15517c42a84ab74dec462ad2f3afc8a9498d8b94692cbb0e0672c19a47c06a2d0383b3e790dff33e08a807eb97405c346d92f2b3a5bbc09503be6157aced
-EBUILD snapper-0.5.4.ebuild 1694 BLAKE2B eb03d7133e4094ffcbedbdc4aed28bcfdda6edb8eb34515c09d13e1b63f4724ddcc19637ebeb2c25f4945cb7e5fff67db99d852e98e171ef90c03af00923599b SHA512 d0156ebcbf1f0797f63eaedb6776993326fff17b8be3b673dbb87be29a84416419723e4bfdac5d9ae64cb188a51880831c9df2e5defa1e030d38bd1f32f28383
+DIST snapper-0.8.1.tar.bz2 591061 BLAKE2B 5f9ae50469f43e930de4c4479428c94b24441832bd713847c6792ff583fb79badfa341b53cc63abfedb787367b22b715de9f83f9172dec945f7b3071c06137ba SHA512 9fa20311f346de54c4f5d1cabb42dce5c677eaac03b3fac2a6049f408553911f5a968b1920fd014f3318ebb6911f2e6bce06463e976b468927e250e16fe783a0
+EBUILD snapper-0.5.6-r1.ebuild 1722 BLAKE2B f23130ea7f81232f27d4fadbf43982168798f7453032bd067c79d0fe426c0d9fb7c4da2b2e51f65030de958f41397031d9a2099fd124786de40286751b74c15c SHA512 c7ad7cd8a9e44b4776b3bb564b6bdc988cb8662bc09cd2d485b4cd25547ee975960afdd729e75f4a00981056ba4e1da2ed9ca591e4c4afc2b025dda4c9c64e13
 EBUILD snapper-0.5.6.ebuild 1689 BLAKE2B 1cec6466a39993a32bfcfd2935f10243c3b6cf3a4fa4cb6768b4fada52fd1fff0e08d51559675d9d03a3fc4978d5b93e8bea458dfc5b2b2e65af7e437988bdef SHA512 049e53c5dacf41bad8c7da90a7734f42125965f3f50c841e1810ee682d2e3dfc1586a5c8bb2ed6b45c3a6d06b9b2f96039966687e56cf650168a7f8251c36c16
-MISC metadata.xml 1456 BLAKE2B 327ecba708769cd77e1cd785f178f124cdfa37bf3ba1a3e90161f673fdb10d823a3a1aa14b73877345ed39a71014c5cc51836fe7a539e2c62cc992f473deb31b SHA512 9954576d7d44f0f1a20a5bd5168a6b9c5968ad1a47708a198ae8b4a7054863c2de1c58d9d6108a3dcabf944fb5f266ffe6451be5c2b924636cc53380b2779976
+EBUILD snapper-0.8.1.ebuild 1729 BLAKE2B 5dc6a58a46466120a8afa0ce116559a61eee4545e5039da5ee9361a1e06ff8ae532d630e085567f77fdffe87ee43047eae653c6a819945c2b643581f6275deed SHA512 6894a8117da291b2c3c9ea0fbc4c45febe0daf7ab9b92ceac13f9c7efd0d44b529945d57cb9b3f5de685f4ffbbdb5a7681a8213c3b2e4fe64f3e47afeeff6f87
+MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch
new file mode 100644
index 000000000000..aa24330d7304
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.5.6-swap.patch
@@ -0,0 +1,36 @@
+commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30
+Author: Spencer Janssen <spencerjanssen@gmail.com>
+Date:   Mon Dec 3 17:33:49 2018 -0600
+
+    Work around btrfs v4.19
+    
+    Addresses #459
+
+diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
+index cb9f7b3..c05557b 100644
+--- a/snapper/Btrfs.cc
++++ b/snapper/Btrfs.cc
+@@ -41,6 +41,9 @@
+ #include <btrfs/send.h>
+ #include <btrfs/send-stream.h>
+ #include <btrfs/send-utils.h>
++#ifdef swap
++#undef swap
++#endif
+ #include <boost/version.hpp>
+ #include <boost/thread.hpp>
+ #endif
+diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc
+index bada3f8..9edc325 100644
+--- a/snapper/BtrfsUtils.cc
++++ b/snapper/BtrfsUtils.cc
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_LIBBTRFS
+ #include <btrfs/ioctl.h>
+ #include <btrfs/send-utils.h>
++#ifdef swap
++#undef swap
++#endif
+ #endif
+ #include <algorithm>
+ #include <functional>
diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml
index 4b63f78f6038..1aa9b1e774ab 100644
--- a/app-backup/snapper/metadata.xml
+++ b/app-backup/snapper/metadata.xml
@@ -32,8 +32,6 @@
 		Add support for getting and setting POSIX extended attributes, through
 		<pkg>sys-apps/attr</pkg>.
 		</flag>
-		<flag name="btrfs">Include Btrfs support <pkg>sys-fs/btrfs-progs</pkg></flag>
-		<flag name="ext4">Include Ext4 support <pkg>sys-fs/e2fsprogs</pkg></flag>
 		<flag name="lvm">Enable LVM thinprovisioned snapshots support <pkg>sys-fs/lvm2</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-backup/snapper/snapper-0.5.4.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild
index 0615011a39c3..27233b7377ee 100644
--- a/app-backup/snapper/snapper-0.5.4.ebuild
+++ b/app-backup/snapper/snapper-0.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${P}-swap.patch
 )
 
 src_prepare() {
diff --git a/app-backup/snapper/snapper-0.5.0.ebuild b/app-backup/snapper/snapper-0.8.1.ebuild
index 1b4ef13115e6..db9c8e6fee6c 100644
--- a/app-backup/snapper/snapper-0.5.0.ebuild
+++ b/app-backup/snapper/snapper-0.8.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit systemd
 
-DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
 HOMEPAGE="http://snapper.io/"
 SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+btrfs ext4 lvm pam xattr"
+IUSE="lvm pam xattr"
 
 RDEPEND="dev-libs/boost:=[threads]
 	dev-libs/libxml2
@@ -20,10 +20,9 @@ RDEPEND="dev-libs/boost:=[threads]
 	sys-apps/acl
 	sys-apps/dbus
 	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
 	sys-libs/zlib
 	virtual/libintl
-	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
-	ext4? ( sys-fs/e2fsprogs )
 	lvm? ( sys-fs/lvm2 )
 	pam? ( sys-libs/pam )
 	xattr? ( sys-apps/attr )"
@@ -32,24 +31,29 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-REQUIRED_USE="|| ( btrfs ext4 lvm )"
-
-DOCS=( AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${PN}-0.5.6-swap.patch
+)
 
 src_prepare() {
 	default
-	epatch "${FILESDIR}"/cron-confd.patch
-	epatch "${FILESDIR}/${P}"-gcc6.patch
+
+	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
+		-i data/Makefile.* \
+		|| die "Failed to fix systemd services and timers installation path"
 }
 
 src_configure() {
+	# ext4 code does not work anymore
+	# snapper does not build without btrfs
 	local myeconfargs=(
 		--with-conf="/etc/conf.d"
 		--docdir="/usr/share/doc/${PF}"
 		--disable-zypp
 		--enable-rollback
-		$(use_enable btrfs)
-		$(use_enable ext4)
+		--disable-ext4
+		--enable-btrfs
 		$(use_enable lvm)
 		$(use_enable pam)
 		$(use_enable xattr xattrs)
@@ -62,7 +66,7 @@ src_install() {
 	default
 	# Existing configuration file required to function
 	newconfd data/sysconfig.snapper snapper
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {