gentoo auto-resync : 11:07:2024 - 12:25:19

5 files changed, 6 insertions, 131 deletions

diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 7405b7dfc7e7..4c70046922b3 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,10 +1,7 @@
-AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
 AUX snapper-0.10.1-testsuite.patch 2525 BLAKE2B 0ece146356113d456ef0a56e46e76eae1f9509e3b454459499fa457119c75a9e5fecb85d5530caaab340cea7f4deba0f155ac9e31706ab3899372c45e381cf77 SHA512 e0e1a4ed7c9ef069bc0bc5449f784c2deda1ce6851e98ca6d04c03988361f00e06b6a4f347671ee905f496dba19f8dffa64e5bdcba89f547292fc9c8d276ecd7
 AUX snapper-0.11.0-cron-confd.patch 424 BLAKE2B beb358e0405a680963fc5776dc2bdd6de36958c53579d4097dd43655a4e4abd1dba0eaeff789da435b7f6fd13993e2dca29f07dd0b29e9bfcb29fa31c3623848 SHA512 1ac7ed0de6be97219282bcff82ebb0c62a9ae1a8869fd8e1246dc06b20aac81e3f95d306198d29d69223226b4efd5b1f4555b3280935f09c1c374803236c1bee
-DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e
-DIST snapper-0.10.7.tar.gz 428482 BLAKE2B 43c48d978296901f6584cef258ec3723de97b1d6b4b4a5b6bc39649f28b3300919616c65b8fcdb97b3ebcab08d04e4583713eef146721367de24513e80113b45 SHA512 bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8
 DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40
-EBUILD snapper-0.10.6.ebuild 2047 BLAKE2B 2edd21d85fbc8d3a750ae08a9961dcb8b6470d46095208dfd0b1c1b024b05db281118fd60697305b3f449ad4967e199acb8862faa8f84eb649cd196fd569c971 SHA512 c71f9432028a102fbfc5d0dc47194f3714e5834514bf3a7c0a2e2a9452824c5ae751de5b777bf6c6840edf73b63331f1f850b67f84283cf5241cef9abf16b45b
-EBUILD snapper-0.10.7.ebuild 2049 BLAKE2B 795e6947da7d2d2c68d24e612ce442fdec03c22584c1d4b85a8d36413b2e555ca4719c6223591cf92e441c15b6069cd29bd869519c99b2f23d54fd0fbb4225e0 SHA512 101ad55fd0be1fa87923bb57114280e626cf84ac22c0a7056f002276b71061e2ad0b3573e9d56dd500bff4b419a180a6c9c70b6be7d44340953f863249dfe93b
-EBUILD snapper-0.11.0.ebuild 2054 BLAKE2B c58e9c9ae9dc006221778c50c6d0727b384d32d4390e280e474e1496fb8155a3cd4448ed725b2dbd679ee7dd90d6bf42b4baa321a74f99290be036374b4d5eec SHA512 ce00a62a1848d756c5174ce4ac3b29ff042494ff5644f4618d2777dde9708b1a89018bbd4a78d4a6c203801e2775a7e4fdb98ec5a30ce6dc8bb375650827b500
+DIST snapper-0.11.1.tar.gz 450693 BLAKE2B 06c90cfdca71550e8dc8a246008a94bceb582f98dc4d56546592ae70ec69bd21f1f73ff1e41776f7eb5a02c42c382e05b771afa3fe583eb63486f640dc1d23d4 SHA512 0d7f6d9a012892c3ea0916cc92da5a6a435aa0a90067941f03b6e5a08adff54a7f3c52cc500cd28e7a7b496fb436c88db4399307cdd5518cfa54f2287e285993
+EBUILD snapper-0.11.0.ebuild 2052 BLAKE2B 13fdc4dfc90e5413b187cb3445b23b68fb271595553277861d5807ca2d7f93cc2719e1418ff8349d253f175d23b85a92a1e1fe73eca35ffd8ebc9fac4cdae51c SHA512 6fbb43ca53e9bf3e40be32bc0c2257b17128f2a8d61219465586de48be1404ed964a5fc6a156c5db3025da1c078a9ac04caf41b7d1f078204ff75678f2bdac57
+EBUILD snapper-0.11.1.ebuild 2062 BLAKE2B bfa3c6823b4d131caf04b10283cc4e91d957c9f8fe6608af4489370d23ff7801d31cc09dbd3d51d451228341921a6db29c04f35ec9228a0bcfbc346011b2d093 SHA512 6251093935e6c75abfc666711596ad52a15fcc78d0bf6aa5b70492ca6fa6246406d06632772b45a5dea05bf20be31b1ca379cc91581510b2231ee4d2078cc596
 MISC metadata.xml 1331 BLAKE2B 891a27fbae2ed364a26952def66b3e9e62be7025580d7b89f559f284888efed53476f4a8f5bcd7209c3c4de8494913a05354059004ef6c3aa6c1829a3e093efb SHA512 add8dffdf453f079d09f06608cae732ce61e04a5fac1988afb0733c8d60a943efe054a4973e54ca1cf304ad3d3778fd8aa6b01fc16815a1f42f83048d58adb63
