gentoo resync : 13.11.2021

4 files changed, 18 insertions, 53 deletions

diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 16cf7ab9eab7..16403fa99b08 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,8 +1,7 @@
-AUX 0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch 660 BLAKE2B 56250a860b836d64b190049912123ebc5a06202ad25a6aa974a420b856f472d7aa5364cee96539c204e2c09c88a9f6e59cc5606aacf5b8c29655310340233a49 SHA512 6af9226a73280ca1c5f3f95d11b9c8f10ad4d847df9401643a8294645031cd3141916e4b00a188e25795f4a51f9f55e4caf2ba3280d5c9bd89f44a89411389a5
-AUX task-2.5.1-clang-build-system.patch 720 BLAKE2B 346ed760dfdc0e7dfb90de4ed91f49fbe91e48e28c624177898ec317fef9f0c43854e18527c57b21ba84320dc87adde3837f5cce69e1ffeb548cc1cbc0ab51a5 SHA512 afeb97da39429fa7402d1f856923d168bd07ae05492099c3132ebf04e459707208ccd0c1a7927c554c7573ae4c296e224e49e12a72e499543057fe7a7b25d8e1
-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 task-2.6.1.tar.gz 836830 BLAKE2B 18531a462e9466d2bfc21af70c05ec75f504c82e67ff4160378dd1dc2438955284eb430ec92969ffd212e9e92b14d6bea6013beda8eb353bfb7b8aac03bbbb2d SHA512 996690831967b5b248d336f0848aa243d5929a34238d05a78d49930f477a7927966d097119cf2dd935aa1c159e930f74bac07b05327504b15d235348927b657b
 DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
-EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
+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
 MISC metadata.xml 466 BLAKE2B f2da2e60c939ef2864d1463434c7581457f8d05435cd428038f18fd00ce7cc24a92dc57430e35ff82927188f4a82f9e20f9f0da5272b7c63d0cf00901740747f SHA512 2211e19b9bec481fb3723596e8aba2c560071910c96f9225b4eb33da132a0563e36b2c6edb574c54061bcf480033cc5eecb3095b6ca1bd56fc7e8c3d38a08225
diff --git a/app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch b/app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch
deleted file mode 100644
index 6ff8ac22e21a..000000000000
--- a/app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d025f3deb6349f56a7fc49551e819cfe13f97917 Mon Sep 17 00:00:00 2001
-From: Paul Beckingham <paul@beckingham.net>
-Date: Wed, 31 Aug 2016 17:48:45 -0400
-Subject: [PATCH] TW-1778: Unicode strings are truncated in task description
-
-- Thanks to Andrew, bjonnh, OKOMPer, Vladimir.
----
-diff --git a/src/text.cpp b/src/text.cpp
-index f5e3496b..bc8353f7 100644
---- a/src/text.cpp
-+++ b/src/text.cpp
-@@ -248,7 +248,7 @@ bool extractLine (
-     // Premature EOL.
-     if (character == '\n')
-     {
--      line = text.substr (offset, line_length);
-+      line = text.substr (offset, prior_cursor - offset);
-       offset = cursor;
-       return true;
-     }
--- 
-2.11.0
-
diff --git a/app-misc/task/files/task-2.5.1-clang-build-system.patch b/app-misc/task/files/task-2.5.1-clang-build-system.patch
deleted file mode 100644
index e138134fcd9a..000000000000
--- a/app-misc/task/files/task-2.5.1-clang-build-system.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Do not force the use of libc++ when compiling with Clang
-Fix by David Denoncin
-https://bugs.gentoo.org/729560
-
---- a/CMakeLists.txt	2020-08-09 14:04:40.095904996 -0000
-+++ b/CMakeLists.txt	2020-08-09 14:04:59.449238208 -0000
-@@ -43,10 +43,6 @@
-  message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
- endif (_HAS_CXX11)
- 
--if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
--  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
--endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
--
- if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-   set (LINUX true)
- elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/app-misc/task/task-2.5.1-r2.ebuild b/app-misc/task/task-2.6.1.ebuild
index a73ab730fb9d..220608c028fd 100644
--- a/app-misc/task/task-2.5.1-r2.ebuild
+++ b/app-misc/task/task-2.6.1.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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://taskwarrior.org/download/${P}.tar.gz"
+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"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 IUSE="+sync"
 
 DEPEND="
 	sync? ( net-libs/gnutls )
 "
-
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch"
-	"${FILESDIR}/${P}-clang-build-system.patch"
-)
-
 src_prepare() {
+	# move test directory into source directory
+	mv "${WORKDIR}"/test "${WORKDIR}"/${P} || die
+
 	cmake_src_prepare
 
 	# don't automatically install scripts
@@ -37,11 +36,18 @@ 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
 }
 
+src_test() {
+	cd "${WORKDIR}"/"${P}"_build || die
+
+	emake test
+}
+
 src_install() {
 	cmake_src_install