Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-misc/task/ChangeLog7
-rw-r--r--app-misc/task/files/0001-Merge-Uri-support.patch28
-rw-r--r--app-misc/task/files/task-1.9.4-rcdir.patch26
-rw-r--r--app-misc/task/files/task-1.9.4-remove-ncurses.patch30
-rw-r--r--app-misc/task/task-1.9.4-r1.ebuild63
5 files changed, 6 insertions, 148 deletions
diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index 842944a3b7f7..9d5a8ec0f1c0 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/task
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.35 2012/08/08 14:55:42 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.36 2012/08/23 16:05:35 radhermit Exp $
+
+ 23 Aug 2012; Tim Harder <radhermit@gentoo.org>
+ -files/0001-Merge-Uri-support.patch, -task-1.9.4-r1.ebuild,
+ -files/task-1.9.4-rcdir.patch, -files/task-1.9.4-remove-ncurses.patch:
+ Remove old.
08 Aug 2012; Andreas Schuerch <nativemad@gentoo.org> task-2.0.0-r1.ebuild:
x86 stable, see bug 418615
diff --git a/app-misc/task/files/0001-Merge-Uri-support.patch b/app-misc/task/files/0001-Merge-Uri-support.patch
deleted file mode 100644
index 8e3d68529ed5..000000000000
--- a/app-misc/task/files/0001-Merge-Uri-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.4-rcdir.patch b/app-misc/task/files/task-1.9.4-rcdir.patch
deleted file mode 100644
index 2d146e35245e..000000000000
--- a/app-misc/task/files/task-1.9.4-rcdir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index a0a3e6eeeba8..000000000000
--- a/app-misc/task/files/task-1.9.4-remove-ncurses.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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-r1.ebuild b/app-misc/task/task-1.9.4-r1.ebuild
deleted file mode 100644
index 3523ac6327e1..000000000000
--- a/app-misc/task/task-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,63 +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.4-r1.ebuild,v 1.4 2011/09/14 20:25:29 nativemad Exp $
-
-EAPI=4
-
-inherit eutils cmake-utils bash-completion-r1
-
-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="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
-
- 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/*
-}