summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/task')
-rw-r--r--app-misc/task/Manifest5
-rw-r--r--app-misc/task/files/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch23
-rw-r--r--app-misc/task/files/task-2.5.1-clang-build-system.patch17
-rw-r--r--app-misc/task/metadata.xml2
-rw-r--r--app-misc/task/task-2.5.1-r2.ebuild61
-rw-r--r--app-misc/task/task-2.6.2.ebuild (renamed from app-misc/task/task-2.5.3.ebuild)14
6 files changed, 12 insertions, 110 deletions
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 8f2e6d07c535..bd91e260c52a 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,3 +1,2 @@
-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
+DIST task-2.6.2.tar.gz 838933 BLAKE2B 47761b1d172f823b35cb5d44edda2ac8d37daf9c54c6e3af267b880bf7f6246c6fbfa436ff63179b415f22c4e6d4253768bb7e9321893ebeaf46089761f309ad SHA512 3c592552c1baada09ef4e06cf2266c9897ffae42a75998b70767f2cfbabd2e1de7d1a900f16f3b8eb164ce19637dabd21e246f84732a20a646f39716895cdf98
+DIST tests-2.6.2.tar.gz 222713 BLAKE2B e65e2da08264a0dcceeb839efdfad4733312d645fa0dad9eb9fd7e1f260ed21db3009f1c2b3c939dc1a1bf8cf4389f228a0ba05844483fcb5e44de82c2d33fb5 SHA512 98946332f898c4cf621e1dfb2b48761ca9496a43935aca45bf5965029d74f87ff37154693348f13aeed0b61836fab7d2a3cec8161ddd2f65ed9402162fe21239
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/metadata.xml b/app-misc/task/metadata.xml
index 3c8e694cc2b1..8ab9c25fc84c 100644
--- a/app-misc/task/metadata.xml
+++ b/app-misc/task/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
- <email>ddenoncin@gmail.com</email>
+ <email>gentoo@denoncin.fr</email>
<name>David Denoncin</name>
</maintainer>
<maintainer type="project" proxied="proxy">
diff --git a/app-misc/task/task-2.5.1-r2.ebuild b/app-misc/task/task-2.5.1-r2.ebuild
deleted file mode 100644
index a73ab730fb9d..000000000000
--- a/app-misc/task/task-2.5.1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 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://taskwarrior.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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() {
- 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_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/*
-}
diff --git a/app-misc/task/task-2.5.3.ebuild b/app-misc/task/task-2.6.2.ebuild
index 47845fd51fdb..fabdbf3946aa 100644
--- a/app-misc/task/task-2.5.3.ebuild
+++ b/app-misc/task/task-2.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 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"
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
IUSE="+sync"
DEPEND="
@@ -31,11 +32,10 @@ src_prepare() {
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DENABLE_SYNC=$(usex sync)
-DTASK_DOCDIR=share/doc/${PF}
-DTASK_RCDIR=share/${PN}/rc
- -DBUILD_SHARED_LIBS=off # bug 764224
)
cmake_src_configure
@@ -44,7 +44,7 @@ src_configure() {
src_test() {
cd "${WORKDIR}"/"${P}"_build || die
- eninja test
+ emake test
}
src_install() {
@@ -61,6 +61,10 @@ src_install() {
insinto /usr/share/zsh/site-functions
doins scripts/zsh/*
+ # fish-completions
+ insinto /usr/share/fish/vendor_completions.d
+ doins scripts/fish/*
+
exeinto "/usr/share/${PN}/scripts"
doexe scripts/add-ons/*
}