net-news/quiterss: sync live ebuild with 0.18.4

Package-Manager: portage-2.2.28

diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
index b2ece1097ce414e3a9c1d85e8940246db3d29369..f223b2a9da28684c5b8628a60811754be3f64161 100644 (file)
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ b/net-news/quiterss/quiterss-9999.ebuild
@@ -4,7 +4,8 @@
 
 EAPI=6
 PLOCALES="ar bg cs de el_GR es fa fi fr gl he hi hu it ja ko lt nl pl pt_BR pt_PT ro_RO ru sk sr sv tg_TJ th_TH tr uk vi zh_CN zh_TW"
-inherit eutils l10n fdo-mime gnome2-utils qmake-utils
+
+inherit fdo-mime gnome2-utils l10n qmake-utils
 
 DESCRIPTION="A Qt-based RSS/Atom feed reader"
 HOMEPAGE="https://quiterss.org"
@@ -19,13 +20,12 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="debug phonon +qt4 qt5"
-REQUIRED_USE="^^ ( qt4 qt5 )"
+IUSE="phonon qt5"
 
-RDEPEND=">=dev-db/sqlite-3.10.0:3
-       dev-qt/qtsingleapplication[X,qt4(+)?,qt5(-)?]
-       qt4? ( dev-qt/qtcore:4
+RDEPEND=">=dev-db/sqlite-3.11.1:3
+       !qt5? ( dev-qt/qtcore:4
                dev-qt/qtgui:4
+               dev-qt/qtsingleapplication[X,qt4(+)]
                dev-qt/qtsql:4[sqlite]
                dev-qt/qtwebkit:4
                phonon? ( || ( media-libs/phonon[qt4] dev-qt/qtphonon:4 ) ) )
@@ -34,6 +34,7 @@ RDEPEND=">=dev-db/sqlite-3.10.0:3
                dev-qt/qtmultimedia:5
                dev-qt/qtnetwork:5
                dev-qt/qtprintsupport:5
+               dev-qt/qtsingleapplication[X,qt5(-)]
                dev-qt/qtsql:5[sqlite]
                dev-qt/qtwebkit:5
                dev-qt/qtwidgets:5
@@ -44,23 +45,30 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS CHANGELOG README.md )
 
 src_prepare() {
+       default
+
        my_rm_loc() {
                sed -i -e "s:lang/${PN}_${1}.ts::" lang/lang.pri || die
        }
 
-       default
-
        # dedicated english locale file is not installed at all
        rm "lang/${PN}_en.ts" || die
 
-       l10n_find_plocales_changes "lang" "${PN}_" '.ts'
+       l10n_find_plocales_changes lang ${PN}_ .ts
        l10n_for_each_disabled_locale_do my_rm_loc
 }
 
 src_configure() {
-       use qt4 && eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 \
-               $(usex phonon '' 'DISABLE_PHONON=1')
-       use qt5 && eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
+       local myqmakeargs=(
+               PREFIX="${EPREFIX}/usr"
+               SYSTEMQTSA=1
+       )
+       if use qt5; then
+               eqmake5 "${myqmakeargs[@]}"
+       else
+               eqmake4 "${myqmakeargs[@]}" \
+                       $(usex phonon '' 'DISABLE_PHONON=1')
+       fi
 }
 
 src_install() {