[gentoo-commits] repo/gentoo:master commit in: dev-python/pynotifier/

[gentoo-commits] repo/gentoo:master commit in: dev-python/pynotifier/

[Michał Górny]

commit:     288b2b760300c1b4c302fba91c532c46e585a0df
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 17:47:22 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 18:16:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288b2b76

dev-python/pynotifier: Support combined dev-python/twisted

 .../{pynotifier-0.7.0-r2.ebuild => pynotifier-0.7.0-r3.ebuild}    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
similarity index 81%
rename from dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild
rename to dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
index 005920f84a6..54dbdb9aaf2 100644
--- a/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild
+++ b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,11 @@ KEYWORDS="amd64 ppc x86"
 IUSE="qt4 gtk"
 
 DEPEND=""
-RDEPEND="dev-python/twisted-core
+RDEPEND="
+	|| (
+		dev-python/twisted[${PYTHON_USEDEP}]
+		dev-python/twisted-core[${PYTHON_USEDEP}]
+	)
 	gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
 	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
 

[gentoo-commits] repo/gentoo:master commit in: dev-python/pynotifier/

[Andreas Sturmlechner]

commit:     0f34213a03112455884d975114f2d1af15d5ed5d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 16:49:13 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 19:34:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f34213a

dev-python/pynotifier: Drop USE=qt4

Closes: https://bugs.gentoo.org/641936
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
index 54dbdb9aaf2..af5e1cea7fb 100644
--- a/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
+++ b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.bitkipper.net/bytes/debian/dists/unstable/source/${PN}_${PV}
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="qt4 gtk"
+IUSE="gtk"
 
 DEPEND=""
 RDEPEND="
@@ -21,11 +21,12 @@ RDEPEND="
 		dev-python/twisted[${PYTHON_USEDEP}]
 		dev-python/twisted-core[${PYTHON_USEDEP}]
 	)
-	gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+	gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
-	use gtk || rm notifier/nf_gtk.py
-	use qt4 || rm notifier/nf_qt.py
+	if !use gtk; then
+		rm notifier/nf_gtk.py || die
+	fi
+	rm notifier/nf_qt.py || die
 	distutils-r1_python_prepare_all
 }