8 files changed, 9 insertions, 283 deletions
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
index 48b03ed5efc6..37d504c2991c 100644
--- a/app-office/taskcoach/Manifest
+++ b/app-office/taskcoach/Manifest
@@ -1,7 +1,2 @@
 DIST TaskCoach-1.3.18.tar.gz 2597941 SHA256 58a1ce7a65b58d71f2e029d69bfbf8c7e39b7623d11bfe5820faa6a224e83692 SHA512 07479e26a30ce66f7fc6f4ea8ef3fe3ddd842516ea68966b95dbb660fb0d61f9eb83d3920ca064c5ceeef6f6237d3fd5479c19899ec4cd2ef012ee90d1994e62 WHIRLPOOL 1943407958802b2d19fee638039f113ba2f62a69f74ee68d2859bfa0dfd005b4929b3c7329e79b5b2931ab7cbab511ec5499718425a1eed3a724ed76706f3ce5
-DIST TaskCoach-1.3.27.tar.gz 2750875 SHA256 37b7b5f94aef590593e7f5db0b8ea28b45aae7286b86fc15d6b514b25d0b4c51 SHA512 501944c9abaa6fa7834e3111cb20687216f81c48d6eb5eaf7dd5db1d2406a40819b786d5faa1db758aa90528ad6a18d196ecfc839fb0303cfe4bf6682c6558c2 WHIRLPOOL 63ea491777cb74df9a05ede3ba2cde02f036978dfc79eeb5b60ae5a912d7b0600c36a9c14ee7a8a9a895e3623dcb8676571c15f96c536c621a3b2b53a201e52e
-DIST TaskCoach-1.3.29.tar.gz 2759329 SHA256 77deaee656a43fd2b5772a77adee1c58d75fb8f3b62047823c06963393a7c036 SHA512 e7a796556be51db3c6342199f9141b3e52a8af7a99275d92c69decbae78e7960455b565e671110e3d27e9f413e6bac6c3b75cfde782b438d76a1ba94c392a802 WHIRLPOOL 3339e89a94ef2f14010fe026febc2ce87295371227c760ae7507f6ccf372f71f233cf181abdf696a72b15b4f502e0095819d89f64e6786cb7ae6c6af5d290a71
-DIST TaskCoach-1.3.32.tar.gz 2789269 SHA256 cf6dbc09eb62aa2c5540ea464ba47bc3f0841b0c7e8d2b63a710929ac9fe4a52 SHA512 4d8addafad65aaf209d0b1611f71d4555ddfe839f073d51bed29b6cdc9fb3b87d3a386b39a5a5800844b6c4e9654adf882c0403c7183a8d80760b1c297f0e0f5 WHIRLPOOL bf03242878dd46fc80d6b0f2ecbbd2188b18879872f769edd35a777104b143cdbd258d13a4264a873ac093916f0bb5f0015a57e968ed772ba136d72ef1931bd3
-DIST TaskCoach-1.3.40.tar.gz 2826741 SHA256 564284c47b6900e863eff08a84498fc0c366789dbdeab2de7f9bdaaabb36ab32 SHA512 54a9eed8c568b61a5ce6e61c02782f804d18f10fab73be658217ee8c225e355155e5e36877e84b97b48004995eafd1faa79d1e64bd30d738cb782a34387041be WHIRLPOOL eeed80c3358a88c724668f9e95ac89a0b12018577940413e5be2a462579f4ccb2d704492c7de614164b114dcab071e400a1ab8c8f13574d3802a2bbcc9e2c1f9
-DIST TaskCoach-1.4.2.tar.gz 2905614 SHA256 2f9a70f6abab688704ea0536f0eacbbb599a1cadda84f10d7dc5de07f711e34f SHA512 0f2465b45771cd211c21949265b758aa097cc76143a09f3c1d81cf15b1381fc6549f71839cb27563a1ab04369b8c925ca06275c799871f880005af2f907f9357 WHIRLPOOL 640ddeb357fc67e1321370c57184fd4e684715b8ddc60f7ffdb08441a0555855b3ca40775fcbcf568ca63acfa9ef2bfb2d23bc9edc50bea08a3c012abe72a03a
 DIST TaskCoach-1.4.3.tar.gz 2927984 SHA256 a2885ffefc0d5b55a0cbe47ad1a2d57cde52595cbba786ebf661bd2435071a2b SHA512 ae449ae66d29ec884de680179853d5e39814a4e7b10d8e5ca2066f1c85fda328470852a10600e74ade1e4a52c5cdc8f749eceaf4f861f8852c2f47d654e9fc88 WHIRLPOOL 6ed69b2f478d98129d7d7638a9db074f2439373d2d63b85adfcf3a64fbce254ef1f734197e9d21f3e3babeb7f21924bbc8a74aa27250f3de63871aef9803b72c
