Version bump.

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

4 files changed, 112 insertions, 9 deletions

diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index c163a9ac301a..1d739df7457d 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2011/10/04 03:41:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.25 2011/10/17 19:32:20 radhermit Exp $
+
+*task-2.0.0_beta4 (17 Oct 2011)
+
+  17 Oct 2011; Tim Harder <radhermit@gentoo.org> +task-2.0.0_beta4.ebuild,
+  +files/task-2.0.0_beta4-rcdir.patch:
+  Version bump.
 
   04 Oct 2011; Tim Harder <radhermit@gentoo.org> -task-2.0.0_beta1.ebuild,
   -task-2.0.0_beta2.ebuild:
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index d8eeea3caa7e..6b885a2c3c07 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -6,21 +6,24 @@ AUX task-1.9.4-lua-automagic.patch 907 RMD160 4898aede6ad624eaaa2cf1268c100333b4
 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
 AUX task-2.0.0_beta1-rcdir.patch 1576 RMD160 15bbfaa5fee144019ce09ab19a1e03914e11f757 SHA1 5d898bab4e061f16fc0ee53de4627fa28ece3f58 SHA256 eb3293b712410c5e224df2dfa0eb2b4328e49dc9bf0b3558d5b6fac833217540
+AUX task-2.0.0_beta4-rcdir.patch 1735 RMD160 10ed2c2dd7c3e598b72afc0a052d957ee109734f SHA1 905af60d9bd445b035d0c6aa4e96172bd6909e6f SHA256 75656f1520b3a86bf23f9bfddea02ca76dc5bae687a89c791e6679f29cf88b1e
 DIST task-1.9.4.tar.gz 479079 RMD160 4f17bfd08d94fc2c9c2da74a2fe0a7322d15623d SHA1 b9bae255f4fa03970eced3ac0876935271d1d7a1 SHA256 1020621c9bf885c3216a5c11cacced3c916b6495e0d09846b7438a152618d34a
 DIST task-2.0.0.beta3.tar.gz 3815342 RMD160 0138c0e7c6a404a4143b56d4c8dd64a91720555c SHA1 4f5d287a468d247ce2b5ecaf8d0fafb0d7348513 SHA256 b4997d46414ff8b547ec5bb2645405f00512fb7a0f69b2dbc24781541baab18d
+DIST task-2.0.0.beta4.tar.gz 4167015 RMD160 dd803784b60bf5168b6c0d243598ff8211103ec9 SHA1 9b31fa334cc64c2e0e89aa66c5bf2d578325b32f SHA256 3cd8ccdf909af07608b46da6ad084766cdd6657d786b6b639da50e4fcb3236b1
 EBUILD task-1.9.4-r1.ebuild 1644 RMD160 8fef440073404e3c899f293ae5eb3ae5424e5d00 SHA1 91b1d2aea1b2089126dfe13b7a25673ec529a36c SHA256 bb91f15a574380d72f3c7fc165fb785dcb01a49f11854575216eff263366a439
 EBUILD task-1.9.4.ebuild 1656 RMD160 4106bb57c48074c8cf00f880cfa8ca142f7730b3 SHA1 db302b79cdcafe515214a22b70883127cec0ef23 SHA256 8f77a90bc9dc8f79e87ebd95b8cc269ae8b2204fbec7d966a07e6836bbcaf290
 EBUILD task-2.0.0_beta3.ebuild 1606 RMD160 6504fac7f488185b6913e94042c2316449d760c7 SHA1 2de47966bda55a92eca4c5c30a83d987e155d84f SHA256 1318a7e47280b59990b65e6b765286a2abebd8e8dc02e9185a226bc051b434b5
