Revbump and remove old. Change theme install path (bug #346159 by Roger Luethi), change i18n install path, use correct directory locations in man pages, remove old MY_P usage, and update patch file to remove hardcoded -O3 optimization.

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

3 files changed, 32 insertions, 9 deletions

diff --git a/app-misc/task/ChangeLog b/app-misc/task/ChangeLog
index 88018371b446..9b57da40d0cb 100644
--- a/app-misc/task/ChangeLog
+++ b/app-misc/task/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/task
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.7 2010/11/19 20:10:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/ChangeLog,v 1.8 2010/11/20 22:24:17 radhermit Exp $
+
+*task-1.9.3-r1 (20 Nov 2010)
+
+  20 Nov 2010; Tim Harder <radhermit@gentoo.org>
+  files/task-1.9.2-configure.patch, -task-1.9.3.ebuild, +task-1.9.3-r1.ebuild:
+  Revbump and remove old. Change theme install path (bug #346159 by Roger
+  Luethi), change i18n install path, use correct directory locations in man
+  pages, remove old MY_P usage, and update patch file to remove hardcoded -O3
+  optimization.
 
   19 Nov 2010; Markos Chandras <hwoarang@gentoo.org> task-1.9.2-r1.ebuild:
   Stable on amd64 wrt bug #345575
diff --git a/app-misc/task/files/task-1.9.2-configure.patch b/app-misc/task/files/task-1.9.2-configure.patch
index 2a3829e9fe18..1a19c933956a 100644
--- a/app-misc/task/files/task-1.9.2-configure.patch
+++ b/app-misc/task/files/task-1.9.2-configure.patch
@@ -1,5 +1,16 @@
---- task-1.9.2/configure.ac.orig	2010-10-06 10:12:58.910069290 -0700
-+++ task-1.9.2/configure.ac	2010-10-06 10:31:02.943655695 -0700
+--- 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.
diff --git a/app-misc/task/task-1.9.3.ebuild b/app-misc/task/task-1.9.3-r1.ebuild
index 32137f8fed12..8b5caa62b7f9 100644
--- a/app-misc/task/task-1.9.3.ebuild
+++ b/app-misc/task/task-1.9.3-r1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2010 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.ebuild,v 1.1 2010/11/09 07:32:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/task/task-1.9.3-r1.ebuild,v 1.1 2010/11/20 22:24:17 radhermit Exp $
 
 EAPI=3
 
 inherit eutils autotools
 
-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"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,10 +19,14 @@ DEPEND="lua? ( dev-lang/lua )
 	ncurses? ( sys-libs/ncurses )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 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
 }
 
@@ -37,7 +40,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
+	emake DESTDIR="${D}" rcfiledir="/usr/share/task/rc" i18ndir="/usr/share/task" \
 		bashscriptsdir="" vimscriptsdir="" zshscriptsdir="" \
 		install || die "emake install failed"