gentoo resync : 25.09.2021

10 files changed, 187 insertions, 10 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 19b36a24a2e6..feed07a707f0 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 990214889f27..16c69faf8bb5 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -12,10 +12,10 @@ AUX bareos-sd.confd 360 BLAKE2B d965bf4cf1db59982b57ee0b848f9f7156d695a37d2a3b4c
 AUX bareos-sd.initd 855 BLAKE2B 40ca8e89b63e67f6fa4a4f60e735bd101ce0b1ad46be07b6df2d1524cd3f3e1f2540ce4b90095168499cab82306ed3d2d1c306c2b185e22632cbd5d18c6e8f4b SHA512 d45c33374da46e53b5828b4575087d00753f4aea3af6b641933f456f2bf5ba254894fc1fc1a6641ab6ae1c3f85bcd606500d6207e23a7070c78fd4e6aa666543
 AUX bareos-sd.service 812 BLAKE2B 7ac9754d98ea177614450045fbbaf7406592b30a280646eacdf31271a0cafd63e88ac463b1d94143ccac96c289de3f88a177edab665f073e7c7692037ffedb68 SHA512 6a0fdb3af03e9f94e0d755a3286aff36b41ab1f00a82e9864f6d3de6931691f6aba79aeb7fc952cec039e4174b545f53c23e96fcfbaed71192877d201b3086ad
 AUX tmpfiles.d-bareos.conf 33 BLAKE2B 68feed7629dde0dad019470851cea33140be3b17186fbbee7ad6c6a591978236ec09252d890117030d8706d22ea02f9971063aa80a393d3726510128527401d0 SHA512 65d3f72e57eb3afc557ab6b56a8ec1895a679b904114fefd1c9d0ceeb6b9fa8413575591ed81e1ce6963bdaf34dad227e781865b39bb237afc6bb5652306d2ef
-DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096 SHA512 2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
-DIST bareos-19.2.10.tar.gz 12893797 BLAKE2B 49493acab4fbd26a4ef9aa2f9c19df8a535460596d8206a4d15fedeaace420b7ba948505d7b74ef65aeb94bb8bfa77cf392babeb3e6509839ac418d935fa7070 SHA512 946b1dc5709696363d2ffa3d890fa662976690723ab8054d827c930f27757a22af44b83915ce2a4f198a7d0c2a71bb19b4597141afd31b9809bd6b214237d475
-DIST bareos-20.0.2.tar.gz 13333946 BLAKE2B f035fc8b98bf176bd675895b459ac78fa43575a686af11d5c43ff6b86451894d9aaa53600f87253da29dac06271c01bb269777284d903001821918405499e536 SHA512 f3a0f481a2c9b3a422f4db3e094587c97fe10e2ea5e7a8ba44e9971b0a11746ae4ad598ea469d5c8ec0dfb962e4104c00931397905aebbf3e22af49834043994
-EBUILD bareos-18.2.10-r2.ebuild 11166 BLAKE2B 0ea402d3feb5ee0d88d9b3743bedd1145c9a199b637f97144543ed60da5cb87a76e35be077002f323ab9dccbb79ee2978197fcba5d91bb067d2fd45eda7b1ff9 SHA512 ac89c1c9830743210c9a83fa6b7afbd67c8bfeec8a2002394fd4bd4f68695b75b21a64d96bf0ca91798b38612c339b9a4da0593c964310ea9ff5693256cd08e6
-EBUILD bareos-19.2.10-r2.ebuild 10913 BLAKE2B 53f53486f4a38da837dc2a611468bf4cc8539b6c98bfa4c8f7de35567a0e18e3e8aae666a44e094735ff7a1d41b7ebd27df97b7004a0b2489b6ac5d0d604c038 SHA512 4deece9d0a99038ae170f9a3187cbfd660ac87d61e48b062f249cba4ea3588569d5cbe8624ffde60f2f649b395d67595e25b69b7c5e207bad418cf40862bc648
-EBUILD bareos-20.0.2-r2.ebuild 11368 BLAKE2B 631d15f7125a5aad10400f76bbc080fd451fa5b28992aa0bcc79223bcdc3ca9e2c7a2e206ff035d078cd607dd59dbf0796ad783fcd9f1036d26c63b6c221cb55 SHA512 5a90972b274d08f102d9a2892f2630828c25e16c732942b93385f6db7ffe6d97e54dae3b9472e82661ae7e4fcdc4f35238c2ee5a83c51b78c8277ca0a0331820
+DIST bareos-18.2.12.tar.gz 10566403 BLAKE2B 765a5430c495b21edc0c22d6903e23d312b1dc2b94e0d2a4227c10a38be8fe638636cf32a58e8aaf83b389581bf1348b4d27be6886f61180c20496acbd0eb015 SHA512 1d308d3021e8277832ce933fbafdf514bc194a1a2a2d761e66fb26ec2af419d19ae38894a7cb56e036c5af003bf640117b5a11954d478b35e13a02007f99f4de
+DIST bareos-19.2.11.tar.gz 12890679 BLAKE2B 2872e4eed8186f024211faeefcb5b38448f38d90a2c7c73ef8fa1e51d3a917344a7acbe09a01d0205ad312ec136161eb1b0aa28dcceabbf71d78206a724602b0 SHA512 46769f6e26068669c2656ed8afc73dbd6f07a88d65cf557193684c130bdb93567f3ab06374484be499e5edb7bdd32013edecb05ff19843d3d806a38ca1892749
+DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
+EBUILD bareos-18.2.12.ebuild 11166 BLAKE2B 0ea402d3feb5ee0d88d9b3743bedd1145c9a199b637f97144543ed60da5cb87a76e35be077002f323ab9dccbb79ee2978197fcba5d91bb067d2fd45eda7b1ff9 SHA512 ac89c1c9830743210c9a83fa6b7afbd67c8bfeec8a2002394fd4bd4f68695b75b21a64d96bf0ca91798b38612c339b9a4da0593c964310ea9ff5693256cd08e6
+EBUILD bareos-19.2.11.ebuild 10913 BLAKE2B 53f53486f4a38da837dc2a611468bf4cc8539b6c98bfa4c8f7de35567a0e18e3e8aae666a44e094735ff7a1d41b7ebd27df97b7004a0b2489b6ac5d0d604c038 SHA512 4deece9d0a99038ae170f9a3187cbfd660ac87d61e48b062f249cba4ea3588569d5cbe8624ffde60f2f649b395d67595e25b69b7c5e207bad418cf40862bc648
+EBUILD bareos-20.0.3.ebuild 11418 BLAKE2B 70dd2c423d7857a6836ae2ac1c12983e69a50dd3f2a5370c0190fb025a7d147ab32ebaced6639b681bbddd4472fffd89eeda903b4589c020ebe1b5600919e321 SHA512 ffa4ef23c32fcf36c2b42e541cf2916feab55022205abcd6a79bf6d1d0f6e6257577f55ee40364c95c533f5234a4364fb679850245f59c551c6a0c4b898c1ed5
 MISC metadata.xml 1552 BLAKE2B 27a6ee8fad25a63be91e5bc712ffb293174c6bfca8df772be3821932baafe510b1fa271b2e36a22a11296c7a7bd23049b86dc9cbcbe2f7f30409a1e7c7b55042 SHA512 40b549c30e36a495a434c607467efa914aec228d886ee8560e77b39e4d6d6396ebae5e4a5cbdfd01b6828011ee9922112ab0041d9a9aa944d68417114b14ef53
