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.

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

4 files changed, 42 insertions, 15 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/Manifest b/app-misc/task/Manifest
index 35a1278a3473..c04ed505bb26 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX task-1.9.2-configure.patch 2108 RMD160 f73968758f958b49ba142c8ec0fcbc44d369f73a SHA1 233ba5fff08ce8541101180d2494be43e8ce12c9 SHA256 cc4778bdd03f4ca2285a74fd2a0eff9d951262ad544c5ba08d2eefc5de8ac816
+AUX task-1.9.2-configure.patch 2396 RMD160 b9baa279b777bb8dab9c3eb1324a81b2478d63eb SHA1 49e843a16eb3d51123be5e966703e9bdd0add9bd SHA256 fde3e622da34a58319e822f5ab845c79d46be6827c7a2d9cfc0b356af4372538
 DIST task-1.9.2.tar.gz 263475 RMD160 ec6d13db28140a0d07905b7bb5656b9edf49decf SHA1 593cb08be661e646f247bec1f7f98788996aba48 SHA256 1f8f0b5cf20a497c8219d81753f72e2e47d10c384d8e0e7a60baba82c698c93c
 DIST task-1.9.3.tar.gz 314687 RMD160 4d7b838c483b7776cb91c4c121907c58d958e0f7 SHA1 997aeb6bee5785b2148ad8fb665551d320114cea SHA256 66f3a85475984a54a457d2aefefb0896710cd656853fc3fc46455753958dbeca
 EBUILD task-1.9.2-r1.ebuild 1291 RMD160 2a706eae0a94e9f0661c3b5bfa9f05662e1e5167 SHA1 00f0757a9d35c773e8395a2b23574b04caca9512 SHA256 17375541d7939cd407f2238e9a7af4ce9d61a8adc767c204ce1e7fef5eda3725
-EBUILD task-1.9.3.ebuild 1371 RMD160 95fb8b11fd24ca7f58a872672b815f434db1e505 SHA1 1f033efc7500454af8ef7147d5ec389be711e1a1 SHA256 e1f665885e3f75b19e2da5094082fe72fcbf6247f31193d55df28d3f1f2ed57b
-MISC ChangeLog 1292 RMD160 e37ff11cdbfcb55248e51436ba6b1ae54e4ddeaa SHA1 c165388962d2f273af07950fc75557e888d38ff5 SHA256 7a4c853385ada45186e639b0c029bddae0f0439119d66e0084303c41ae88bf4c
+EBUILD task-1.9.3-r1.ebuild 1673 RMD160 1ce2daf56f441aa17ac21a209d60ee8b53e519c5 SHA1 58423b10ace107db712568bb00ba63554cac3bac SHA256 04f0f05a31e06d307e72f77dc66b767de08b4ace9b76f3da55044c8169d1e39a
+MISC ChangeLog 1696 RMD160 83cfdc28040d794c07b51388eda22ffc0a68bfc7 SHA1 464632e7a4e7683d2cce7411af24209dc7164a82 SHA256 e8e65b259b33dbcac63d7356345ec95a232b41c752387a939ba8285623dbe502
 MISC metadata.xml 249 RMD160 a5babf138125425341877a815124eb64b960822d SHA1 d8d6a882d321d9f63e39129680cf4e6ce6dd5b6d SHA256 3ff4375deaa1a580af26f45c44db59c83418083f469e1c94a3e21a72d5001347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzm2egACgkQ9/cejkQaxBCDHgCeOppAJ1AzupLmTlYvEGGtOcJP
-nNYAn2Fl8loIcNQNE1GfpzIp6lhxGCsa
-=LyqH
+iQEcBAEBAgAGBQJM6EqaAAoJEEqz6FtPBkyji+YH/A8IjwDtz2NW0Yw8wqb/BG9a
+XgjXSmAb0iuJFsBY1rXC4rgvVS5w0Uk1omAeyNxn8KetQmJfDxvOI7txPdPcGL1p
+NUYa0mDJ8enUFUw1CWZ7/ABky1+AsNeqBgOFQKMjR6IUO2F5e8xql8fKmf+0CyQt
+X/G/IaNBd80/ZqPS7O0Mrjgy/DwFzXa19rExQlXtR81vPKiLMWEcAkwXRXM/50yd
+JyiOSok/scK7FSg2gEwsnJ3jrqzR3q/wSStUtW0JpU5Vs376lCi+cgZldoOkXrgK
+pP63FFAPlt9FUvlH9TJcIiKLqph8BnGwtdpgC65+dG6cxsqCsgqibMqrm1hjo/A=
+=u1qU
 -----END PGP SIGNATURE-----
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"