yngwin 15/03/05 13:48:24 Modified: qpdfview-0.4.14.ebuild ChangeLog Added: qpdfview-0.4.13-r1.ebuild Removed: qpdfview-0.4.13.ebuild Log: 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!)
Revision Changes Path 1.2 app-text/qpdfview/qpdfview-0.4.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild?r1=1.1&r2=1.2 Index: qpdfview-0.4.14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qpdfview-0.4.14.ebuild 5 Mar 2015 13:37:24 -0000 1.1 +++ qpdfview-0.4.14.ebuild 5 Mar 2015 13:48:24 -0000 1.2 @@ -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 @@ 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 @@ 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" } 1.67 app-text/qpdfview/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/ChangeLog?rev=1.67&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/ChangeLog?rev=1.67&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/ChangeLog?r1=1.66&r2=1.67 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- ChangeLog 5 Mar 2015 13:37:24 -0000 1.66 +++ ChangeLog 5 Mar 2015 13:48:24 -0000 1.67 @@ -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 <[email protected]> +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) 1.1 app-text/qpdfview/qpdfview-0.4.13-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild?rev=1.1&content-type=text/plain Index: qpdfview-0.4.13-r1.ebuild =================================================================== # 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-r1.ebuild,v 1.1 2015/03/05 13:48:24 yngwin Exp $ EAPI=5 PLOCALES="ast az bg bs ca cs da de el en_GB eo es eu fi fr gl he hr id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv tr ug uk vi zh_CN" inherit eutils l10n multilib qmake-utils DESCRIPTION="A tabbed document viewer" HOMEPAGE="http://launchpad.net/qpdfview"; 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 +qt4 qt5 sqlite +svg synctex" REQUIRED_USE="^^ ( qt4 qt5 ) ?? ( fitz pdf )" 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[iconv] dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 ) pdf? ( app-text/poppler[qt4] ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.26.4[qt5] ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) ) !svg? ( virtual/freedesktop-icon-theme )" DEPEND="${RDEPEND} virtual/pkgconfig" DOCS=( CHANGES CONTRIBUTORS README TODO ) src_prepare() { prepare_locale() { local _lrel use qt4 && _lrel="$(qt4_get_bindir)/lrelease" use qt5 && _lrel="$(qt5_get_bindir)/lrelease" ${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed" } rm_help() { rm -f "miscellaneous/help_${1}.html" || die "removing extraneous help files failed" } l10n_find_plocales_changes translations "${PN}_" '.ts' l10n_for_each_locale_do prepare_locale l10n_for_each_disabled_locale_do rm_help # adapt for prefix sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die } src_configure() { local config i for i in cups dbus pdf djvu svg synctex; do if ! use ${i}; then config+=" without_${i}" fi done use fitz && config+=" with_fitz" use postscript || config+=" without_ps" use sqlite || config+=" without_sql" if use qt4; then eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" else eqmake5 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" qpdfview.pro fi } src_install() { emake INSTALL_ROOT="${D}" install einstalldocs }
