gentoo resync : 16.09.2020

4 files changed, 89 insertions, 2 deletions

diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 323f0193efc7..edb943995ab2 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD task-2.5.1-r1.ebuild 1264 BLAKE2B 9ce29b7eb39bd74479dbd22f7169072047f6f84610dadfffff0cc092ec28764be925760ef0707c37b91294bbeb9bda530fde908837e704ed9d2132a338d32508 SHA512 1cb91bbc30012a9c292a4d3b3c40aa6ef80ff7580b2fd86d9e12e7a1b49b414c0fa9de60c1ac6b55067b5f258977517b7f103488d2923cd4e96d787dc074d150
-MISC metadata.xml 236 BLAKE2B f169c33fe55c71f409182027bb298488600a0430d4c48aa4330f560e294c808ece6dfd6c6060ed3b8dc2206e2c50c5b092431b3cb04d5305744f90f1775a67e0 SHA512 f480ca34742d0ccf07a52fa544ccb6a0d8af3426341e5b0e2492c9f349cb2e3788c87424208559af17f6552764b65e278e290148d9644a935e1e4aae2445a55a
+EBUILD task-2.5.1-r2.ebuild 1168 BLAKE2B 300fa4227912d43a7f81d2ab75b9d473057985625a31ec20c96d7e772955b110eb42d3e349ce5846889928ad26a0219645b8bf9bc420c052194b68f0159e5fc4 SHA512 877291c8484b3c6fea9a6ebd32d8ffe996540ce292b4f61e27e56754ca6fd4d2fb928ae901081e5bd76837c7803032997459d8207cf47c154983d7a4a0a27629
+MISC metadata.xml 435 BLAKE2B bc50b21afa9614b81ef07ba84c6261fa5978fc8e050a7b2436e83eb2030a86404c89c37a2acc6164d53d0aa265921fea209eb0e3e10d67b3dc028a41f4a2885a SHA512 2b2ea567948e32f5cab9fbebb7e5b96add831e4992eab88bcc304c26eb2bf533fade36048dbdbf36202c174a63cd8587b33f2a7ba86d0fd8bf009a860c9a7593
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
new file mode 100644
index 000000000000..e138134fcd9a
--- /dev/null
+++ b/app-misc/task/files/task-2.5.1-clang-build-system.patch
@@ -0,0 +1,17 @@
+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 41d4a9ba90e9..3720d3657373 100644
--- a/app-misc/task/metadata.xml
+++ b/app-misc/task/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<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>
diff --git a/app-misc/task/task-2.5.1-r2.ebuild b/app-misc/task/task-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..3f7eacc9f2a5
--- /dev/null
+++ b/app-misc/task/task-2.5.1-r2.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 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/*
+}