Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.8.6.8-r1.ebuild ChangeLog
Date: Sat, 31 Aug 2013 19:17:12
Message-Id: 20130831191705.342E22004B@flycatcher.gentoo.org
1 ssuominen 13/08/31 19:17:05
2
3 Modified: ChangeLog
4 Added: imagemagick-6.8.6.8-r1.ebuild
5 Log:
6 Fix broken glib version check that prevented conversion from .svg to .png wrt #468050 by Lars Wendler, Nikolaj Sjujskij and Andrian Nord
7
8 (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
9
10 Revision Changes Path
11 1.511 media-gfx/imagemagick/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.511&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.511&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.510&r2=1.511
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
20 retrieving revision 1.510
21 retrieving revision 1.511
22 diff -u -r1.510 -r1.511
23 --- ChangeLog 29 Aug 2013 19:52:19 -0000 1.510
24 +++ ChangeLog 31 Aug 2013 19:17:05 -0000 1.511
25 @@ -1,6 +1,14 @@
26 # ChangeLog for media-gfx/imagemagick
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.510 2013/08/29 19:52:19 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.511 2013/08/31 19:17:05 ssuominen Exp $
30 +
31 +*imagemagick-6.8.6.8-r1 (31 Aug 2013)
32 +
33 + 31 Aug 2013; Samuli Suominen <ssuominen@g.o>
34 + +files/imagemagick-6.8.6.8-broken_glib_version_check.patch.patch,
35 + +imagemagick-6.8.6.8-r1.ebuild:
36 + Fix broken glib version check that prevented conversion from .svg to .png wrt
37 + #468050 by Lars Wendler, Nikolaj Sjujskij and Andrian Nord
38
39 29 Aug 2013; Agostino Sarubbo <ago@g.o> imagemagick-6.8.6.8.ebuild:
40 Stable for ia64, wrt bug #481146
41
42
43
44 1.1 media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild?rev=1.1&content-type=text/plain
48
49 Index: imagemagick-6.8.6.8-r1.ebuild
50 ===================================================================
51 # Copyright 1999-2013 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8-r1.ebuild,v 1.1 2013/08/31 19:17:05 ssuominen Exp $
54
55 EAPI=5
56 inherit multilib toolchain-funcs versionator libtool flag-o-matic eutils
57
58 MY_P=ImageMagick-$(replace_version_separator 3 '-')
59
60 DESCRIPTION="A collection of tools and libraries for many image formats"
61 HOMEPAGE="http://www.imagemagick.org/"
62 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
63
64 LICENSE="imagemagick"
65 SLOT="0/${PV}"
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
67 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
68
69 RESTRICT="perl? ( userpriv )"
70
71 RDEPEND=">=sys-devel/libtool-2.2.6b
72 autotrace? ( >=media-gfx/autotrace-0.31.1 )
73 bzip2? ( app-arch/bzip2 )
74 corefonts? ( media-fonts/corefonts )
75 djvu? ( app-text/djvu )
76 fftw? ( sci-libs/fftw:3.0 )
77 fontconfig? ( media-libs/fontconfig )
78 fpx? ( >=media-libs/libfpx-1.3.0-r1 )
79 graphviz? ( media-gfx/graphviz )
80 jbig? ( media-libs/jbigkit )
81 jpeg? ( virtual/jpeg:0 )
82 jpeg2k? ( media-libs/jasper )
83 lcms? ( media-libs/lcms:2 )
84 lqr? ( media-libs/liblqr )
85 opencl? ( virtual/opencl )
86 openexr? ( media-libs/openexr )
87 pango? ( x11-libs/pango )
88 perl? ( >=dev-lang/perl-5.8.8 )
89 png? ( media-libs/libpng:0 )
90 postscript? ( app-text/ghostscript-gpl )
91 raw? ( media-gfx/ufraw )
92 svg? ( gnome-base/librsvg )
93 tiff? ( media-libs/tiff:0 )
94 truetype? (
95 media-fonts/urw-fonts
96 >=media-libs/freetype-2
97 )
98 webp? ( media-libs/libwebp )
99 wmf? ( media-libs/libwmf )
100 X? (
101 x11-libs/libICE
102 x11-libs/libSM
103 x11-libs/libXext
104 x11-libs/libXt
105 )
106 xml? ( dev-libs/libxml2 )
107 lzma? ( app-arch/xz-utils )
108 zlib? ( sys-libs/zlib )"
109 DEPEND="${RDEPEND}
110 !media-gfx/graphicsmagick[imagemagick]
111 virtual/pkgconfig
112 X? ( x11-proto/xextproto )"
113
114 REQUIRED_USE="corefonts? ( truetype )
115 test? ( corefonts )"
116
117 S=${WORKDIR}/${MY_P}
118
119 src_prepare() {
120 epatch "${FILESDIR}"/${P}-broken_glib_version_check.patch.patch #468050
121 elibtoolize # for Darwin modules
122 }
123
124 src_configure() {
125 local depth=16
126 use q8 && depth=8
127 use q32 && depth=32
128 use q64 && depth=64
129
130 local openmp=disable
131 use openmp && { tc-has-openmp && openmp=enable; }
132
133 [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
134
135 econf \
136 $(use_enable static-libs static) \
137 $(use_enable hdri) \
138 $(use_enable opencl) \
139 --with-threads \
140 --with-modules \
141 --with-quantum-depth=${depth} \
142 $(use_with cxx magick-plus-plus) \
143 $(use_with perl) \
144 --with-perl-options='INSTALLDIRS=vendor' \
145 --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
146 $(use_with bzip2 bzlib) \
147 $(use_with X x) \
148 $(use_with zlib) \
149 $(use_with autotrace) \
150 $(use_with postscript dps) \
151 $(use_with djvu) \
152 --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
153 $(use_with fftw) \
154 $(use_with fpx) \
155 $(use_with fontconfig) \
156 $(use_with truetype freetype) \
157 $(use_with postscript gslib) \
158 $(use_with graphviz gvc) \
159 $(use_with jbig) \
160 $(use_with jpeg) \
161 $(use_with jpeg2k jp2) \
162 --without-lcms \
163 $(use_with lcms lcms2) \
164 $(use_with lqr) \
165 $(use_with lzma) \
166 $(use_with openexr) \
167 $(use_with pango) \
168 $(use_with png) \
169 $(use_with svg rsvg) \
170 $(use_with tiff) \
171 $(use_with webp) \
172 $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
173 $(use_with wmf) \
174 $(use_with xml) \
175 --${openmp}-openmp
176 }
177
178 src_test() {
179 if has_version ~${CATEGORY}/${P}; then
180 emake -j1 check
181 else
182 ewarn "Skipping testsuite because installed version doesn't match."
183 fi
184 }
185
186 src_install() {
187 # Ensure documentation installation files and paths with each release!
188 emake \
189 DESTDIR="${D}" \
190 DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
191 install
192
193 rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
194 dodoc {AUTHORS,README}.txt ChangeLog
195
196 if use perl; then
197 find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
198 find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
199 fi
200
201 find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
202 }