Version bump. Use new cmake-based build system.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

6 files changed, 169 insertions, 9 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/Manifest b/app-misc/task/Manifest
index e0c84d0480b6..80a29f144659 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -2,18 +2,23 @@
 Hash: SHA1
 
 AUX task-1.9.2-configure.patch 2396 RMD160 b9baa279b777bb8dab9c3eb1324a81b2478d63eb SHA1 49e843a16eb3d51123be5e966703e9bdd0add9bd SHA256 fde3e622da34a58319e822f5ab845c79d46be6827c7a2d9cfc0b356af4372538
+AUX task-1.9.4-lua-automagic.patch 907 RMD160 4898aede6ad624eaaa2cf1268c100333b4518b67 SHA1 97bddfe68524fe11a0b7535ab814aaa96f15c834 SHA256 8e42b81c13030fb40342e127906ea528265bde9da61d7a48b67de56ef115f7cd
+AUX task-1.9.4-rcdir.patch 1585 RMD160 d7b50c3485e45cd628f38176eadc3a1984f9899c SHA1 163b9df7428b3422657f52dea84938898bab36b5 SHA256 e49f6a0a1ee5fd71a2bb0b3650f4196bd172128751fee7f2a00c32cbef5dde02
+AUX task-1.9.4-remove-ncurses.patch 701 RMD160 37ed0ee3e9997d5f9fda441626b78e77577ff01b SHA1 03be8ea636fd92db6dd2c4edffc7491de605bc3f SHA256 196c93c304077aac9e0be4644e29c3ae0c01b7a3b7eb9aec96d1f1e60c658d57
 DIST task-1.9.3.tar.gz 314687 RMD160 4d7b838c483b7776cb91c4c121907c58d958e0f7 SHA1 997aeb6bee5785b2148ad8fb665551d320114cea SHA256 66f3a85475984a54a457d2aefefb0896710cd656853fc3fc46455753958dbeca
+DIST task-1.9.4.tar.gz 479079 RMD160 4f17bfd08d94fc2c9c2da74a2fe0a7322d15623d SHA1 b9bae255f4fa03970eced3ac0876935271d1d7a1 SHA256 1020621c9bf885c3216a5c11cacced3c916b6495e0d09846b7438a152618d34a
 EBUILD task-1.9.3-r1.ebuild 1670 RMD160 6024fc1d78ffcd407a240408da88cdf004c70438 SHA1 1f8b839418e6efe56241370cf3ff8d38c8a3c2ad SHA256 b13c006cc4a63570f30ac07a41fa44c959d3ddc28c0cd2beb4dca4a3ed7d7e8c
-MISC ChangeLog 2000 RMD160 975349aa29eafb3d6c1ddb59572ff04063c6170a SHA1 f5d875e027a68f189f74899101bc437ec1acccb0 SHA256 a1c1c60cb6d60f8f47b60aef6448f2b6ef13126f1b8440c89c487948934ed613
+EBUILD task-1.9.4.ebuild 1650 RMD160 e017de33e09270cd6e19bd7205a7066c979dbd52 SHA1 490cfd733c5f47998bdd5a6bf7bd9d294e440053 SHA256 a0db086ce3e0d6fde4beb89ef1299124b0eaf895eb8f1715ce77f0a7f798901a
+MISC ChangeLog 2261 RMD160 5b65239cbc4d8dcffba33c41ca4792352f5643c5 SHA1 4aed582f3bb9b8eecde928181794891676179e81 SHA256 399a64180ce20c3ddc97259479596d5a24e3ff6cc2103069b3eb580a31343878
 MISC metadata.xml 249 RMD160 a5babf138125425341877a815124eb64b960822d SHA1 d8d6a882d321d9f63e39129680cf4e6ce6dd5b6d SHA256 3ff4375deaa1a580af26f45c44db59c83418083f469e1c94a3e21a72d5001347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNVQ8eAAoJEEqz6FtPBkyjHJgH/0PgmUVH1JVMInPrxoR3vU/u
-TWssVtqx3vin10eK+eIAFFZfGLVtsg8HXDcP8Jyt6mYc3oQ1EhXwzy5tGrwEYwfJ
-j+3/S1zmpZJD/Canhm0WZ1sQORV/b/4Gg8ZHtKxCmMe11+X5CEXqum4G70RDBhRF
-vALKAdSuUT40IjHNs6fkQAZiT3nml2EX4h7n1vswvW5z7fLvRX/bweSEoSohMLhT
-cjnL+AiyX/EaRcvGPjRxw1Db0GKFbboKuezR53aRm5KVuXio28HghOiBLTLeOFeY
-F+2/mFlA/Eo99zEp+IaRPV9szrhj8GaAoB9fRA5tUDCkaUWX9I1vwXUzc0SMbbk=
-=e0po
+iQEcBAEBAgAGBQJNdI+pAAoJEEqz6FtPBkyjsLUH/0zhWpjeKsb/6LNgKZfXull5
+zEOm73LOa9Z9YNCMTNM8TGeiT9cDxqmNQxPhzv+o0pHw5n5NOyglr366Po/0fayU
+KqagJuXziQXbnFBea/igfUlKvqUSuyGtMJwBbIP+uw7GeYvFx/4EaLoqgCtEbTWZ
+51zRKSv9CdkP60wMUBA9UTntNmFu8uaoDXqOMNXCCZGyOZmfIms3qGBjl42hdqOx
+e0Vh7TGs28OMmxo6FWy1Czla47RUoI92sohJkkgIviWL3YCT9oOYrUo+tB0QrKcs
+6PG+G7nz7bM96JHa4Gs2pr/EeIvcLKG+zAZjPS7uteIByMqpnJg2Z/XDdiyglEY=
+=THN6
 -----END PGP SIGNATURE-----
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/*
+}