Backport fix for upstream bug 3081666 from upstream svn.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

4 files changed, 87 insertions, 2 deletions

diff --git a/app-office/taskcoach/ChangeLog b/app-office/taskcoach/ChangeLog
index 1a13c21bbd6a..88b51dafb87a 100644
--- a/app-office/taskcoach/ChangeLog
+++ b/app-office/taskcoach/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/taskcoach
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/ChangeLog,v 1.59 2010/10/01 07:09:06 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/ChangeLog,v 1.60 2010/10/10 22:17:32 caster Exp $
+
+*taskcoach-1.1.4-r1 (10 Oct 2010)
+
+  10 Oct 2010; Vlastimil Babka <caster@gentoo.org> +files/3081666.patch,
+  +taskcoach-1.1.4-r1.ebuild:
+  Backport fix for upstream bug 3081666 from upstream svn.
 
 *taskcoach-1.1.4 (01 Oct 2010)
 
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
index 7e544a7afe58..0b4b7047e4b6 100644
--- a/app-office/taskcoach/Manifest
+++ b/app-office/taskcoach/Manifest
@@ -1,8 +1,10 @@
+AUX 3081666.patch 1023 RMD160 51f044950d242b5a7e7181833b99ffb74019d9d5 SHA1 cacda3b8c6d5fccb0912dfd2bcaa26b8429a9c6c SHA256 7df6bcf708813708c5543895c2b8eaac2fa08cf7c097bc8b2b1d1cb0876bc344
 DIST TaskCoach-1.0.10.tar.gz 1914097 RMD160 d1a29aae633825aa5168ff09ea3a8f64ce86e9f3 SHA1 02536348bd1ec588e199472fdc7e1443ade3e7df SHA256 2144632be1651c6ce22f9f658e203b8709e766637257f54cc2cd27a08a1c76a8
 DIST TaskCoach-1.1.3.tar.gz 1977063 RMD160 bba351f9ef142af5f199efe3c366b70a91ce1af6 SHA1 681972a7f1fab62467e324c6a6e09840ca819e88 SHA256 ce300ceb2e4ec9784d0025e1d49d8ff18faaf3be4dd0ef4e1261228543e1b3f8
 DIST TaskCoach-1.1.4.tar.gz 1977720 RMD160 7fd8b45b2ff9a79704f63a3a705f026e159ed604 SHA1 7f85b4360dcc76b29686332d75802e88782598c0 SHA256 953522efdb796ca09e45a99fbe028901689fa7adf9a2c1cc1a2f8cbc5348b94e
 EBUILD taskcoach-1.0.10.ebuild 1325 RMD160 d724706bce0cb515bc603a87fe590f74c92157ab SHA1 4cde630e733a581ddf1627b6c295d690c122dc42 SHA256 d3199c2b60bfc9aef72d79c4937cc0ad34943ea2080ce84e3ee29cabf647c4a3
 EBUILD taskcoach-1.1.3.ebuild 1328 RMD160 218ea02fa68c6cc97236cadfbb9d7bfc560abba2 SHA1 4bf84b994e2d78dc5be6f0003a7f1927589df35b SHA256 8adaa04a2ad1825951568b458c765437ef77ebd164e8d3ffdd4c485cc229b4f7
+EBUILD taskcoach-1.1.4-r1.ebuild 1410 RMD160 04cbd71e81a86cbc507b1e21aea16c74c6f711e3 SHA1 4afb3f59a48e26e7c0abd58a2dc656288aec624e SHA256 37544139d4e7a31c168a3f03989a2bba4661a00a2827598f353bb6add11c8e3e
 EBUILD taskcoach-1.1.4.ebuild 1328 RMD160 2eacb90650dc10e7596c94bad13fe738c6d2b825 SHA1 1d9d694622fc10aaab528667e74c40be924bd98c SHA256 182f5e414b46a78227e599fda5ae90619b45522890d63ee0dce2c131d8ea3548