-MISC ChangeLog 3958 RMD160 aa447534f7103c82f2261b852113b8f362c94ede SHA1 19b24dc4dd198fd19b46d9cbeb64d9adcd497439 SHA256 242e755ce949f70d9163e025b400a0c563255d015661566ac86e574ab46ea3ff
+EBUILD task-2.0.0_beta4.ebuild 1591 RMD160 06fc24f0e8699127e6cb18132d5562436840e782 SHA1 916613a9484d907e59101cc1a8d5768a1d09ba40 SHA256 ba4cd7359156f0fa4f48a5463a18c8a91cc5a8189000f0afac25f7b29506932a
+MISC ChangeLog 4122 RMD160 a542ccbc8b33c7225de1aa3ad6579a524796fa5b SHA1 edde02c0b539dc153cf3a140683c52563b8bfd67 SHA256 f4aa17c5a127f542f2e38e738cd4d5ef916d1f064ab5cd73615c1559933f8086
 MISC metadata.xml 228 RMD160 d76fb09804bd7c3340ad0845df7ba7187842f54e SHA1 fc25d06e901526005b042c254ba9b26359cf4d03 SHA256 1b7e281c5478397754b53aa513c61f0477cdbe9900bb3b795239e5770ee52665
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOioCJAAoJEEqz6FtPBkyjPBUIAKJ0B548hyvzx5DR8DnM4v+y
-zZjwO5YRfBc7sGPJTeto/uYdKsYMWoL2MMC2oTM4dGpvRbLSQzyWQD6n8zzqxdSG
-UzokwtUwO2/hwm8TrKdjDxOfIVA/xhGBfANbslqT/oRXn/GXt+MuN1VxpgHCabFi
-fQ1MaJrDdvpsLghTfK3SSHqcDXT1WtBHcCZd3nd9l0stQL//4702mRsvkho7bMIw
-KRs7wSy5NeOfmmVqGWDerDgXupVjMy6JfMVTJMG+124ziRjAERvYYtNwPF+o4QiO
-msF+PcpvWJkEgGFKPkzbIBLnJ0sKS4zMR59X36SRMaexh8xh5f3tnGHXwxAzqgA=
-=Ri8Z
+iQEcBAEBCgAGBQJOnILJAAoJEEqz6FtPBkyjL04H/043lFtjFO9w3dPqQXERv8fG
+hTKmQHDxNQ358To3H5pm6QJo0yiaZ3ACYYLlxCpb10BJAjD9w/S4t4RSqvKTAeqO
+nZHGP20iV/qJwmcMTOxYLIltFp13JVIiYoDfPFaU9wXX9ggHnI5ruTyNXDY+MczK
+o7wW9eeUVC1lFudWVbGHIIzaDNs1l++vsYOrAnLG0BZ89WqxPXIPBvEsden7HGyy
+GWKoMsBzoH3AypU3eZdi9rS7fXSt4lB7Vs/Fa8pLGtloaiHrVV9yr3gRXIo5wrqT
+OjlI6vQV0SQv6TRAUV6WgaSxNsVSEjwNjw46f3uV+h0x5DuFraFPn949pZQ0a8k=
+=Ti4q
 -----END PGP SIGNATURE-----
diff --git a/app-misc/task/files/task-2.0.0_beta4-rcdir.patch b/app-misc/task/files/task-2.0.0_beta4-rcdir.patch
new file mode 100644
index 000000000000..0a2f1e63bb19
--- /dev/null
+++ b/app-misc/task/files/task-2.0.0_beta4-rcdir.patch
@@ -0,0 +1,30 @@
+Install non-documentation files in the correct directory
+
+--- task-2.0.0.beta4.orig/CMakeLists.txt
++++ task-2.0.0.beta4/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")
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+--- task-2.0.0.beta4.orig/doc/CMakeLists.txt
++++ task-2.0.0.beta4/doc/CMakeLists.txt
+@@ -11,6 +11,6 @@
+                                                       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})
+ 
+ install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})
+--- task-2.0.0.beta4.orig/i18n/CMakeLists.txt
++++ task-2.0.0.beta4/i18n/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ cmake_minimum_required (VERSION 2.8)
+-install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_DOCDIR}/i18n
++install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${TASK_RCDIR}/i18n
+                                                 FILES_MATCHING REGEX "tips.*"
+                                                                PATTERN "CMakeFiles" EXCLUDE)
diff --git a/app-misc/task/task-2.0.0_beta4.ebuild b/app-misc/task/task-2.0.0_beta4.ebuild
new file mode 100644
index 000000000000..7f4d04593147
--- /dev/null
+++ b/app-misc/task/task-2.0.0_beta4.ebuild
@@ -0,0 +1,64 @@
+# 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-2.0.0_beta4.ebuild,v 1.1 2011/10/17 19:32:20 radhermit Exp $
+
+EAPI=4
+
+inherit eutils cmake-utils bash-completion-r1
+
+MY_P="${P/_/.}"
+DESCRIPTION="A task management tool with a command-line interface"
+HOMEPAGE="http://taskwarrior.org/projects/show/taskwarrior/"
+SRC_URI="http://taskwarrior.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lua vim-syntax zsh-completion"
+
+DEPEND="lua? ( dev-lang/lua )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Use the correct directory locations
+	sed -i -e "s:/usr/local/share/doc/task/rc:/usr/share/task/rc:" \
+		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 \
+		"${FILESDIR}"/${PN}-1.9.4-lua-automagic.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
+
+	newbashcomp scripts/bash/task_completion.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/*
+}