app-text/qpdfview: remove qt4 support

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/app-text/qpdfview/qpdfview-0.4.16.ebuild b/app-text/qpdfview/qpdfview-0.4.16.ebuild
index 472a947b0f7c5e3817c904abd216328afd79966b..89e07a090fb5027b19cb7a112ac4a630f271bb73 100644 (file)
--- a/app-text/qpdfview/qpdfview-0.4.16.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.16.ebuild
@@ -13,43 +13,37 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript qt5 +sqlite +svg synctex"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
 
 RDEPEND="
+       dev-qt/qtconcurrent:5
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtprintsupport:5
+       dev-qt/qtwidgets:5
        cups? ( net-print/cups )
+       dbus? ( dev-qt/qtdbus:5 )
        djvu? ( app-text/djvu )
        fitz? ( >=app-text/mupdf-1.7:= )
+       pdf? (
+               >=app-text/poppler-0.35[qt5]
+               dev-qt/qtxml:5
+       )
        postscript? ( app-text/libspectre )
-       !qt5? ( dev-qt/qtcore:4[iconv]
-               dev-qt/qtgui:4
-               sys-apps/file
-               dbus? ( dev-qt/qtdbus:4 )
-               pdf? ( >=app-text/poppler-0.35[qt4] )
-               sqlite? ( dev-qt/qtsql:4[sqlite] )
-               svg? ( dev-qt/qtsvg:4 ) )
-       qt5? ( dev-qt/qtconcurrent:5
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-               dbus? ( dev-qt/qtdbus:5 )
-               pdf? ( >=app-text/poppler-0.35[qt5]
-                       dev-qt/qtxml:5 )
-               sqlite? ( dev-qt/qtsql:5[sqlite] )
-               svg? ( dev-qt/qtsvg:5 ) )
+       sqlite? ( dev-qt/qtsql:5[sqlite] )
+       svg? ( dev-qt/qtsvg:5 )
        !svg? ( virtual/freedesktop-icon-theme )
        synctex? ( app-text/texlive-core )"
 DEPEND="${RDEPEND}
-       qt5? ( dev-qt/linguist-tools:5 )
+       dev-qt/linguist-tools:5
        virtual/pkgconfig"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
 
 src_prepare() {
-       local mylrelease="$(qt4_get_bindir)"/lrelease
-       use qt5 && mylrelease="$(qt5_get_bindir)"/lrelease
+       local mylrelease="$(qt5_get_bindir)"/lrelease
 
        prepare_locale() {
                "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
@@ -83,11 +77,7 @@ src_configure() {
                CONFIG+="${myconfig[@]}"
                PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
        )
-       if use qt5; then
-               eqmake5 "${myqmakeargs[@]}"
-       else
-               eqmake4 "${myqmakeargs[@]}"
-       fi
+       eqmake5 "${myqmakeargs[@]}"
 }
 
 src_install() {

diff --git a/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild b/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
index 103b3111028081dbb3cd605bc8aeb89639eb636c..0002d29b3a058be404fb9376bc68e9339eebc459 100644 (file)
--- a/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
@@ -13,36 +13,31 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_/}/+download/${P/_/}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript qt5 +sqlite +svg synctex"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
 
 RDEPEND="
+       dev-qt/qtconcurrent:5
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtprintsupport:5
+       dev-qt/qtwidgets:5
        cups? ( net-print/cups )
+       dbus? ( dev-qt/qtdbus:5 )
        djvu? ( app-text/djvu )
        fitz? ( >=app-text/mupdf-1.7:= )
+       pdf? (
+               >=app-text/poppler-0.35[qt5]
+               dev-qt/qtxml:5
+       )
        postscript? ( app-text/libspectre )
-       !qt5? ( dev-qt/qtcore:4[iconv]
-               dev-qt/qtgui:4
-               sys-apps/file
-               dbus? ( dev-qt/qtdbus:4 )
-               pdf? ( >=app-text/poppler-0.35[qt4] )
-               sqlite? ( dev-qt/qtsql:4[sqlite] )
-               svg? ( dev-qt/qtsvg:4 ) )
-       qt5? ( dev-qt/qtconcurrent:5
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtprintsupport:5
-               dev-qt/qtwidgets:5
-               dbus? ( dev-qt/qtdbus:5 )
-               pdf? ( >=app-text/poppler-0.35[qt5]
-                       dev-qt/qtxml:5 )
-               sqlite? ( dev-qt/qtsql:5[sqlite] )
-               svg? ( dev-qt/qtsvg:5 ) )
+       sqlite? ( dev-qt/qtsql:5[sqlite] )
+       svg? ( dev-qt/qtsvg:5 )
        !svg? ( virtual/freedesktop-icon-theme )
        synctex? ( app-text/texlive-core )"
 DEPEND="${RDEPEND}
-       qt5? ( dev-qt/linguist-tools:5 )
+       dev-qt/linguist-tools:5
        virtual/pkgconfig"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
@@ -50,8 +45,7 @@ DOCS=( CHANGES CONTRIBUTORS README TODO )
 S="${WORKDIR}/${P/_/}"
 
 src_prepare() {
-       local mylrelease="$(qt4_get_bindir)"/lrelease
-       use qt5 && mylrelease="$(qt5_get_bindir)"/lrelease
+       local mylrelease="$(qt5_get_bindir)"/lrelease
 
        prepare_locale() {
                "${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
@@ -85,11 +79,7 @@ src_configure() {
                CONFIG+="${myconfig[@]}"
                PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
        )
-       if use qt5; then
-               eqmake5 "${myqmakeargs[@]}"
-       else
-               eqmake4 "${myqmakeargs[@]}"
-       fi
+       eqmake5 "${myqmakeargs[@]}"
 }
 
 src_install() {