gentoo resync : 11.05.2021

3 files changed, 3 insertions, 56 deletions

diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index d57db57dfb6e..fc1cc7478f67 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -11,7 +11,6 @@ AUX zfs-auto-snapshot-weekly.service 217 BLAKE2B 715f8f8da6272b9ea782dbe77dbafa6
 AUX zfs-auto-snapshot-weekly.timer 150 BLAKE2B 655187add790017f8328edae33e88eb0a4b88774999e67a5fb9c990f5bae9a13ac1e64c290c7e0a218cdcf05dd7bbe320369d1741da036c54994371eecfc50d7 SHA512 49357f15660900b344eba04f8d4bab7e153b728b4665e285b2f9320a287c15b62c426d568d2ba9a43daf69c6f1a6fbccff8b68417f8991dd5f8c3368d562b73c
 AUX zfs-auto-snapshot.target 360 BLAKE2B 17be6ab113a8849d5244fd36140d1165c4e919df2a04f4b16aa591c1c92b29243b1be4f2243bcc6a8ef015b0cc1fb53b183da1c83668e4e7e0b609f7301a3372 SHA512 f607dada27e4be409184152b93e2079eecf12f5eba76f2dbe42bdbf4793603063c23813e752bfd829a081eeb6d09c86bc18ab75d65bff87b2c1d4f998abac516
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
-EBUILD zfs-auto-snapshot-1.2.4-r1.ebuild 2569 BLAKE2B f263b09a100de5847cd23761b53f123e61f4ab8e9c4f98bb7a0dd8854e3e70e41fd4e4df730b2c265e5a18a636c479bbf7a689309b6a8bd7fe8ae011801a8732 SHA512 ecbcdd796820464725ecab22bd8fd5049c46cd1a3f45bef305e1910f14dddbc3ca9973afe623423c409b71ff8459b22a5eda201b2e0b08235b728dd6fbf74301
-EBUILD zfs-auto-snapshot-1.2.4.ebuild 1388 BLAKE2B bbdc50ab6b3ee05cd8c7606b07d7609d62e092345232261a47bf12e423d0bd548d1f009f54aa8fa25a387264e20abfbf8efa415f87cb6ab2331a6e8250ef8a55 SHA512 2bbc915d73fe4fb581af4b9a512228834eaa13105be89e8b9a2303334328c426030220fe750ab7662f83c173184787367994bdb1c2adb7647fc9bc5e14b4a8d0
+EBUILD zfs-auto-snapshot-1.2.4-r1.ebuild 2566 BLAKE2B 15343e88686145958d825f2885d10106ab80b8ee066960d8d733c3fb897670f3eb5edd0a67181381253dfd67241c2f290f663228b71415c7f4ec7840734aa715 SHA512 59a057ccbe82dc42faa2fbafee754c706b900760e68b9e7f558656067668621130503928031d5d0d491ff9850460213764253726ddb82b772f012b39ba0b23bd
 EBUILD zfs-auto-snapshot-9999.ebuild 2569 BLAKE2B f263b09a100de5847cd23761b53f123e61f4ab8e9c4f98bb7a0dd8854e3e70e41fd4e4df730b2c265e5a18a636c479bbf7a689309b6a8bd7fe8ae011801a8732 SHA512 ecbcdd796820464725ecab22bd8fd5049c46cd1a3f45bef305e1910f14dddbc3ca9973afe623423c409b71ff8459b22a5eda201b2e0b08235b728dd6fbf74301
 MISC metadata.xml 964 BLAKE2B 1770ba286fb8bc951069d778bed894d02536ee199e9cfa776878af509ecc77db36048a62ea45ff4f3ce6e4320e1d03ad373825a9de54fcd42e16031d8be52125 SHA512 89291918f6f2f4fb919513ed50ec47d3abeb0b5bb9227c13f6d5875a0d12765fee685c75b547745df90f625b7231226a2f299a197336d57e6970a0bbe6fc4071
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
index 4096503e2fff..e5ec98d94089 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.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
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
deleted file mode 100644
index 0975c6425fc7..000000000000
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"
-else
-	MY_P="${PN}-upstream-${PV}"
-	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ppc64"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="ZFS Automatic Snapshot Service for Linux"
-HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+default-exclude"
-
-RDEPEND="sys-fs/zfs
-	virtual/cron"
-
-src_install() {
-	if use default-exclude; then
-		for cronfile in etc/"${PN}".cron.{daily,hourly,monthly,weekly}; do
-			sed -i "s/\(^exec ${PN}\)/\1 --default-exclude/" "${cronfile}" || die
-		done
-		sed -i "s/\(; ${PN}\)/\1 --default-exclude/" etc/"${PN}".cron.frequent || die
-	fi
-	readme.gentoo_create_doc
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if ! use default-exclude; then
-		ewarn "snapshots are enabled by default for ALL zfs datasets"
-		ewarn "set com.sun:auto-snapshot=false or enable 'default-exclude' flag"
-		elog
-	fi
-
-	if has_version sys-process/fcron; then
-		ewarn "frequent snapshot may not work if you are using fcron"
-		ewarn "you should add frequent job to crontab manually"
-	fi
-}