Gentoo Archives: gentoo-commits

From: "Ben de Groot (yngwin)" <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/qpdfview: qpdfview-0.4.13-r1.ebuild qpdfview-0.4.14.ebuild ChangeLog qpdfview-0.4.13.ebuild
Date: Thu, 05 Mar 2015 13:48:32
Message-Id: 20150305134824.5FDA513189@oystercatcher.gentoo.org
1 yngwin 15/03/05 13:48:24
2
3 Modified: qpdfview-0.4.14.ebuild ChangeLog
4 Added: qpdfview-0.4.13-r1.ebuild
5 Removed: qpdfview-0.4.13.ebuild
6 Log:
7 Use eclass functions, which makes this compatible with stable qt4 again.
8
9 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
10
11 Revision Changes Path
12 1.2 app-text/qpdfview/qpdfview-0.4.14.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild?r1=1.1&r2=1.2
17
18 Index: qpdfview-0.4.14.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- qpdfview-0.4.14.ebuild 5 Mar 2015 13:37:24 -0000 1.1
25 +++ qpdfview-0.4.14.ebuild 5 Mar 2015 13:48:24 -0000 1.2
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.1 2015/03/05 13:37:24 yngwin Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.14.ebuild,v 1.2 2015/03/05 13:48:24 yngwin Exp $
31
32 EAPI=5
33
34 @@ -23,7 +23,7 @@
35 djvu? ( app-text/djvu )
36 fitz? ( app-text/mupdf:0/1.4 )
37 postscript? ( app-text/libspectre )
38 - qt4? ( >=dev-qt/qtcore-4.8.6-r1:4[iconv]
39 + qt4? ( dev-qt/qtcore:4[iconv]
40 dev-qt/qtgui:4
41 dbus? ( dev-qt/qtdbus:4 )
42 pdf? ( app-text/poppler[qt4] )
43 @@ -47,8 +47,8 @@
44 src_prepare() {
45 prepare_locale() {
46 local _lrel
47 - use qt4 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt4/bin/lrelease"
48 - use qt5 && _lrel="${EPREFIX}/usr/$(get_libdir)/qt5/bin/lrelease"
49 + use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
50 + use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
51 ${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
52 }
53
54
55
56
57 1.67 app-text/qpdfview/ChangeLog
58
59 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/ChangeLog?rev=1.67&view=markup
60 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/ChangeLog?rev=1.67&content-type=text/plain
61 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/ChangeLog?r1=1.66&r2=1.67
62
63 Index: ChangeLog
64 ===================================================================
65 RCS file: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v
66 retrieving revision 1.66
67 retrieving revision 1.67
68 diff -u -r1.66 -r1.67
69 --- ChangeLog 5 Mar 2015 13:37:24 -0000 1.66
70 +++ ChangeLog 5 Mar 2015 13:48:24 -0000 1.67
71 @@ -1,6 +1,12 @@
72 # ChangeLog for app-text/qpdfview
73 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
74 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.66 2015/03/05 13:37:24 yngwin Exp $
75 +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.67 2015/03/05 13:48:24 yngwin Exp $
76 +
77 +*qpdfview-0.4.13-r1 (05 Mar 2015)
78 +
79 + 05 Mar 2015; Ben de Groot <yngwin@g.o> +qpdfview-0.4.13-r1.ebuild,
80 + -qpdfview-0.4.13.ebuild, qpdfview-0.4.14.ebuild:
81 + Use eclass functions, which makes this compatible with stable qt4 again.
82
83 *qpdfview-0.4.14 (05 Mar 2015)
84
85
86
87
88 1.1 app-text/qpdfview/qpdfview-0.4.13-r1.ebuild
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/qpdfview/qpdfview-0.4.13-r1.ebuild?rev=1.1&view=markup
91 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
92
93 Index: qpdfview-0.4.13-r1.ebuild
94 ===================================================================
95 # Copyright 1999-2015 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 # $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 $
98
99 EAPI=5
100
101 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"
102 inherit eutils l10n multilib qmake-utils
103
104 DESCRIPTION="A tabbed document viewer"
105 HOMEPAGE="http://launchpad.net/qpdfview"
106 SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
107
108 LICENSE="GPL-2"
109 SLOT="0"
110 KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
111 IUSE="cups dbus djvu fitz +pdf postscript +qt4 qt5 sqlite +svg synctex"
112
113 REQUIRED_USE="^^ ( qt4 qt5 )
114 ?? ( fitz pdf )"
115
116 RDEPEND="cups? ( net-print/cups )
117 djvu? ( app-text/djvu )
118 fitz? ( app-text/mupdf:0/1.4 )
119 postscript? ( app-text/libspectre )
120 qt4? ( dev-qt/qtcore:4[iconv]
121 dev-qt/qtgui:4
122 dbus? ( dev-qt/qtdbus:4 )
123 pdf? ( app-text/poppler[qt4] )
124 sqlite? ( dev-qt/qtsql:4[sqlite] )
125 svg? ( dev-qt/qtsvg:4 ) )
126 qt5? ( dev-qt/linguist-tools:5
127 dev-qt/qtconcurrent:5
128 dev-qt/qtcore:5
129 dev-qt/qtgui:5
130 dev-qt/qtprintsupport:5
131 dbus? ( dev-qt/qtdbus:5 )
132 pdf? ( >=app-text/poppler-0.26.4[qt5] )
133 sqlite? ( dev-qt/qtsql:5[sqlite] )
134 svg? ( dev-qt/qtsvg:5 ) )
135 !svg? ( virtual/freedesktop-icon-theme )"
136 DEPEND="${RDEPEND}
137 virtual/pkgconfig"
138
139 DOCS=( CHANGES CONTRIBUTORS README TODO )
140
141 src_prepare() {
142 prepare_locale() {
143 local _lrel
144 use qt4 && _lrel="$(qt4_get_bindir)/lrelease"
145 use qt5 && _lrel="$(qt5_get_bindir)/lrelease"
146 ${_lrel} "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
147 }
148
149 rm_help() {
150 rm -f "miscellaneous/help_${1}.html" || die "removing extraneous help files failed"
151 }
152
153 l10n_find_plocales_changes translations "${PN}_" '.ts'
154 l10n_for_each_locale_do prepare_locale
155 l10n_for_each_disabled_locale_do rm_help
156
157 # adapt for prefix
158 sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
159 }
160
161 src_configure() {
162 local config i
163 for i in cups dbus pdf djvu svg synctex; do
164 if ! use ${i}; then
165 config+=" without_${i}"
166 fi
167 done
168
169 use fitz && config+=" with_fitz"
170 use postscript || config+=" without_ps"
171 use sqlite || config+=" without_sql"
172
173 if use qt4; then
174 eqmake4 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
175 else
176 eqmake5 CONFIG+="${config}" PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}" qpdfview.pro
177 fi
178 }
179
180 src_install() {
181 emake INSTALL_ROOT="${D}" install
182 einstalldocs
183 }