diff --git a/app-office/taskcoach/taskcoach-1.3.27.ebuild b/app-office/taskcoach/taskcoach-1.3.27.ebuild
deleted file mode 100644
index 1c80baa7cb7f..000000000000
--- a/app-office/taskcoach/taskcoach-1.3.27.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 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 https://pypi.python.org/pypi/TaskCoach"
-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_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
-}
diff --git a/app-office/taskcoach/taskcoach-1.3.29.ebuild b/app-office/taskcoach/taskcoach-1.3.29.ebuild
deleted file mode 100644
index 1c80baa7cb7f..000000000000
--- a/app-office/taskcoach/taskcoach-1.3.29.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 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 https://pypi.python.org/pypi/TaskCoach"
-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_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
-}
diff --git a/app-office/taskcoach/taskcoach-1.3.32-r1.ebuild b/app-office/taskcoach/taskcoach-1.3.32-r1.ebuild
deleted file mode 100644
index 7d391e2490bb..000000000000
--- a/app-office/taskcoach/taskcoach-1.3.32-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_PN="TaskCoach"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="http://www.taskcoach.org https://pypi.python.org/pypi/TaskCoach"
-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[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES.txt README.txt )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# 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"
-	make_desktop_entry ${PN} "Task Coach" ${PN} Office
-}
diff --git a/app-office/taskcoach/taskcoach-1.3.32.ebuild b/app-office/taskcoach/taskcoach-1.3.32.ebuild
deleted file mode 100644
index 1c80baa7cb7f..000000000000
--- a/app-office/taskcoach/taskcoach-1.3.32.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 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 https://pypi.python.org/pypi/TaskCoach"
-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_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
-}
diff --git a/app-office/taskcoach/taskcoach-1.3.40.ebuild b/app-office/taskcoach/taskcoach-1.3.40.ebuild
deleted file mode 100644
index e76d3346cbaa..000000000000
--- a/app-office/taskcoach/taskcoach-1.3.40.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="TaskCoach"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="http://www.taskcoach.org https://pypi.python.org/pypi/TaskCoach"
-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[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-10.0"
-RDEPEND="${DEPEND}
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES.txt README.txt )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "icons.in/${PN}.png"
-	make_desktop_entry ${PN}.py "Task Coach" ${PN} Office
-}
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ! version_is_at_least 1.3.40 ${REPLACING_VERSIONS}; then
-			elog "Since version 1.3.40, the Task Coach executable is called ${PN}.py"
-		fi
-	fi
-}
diff --git a/app-office/taskcoach/taskcoach-1.4.2.ebuild b/app-office/taskcoach/taskcoach-1.4.2.ebuild
deleted file mode 100644
index 9aeeb90ccba7..000000000000
--- a/app-office/taskcoach/taskcoach-1.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils versionator
-
-MY_PN="TaskCoach"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Simple personal tasks and todo lists manager"
-HOMEPAGE="http://www.taskcoach.org https://pypi.python.org/pypi/TaskCoach"
-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[${PYTHON_USEDEP}]
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/twisted-core-10.0"
-RDEPEND="${DEPEND}
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGES.txt README.txt )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-desktop-file.patch
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doicon "icons.in/${PN}.png"
-	make_desktop_entry ${PN}.py "Task Coach" ${PN} Office
-}
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ! version_is_at_least 1.3.40 ${REPLACING_VERSIONS}; then
-			elog "Since version 1.3.40, the Task Coach executable is called ${PN}.py"
-		fi
-	fi
-}
diff --git a/app-office/taskcoach/taskcoach-1.4.3.ebuild b/app-office/taskcoach/taskcoach-1.4.3.ebuild
index 194fa66e24f7..d32b3c17efd0 100644
--- a/app-office/taskcoach/taskcoach-1.4.3.ebuild
+++ b/app-office/taskcoach/taskcoach-1.4.3.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils versionator
@@ -14,17 +13,23 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Simple personal tasks and todo lists manager"
 HOMEPAGE="http://www.taskcoach.org https://pypi.python.org/pypi/TaskCoach"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libnotify"
-DEPEND="|| (
+
+DEPEND="
+	|| (
 		>=dev-python/wxpython-2.8.9.2:2.8[${PYTHON_USEDEP}]
 		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
-	>=dev-python/twisted-core-10.0"
+	>=dev-python/twisted-core-10.0
+"
 RDEPEND="${DEPEND}
-	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )"
+	x11-libs/libXScrnSaver
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+"
 
 S="${WORKDIR}/${MY_P}"