gentoo auto-resync : 12:08:2022 - 20:22:37

5 files changed, 2 insertions, 268 deletions

diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index a9c2ccf86880..a7188a0012b7 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,11 +1,6 @@
 AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae1f9509e3b454459499fa457119c75a9e5fecb85d5530caaab340cea7f4deba0f155ac9e31706ab3899372c45e381cf77 SHA512 e0e1a4ed7c9ef069bc0bc5449f784c2deda1ce6851e98ca6d04c03988361f00e06b6a4f347671ee905f496dba19f8dffa64e5bdcba89f547292fc9c8d276ecd7
-AUX snapper-0.9.1-testsuite.patch 2613 BLAKE2B 6fd621d1cab8ee829ba07ee7fac0ca7de884becb6b3ca24e444de4de547866fe2ec1c108fcc6686c8adc78661324445c8f37e82110514b7a7d9b578ede70c7ef SHA512 e447c6062e85f587b084334a5565d02dd89c778985d121e7489f8059a647b22a2e3386992f107f589b60bbfd55036f71efe21651841592073b29981a1451df36
 AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
-DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0
 DIST snapper-0.10.2.tar.gz 407857 BLAKE2B f59ee95612a66397f9cb1bec4a3a20fec41f12324d1a778d5bbdac2bd3359b6719d16fba5c50b3753e416681e83780180fe8965757b810165bebef8c4bed6634 SHA512 bdda67908b054beee7285bb3ac97ce28276449d7719369135a7ffa74bce40000ebc89f4f059abe44f8cc7c3a09c46af446e812229290ddd10b2af053fefbc568
-DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293
-EBUILD snapper-0.10.1.ebuild 2003 BLAKE2B ba7081ebddda94e426a031a99063fa85e99fb53905f507ad40bd87fdb809fc4d6bfb9e553390e969f84ce60e2d7cb5255bb72cb7e8408c51415c229046c6fcf3 SHA512 5ea5a60365e210af54aca1df2a512f6df5815f5c765a07bbae19487b63226695dae0ad73453487a7e192ef8c9384b4c76c86d7acc27b8a77466a3646157c856f
-EBUILD snapper-0.10.2.ebuild 2011 BLAKE2B 31ded933dbf072fc8bbfdef0ea4cf77a934892ef74d59d8ac764e6961f3216098a2664de49cda1b064d5703b5b1239ff536419526113bff6bd480bdb65770b42 SHA512 779de9868224af494d7a4f53f7865477d25f4f2d5459040b7a9349fbda4223c5f270a935b8c614132bae7d64729297e3957e6474ac71f81f930cad55fe5ecb52
-EBUILD snapper-0.9.1.ebuild 2064 BLAKE2B ba272ba78aed3980832775c8318671ef38781785b530d8322dfbaa2751b46f3772a324135f57dbb9fa21ac81f5e5d4be3756dd311de54992fa66a20c5368179d SHA512 e074e324915122c9e4ac42a7c6e27719b90ea32fe91bacc3f7e0ced18164100988f3d9309e2e95697a8668e5ad2f754ada9325e6e7d95bbcbad91354f4017f17
+EBUILD snapper-0.10.2.ebuild 2009 BLAKE2B 148ba5f979e5591d011ec5be16c38133f050504d4aa61cd807bd95e0d187fc37f90e16633ff8875b70725f589c8bbb148dab8aaaffc0b1dd33b9b575a36aaf78 SHA512 3a3b93cb0989e48230845d678d0119c4039778729032534eea9ba1fa05d1cd480d3cc5ffb4983587727539c41d631a8bb4b0d74cf5a5f885347382bf51852a2b
 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
deleted file mode 100644
index 0bd3fd3189fc..000000000000
--- a/app-backup/snapper/files/snapper-0.9.1-testsuite.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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.10.1.ebuild b/app-backup/snapper/snapper-0.10.1.ebuild
deleted file mode 100644
index 11fe4ff862dd..000000000000
--- a/app-backup/snapper/snapper-0.10.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools systemd
-
-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 ~arm64 ~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
-}
-
-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"
-}
diff --git a/app-backup/snapper/snapper-0.10.2.ebuild b/app-backup/snapper/snapper-0.10.2.ebuild
index a9bdd7be0315..f8c9f634d9d5 100644
--- a/app-backup/snapper/snapper-0.10.2.ebuild
+++ b/app-backup/snapper/snapper-0.10.2.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 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="doc lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.9.1.ebuild b/app-backup/snapper/snapper-0.9.1.ebuild
deleted file mode 100644
index df3d33714c14..000000000000
--- a/app-backup/snapper/snapper-0.9.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 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 ~arm64 ~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"
-}