diff --git a/app-backup/snapper/files/cron-confd.patch b/app-backup/snapper/files/cron-confd.patch
deleted file mode 100644
index 473e749d0bb2..000000000000
--- a/app-backup/snapper/files/cron-confd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -u old/scripts/snapper-daily new/scripts/snapper-daily
---- old/scripts/snapper-daily   2014-01-29 17:48:30.000000000 +0200
-+++ new/scripts/snapper-daily   2014-02-19 13:32:22.702734875 +0200
-@@ -9,10 +9,10 @@
- 
- 
- #
--# get information from /etc/sysconfig/snapper
-+# get information from /etc/conf.d/snapper
- #
--if [ -f /etc/sysconfig/snapper ] ; then
--    . /etc/sysconfig/snapper
-+if [ -f /etc/conf.d/snapper ] ; then
-+    . /etc/conf.d/snapper
- fi
- 
- 
-diff -u old/scripts/snapper-hourly new/scripts/snapper-hourly
---- old/scripts/snapper-hourly  2014-01-29 17:48:30.000000000 +0200
-+++ new/scripts/snapper-hourly  2014-02-19 13:32:43.609166927 +0200
-@@ -9,10 +9,10 @@
- 
- 
- #
--# get information from /etc/sysconfig/snapper
-+# get information from /etc/conf.d/snapper
- #
--if [ -f /etc/sysconfig/snapper ] ; then
--    . /etc/sysconfig/snapper
-+if [ -f /etc/conf.d/snapper ] ; then
-+    . /etc/conf.d/snapper
- fi
diff --git a/app-backup/snapper/snapper-0.10.6.ebuild b/app-backup/snapper/snapper-0.10.6.ebuild
deleted file mode 100644
index 2adf8bcfcde5..000000000000
--- a/app-backup/snapper/snapper-0.10.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 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="lvm pam test systemd xattr"
-RESTRICT="test"
-
-BDEPEND="app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-RDEPEND="dev-libs/boost:=
-	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}"
-
-PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
-	"${FILESDIR}"/${PN}-0.10.1-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
-		--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 and"
-	elog "https://wiki.gentoo.org/wiki/Snapper"
-}
diff --git a/app-backup/snapper/snapper-0.11.0.ebuild b/app-backup/snapper/snapper-0.11.0.ebuild
index 0e9331554272..011eb5479f3e 100644
--- a/app-backup/snapper/snapper-0.11.0.ebuild
+++ b/app-backup/snapper/snapper-0.11.0.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="lvm pam test systemd xattr"
 RESTRICT="test"
 
diff --git a/app-backup/snapper/snapper-0.10.7.ebuild b/app-backup/snapper/snapper-0.11.1.ebuild
index 9d04eeeb2e14..92c569f5b215 100644
--- a/app-backup/snapper/snapper-0.10.7.ebuild
+++ b/app-backup/snapper/snapper-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ RDEPEND="dev-libs/boost:=
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/cron-confd.patch
+	"${FILESDIR}"/${PN}-0.11.0-cron-confd.patch
 	"${FILESDIR}"/${PN}-0.10.1-testsuite.patch
 )