Fix automagic gnutls support (bug #522230).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 103 insertions, 1 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/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/*
+}