Fix bug #222391 for python 2.4 users. Also switch to icon that's now included in the upstream distfile instead of distributing own.

Package-Manager: portage-2.1.5.3

4 files changed, 31 insertions, 7 deletions

diff --git a/app-office/taskcoach/ChangeLog b/app-office/taskcoach/ChangeLog
index 51b2abd7939a..398f5f57a6f6 100644
--- a/app-office/taskcoach/ChangeLog
+++ b/app-office/taskcoach/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/taskcoach
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/ChangeLog,v 1.6 2008/05/12 19:32:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/ChangeLog,v 1.7 2008/06/04 08:24:45 caster Exp $
+
+  04 Jun 2008; Vlastimil Babka <caster@gentoo.org>
+  +files/taskcoach-setup.patch, taskcoach-0.70.0.ebuild:
+  Fix bug #222391 for python 2.4 users. Also switch to icon that's now
+  included in the upstream distfile instead of distributing own.
 
 *taskcoach-0.70.0 (12 May 2008)
 
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
index cd6d0b0901da..db31276309b9 100644
--- a/app-office/taskcoach/Manifest
+++ b/app-office/taskcoach/Manifest
@@ -1,7 +1,8 @@
+AUX taskcoach-setup.patch 271 RMD160 244796e3a19a80ac4dca176990e7fd3e13bdf9c8 SHA1 b197b06825c92fcaca1fa01b0971c7081896ddfd SHA256 c3f851a4e3fea1e61210bd0eb2fe7cc61e68f42e8523af03d8fbde00e136e041
 DIST TaskCoach-0.69.2.tar.gz 758693 RMD160 ed9d6289b6cf7de6f8c1b711ffde132c59ca8d03 SHA1 687df6bab25160cdff589bdb776bfe40782d596b SHA256 a57c81f65d6129a3f6cd5bf8df848e8062f7d60f42699ea0da3ce41450296a6f
 DIST TaskCoach-0.70.0.tar.gz 907310 RMD160 53a91b66a04912e21eb5a7ff604788ace18bd1c8 SHA1 0ed59eb92d15d543f72b3a92e51019c5454039da SHA256 60f31fc6486dd96d7936c791a50ab5916b94b355bcdcda74621eda27a8e5d744
 DIST taskcoach-icon.tar.bz2 39783 RMD160 e18000eada427498ae9b36278e02b3303a07bfa8 SHA1 b970c70af1af6ccc6f9ba7b625fe8b5ba436f2d9 SHA256 7c354416244b66c050f92d923e7be4e1a66289654c69988dbc80fe3c46f8665d
 EBUILD taskcoach-0.69.2.ebuild 911 RMD160 1c541934b7080270ea68347a6c387a7d1d795253 SHA1 41e33a3d1b562bbf314f116f05b741ff0d783953 SHA256 b9eafb70e7a50dde2a81aa8b83f2f0968bb883c6983c52a430221fde0608aa50
-EBUILD taskcoach-0.70.0.ebuild 911 RMD160 09791884dfcac57233b8469c16640132fa6d882d SHA1 cb2252fb89808810527a7ac3054cea9304bb00e8 SHA256 2dea9b442dbc291f76ff09b914b58b67b198c18bf018eecbe2204560f3b85512
-MISC ChangeLog 1164 RMD160 54b3c48ab603e47698bb0d7ec16c7a947efd7c2d SHA1 4f634c05a84ac50c0a9e6edcb7dd8ecdccf0ae02 SHA256 c1299511e458868d0efef1e915209634f85f6f3374bd3b2980dee65eabd04911
+EBUILD taskcoach-0.70.0.ebuild 968 RMD160 2b58490d83f367687064f2039376834cf0768f59 SHA1 fef2c0cb0f2d38d25a8cd0c93184547281065bec SHA256 f4e8364978567a540e511d3d1887697fe245c061d3e41e79ccf951b3973e31d8
+MISC ChangeLog 1409 RMD160 04b11058a3623c68fcae34cf71cc3f8e92ef72aa SHA1 5a4ced181719b1578f9609f6c61195035171a0d7 SHA256 e31a0cca42573d3a7c2463a4a272151d75457ea955d9915ceff69d482232241c
 MISC metadata.xml 218 RMD160 55c7da47548fa7583b66c5851782a83e92566fbd SHA1 073b6fc1108038a5125d7c9c661aa56fa289bd6b SHA256 167f14bc8b5b6d52bf9199a18085da3006bde3bf8821ea0d209ed240df550c47
diff --git a/app-office/taskcoach/files/taskcoach-setup.patch b/app-office/taskcoach/files/taskcoach-setup.patch
new file mode 100644
index 000000000000..8226dc7641d0
--- /dev/null
+++ b/app-office/taskcoach/files/taskcoach-setup.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig	2008-06-04 10:16:13.000000000 +0200
++++ setup.py	2008-06-04 10:15:39.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ import platform
+ from distutils.core import setup
+-from taskcoachlib import meta
++from taskcoachlib import meta, thirdparty
+ 
+ 
+ setupOptions = { 
diff --git a/app-office/taskcoach/taskcoach-0.70.0.ebuild b/app-office/taskcoach/taskcoach-0.70.0.ebuild
index f00a0ae5d236..09ab04aae5f9 100644
--- a/app-office/taskcoach/taskcoach-0.70.0.ebuild
+++ b/app-office/taskcoach/taskcoach-0.70.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/taskcoach-0.70.0.ebuild,v 1.1 2008/05/12 19:32:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/taskcoach/taskcoach-0.70.0.ebuild,v 1.2 2008/06/04 08:24:45 caster Exp $
 
 inherit distutils eutils
 
@@ -9,8 +9,7 @@ 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
-	mirror://gentoo/${PN}-icon.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -23,12 +22,20 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="CHANGES.txt"
 
+src_unpack() {
+	distutils_src_unpack
+
+	cd "${S}"
+	# bug 222391
+	epatch "${FILESDIR}/${PN}-setup.patch"
+}
+
 src_install() {
 	distutils_src_install
 
 	mv "${D}/usr/bin/taskcoach.py" "${D}/usr/bin/taskcoach" || die
 	rm "${D}/usr/bin/taskcoach.pyw" || die
 
-	doicon "${WORKDIR}/${PN}-icon/${PN}.png" || die
+	doicon "icons.in/${PN}.png" || die
 	make_desktop_entry ${PN} "Task Coach" ${PN} Office || die
 }