diff --git a/app-backup/bareos/bareos-18.2.10-r2.ebuild b/app-backup/bareos/bareos-18.2.12.ebuild
index 996c4c35ce13..996c4c35ce13 100644
--- a/app-backup/bareos/bareos-18.2.10-r2.ebuild
+++ b/app-backup/bareos/bareos-18.2.12.ebuild
diff --git a/app-backup/bareos/bareos-19.2.10-r2.ebuild b/app-backup/bareos/bareos-19.2.11.ebuild
index a9e76afe1016..a9e76afe1016 100644
--- a/app-backup/bareos/bareos-19.2.10-r2.ebuild
+++ b/app-backup/bareos/bareos-19.2.11.ebuild
diff --git a/app-backup/bareos/bareos-20.0.2-r2.ebuild b/app-backup/bareos/bareos-20.0.3.ebuild
index 0e4e0741a3cb..261eb0feb129 100644
--- a/app-backup/bareos/bareos-20.0.2-r2.ebuild
+++ b/app-backup/bareos/bareos-20.0.3.ebuild
@@ -92,7 +92,7 @@ src_prepare() {
 	popd >&/dev/null || die
 
 	# fix gentoo platform support
-	eapply -p1 "${FILESDIR}/${P}-cmake-gentoo.patch"
+	eapply -p1 "${FILESDIR}/${PN}-20.0.2-cmake-gentoo.patch"
 
 	# fix missing DESTDIR in symlink creation
 	sed -i '/bareos-symlink-default-db-backend.cmake/d' "${S}/core/src/cats/CMakeLists.txt"
@@ -194,8 +194,9 @@ src_install() {
 	# remove upstream init scripts and systemd units
 	rm -f "${D}"/etc/init.d/bareos-* "${D}"/lib/systemd/system/bareos-*.service
 
-	# remove misc stuffwe do not need in production
+	# remove misc stuff we do not need in production
 	rm -f "${D}"/etc/bareos/bareos-regress.conf
+	rm -f "${D}"/etc/logrotate.d/bareos-dir
 
 	# get rid of py2 stuff if USE=-vmware
 	if ! use vmware; then
diff --git a/app-backup/borgmatic/Manifest b/app-backup/borgmatic/Manifest
index 2f92f182c802..a5819d7cfb3e 100644
--- a/app-backup/borgmatic/Manifest
+++ b/app-backup/borgmatic/Manifest
@@ -5,5 +5,5 @@ AUX borgmatic-1.5.16-systemd_service_bin_path.patch 556 BLAKE2B f90b66d3d46ea972
 DIST borgmatic-1.5.15.tar.gz 275702 BLAKE2B c01c469a4e0b96f4a364e0e44cd26d60cf34bc1c969cbf9931ee5ec6688cf012a1c22acb20e3a434b765ef5ec68657a2507e292e5ed3b9e0587f8784e85ecfe9 SHA512 5520e2e903162caa42c66c1e172af225f5f9622c1b33e5f0854f2dc8379752865e8cb8c442e545ec4fc98509e5c7c863373b12e57cf0bbd417b4e8c0887a27fc
 DIST borgmatic-1.5.18.tar.gz 277064 BLAKE2B 43f5f8d2fb7f13ed6bcfd5b00f99a797f214f5220b27f8c173f636d37b4c0b5c8d1915a73684597d71fb436717a84de542be51a9b23f735e304e15427d40ace1 SHA512 2e008ef01922851a3fd5c7b5d1ad30d5b0e007e5f76af4849159ff2f730add591ffb30ba3d867b0e7221b98e949e4cf3e11b8853a3412395a63c135248761264
 EBUILD borgmatic-1.5.15.ebuild 2143 BLAKE2B 2a29e0c8c0274a2e02d4137c0cd3661bf2c86c9f9d5b3f59068d3222022ff70975eda4344699f03e181bd746b3c4ccda7e34c365301f1a1d4cb7a167e7ffcceb SHA512 cdabf0735ac44acdfd96f6ada94db2c9cb7fa0de0650d62948850156a08a7266184ed5da9d3d347e19a30609fd104f07c12fca6c515d5767403aa2bf9c42929f
-EBUILD borgmatic-1.5.18.ebuild 2090 BLAKE2B 24a2fd8eb7994b328dddfa1360f2fff5cab9940e9cc420a180243ead04ad576498f90119ebc479238bf752bad8bbdc64d2bee93ae4d6a2a634ae48d87c79afdc SHA512 cde230307e3dda41e0c3fb2743282007dca4c51842c30da0198719163cf4a6169588d888eb4ad35a0fc18c378670b715b21df431457eebbbf3b8b0c7447b0313
+EBUILD borgmatic-1.5.18.ebuild 2089 BLAKE2B 323ef6ae7bf7a4193402bd4c6190a48a3649b631c47a80fb7092017a823e7ff151deb2b6e7778b3033e51479bcd577336f5630725e3ceebe81e66f597386c751 SHA512 cdf5ddd667b566a4750f583212c14c36cb2a0416addf265d6353dc981a39839f8802093b92748eb98a360d20e4cb6a36fa1061a2c61c60107e63d7204b52b7d1
 MISC metadata.xml 366 BLAKE2B e4c95292ab3040a6e29337f620ee8b808b1da11733b300fe7d53f1bf1c9511c2835d122d1c4c8da36f99a98f35eb1f3f505357c9d5796c6b9dd187f7171098a4 SHA512 c23574795068b1a77b4c2c8efc7a171e9a6160b1f05f528c589589eb56d607ad03168c894f4c4f358e03a33c04b7e84a3b464be347b4cfbd7eea92d5f5b5f411
diff --git a/app-backup/borgmatic/borgmatic-1.5.18.ebuild b/app-backup/borgmatic/borgmatic-1.5.18.ebuild
index 08585b18bbf2..438a43dadf96 100644
--- a/app-backup/borgmatic/borgmatic-1.5.18.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.18.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv"
+KEYWORDS="amd64 ~arm ~riscv"
 
 # borg is called as an external tool, hence no pythonic stuff
 RDEPEND="app-backup/borgbackup
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index d236ece780d3..6e827416c652 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,11 +1,14 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 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-0.9.1-testsuite.patch 2613 BLAKE2B 6fd621d1cab8ee829ba07ee7fac0ca7de884becb6b3ca24e444de4de547866fe2ec1c108fcc6686c8adc78661324445c8f37e82110514b7a7d9b578ede70c7ef SHA512 e447c6062e85f587b084334a5565d02dd89c778985d121e7489f8059a647b22a2e3386992f107f589b60bbfd55036f71efe21651841592073b29981a1451df36
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
 DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c
 DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae
 DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
+DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
 EBUILD snapper-0.8.15-r2.ebuild 2050 BLAKE2B 9aa6d6f8b72f680edf08ada7a87850e734a445c2b780403564bf3f1f1b51bebc1d2c02c195dc2ae1dd5214299fa8ff094a2a0e8f6549c053001b970f68d39e3b SHA512 8916ebc3ba6f3bd30a053b5e41d60de1057868f6e102151d0bd137b0af31acebcabfb7fd0922b451edbae4f38b75494a6db481c977eb50f2ab997ee0b141f403
 EBUILD snapper-0.8.16-r1.ebuild 2060 BLAKE2B 08c83366000f96267a5ac13ae7950c3471aa6ced6e88b394340f6c3555d7ebdeb9197a7102c3613d228c1bf7b10e967aa457f8e961c5a24a9c24c751b3ce43d8 SHA512 e295e6a70bc9e0834da1220538d93d2fc78bbdc98bdebddc10b1a272c89d9e5dccb3a6952e49173fd039353d709898cbad07af17e26be4974d3b56f23b1dab89
 EBUILD snapper-0.9.0-r1.ebuild 2059 BLAKE2B 24f81580afeb058a40cc1f6f1ce2a491c026b2a354e4982eec3065b92d6635f64296d852aaf5a1c686150617b9734f0fc0d076c222d0e5ef1545891adca981b1 SHA512 597e80417d5823dbb22543cf5c48e12626979395b7d2f80d59863c34428bd8bec77a24c2a136ebfdc1261c5e30c8bab418e53f0e3a947792f7f780b3b765f70e
+EBUILD snapper-0.9.1.ebuild 2059 BLAKE2B 24f81580afeb058a40cc1f6f1ce2a491c026b2a354e4982eec3065b92d6635f64296d852aaf5a1c686150617b9734f0fc0d076c222d0e5ef1545891adca981b1 SHA512 597e80417d5823dbb22543cf5c48e12626979395b7d2f80d59863c34428bd8bec77a24c2a136ebfdc1261c5e30c8bab418e53f0e3a947792f7f780b3b765f70e
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch b/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
new file mode 100644
index 000000000000..0bd3fd3189fc
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
@@ -0,0 +1,84 @@
+diff --git a/configure.ac b/configure.ac
+index 3f5c911..a8c9c95 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
+ 
+ PAM_SECURITY=${libdir}/security
+ 
++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_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]),
+ 	[with_pam_security=$withval], [with_pam_security=no])
+ AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"])
+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.9.1.ebuild b/app-backup/snapper/snapper-0.9.1.ebuild
new file mode 100644
index 000000000000..3f1b02d77735
--- /dev/null
+++ b/app-backup/snapper/snapper-0.9.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd bash-completion-r1
+
+DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
+HOMEPAGE="http://snapper.io/"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~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
+	sys-apps/dbus
+	sys-apps/util-linux
+	>=sys-fs/btrfs-progs-3.17.1
+	sys-libs/zlib
+	virtual/libintl
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	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}-testsuite.patch
+)
+
+src_prepare() {
+	default
+
+	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"
+		--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)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+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() {
+	elog "In order to use Snapper, you need to set up"
+	elog "at least one config first. To do this, run:"
+	elog "snapper create-config <subvolume>"
+	elog "For more information, see man (8) snapper or"
+	elog "http://snapper.io/documentation.html"
+}