4 files changed, 84 insertions, 71 deletions
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 637c9be95179..8f2e6d07c535 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1 +1,3 @@
 DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6b0834f875b1b02b38dbfde5e961122fdde00dc5ff29b56226a5ce0f805bd1be8a8194c9e185ab80ad6d6c2 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10
+DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
+DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
diff --git a/app-misc/task/metadata.xml b/app-misc/task/metadata.xml
index 3720d3657373..4e5600a7ba03 100644
--- a/app-misc/task/metadata.xml
+++ b/app-misc/task/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ddenoncin@gmail.com</email>
-		<name>David Denoncin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="sync">Enable "task sync" support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>ddenoncin@gmail.com</email>
+  <name>David Denoncin</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="sync">Enable "task sync" support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/app-misc/task/task-2.5.1-r1.ebuild b/app-misc/task/task-2.5.1-r1.ebuild
deleted file mode 100644
index 25ea234d42b0..000000000000
--- a/app-misc/task/task-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Taskwarrior is a command-line todo list manager"
-HOMEPAGE="https://taskwarrior.org/"
-SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="+sync vim-syntax zsh-completion"
-
-DEPEND="sys-libs/readline:0
-	sync? ( net-libs/gnutls:0= )
-	elibc_glibc? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# don't automatically install scripts
-	sed -i '/scripts/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_SYNC=$(usex sync)
-		-DTASK_DOCDIR=share/doc/${PF}
-		-DTASK_RCDIR=share/${PN}/rc
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newbashcomp scripts/bash/task.sh task
-
-	if use vim-syntax; then
-		rm scripts/vim/README || die
-		insinto /usr/share/vim/vimfiles
-		doins -r scripts/vim/*
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh/*
-	fi
-
-	exeinto "/usr/share/${PN}/scripts"
-	doexe scripts/add-ons/*
-}
diff --git a/app-misc/task/task-2.5.3.ebuild b/app-misc/task/task-2.5.3.ebuild
new file mode 100644
index 000000000000..3b3b987763ac
--- /dev/null
+++ b/app-misc/task/task-2.5.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${PV}/${P}.tar.gz
+	https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v${PV}/tests-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+sync"
+
+DEPEND="
+	sync? ( net-libs/gnutls )
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# move test directory into source directory
+	mv "${WORKDIR}"/test "${WORKDIR}"/"$P" || die
+
+	cmake_src_prepare
+
+	# don't automatically install scripts
+	sed -i '/scripts/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_SYNC=$(usex sync)
+		-DTASK_DOCDIR=share/doc/${PF}
+		-DTASK_RCDIR=share/${PN}/rc
+		-DBUILD_SHARED_LIBS=off  # bug 764224
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${WORKDIR}"/"${P}"_build || die
+
+	eninja test
+}
+
+src_install() {
+	cmake_src_install
+
+	newbashcomp scripts/bash/task.sh task
+
+	# vim syntax
+	rm scripts/vim/README || die
+	insinto /usr/share/vim/vimfiles
+	doins -r scripts/vim/*
+
+	# zsh-completions
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh/*
+
+	exeinto "/usr/share/${PN}/scripts"
+	doexe scripts/add-ons/*
+}