Revision bump and remove old. Apply upstream patch to fix ssh syncing issue (bug #377451).

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

5 files changed, 103 insertions, 142 deletions

diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index 5c7242773f83..5090dd41d6c7 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2011/06/14 19:29:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.17 2011/08/03 17:18:56 radhermit Exp $
+
+*task-1.9.4-r1 (03 Aug 2011)
+
+  03 Aug 2011; Tim Harder <radhermit@gentoo.org>
+  +files/0001-Merge-Uri-support.patch, -files/task-1.9.2-configure.patch,
+  -task-1.9.3-r1.ebuild, +task-1.9.4-r1.ebuild:
+  Revision bump and remove old. Apply upstream patch to fix ssh syncing issue
+  (bug #377451).
 
   14 Jun 2011; Markus Meier <maekke@gentoo.org> task-1.9.4.ebuild:
   x86 stable, bug #370431
diff --git a/app-misc/task/files/0001-Merge-Uri-support.patch b/app-misc/task/files/0001-Merge-Uri-support.patch
new file mode 100644
index 000000000000..8e3d68529ed5
--- /dev/null
+++ b/app-misc/task/files/0001-Merge-Uri-support.patch
@@ -0,0 +1,28 @@
+From 13f456a5763cd6f5f95b661c3034ddd844feb088 Mon Sep 17 00:00:00 2001
+Message-Id: <13f456a5763cd6f5f95b661c3034ddd844feb088.1299803526.git.johannes@schlatow.name>
+From: Johannes Schlatow <johannes@schlatow.name>
+Date: Fri, 11 Mar 2011 00:54:43 +0100
+Subject: [PATCH] Merge/Uri support
+
+- fixed autopush bug where e.g. 'ssh://' was omitted
+  (Uri::parse() was wrongly modifying the data member)
+---
+ src/Uri.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Uri.cpp b/src/Uri.cpp
+index 6695b94..36791ff 100644
+--- a/src/Uri.cpp
++++ b/src/Uri.cpp
+@@ -198,7 +198,7 @@ void Uri::parse ()
+   }
+ 
+   std::string::size_type pos;
+-  std::string uripart;
++  std::string data = this->data;
+   std::string pathDelimiter = "/";
+ 
+   user = "";
+-- 
+1.7.4.1
+
diff --git a/app-misc/task/files/task-1.9.2-configure.patch b/app-misc/task/files/task-1.9.2-configure.patch
deleted file mode 100644
index 1a19c933956a..000000000000
--- a/app-misc/task/files/task-1.9.2-configure.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- task-1.9.3/configure.ac.orig	2010-11-20 12:50:26.249141946 -0800
-+++ task-1.9.3/configure.ac	2010-11-20 12:51:13.939550053 -0800
-@@ -29,8 +29,8 @@
-   CXXFLAGS="$CXXFLAGS -Wall -pedantic -ggdb3 -DDEBUG"
-   AC_MSG_RESULT(yes)
- else
--  CFLAGS="$CFLAGS -Wall -pedantic -O3"
--  CXXFLAGS="$CXXFLAGS -Wall -pedantic -O3"
-+  CFLAGS="$CFLAGS -Wall -pedantic"
-+  CXXFLAGS="$CXXFLAGS -Wall -pedantic"
-   AC_MSG_RESULT(no)
- fi
- 
-@@ -66,31 +66,10 @@
- 
- # ncurses enabled by default.
- AC_ARG_WITH([ncurses],
--            [AS_HELP_STRING([--without-ncurses], [disable support for ncurses])],
--            [with_ncurses=no],
--            [with_ncurses=yes])
--
--AC_ARG_WITH([ncurses-inc],
--            [AS_HELP_STRING ([--with-ncurses-inc=DIR], [ncurses include files are in DIR])],
--            [ncurses_inc=$withval],
--            [ncurses_inc=''])
--
--AC_ARG_WITH([ncurses-lib],
--            [AS_HELP_STRING ([--with-ncurses-lib=DIR], [ncurses lib files are in DIR])],
--            [ncurses_lib=$withval],
--            [ncurses_lib=''])
-+            AS_HELP_STRING([--without-ncurses], [disable support for ncurses]))
- 
- if test "x$with_ncurses" = "xyes" ; then
-   AC_DEFINE([HAVE_LIBNCURSES], [1], [Defined if you have libncurses])
--  if test -n "$ncurses_inc"; then
--    CFLAGS="$CFLAGS -I$ncurses_inc"
--    CXXFLAGS="$CXXFLAGS -I$ncurses_inc"
--  fi
--
--  if test -n "$ncurses_lib"; then
--    LDFLAGS="$LDFLAGS -L$ncurses_lib"
--  fi
--
-   AC_CHECK_LIB([ncurses],[main])
- fi
- 
-@@ -128,31 +107,10 @@
- 
- # Lua disabled by default.
- AC_ARG_WITH([lua],
--            [AS_HELP_STRING([--with-lua], [enable support for lua])],
--            [with_lua=yes],
--            [with_lua=no])
--
--AC_ARG_WITH([lua-inc],
--            [AS_HELP_STRING ([--with-lua-inc=DIR], [lua include files are in DIR])],
--            [lua_inc=$withval],
--            [lua_inc=''])
--
--AC_ARG_WITH([lua-lib],
--            [AS_HELP_STRING ([--with-lua-lib=DIR], [lua lib files are in DIR])],
--            [lua_lib=$withval],
--            [lua_lib=''])
-+            AS_HELP_STRING([--with-lua], [enable support for lua]))
- 
- if test "x$with_lua" = "xyes" ; then
-   AC_DEFINE([HAVE_LIBLUA], [1], [Defined if you have liblua])
--  if test -n "$lua_inc"; then
--    CFLAGS="$CFLAGS -I$lua_inc"
--    CXXFLAGS="$CXXFLAGS -I$lua_inc"
--  fi
--
--  if test -n "$lua_lib"; then
--    LDFLAGS="$LDFLAGS -L$lua_lib"
--  fi
--
-   AC_CHECK_LIB([lua],[main])
- fi
- 
diff --git a/app-misc/task/task-1.9.3-r1.ebuild b/app-misc/task/task-1.9.3-r1.ebuild
deleted file mode 100644
index f2bfe0e30d30..000000000000
--- a/app-misc/task/task-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.3-r1.ebuild,v 1.3 2011/02/11 00:06:38 hwoarang Exp $
-
-EAPI=3
-
-inherit eutils autotools
-
-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 debug lua +ncurses vim-syntax zsh-completion"
-
-DEPEND="lua? ( dev-lang/lua )
-	ncurses? ( sys-libs/ncurses )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.2-configure.patch
-
-	# 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 doc/man/task-tutorial.5 doc/man/task-color.5 || die "sed failed"
-	sed -i -e "s:/usr/local/bin:/usr/bin:" doc/man/task-faq.5 || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable debug ) \
-		$(use_with lua) \
-		$(use_with ncurses)
-}
-
-src_install() {
-	emake DESTDIR="${D}" rcfiledir="/usr/share/task/rc" i18ndir="/usr/share/task" \
-		bashscriptsdir="" vimscriptsdir="" zshscriptsdir="" \
-		install || die "emake install failed"
-
-	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
-}
diff --git a/app-misc/task/task-1.9.4-r1.ebuild b/app-misc/task/task-1.9.4-r1.ebuild
new file mode 100644
index 000000000000..8be791658208
--- /dev/null
+++ b/app-misc/task/task-1.9.4-r1.ebuild
@@ -0,0 +1,66 @@
+# 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-r1.ebuild,v 1.1 2011/08/03 17:18:56 radhermit Exp $
+
+EAPI=4
+
+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 \
+		"${FILESDIR}"/${P}-lua-automagic.patch \
+		"${FILESDIR}"/${P}-remove-ncurses.patch \
+		"${FILESDIR}"/0001-Merge-Uri-support.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
+		newins scripts/bash/task_completion.sh task
+	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
+
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/add-ons/*
+}