[gentoo-commits] repo/gentoo:master commit in: app-portage/etc-proposals/

[gentoo-commits] repo/gentoo:master commit in: app-portage/etc-proposals/

[Andreas Sturmlechner]

commit:     1be2d102568d7d336b1c6d99b1f93b5b89988b2d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 20:03:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 20:04:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be2d102

app-portage/etc-proposals: Drop USE=gtk,qt4

PyQt4 will be gone soon, maybe someone wishes to port to PyQt5 in future.

Closes: https://bugs.gentoo.org/634956
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
index 79823873938..8ec312a9443 100644
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,13 +10,12 @@ DESCRIPTION="a set of tools for updating gentoo config files"
 HOMEPAGE="https://sourceforge.net/projects/etc-proposals.berlios/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 
-IUSE="gtk qt4"
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="gtk? ( >=dev-python/pygtk-2.10 )
-		qt4? ( >=dev-python/PyQt4-4.1.1[X] )"
+DEPEND=">=dev-python/pygtk-2.10"
 RDEPEND="${DEPEND}"
 
 python_install_all() {
@@ -27,9 +26,8 @@ python_install_all() {
 	mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die
 	rmdir "${ED%/}/usr/bin" || die
 
-	# Bug 308725: Filter out the "PreferedFrontends" based on USE Flags:
-	use qt4 || sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
-	use gtk || sed -i -e '/^PreferedFrontends=/ s/gtk2,//' "${D}"/etc/etc-proposals.conf
+	# Package has PyQt4 support no one ported to PyQt5 so far, bug #634956
+	sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
 }
 
 pkg_postinst() {