gentoo Easter resync : 12.04.2020

3 files changed, 63 insertions, 56 deletions

diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index 086550147b9a..3d2a794b2a7b 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,3 +1,3 @@
-DIST yadm-1.12.0.tar.gz 47340 BLAKE2B ef710f56c96244c082bfcc887cae4aee00aaaadec5e7466500dde263c5e4f43df046e11742fd275e989bd9704b39a123f17248cd70d64f6ca552b28db6c44814 SHA512 402a67770154ce3ae7ab947ff4d4e26ca5040d343110fb749195ca5c3f4ee435aba1d8cdf02d4ecf4a81d3f331c1b891bed4fb3fcfcc893867e0fce45b9c8cd8
-EBUILD yadm-1.12.0.ebuild 1258 BLAKE2B 6c1cda1aa6ff1f7ee5eae8dc43cee7aed49b7eb6e7d1a130c932fd58c8518268fa56024cf18dde7eeec50c0053693493a1cf452ea169ab1668a22a424b3f1167 SHA512 78d6becc931275ddf9a63b55f270b7c4145e364b81d0c512742b5b3c7532c7e1242f840513614343c325a176d9126232de16a50cca977764fa16726820bf94c9
+DIST yadm-2.4.0.tar.gz 96877 BLAKE2B 462a5816e106c4502007ff34ab338904e14a9851ebcfc7ff79a32a8b11fbbe3e0b7e6538ed6b489ab67e2205c84b2250749e3091c77fa663886dc9792078a576 SHA512 43e16a9502f9dd9f6c6dba3bb5403bb048244a406d44cb42a96a43e62bf7342efd5f302304dbedede61423546787fc929f378d68da9031207e70239ec4e265ce
+EBUILD yadm-2.4.0.ebuild 1348 BLAKE2B 59d48345afeff41cd3ca05cdacdfcc275dcd012ffd5a04b99cbb7790d7e995105a002621a789b0543afb95e36f5531d50d0ac8c59b25607d602e3606ae78eae4 SHA512 0e4fe41bb17f8129175bb42625bf98511ce9a2787a23239813c11c79e0079f86635e04f13a5bc7976e1e103f9b859842229b0c527408ac4b0e38baa23ddcebdb
 MISC metadata.xml 825 BLAKE2B 6fbf4554179cf6141396b8e21be3dada54c0eec7c5c5bd1e18860b73f1d170044006b92010f7dd5d3c2238f8545024ee43dc2c86305e8bc91871acdd497c8749 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb
diff --git a/app-admin/yadm/yadm-1.12.0.ebuild b/app-admin/yadm/yadm-1.12.0.ebuild
deleted file mode 100644
index 55922bd1e757..000000000000
--- a/app-admin/yadm/yadm-1.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="A dotfile manager for the config files in your home folder"
-HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
-SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="zsh-completion test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-tcltk/expect
-		dev-util/bats
-		dev-vcs/git
-	)"
-
-RDEPEND="
-	dev-vcs/git
-	app-crypt/gnupg
-	zsh-completion? ( app-shells/gentoo-zsh-completions )"
-
-src_compile() {
-	emake "${PN}.md"
-}
-
-src_test() {
-	# 109_accept_encryption tests are interactive, thus fail. Skip them
-	# 113_accept_jinja_alt.bats are depepending on the optional envtpl
-	while IFS="" read -d $'\0' -r f ; do
-		bats "${f}" || die "test ${f} failed"
-	done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -and -not -name '113_accept_jinja_alt.bats' -print0)
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "${PN}"
-	doman "${PN}.1"
-
-	dobashcomp completion/yadm.bash_completion
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins completion/yadm.zsh_completion _${PN}
-	fi
-}
diff --git a/app-admin/yadm/yadm-2.4.0.ebuild b/app-admin/yadm/yadm-2.4.0.ebuild
new file mode 100644
index 000000000000..10da88e012a8
--- /dev/null
+++ b/app-admin/yadm/yadm-2.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="A dotfile manager for the config files in your home folder"
+HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
+SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/gnupg
+	dev-vcs/git
+"
+
+DEPEND="
+	test? ( ${RDEPEND}
+		dev-python/pytest
+		dev-tcltk/expect
+	)
+"
+
+src_compile() {
+	emake "${PN}.md"
+}
+
+src_test() {
+	# test_encryption: needs write access to /tmp
+	# test_alt, test_compat_jinja, test_unit_template_j2: needs envtpl
+	# test_syntax: needs yamllint (not packaged)
+	# test_compat_alt: known broken, tests deprecated features
+	# test_compat_jinja: needs envtpl
+	rm -v test/test_encryption.py || die
+	rm -v test/test_alt.py || die
+	rm -v test/test_compat_jinja.py || die
+	rm -v test/test_unit_template_j2.py || die
+	rm -v test/test_syntax.py || die
+	rm -v test/test_compat_alt.py || die
+
+	pytest || die "Testsuite failed under ${EPYTHON}"
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	newbashcomp completion/yadm.bash_completion yadm
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/yadm.zsh_completion _${PN}
+}