Version bump. Use new cmake-based build system.

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

5 files changed, 156 insertions, 1 deletions

diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index 3ad8082fa89f..12a8326d11fb 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/task
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.11 2011/02/11 10:27:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.12 2011/03/07 07:56:17 radhermit Exp $
+
+*task-1.9.4 (07 Mar 2011)
+
+  07 Mar 2011; Tim Harder <radhermit@gentoo.org> +task-1.9.4.ebuild,
+  +files/task-1.9.4-lua-automagic.patch, +files/task-1.9.4-rcdir.patch,
+  +files/task-1.9.4-remove-ncurses.patch:
+  Version bump. Use new cmake-based build system.
 
   11 Feb 2011; Tim Harder <radhermit@gentoo.org> -task-1.9.2-r1.ebuild:
   Remove old
diff --git a/app-misc/task/files/task-1.9.4-lua-automagic.patch b/app-misc/task/files/task-1.9.4-lua-automagic.patch
new file mode 100644
index 000000000000..4d29766214a6
--- /dev/null
+++ b/app-misc/task/files/task-1.9.4-lua-automagic.patch
@@ -0,0 +1,27 @@
+--- task-1.9.4/CMakeLists.txt.orig
++++ task-1.9.4/CMakeLists.txt
+@@ -30,14 +30,16 @@
+ set (PACKAGE_VERSION "${VERSION}")
+ set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
+ 
+-message ("-- Looking for Lua51")
+-find_package (Lua51)
+-if (LUA51_FOUND)
+-  message ("-- Found Lua51: ${LUA_LIBRARIES}")
+-  set (HAVE_LIBLUA true)
+-  set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
+-  set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
+-endif (LUA51_FOUND)
++if( ENABLE_LUA )
++  message ("-- Looking for Lua51")
++  find_package (Lua51)
++  if (LUA51_FOUND)
++    message ("-- Found Lua51: ${LUA_LIBRARIES}")
++    set (HAVE_LIBLUA true)
++    set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${LUA_INCLUDE_DIR})
++    set (TASK_LIBRARIES    ${TASK_LIBRARIES}    ${LUA_LIBRARIES})
++  endif (LUA51_FOUND)
++endif (ENABLE_LUA )
+ 
+ message ("-- Looking for pthread")
+ find_path (PTHREAD_INCLUDE_DIR pthread.h)
diff --git a/app-misc/task/files/task-1.9.4-rcdir.patch b/app-misc/task/files/task-1.9.4-rcdir.patch
new file mode 100644
index 000000000000..2d146e35245e
--- /dev/null
+++ b/app-misc/task/files/task-1.9.4-rcdir.patch
@@ -0,0 +1,26 @@
+--- task-1.9.4.orig/CMakeLists.txt
++++ task-1.9.4/CMakeLists.txt
+@@ -9,6 +9,7 @@
+ SET (TASK_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
+ SET (TASK_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
+ SET (TASK_DOCDIR  share/doc/task CACHE STRING "Installation directory for doc files")
++SET (TASK_RCDIR  share/task CACHE STRING "Installation directory for rc files")
+ SET (TASK_BINDIR  bin            CACHE STRING "Installation directory for the binary")
+ 
+ message ("-- Looking for SHA1 references")
+--- task-1.9.4.orig/doc/CMakeLists.txt
++++ task-1.9.4/doc/CMakeLists.txt
+@@ -10,4 +10,4 @@
+                                                     FILES_MATCHING PATTERN "*.1")
+ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN5DIR}
+                                                     FILES_MATCHING PATTERN "*.5")
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc   DESTINATION ${TASK_DOCDIR})
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc   DESTINATION ${TASK_RCDIR})
+--- task-1.9.4.orig/i18n/CMakeLists.txt
++++ task-1.9.4/i18n/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_DOCDIR}/i18n
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_RCDIR}/i18n
+                                                 FILES_MATCHING REGEX "strings.*"
+                                                                REGEX "tips.*"
+                                                                PATTERN "CMakeFiles" EXCLUDE)
diff --git a/app-misc/task/files/task-1.9.4-remove-ncurses.patch b/app-misc/task/files/task-1.9.4-remove-ncurses.patch
new file mode 100644
index 000000000000..a0a3e6eeeba8
--- /dev/null
+++ b/app-misc/task/files/task-1.9.4-remove-ncurses.patch
@@ -0,0 +1,30 @@
+--- task-1.9.4.orig/src/ui/Element.h
++++ task-1.9.4/src/ui/Element.h
+@@ -28,7 +28,6 @@
+ #define INCLUDED_ELEMENT
+ 
+ #include <string>
+-#include <ncurses.h>
+ class Layout;
+ 
+ class Element
+--- task-1.9.4.orig/src/ui/Layout.cpp
++++ task-1.9.4/src/ui/Layout.cpp
+@@ -25,7 +25,6 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+-#include <ncurses.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <pthread.h>
+--- task-1.9.4.orig/src/ui/UI.cpp
++++ task-1.9.4/src/ui/UI.cpp
+@@ -25,7 +25,6 @@
+ //
+ ////////////////////////////////////////////////////////////////////////////////
+ 
+-#include <ncurses.h>
+ #include <ctype.h>
+ #include <pthread.h>
+ #include "log.h"
diff --git a/app-misc/task/task-1.9.4.ebuild b/app-misc/task/task-1.9.4.ebuild
new file mode 100644
index 000000000000..25a38d39353b
--- /dev/null
+++ b/app-misc/task/task-1.9.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-1.9.4.ebuild,v 1.1 2011/03/07 07:56:16 radhermit Exp $
+
+EAPI=3
+
+inherit eutils cmake-utils
+
+DESCRIPTION="A task management tool with a command-line interface"
+HOMEPAGE="http://taskwarrior.org/projects/show/taskwarrior/"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion lua vim-syntax zsh-completion"
+
+DEPEND="lua? ( dev-lang/lua )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use the correct directory locations
+	sed -i -e "s:/usr/local/share/doc/task/rc:/usr/share/task/rc:" src/Config.cpp \
+		doc/man/taskrc.5.in doc/man/task-tutorial.5.in doc/man/task-color.5.in
+	sed -i -e "s:/usr/local/bin:/usr/bin:" doc/man/task-faq.5.in scripts/add-ons/*
+
+	# Don't automatically install scripts
+	sed -i -e '/scripts/d' CMakeLists.txt
+
+	epatch "${FILESDIR}"/${P}-rcdir.patch
+	epatch "${FILESDIR}"/${P}-lua-automagic.patch
+	epatch "${FILESDIR}"/${P}-remove-ncurses.patch
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable lua LUA)
+		-DTASK_DOCDIR=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use bash-completion ; then
+		insinto /usr/share/bash-completion
+		doins scripts/bash/*
+	fi
+
+	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
+
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/add-ons/*
+}