Fix automagic gnutls support (bug #522230).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 113 insertions, 9 deletions

diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index 884c3fde8dbf..dcdb184ea2aa 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/task
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.48 2014/11/28 17:16:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.49 2014/11/28 18:00:46 radhermit Exp $
+
+*task-2.3.0-r1 (28 Nov 2014)
+
+  28 Nov 2014; Tim Harder <radhermit@gentoo.org> +task-2.3.0-r1.ebuild,
+  +files/task-2.3.0-gnutls-automagic.patch:
+  Fix automagic gnutls support (bug #522230).
 
   28 Nov 2014; Tim Harder <radhermit@gentoo.org> task-2.1.2.ebuild,
   task-2.2.0.ebuild, task-2.3.0.ebuild:
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 3bce45f526c8..ef3db20e3483 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 AUX task-1.9.4-lua-automagic.patch 907 SHA256 8e42b81c13030fb40342e127906ea528265bde9da61d7a48b67de56ef115f7cd SHA512 3ab332dc2d8457c97625d30aa89ea304a1b7a1ee6a735a76438dcacfb219200ec9ffe40c147854b2750da6514de13fa8c084f5b48ed4b55163f9da57ca30d6b7 WHIRLPOOL c2ea68f731dfc228ace2d98e6e233fb54245621eeafb178d62be2d5422ecb3fa8949bac1e0c0174ca9fd44cf7bbc2d75e3dfa14d4eb247c49b14941ad6aa1e3c
 AUX task-2.0.0_beta4-rcdir.patch 1735 SHA256 75656f1520b3a86bf23f9bfddea02ca76dc5bae687a89c791e6679f29cf88b1e SHA512 6341edca1682172779617d4914a7ae4356c71947f3f19f6949559627ce9ac14b85fd02c46df84e9c57043b59cdd58c7ce72711608827f9297486c52d224c4b24 WHIRLPOOL dda07f52690344219885570d64b62a44076b53dbeb2491f7643351cf338d1a1c6e31783cd78596b87c78df442805dd1a5aef3bc3dd5a250422447819a6b6a622
+AUX task-2.3.0-gnutls-automagic.patch 1055 SHA256 8adeb0734d5d46987f62f7edb38064a64061bf7416e5bc2057de914ec3033911 SHA512 d20f35e1aaef55afcbf0c40ca643c43d3f72d3c4c97ed0c6adf396afbf25e6c45435cd5236e37b5c0f9076d5759727b62e1546bc84020294c7a9589e5e9089d1 WHIRLPOOL b29ec217487bf5aa0a624dd7400376e711f1e7eaaa5657529ca73068dc78923f867f4a52251c10fed02df3addc57e85a5cfc228feea81c1c50894274f9ab136d
 AUX task-2.3.0-issue-1473-rcdir-fix.patch 1155 SHA256 6cf754ba77ebda5d012bfe60a5d8b737a6551238bdc1346c3090c6999dbc4084 SHA512 b856a63a29ed7a06d87be8a9edd2c94d01f9d1a213086189628c1e99588a6537903317744b5149ea67d5b613b456a829d05d87d320938f736689836fdaedcb1c WHIRLPOOL 64a18744226b6a595b3acabc1e5450c3092bb7d7017c1b857f604e240afd1689f309d8e40007dc2aa8f4f21efcc54bf50575aa6de7604fa0d09270ee32b8f3f3
 DIST task-2.1.2.tar.gz 4639841 SHA256 cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36 SHA512 b9c802503b5580f6c1b965cdee1e39386e818027adba69699071d28dca12c27b37963bb9586b17a764c3430d3405a55febae176b6ef087798660020f2f683b86 WHIRLPOOL cba5aeb279021cb98b9c23c417182f7f2ebd9a05468bd283d10703f2b177c36f9e7c71c2466d4ebaadfa4b9524bd86c202e93be45fa172037c0d1b5e0d51c20a
 DIST task-2.2.0.tar.gz 1190905 SHA256 39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14 SHA512 16ff1ccd037d62fc99ea0a31647714d3ccf8a90948b67d845d55e08e4bf49bb6a7f69f7464f485093abeff0672f17dc5f6d4efd96d2e447316975d185082f862 WHIRLPOOL c790c59a8867249ede33d51a85d33987a51f1031db225267fdac4e50e6f8ac3f94abc8ef80577648a783aa85d4b1297e7e8be55103750e46bb521d1282c8555e
 DIST task-2.3.0.tar.gz 1238592 SHA256 2b9a289109e691e305b84631622299853134cf195d4c9af962759b640176ac73 SHA512 9a17ec79735800edb6b5b4c6eede6ef62e8374a80a4f566b967e8ee45883e0d3533d4c3643a858f12adf6b9021fb8c9d54cae7620ca4749cf4237f0235e1d483 WHIRLPOOL a160a0df5d6ab27ee6fa608964ea38c950f786519737578406248812b8e13f5dcf03045ecb7d9437b824b1aa76d2124396d381397729270f17796d00ef0aee18
 EBUILD task-2.1.2.ebuild 1627 SHA256 da11b812313dca482a1fd28ea0ccb41690e6ed30e9fbf1747f4271eded6cf3cd SHA512 badd1d50dcb87242fdf2a50620eb749a304cbe9aabdbeaebfcb7ddf485aba33e942a157f74dc1459d46e6c59699d403b35696cc05b779c7a13a1cc10be2c5f42 WHIRLPOOL b3dd595fa8220bbbbdaa60b394b02c77c78c20ba95e037413aa95f3b7be3465e53cec06fe4435eb8ddd21f0f8e313ba56e3cc2c791799121034a2402d6a71d10
 EBUILD task-2.2.0.ebuild 1443 SHA256 b347612e79177eee79efb37ff1bacdf4c7df0afb0f6337d9305ad13f9edb89db SHA512 6a94c4b7105af278b811075a64869f0048dc4ee7f012e3dcd082c63c7344ee214059458546d853db05e6f7d913b2d4aae5e46d6a4bb5154867e6984581983273 WHIRLPOOL 4258bdd315292a96c5d5890d8e96bc9fcb75efb333065b93f7f6fe49f2fdbb91b70d3cbb3353f4c4107e54cd1f202d3446c459a6fcddd3257963749e175e3d11
+EBUILD task-2.3.0-r1.ebuild 1488 SHA256 b10bbfccf6bab9ec335bd0a5bb9dbdddcf580d27884814b27c3635ef69b8bf46 SHA512 e88d5482a78daadc5074881fc747145d4a104b3e7cdba8743e8e2a8100942b88d9e9751741d1dd99e065cd55d202ec804a553f874fdd18b104246d9680935e0a WHIRLPOOL 37eec1a014abeb4240c488effa5989e97c9a9545456cc47f1ef3593cc6e93c15416059d6d0812bbea688fbb6fa62601b72cb307ca467b01ae907131ebf28d5ef
 EBUILD task-2.3.0.ebuild 1383 SHA256 38a3fcf605dd2075c27263557d9e85737910563eba83b2bf826c79da0a87a13a SHA512 bd53cc0af761c7a2068fd751dd562734c58f5d37a9664893381a9ce9002a1b69e0b3d898c637df94cd46486dd83459d44d7e2911fffb0632bba07e34c68ecebc WHIRLPOOL feab609b4a3a22711fb76db6a22d15d21cab71d0da844ed0619fb3f50732736ba873afc6046a7c0a5e5c6868f4c193645d2e2011de22fa19f006f35c5c9220ae
-MISC ChangeLog 7050 SHA256 caa522d5d240c8ca966534e82b7897a232a951d5b3278f2b614329838a5fe340 SHA512 4490add301ce58ae8008eb262003350933ca79d06ba4612953fb9ba3701e9fe9723c5cf98e53689fb943c06b6e77cb554640df3e82814cb43fed77ab48000c60 WHIRLPOOL e90fc73be9ce0e135cdc72d08d8ab76612875fc424631533c3bf8492d424cae3fe33173fd91ca3dec74fbe3296373e0decceed4add2e18cdf166bb964dbb16de
+MISC ChangeLog 7243 SHA256 982ed1fd90b48a367b09003dfe8ca657a8d5c6488c15463d29775a278d87b7c4 SHA512 1554cae8cbd15acfbd65dc739a439c837c4cc8503d8c55299e633493b3247ac500d486d48a31299778bee1579fa30ad2d779d517fa0734f58e7ed4fd15b21c9e WHIRLPOOL be6b86835609468da3945d79dc9c7294d15a233bc8120c9cac4bb420ffa0f38f37da2b89a65a62dd7eb8158bbc277134f9078ca9047ab328530ab96e489ce2e9
 MISC metadata.xml 228 SHA256 1b7e281c5478397754b53aa513c61f0477cdbe9900bb3b795239e5770ee52665 SHA512 a056b549dccf17ee69a41734313bd6d31ec01b17f001589ed40a05612ffdc1b46bb63a8c7931c5109b5dc86756e752fb53226c6fd7fe97d3fb9173318879aeb5 WHIRLPOOL cd9298d522880abd757087ecec3835327043dbd25acecaa0ac30b4e337ee24c6d2f423c666b017406a92cd62c28a2f02aeae69a12fcdbdf41e8344cb5b793b9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUeK37AAoJEEqz6FtPBkyjYs8IALQChwuxp9i3RjrLJPhXEWJ8
-BvKFxPWi4zQRQnMwc8ULvFQvgURQXDUP8479Mb5BeQx/rvSZ4yK8h0D4hqE64cE+
-dCpTiTH9lSAJe5Xroh5YsvLtq9EN1sAJj+q5LWDns8uhj/a6m6n/WBtXUYbp+RQX
-etNdvxY00BOBj4lv6Tww2lcsGzbocReBClsjaWbalys0wb420BQMgvBT9GRxW/NJ
-kZIUvZR2+8wYU4ntUSlc3F5k/fFFewp1f2fmi1hyLvKkokDC8iWsWCEGiQlGYMUF
-9o/Z4Cuozxenop2k4+AZN5aD8Z9LUAuT3C+l0lXx+tAaFD0MnHWUxhgfTAdhLXI=
-=rW4h
+iQEcBAEBCAAGBQJUeLhWAAoJEEqz6FtPBkyjyXwH/A0Edz6ZPMSW2i6fDxqB8tOr
+awnqXB/k6pEXAnMa8BN/eTm0fZ3o5v1mUb1zg0SJX2mS5N6/PI9h4cp1TlWnopmA
+blCOxqZ21TebNPe9zhLgV6n2gBdIciz+sYHeqnFpT+OSf7g4uNo/4d4P3lviEo5H
+NXo+2FOeN1c9QIDSBplQi3u69odzfbU/LUDOiNvq5j2g9JHakrSrZdXzak9PBv9v
+GBuYWs6VRPswiXUvXTKJ+stxvIjqRS4ptwX8UpJZW/ujRbamj4yruYeJ7UfUtx/0
+DXwwrH3N7c1HTFBFTC1uMECIX1XNLAYBcH5QnVt3d4rJep3Euw6BNyRWQbNu5P0=
+=gh/K
 -----END PGP SIGNATURE-----
diff --git a/app-misc/task/files/task-2.3.0-gnutls-automagic.patch b/app-misc/task/files/task-2.3.0-gnutls-automagic.patch
new file mode 100644
index 000000000000..33ab694bb480
--- /dev/null
+++ b/app-misc/task/files/task-2.3.0-gnutls-automagic.patch
@@ -0,0 +1,34 @@
+--- task-2.3.0/CMakeLists.txt
++++ task-2.3.0/CMakeLists.txt
+@@ -9,6 +9,8 @@
+ project (task)
+ set (PROJECT_VERSION "2.3.0")
+ 
++OPTION(USE_GNUTLS "Build gnutls support." ON)
++
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+   set (LINUX true)
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+@@ -59,13 +61,15 @@
+ set (PACKAGE_VERSION "${VERSION}")
+ set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
+ 
+-message ("-- Looking for GnuTLS")
+-find_package (GnuTLS)
+-if (GNUTLS_FOUND)
+-  set (HAVE_LIBGNUTLS true)
+-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
+-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${GNUTLS_LIBRARIES})
+-endif (GNUTLS_FOUND)
++if (USE_GNUTLS)
++  message ("-- Looking for GnuTLS")
++  find_package (GnuTLS)
++  if (GNUTLS_FOUND)
++    set (HAVE_LIBGNUTLS true)
++    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
++    set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${GNUTLS_LIBRARIES})
++  endif (GNUTLS_FOUND)
++endif (USE_GNUTLS)
+ 
+ #message ("-- Looking for pthread")
+ #find_path (PTHREAD_INCLUDE_DIR pthread.h)
diff --git a/app-misc/task/task-2.3.0-r1.ebuild b/app-misc/task/task-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..7775046b5815
--- /dev/null
+++ b/app-misc/task/task-2.3.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-2.3.0-r1.ebuild,v 1.1 2014/11/28 18:00:46 radhermit Exp $
+
+EAPI=5
+
+inherit eutils cmake-utils bash-completion-r1
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="http://taskwarrior.org/"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="gnutls vim-syntax zsh-completion"
+
+DEPEND="gnutls? ( net-libs/gnutls )
+	sys-libs/readline
+	elibc_glibc? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# use the correct directory locations
+	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" \
+		scripts/add-ons/* || die
+
+	# don't automatically install scripts
+	sed -i '/scripts/d' CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-issue-1473-rcdir-fix.patch
+	epatch "${FILESDIR}"/${P}-gnutls-automagic.patch
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use gnutls GNUTLS)
+		-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
+		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/*
+}