gentoo resync : 15.06.2021

6 files changed, 121 insertions, 54 deletions

diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 8b122b0fc0c3..d75d60f13384 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,11 +1,11 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
-AUX snapper-0.5.6-swap.patch 852 BLAKE2B 89b05a268d3fed009665c9db6e43d5552023940b14c5afb58521582ba10c9ce332cf2aa07dcb336dd8cb825e5063a553aa6fcb84f597e380831bf0d507b7a96b SHA512 7ec3a471ece6e24c6e225f45401635317197a8d4daebb32817df64b035df3a7df02f0af85677a37d7a2b69af1afc785d70bcfe42252cc7453bc7eb2f7aa2740b
 AUX snapper-0.8.15-testsuite.patch 2528 BLAKE2B c68cb221ade1d281f0d8bdfc5b4853d1bd3f6409ac0bca56ed9348968f2f5f66646105e2158a8cb55857afe41ee1078427b953d964b30877e887e40928a0a01b SHA512 29a447e26eb5092f40f5ca097026ca6f62a5c75c5be4ed51ec5a77eff80a25f86ddf0c67f6805a180e45f81c64594908fb5d30a52db68e96e975f40d50a095d2
+AUX snapper-0.9.0-testsuite.patch 2520 BLAKE2B 37a29e0e622a68a3a941a1eaf6244b11d315566c03a61bf88b0a805c434b06d363d242e401cb82d109f07d8566390465f821d80a13c4fc8a593dded7ae567d8b SHA512 0878c41b78c99e3e86357a49dc46819b1296698a2520688268679cb14b376e9ca2e4913ee7627df4b16ab7e179d3b86bcae02198c563e56b94892cfc54078cc9
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
-DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
 DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c
-DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d
-EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
-EBUILD snapper-0.8.15-r1.ebuild 2047 BLAKE2B 60f9e5d2b31d3d4fb8b64c07d2e5b819e83653cef5b51bd2a5fdc79c0758b02bdf64eebde7d98ebcebc22ca2cb100a04ab09bf29c03c7616504ea2cb1c868187 SHA512 5b14fd94d7685fb733d522d786f47bbed6778af456e3df6a3f2257e8c7456743a2e6b658c3af2e3d6d81a560a4c6049af9549aa89cb56b1d38928abf3bdb287e
-EBUILD snapper-0.8.9-r1.ebuild 1843 BLAKE2B 8d24ca268222ef6917a6f06c6d83a667c363037ae413b8139844715fb00c38e25e821be080edeeab136267718497f49c675e6b14cd15572c06458baf659a59a1 SHA512 40f4443313427b740f18ad279e8188c48295d8d6b2f38cd0fcb601d9b4f6f1f486e48b3fa1b057d1815ab3f227eb1537ce4c1f1c306256104416a5358d5a3c60
+DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae
+DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
+EBUILD snapper-0.8.15-r1.ebuild 2045 BLAKE2B 05149082654681be0062cee1360b3cf93ea2b8059cc70d3af365f8fb3913f99eed6953c4ebaf9f5cc89a0477c66b51a53414143b60531ec02c42bee092ed3ac2 SHA512 3302ac9266cfd50c7365ef1e573013a0ac1cb5b5d0b22caeb5e0eef6118c4db3004c09c2f89499f363245308f8b1a36fab7c1ba19cab9cd53b4e47f6ee761585
+EBUILD snapper-0.8.16.ebuild 2055 BLAKE2B f72ae42c8108cb28b257f9f3fd34c6f23ce18e9d7e3ff9dd2257440263417d7e2124096fa123f80e211ff2d59a72498e3fb653ca5a972f9ef955b716d0d9aa7d SHA512 201f826a193136f585675dfdacb710e4e724be8dbf7220859cfe56297e4002a09995a905b42ee2ae356c7b997242e87dc4641649b66c4a8071ef88eebdffe772
+EBUILD snapper-0.9.0.ebuild 2047 BLAKE2B 60f9e5d2b31d3d4fb8b64c07d2e5b819e83653cef5b51bd2a5fdc79c0758b02bdf64eebde7d98ebcebc22ca2cb100a04ab09bf29c03c7616504ea2cb1c868187 SHA512 5b14fd94d7685fb733d522d786f47bbed6778af456e3df6a3f2257e8c7456743a2e6b658c3af2e3d6d81a560a4c6049af9549aa89cb56b1d38928abf3bdb287e
 MISC metadata.xml 1330 BLAKE2B cf72d6a7fc0ae542f465e6e916ae284710f057cee8492bbb2c3f3ce833bbc633e4ed53dd996b231bf26343898b344c37322582c18dbf01e23d068b80fccf5875 SHA512 3086569ba74f6b163619718fe08974856634dde997fcc2a8152f7cc1ba1a5c5638869869806d723f65249725fb61d84d3fe64f2b3b58c8b5e05a1524cb464915
diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch
deleted file mode 100644
index aa24330d7304..000000000000
--- a/app-backup/snapper/files/snapper-0.5.6-swap.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/snapper-0.9.0-testsuite.patch b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
new file mode 100644
index 000000000000..7aa089569b4a
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 06e4721..c89d0aa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
+ 
+ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
+ 
++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
++		[with_tests=$enableval],[with_tests=yes])
++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
++if test "x$with_tests" = "xyes"; then
++	AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
++fi
+ 
+ AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
+ 		[with_btrfs=$enableval],[with_btrfs=yes])
+diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
+index 81104bf..9c29477 100644
+--- a/testsuite-cmp/Makefile.am
++++ b/testsuite-cmp/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite-cmp
+ #
+ 
++if ENABLE_TESTS
+ AM_CPPFLAGS = -I$(top_srcdir)
+ AM_LDFLAGS = -lboost_system
+ 
+@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
+ 
+ EXTRA_DIST = $(noinst_SCRIPTS)
+ 
++endif
+diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
+index 717313a..527843d 100644
+--- a/testsuite-real/Makefile.am
++++ b/testsuite-real/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite-real
+ #
+ 
++if ENABLE_TESTS
+ CXXFLAGS += -std=gnu++0x
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)
+@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
+ 
+ EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
+ 
++endif
+diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
+index ccb84d3..409e265 100644
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite
+ #
+ 
++if ENABLE_TESTS
+ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+ 
+ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
+ range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+ 
+ limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
++endif
+diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
+index 7b52e13..71cb545 100644
+--- a/zypp-plugin/testsuite/Makefile.am
++++ b/zypp-plugin/testsuite/Makefile.am
+@@ -1,3 +1,5 @@
++
++if ENABLE_TESTS
+ if HAVE_ZYPP
+ TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
+ 
+@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
+ 
+ EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
+ endif
++endif
diff --git a/app-backup/snapper/snapper-0.8.15-r1.ebuild b/app-backup/snapper/snapper-0.8.15-r1.ebuild
index 3a46790c0d3c..43989af176b2 100644
--- a/app-backup/snapper/snapper-0.8.15-r1.ebuild
+++ b/app-backup/snapper/snapper-0.8.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.8.16.ebuild
index c6f5ffca2a55..2cfe0b2ba1f1 100644
--- a/app-backup/snapper/snapper-0.5.6-r1.ebuild
+++ b/app-backup/snapper/snapper-0.8.16.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit systemd
+inherit autotools systemd bash-completion-r1
 
 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"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="lvm pam xattr"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lvm pam test systemd xattr"
+RESTRICT="test"
 
 RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/json-c
 	dev-libs/libxml2
 	dev-libs/icu:=
 	sys-apps/acl
@@ -28,12 +30,14 @@ RDEPEND="dev-libs/boost:=[threads]
 	xattr? ( sys-apps/attr )"
 
 DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${P}-swap.patch
+	"${FILESDIR}"/${PN}-0.8.15-testsuite.patch
 )
 
 src_prepare() {
@@ -42,19 +46,25 @@ src_prepare() {
 	sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
 		-i data/Makefile.* \
 		|| die "Failed to fix systemd services and timers installation path"
+	eautoreconf
 }
 
 src_configure() {
 	# ext4 code does not work anymore
 	# snapper does not build without btrfs
 	local myeconfargs=(
+		--disable-silent-rules
 		--with-conf="/etc/conf.d"
-		--disable-zypp
+		--enable-zypp
 		--enable-rollback
+		--enable-btrfs-quota
 		--disable-ext4
 		--enable-btrfs
+		$(use_enable doc)
 		$(use_enable lvm)
 		$(use_enable pam)
+		$(use_enable test tests)
+		$(use_enable systemd)
 		$(use_enable xattr xattrs)
 	)
 
@@ -64,8 +74,10 @@ src_configure() {
 src_install() {
 	default
 	# Existing configuration file required to function
+	keepdir /etc/snapper/configs
 	newconfd data/sysconfig.snapper snapper
 	find "${D}" -name '*.la' -delete || die
+	newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
 }
 
 pkg_postinst() {
diff --git a/app-backup/snapper/snapper-0.8.9-r1.ebuild b/app-backup/snapper/snapper-0.9.0.ebuild
index 5a5593c28464..3a46790c0d3c 100644
--- a/app-backup/snapper/snapper-0.8.9-r1.ebuild
+++ b/app-backup/snapper/snapper-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,9 +12,11 @@ SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="lvm pam xattr"
+IUSE="doc lvm pam test systemd xattr"
+RESTRICT="test"
 
 RDEPEND="dev-libs/boost:=[threads]
+	dev-libs/json-c
 	dev-libs/libxml2
 	dev-libs/icu:=
 	sys-apps/acl
@@ -35,6 +37,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${P}-testsuite.patch
 )
 
 src_prepare() {
@@ -50,13 +53,18 @@ src_configure() {
 	# ext4 code does not work anymore
 	# snapper does not build without btrfs
 	local myeconfargs=(
+		--disable-silent-rules
 		--with-conf="/etc/conf.d"
-		--disable-zypp
+		--enable-zypp
 		--enable-rollback
+		--enable-btrfs-quota
 		--disable-ext4
 		--enable-btrfs
+		$(use_enable doc)
 		$(use_enable lvm)
 		$(use_enable pam)
+		$(use_enable test tests)
+		$(use_enable systemd)
 		$(use_enable xattr xattrs)
 	)