gentoo resync : 05.12.2021

3 files changed, 72 insertions, 2 deletions

diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 16403fa99b08..ddabefcd5780 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -3,5 +3,6 @@ DIST task-2.6.1.tar.gz 836830 BLAKE2B 18531a462e9466d2bfc21af70c05ec75f504c82e67
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
 DIST tests-2.6.1.tar.gz 221364 BLAKE2B 6aac691ba1828abb3469dfa2a9c093b92431591ac21113f71550676f7f9c40394770ddd2c649bf6cda5655d5f1c25aa6c7ef174e9da7ea0c647109d25771dc2d SHA512 df252b252ac7e319d46ef7e72c587c52a97bf7b496ad401342611114db15b7fdab501b4fffc60ea6a8dca7820abc267120375a1aafd1da0a0c41b925e9fd62da
 EBUILD task-2.5.3.ebuild 1369 BLAKE2B 9a9697292649fccd81b763cb645879c7cd8a46ec8b7cf222ad3be528e2f9244e529fbf14a7a3151b535cfb2674daaae42a851821250f132216d305300b2a09b5 SHA512 6306303a1e824e13d14588d56f79559da8ae54dd237b64fc249dde94da842daf7ece3ea8ed7a5127261ac8e4f245adfd9de514a2d41e73c6248933c73c20a31c
-EBUILD task-2.6.1.ebuild 1403 BLAKE2B 9a59669bfcdf79fcf3c269bc309c994d9929af7b634f9324959460c323e70f08df3b4c4bf15c664e325463525a8ceeb4b876fd359d3ecb8a17e1f7dd3f0a3658 SHA512 ad38a0f60c2b2122c6494db7aef0b646bc3f78fec2fb13d07787b182b27a7297f373769d92913e4e57f67269cff869b3ea4a9ce7580c2408a78d4340768f0311
+EBUILD task-2.6.1-r1.ebuild 1443 BLAKE2B f6228b9e9f3de0220452bc7e3abdd7b4a3b5983d82b2474c9c5451b8338059958f608fa3140204035e038c1e57e54bce0912e2a36e83e382e62535d1c454a10e SHA512 619f60a1cceee92bac7db6c5c60ed82268d82deb82195e5bd11a9322fe19e24ac50d587c5f4a9bcc4498b17d5c293319b34358b820b34f02ee9384382472c0c4
+EBUILD task-2.6.1.ebuild 1363 BLAKE2B 194af9d8ec57b6ee79b11cbb1f9c8443a83b3fb27f777284515042bcdcec1a26ccbbaa258ae399dd12b53ed621ecde55e2ceb281b62519424092d323ae2f97b4 SHA512 db59c98871348a7d2baf95f36ec1cafd325287971a2bc677523c511433539e09a4d1d6a7778855e470067b252a6aed7939921219f04160e2c69d280830a87457
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225
diff --git a/app-misc/task/task-2.6.1-r1.ebuild b/app-misc/task/task-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..d4f6942da292
--- /dev/null
+++ b/app-misc/task/task-2.6.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+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
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${WORKDIR}"/"${P}"_build || die
+
+	emake 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/*
+
+	# fish-completions
+	insinto /usr/share/fish/completions
+	doins scripts/fish/*
+
+	exeinto "/usr/share/${PN}/scripts"
+	doexe scripts/add-ons/*
+}
diff --git a/app-misc/task/task-2.6.1.ebuild b/app-misc/task/task-2.6.1.ebuild
index 220608c028fd..f1d4aba890f6 100644
--- a/app-misc/task/task-2.6.1.ebuild
+++ b/app-misc/task/task-2.6.1.ebuild
@@ -36,7 +36,6 @@ src_configure() {
 		-DENABLE_SYNC=$(usex sync)
 		-DTASK_DOCDIR=share/doc/${PF}
 		-DTASK_RCDIR=share/${PN}/rc
-		-DBUILD_SHARED_LIBS=off  # bug 764224
 	)
 
 	cmake_src_configure