-MISC ChangeLog 9778 RMD160 4b3323c84183454b247d0599fd8b763d0613f49a SHA1 60f9b2fba23804fdb8015ff3468204f86a2438fb SHA256 ac6d771a7bc1fec9970fdeb8e2fafafa9d618c6ba28c979e0fb8b96da51a0c45
+MISC ChangeLog 9976 RMD160 b2e7dcb3e174e57d8f5b011a55ea4f482ea7169f SHA1 218be6f4512bc467c2e147271cb4ece641c46f05 SHA256 8327d573064073779c306adaa8fa5c044611d587952523465e20e7cc08f0e7be
 MISC metadata.xml 218 RMD160 55c7da47548fa7583b66c5851782a83e92566fbd SHA1 073b6fc1108038a5125d7c9c661aa56fa289bd6b SHA256 167f14bc8b5b6d52bf9199a18085da3006bde3bf8821ea0d209ed240df550c47
diff --git a/app-office/taskcoach/files/3081666.patch b/app-office/taskcoach/files/3081666.patch
new file mode 100644
index 000000000000..a425f5b340de
--- /dev/null
+++ b/app-office/taskcoach/files/3081666.patch
@@ -0,0 +1,18 @@
+--- branches/Release1_1_Branch/taskcoach/taskcoachlib/gui/dialog/editor.py	2010/09/04 19:10:18	3595
++++ branches/Release1_1_Branch/taskcoach/taskcoachlib/gui/dialog/editor.py	2010/10/05 20:49:36	3657
+@@ -687,9 +687,12 @@
+     @patterns.eventSource    
+     def ok(self, event=None): # pylint: disable-msg=W0221
+         for item in self.items:
+-            item.setBudget(self._budgetEntry.get(), event=event)
+-            item.setHourlyFee(self._hourlyFeeEntry.get(), event=event)
+-            item.setFixedFee(self._fixedFeeEntry.get(), event=event)
++            if len(self.items) == 1 or self._budgetLabel.IsChecked():
++                item.setBudget(self._budgetEntry.get(), event=event)
++            if len(self.items) == 1 or self._hourlyFeeLabel.IsChecked():
++                item.setHourlyFee(self._hourlyFeeEntry.get(), event=event)
++            if len(self.items) == 1 or self._fixedFeeLabel.IsChecked():
++                item.setFixedFee(self._fixedFeeEntry.get(), event=event)
+ 
+ 
+ class PageWithViewer(Page):
diff --git a/app-office/taskcoach/taskcoach-1.1.4-r1.ebuild b/app-office/taskcoach/taskcoach-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..09a4122bcf8c
--- /dev/null
+++ b/app-office/taskcoach/taskcoach-1.1.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/taskcoach-1.1.4-r1.ebuild,v 1.1 2010/10/10 22:17:32 caster Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+PYTHON_MODNAME="buildlib taskcoachlib"
+
+inherit distutils eutils
+
+MY_PN="TaskCoach"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple personal tasks and todo lists manager"
+HOMEPAGE="http://www.taskcoach.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+DEPEND=">=dev-python/wxpython-2.8.9.2:2.8"
+RDEPEND="${DEPEND}
+	libnotify? ( dev-python/notify-python )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="CHANGES.txt"
+
+src_unpack() {
+	default
+
+	einfo "Removing Funambol support, works only on x86 and python 2.5."
+	rm -fv "${S}"/taskcoachlib/bin.in/linux/*.so || die
+}
+
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/3081666.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	# a bit ugly but...
+	mv "${D}/usr/bin/taskcoach.py" "${D}/usr/bin/taskcoach" || die
+	for file in "${D}"/usr/bin/taskcoach.py-*; do
+		dir=$(dirname ${file})
+		ver=$(basename ${file})
+		ver=${ver#taskcoach.py-}
+		mv "${file}" "${dir}/taskcoach-${ver}" || die
+	done
+
+	doicon "icons.in/${PN}.png" || die
+	make_desktop_entry ${PN} "Task Coach" ${PN} Office || die
+}