Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Maciej Mrozowski (reavertm)" <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.12.4-r2.ebuild ChangeLog poppler-0.12.3-r6.ebuild poppler-0.12.3-r5.ebuild poppler-0.12.4-r1.ebuild
Date: Sat, 10 Apr 2010 02:13:22
Message-Id: 20100410021318.2B9FF2C03E@corvid.gentoo.org
1 reavertm 10/04/10 02:13:18
2
3 Modified: ChangeLog
4 Added: poppler-0.12.4-r2.ebuild poppler-0.12.3-r6.ebuild
5 Removed: poppler-0.12.3-r5.ebuild poppler-0.12.4-r1.ebuild
6 Log:
7 Fix bug 309297 - preserve compiler flags
8 (Portage version: 2.2_rc67/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.229 app-text/poppler/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?rev=1.229&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?rev=1.229&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/ChangeLog?r1=1.228&r2=1.229
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
20 retrieving revision 1.228
21 retrieving revision 1.229
22 diff -u -r1.228 -r1.229
23 --- ChangeLog 18 Mar 2010 14:31:21 -0000 1.228
24 +++ ChangeLog 10 Apr 2010 02:13:17 -0000 1.229
25 @@ -1,6 +1,15 @@
26 # ChangeLog for app-text/poppler
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.228 2010/03/18 14:31:21 yngwin Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.229 2010/04/10 02:13:17 reavertm Exp $
30 +
31 +*poppler-0.12.4-r2 (10 Apr 2010)
32 +*poppler-0.12.3-r6 (10 Apr 2010)
33 +
34 + 10 Apr 2010; Maciej Mrozowski <reavertm@g.o>
35 + -poppler-0.12.3-r5.ebuild, +poppler-0.12.3-r6.ebuild,
36 + +files/poppler-0.12.3-preserve-cflags.patch, -poppler-0.12.4-r1.ebuild,
37 + +poppler-0.12.4-r2.ebuild:
38 + Fix bug 309297 - preserve compiler flags
39
40 18 Mar 2010; Ben de Groot <yngwin@g.o> metadata.xml:
41 Reassign to me instead of desktop-misc herd which I left.
42
43
44
45 1.1 app-text/poppler/poppler-0.12.4-r2.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.4-r2.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.4-r2.ebuild?rev=1.1&content-type=text/plain
49
50 Index: poppler-0.12.4-r2.ebuild
51 ===================================================================
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4-r2.ebuild,v 1.1 2010/04/10 02:13:17 reavertm Exp $
55
56 EAPI="2"
57
58 inherit cmake-utils
59
60 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
61 HOMEPAGE="http://poppler.freedesktop.org/"
62 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
63
64 LICENSE="GPL-2"
65 SLOT="0"
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
67 IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
68
69 COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
70 >=media-libs/freetype-2.3.9
71 sys-libs/zlib
72 abiword? ( dev-libs/libxml2:2 )
73 cairo? ( dev-libs/glib:2
74 >=x11-libs/cairo-1.8.4
75 >=x11-libs/gtk+-2.14.0:2 )
76 jpeg? ( >=media-libs/jpeg-7:0 )
77 jpeg2k? ( media-libs/openjpeg )
78 lcms? ( media-libs/lcms )
79 png? ( media-libs/libpng )
80 qt4? ( x11-libs/qt-core:4
81 x11-libs/qt-gui:4 )"
82 DEPEND="${COMMON_DEPEND}
83 dev-util/pkgconfig"
84 RDEPEND="${COMMON_DEPEND}
85 !dev-libs/poppler
86 !dev-libs/poppler-glib
87 !dev-libs/poppler-qt3
88 !dev-libs/poppler-qt4
89 !app-text/poppler-utils
90 cjk? ( >=app-text/poppler-data-0.2.1 )"
91
92 DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO"
93
94 src_prepare() {
95 epatch "${FILESDIR}"/${PN}-0.12.3-cmake-disable-tests.patch
96 epatch "${FILESDIR}"/${PN}-0.12.3-fix-headers-installation.patch
97 epatch "${FILESDIR}"/${PN}-0.12.3-gdk.patch
98 epatch "${FILESDIR}"/${PN}-0.12.3-darwin-gtk-link.patch
99 epatch "${FILESDIR}"/${P}-config.patch #304407
100 epatch "${FILESDIR}"/${PN}-0.12.3-cairo-downscale.patch #303817
101 epatch "${FILESDIR}"/${PN}-0.12.3-preserve-cflags.patch #309297
102 epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
103 }
104
105 src_configure() {
106 mycmakeargs=(
107 -DBUILD_GTK_TESTS=OFF
108 -DBUILD_QT4_TESTS=OFF
109 -DWITH_Qt3=OFF
110 -DENABLE_SPLASH=ON
111 -DENABLE_ZLIB=ON
112 $(cmake-utils_use_enable abiword)
113 $(cmake-utils_use_enable lcms)
114 $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
115 $(cmake-utils_use_enable utils)
116 $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
117 $(cmake-utils_use_with cairo)
118 $(cmake-utils_use_with cairo GTK)
119 $(cmake-utils_use_with jpeg)
120 $(cmake-utils_use_with png)
121 $(cmake-utils_use_with qt4)
122 $(cmake-utils_use exceptions USE_EXCEPTIONS)
123 )
124
125 cmake-utils_src_configure
126 }
127
128 src_install() {
129 cmake-utils_src_install
130
131 if use cairo && use doc; then
132 # For now install gtk-doc there
133 insinto /usr/share/gtk-doc/html/poppler
134 doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
135 fi
136 }
137
138 pkg_postinst() {
139 ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
140 ewarn 'depending on it. If you have gentoolkit installed, you can find those'
141 ewarn 'with `equery d poppler`.'
142 }
143
144
145
146 1.1 app-text/poppler/poppler-0.12.3-r6.ebuild
147
148 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r6.ebuild?rev=1.1&view=markup
149 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/poppler/poppler-0.12.3-r6.ebuild?rev=1.1&content-type=text/plain
150
151 Index: poppler-0.12.3-r6.ebuild
152 ===================================================================
153 # Copyright 1999-2010 Gentoo Foundation
154 # Distributed under the terms of the GNU General Public License v2
155 # $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r6.ebuild,v 1.1 2010/04/10 02:13:17 reavertm Exp $
156
157 EAPI="2"
158
159 inherit cmake-utils
160
161 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
162 HOMEPAGE="http://poppler.freedesktop.org/"
163 SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
164
165 LICENSE="GPL-2"
166 SLOT="0"
167 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
168 IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
169
170 COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
171 >=media-libs/freetype-2.3.9
172 sys-libs/zlib
173 abiword? ( dev-libs/libxml2:2 )
174 cairo? ( dev-libs/glib:2
175 >=x11-libs/cairo-1.8.4
176 >=x11-libs/gtk+-2.14.0:2 )
177 jpeg? ( >=media-libs/jpeg-7:0 )
178 jpeg2k? ( media-libs/openjpeg )
179 lcms? ( media-libs/lcms )
180 png? ( media-libs/libpng )
181 qt4? ( x11-libs/qt-core:4
182 x11-libs/qt-gui:4 )"
183 DEPEND="${COMMON_DEPEND}
184 dev-util/pkgconfig"
185 RDEPEND="${COMMON_DEPEND}
186 !dev-libs/poppler
187 !dev-libs/poppler-glib
188 !dev-libs/poppler-qt3
189 !dev-libs/poppler-qt4
190 !app-text/poppler-utils
191 cjk? ( >=app-text/poppler-data-0.2.1 )"
192
193 DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO"
194
195 src_prepare() {
196 epatch "${FILESDIR}"/${P}-cmake-disable-tests.patch
197 epatch "${FILESDIR}"/${P}-fix-headers-installation.patch
198 epatch "${FILESDIR}"/${P}-gdk.patch
199 epatch "${FILESDIR}"/${P}-darwin-gtk-link.patch
200 epatch "${FILESDIR}"/${P}-config.patch #304407
201 epatch "${FILESDIR}"/${P}-cairo-downscale.patch #303817
202 epatch "${FILESDIR}"/${PN}-0.12.3-preserve-cflags.patch #309297
203 }
204
205 src_configure() {
206 mycmakeargs=(
207 -DBUILD_GTK_TESTS=OFF
208 -DBUILD_QT4_TESTS=OFF
209 -DWITH_Qt3=OFF
210 -DENABLE_SPLASH=ON
211 -DENABLE_ZLIB=ON
212 $(cmake-utils_use_enable abiword)
213 $(cmake-utils_use_enable lcms)
214 $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
215 $(cmake-utils_use_enable utils)
216 $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
217 $(cmake-utils_use_with cairo)
218 $(cmake-utils_use_with cairo GTK)
219 $(cmake-utils_use_with jpeg)
220 $(cmake-utils_use_with png)
221 $(cmake-utils_use_with qt4)
222 $(cmake-utils_use exceptions USE_EXCEPTIONS)
223 )
224
225 cmake-utils_src_configure
226 }
227
228 src_install() {
229 cmake-utils_src_install
230
231 if use cairo && use doc; then
232 # For now install gtk-doc there
233 insinto /usr/share/gtk-doc/html/poppler
234 doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
235 fi
236 }
237
238 pkg_postinst() {
239 ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
240 ewarn 'depending on it. If you have gentoolkit installed, you can find those'
241 ewarn 'with `equery d poppler`.'
242 }
Report Message
Find on MARC Find on Google Groups