Use eclass functions, which makes this compatible with stable qt4 again.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

3 files changed, 15 insertions, 9 deletions

diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog
index d55b6ecb0207..c13c1d2986dc 100644
--- a/app-text/qpdfview/ChangeLog
+++ b/app-text/qpdfview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/qpdfview
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.66 2015/03/05 13:37:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.67 2015/03/05 13:48:24 yngwin Exp $
+
+*qpdfview-0.4.13-r1 (05 Mar 2015)
+
+  05 Mar 2015; Ben de Groot <yngwin@gentoo.org> +qpdfview-0.4.13-r1.ebuild,
+  -qpdfview-0.4.13.ebuild, qpdfview-0.4.14.ebuild:
+  Use eclass functions, which makes this compatible with stable qt4 again.
 
 *qpdfview-0.4.14 (05 Mar 2015)
 
diff --git a/app-text/qpdfview/qpdfview-0.4.13.ebuild b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
index 63d1effa61f3..f188ac985fb1 100644
--- a/app-text/qpdfview/qpdfview-0.4.13.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13.ebuild,v 1.3 2015/02/10 06:26:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild,v 1.1 2015/03/05 13:48:24 yngwin Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="cups? ( net-print/cups )
 	djvu? ( app-text/djvu )
 	fitz? ( app-text/mupdf:0/1.4 )
 	postscript? ( app-text/libspectre )
-	qt4? ( >=dev-qt/qtcore-4.8.6-r1:4[iconv]
+	qt4? ( dev-qt/qtcore:4[iconv]
 		dev-qt/qtgui:4
 		dbus? ( dev-qt/qtdbus:4 )
 		pdf? ( app-text/poppler[qt4] )
@@ -47,8 +47,8 @@ DOCS=( CHANGES CONTRIBUTORS README TODO )
 src_prepare() {
 	prepare_locale() {
 		local _lrel
-		use qt4 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt4/bin/lrelease"
-		use qt5 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt5/bin/lrelease"
+		use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
+		use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
 		${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
 	}
 
diff --git a/app-text/qpdfview/qpdfview-0.4.14.ebuild b/app-text/qpdfview/qpdfview-0.4.14.ebuild
index 53a4b3d80788..3098f9bd6611 100644
--- a/app-text/qpdfview/qpdfview-0.4.14.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.1 2015/03/05 13:37:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.2 2015/03/05 13:48:24 yngwin Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="cups? ( net-print/cups )
 	djvu? ( app-text/djvu )
 	fitz? ( app-text/mupdf:0/1.4 )
 	postscript? ( app-text/libspectre )
-	qt4? ( >=dev-qt/qtcore-4.8.6-r1:4[iconv]
+	qt4? ( dev-qt/qtcore:4[iconv]
 		dev-qt/qtgui:4
 		dbus? ( dev-qt/qtdbus:4 )
 		pdf? ( app-text/poppler[qt4] )
@@ -47,8 +47,8 @@ DOCS=( CHANGES CONTRIBUTORS README TODO )
 src_prepare() {
 	prepare_locale() {
 		local _lrel
-		use qt4 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt4/bin/lrelease"
-		use qt5 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt5/bin/lrelease"
+		use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
+		use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
 		${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
 	}