From: Samuli Suominen Date: Mon, 10 Oct 2011 22:00:28 +0000 (+0000) Subject: Version bump. See ChangeLog for details X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e574c84f747887bf057e0523493a4d8067a61b24;p=gentoo.git Version bump. See ChangeLog for details Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64 --- diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index bf362874dab3..9f323f7cb40a 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.444 2011/09/24 16:49:49 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.445 2011/10/10 22:00:28 ssuominen Exp $ + +*imagemagick-6.7.3.0 (10 Oct 2011) + + 10 Oct 2011; Samuli Suominen + +imagemagick-6.7.3.0.ebuild: + Version bump wrt #385427 by Kamen Dokov. Improve USE="opencl" logic wrt + #381281 by Sergey Parubochiy. Change --without-corefonts to + --without-windows-font-dir by Agostino Sarubbo. 24 Sep 2011; Raúl Porcel imagemagick-6.7.1.0.ebuild: alpha/ia64/s390/sh/sparc stable wrt #378543 diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index f3be18ff9f31..e529cec9b454 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -7,17 +7,23 @@ DIST ImageMagick-6.6.7-6.tar.xz 7579776 RMD160 430a59204360abcc4180c33d99b53e0e3 DIST ImageMagick-6.6.8-5.tar.xz 7637460 RMD160 bc3b8c30ad8bf603106a19cdbd1c7f2908454dfd SHA1 ec80517e020c5800cdcf5bdf2b0c968009e7a439 SHA256 cbbf9f84daf837141b5a0d9bb4ffafb2263f6c23e661c405546deb7be603d919 DIST ImageMagick-6.7.1-0.tar.xz 7754528 RMD160 cc0e60a2c4c05723128200066f44939f7b1edd43 SHA1 6570b9f994ae58e047d3a3ad84b1bfdf2e749159 SHA256 1b26dff61f46cdbb13fe57acdba9583dc9c47e303826bddea9276a0d3a666b47 DIST ImageMagick-6.7.2-6.tar.xz 7765424 RMD160 a73052cfdfd5b6191c1a52b825285beaedfe215e SHA1 03eb6639dbef97699394eeaa89afd3ef40c9cfd4 SHA256 e13d1957f2565f2e4086fceaeea21d603fdf5fa588ef11953312bb02905f638f +DIST ImageMagick-6.7.3-0.tar.xz 7946508 RMD160 628626e7eff38148339851f41f9804bb3dafa763 SHA1 bbcdb092f6c4cc4c1d29163bef1199e86dd5ab05 SHA256 8159b3c3fa2c121b30a020df5ae87ec345a79608379413a8fa38fe3000d0607b EBUILD imagemagick-6.6.5.6.ebuild 4113 RMD160 62448e140a1ca859702df12b0760c71800ef00ca SHA1 0650fed9e535c95a5762b8ef32bbfae132340163 SHA256 948fd844534c4312ab9b066985db340c673e6084e9fdf2db59a1931d73a0a55d EBUILD imagemagick-6.6.7.6.ebuild 4179 RMD160 36d0bc9ad0c7168e11619790ab7de09712fbbebe SHA1 d578764b45524fa4c532fd0d47d6c11a07778628 SHA256 2e541ebf5db2b23d244873dc7686429877e3d4e447ffe08c6699277b496a07b6 EBUILD imagemagick-6.6.8.5.ebuild 4359 RMD160 8631ec958eee48796e3214b095d824be99894d30 SHA1 090b42c5cfae62163ea014c274947f4cb1fcfb56 SHA256 190a0bda6738466825d698036a5d9cb3828d79c82eafb76edebcc5872b0ad988 EBUILD imagemagick-6.7.1.0.ebuild 4203 RMD160 1961470561ac3643f87614c532daf3d3574b15c5 SHA1 1b9c10c21fdd7c7476a45aeb5d30b1a332e9f020 SHA256 cd521bdcae58351d1bba8007233bf7b9a04c8b09db436e9504bc1371471f4786 EBUILD imagemagick-6.7.2.6.ebuild 4296 RMD160 afdb8438b3a6769ee92b32090e24905295f1b43c SHA1 4a2dbc3623e93729a569a8828b1f839753e641b7 SHA256 d330287fa76cba5f02446d5df833b937366a6bccec946fcdab7075e6a778d017 -MISC ChangeLog 65665 RMD160 3f6940538c25efcb41f82f8e6e40ba331c284c48 SHA1 8befbb03576dc728ce0eaa77988cb1edf08051d0 SHA256 0e074ce7def67e3714e8d5298b8d7a2e755a1efce0e1c40f73e58aa79d57f3d8 +EBUILD imagemagick-6.7.3.0.ebuild 4336 RMD160 d8abec4feffd4db431892dced207a6f78f673034 SHA1 e4d819d94c329a496342bc2a4d1878b554a635bc SHA256 2fdd63eea98bcc168f8ce9e9d83942686be098604927bdb0347a9b6c8a46170d +MISC ChangeLog 65975 RMD160 67961cb284362700bfd691ad7b0cbea42e2d0c59 SHA1 d78e232c3febee37725b354883b5cf78c30ab7ab SHA256 830462ef8e71ec6d1105a7b6edab4b99d35a165ac7dfc13999ea07784a9e6721 MISC metadata.xml 996 RMD160 4afdb1acb67b84fdb8a4c4b720ec1858e85bc2fd SHA1 5cb81df1fbada2f137e13530b30af67baed6c68d SHA256 42f246f5285d9d6a16d764420e069baecd0518d126ecbbc3ff4fa81536947062 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5+CjMACgkQuQc30/atMkAz3QCbB/vuONgSO78j0cPtOPZ4Hlut -05QAn3CfXUJdz3oApG5ajpCJfyf5QJPM -=Prv7 +iQEcBAEBAgAGBQJOk2sOAAoJEEdUh39IaPFNAasH/0xLn1JDEEBg6kyWVi2THfxU +ruIoGPBudOwCVpaQFxAqg79yAEFKKQHCzGPGkQCcPGbiXYNWGkB6FgRs1HE5nou4 +wU3LoCYLeCEoVwCrGfBwWlSukqYt/XQbDzg6dxokRZknXNTZDCqod5en3ssFczmi +z+PT1TKBjtNuqsuKXzR+KVGtfwRpjbMTFe4EUx+SpppmwSE4N86Gfk0H0u4BRIFt +mzn8NC+0+MC5XgBKHAskSEcMg6+Dc3nVs6vZ3bxO0aq2saqYYvhGB2xU8KK1SLeK +EkpuNfsuxLaMvgqt8ljF3tmIdyGEqGL3Y5uGGBJSXyDQL6nsSDe6qjpLD27+n78= +=zF76 -----END PGP SIGNATURE----- diff --git a/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild b/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild new file mode 100644 index 000000000000..82e575573054 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.3.0.ebuild,v 1.1 2011/10/10 22:00:28 ssuominen Exp $ + +EAPI=4 +inherit multilib toolchain-funcs versionator + +MY_P=ImageMagick-$(replace_version_separator 3 '-') + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="http://www.imagemagick.org/" +SRC_URI="mirror://${PN}/${MY_P}.tar.xz" + +LICENSE="imagemagick" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="autotrace bzip2 +corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp perl png q32 q64 q8 raw static-libs svg tiff truetype video_cards_nvidia webp wmf X xml zlib" + +# libtool is required for loading plugins +RDEPEND=">=sys-devel/libtool-2.2.6b + autotrace? ( >=media-gfx/autotrace-0.31.1 ) + bzip2? ( app-arch/bzip2 ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( >=media-gfx/graphviz-2.6 ) + gs? ( app-text/ghostscript-gpl ) + jbig? ( media-libs/jbigkit ) + jpeg? ( virtual/jpeg ) + jpeg2k? ( media-libs/jasper ) + lcms? ( media-libs/lcms:2 ) + lqr? ( >=media-libs/liblqr-0.1.0 ) + opencl? ( video_cards_nvidia? ( x11-drivers/nvidia-drivers >=dev-util/nvidia-cuda-toolkit-3.1 ) ) + openexr? ( media-libs/openexr ) + perl? ( >=dev-lang/perl-5.8.6-r6 ) + png? ( >=media-libs/libpng-1.4 ) + raw? ( media-gfx/ufraw ) + svg? ( >=gnome-base/librsvg-2.9.0 ) + tiff? ( >=media-libs/tiff-3.5.5 ) + truetype? ( media-libs/freetype:2 + corefonts? ( media-fonts/corefonts ) ) + webp? ( media-libs/libwebp ) + wmf? ( >=media-libs/libwmf-0.2.8 ) + X? ( + x11-libs/libXext + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + ) + xml? ( >=dev-libs/libxml2-2.4.10 ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib ) + !dev-perl/perlmagick + !media-gfx/graphicsmagick[imagemagick]" +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + X? ( x11-proto/xextproto )" + +S=${WORKDIR}/${MY_P} + +RESTRICT="perl? ( userpriv )" + +DOCS=( AUTHORS.txt ChangeLog NEWS.txt README.txt ) + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + use q64 && depth=64 + + local opencl=disable + if use opencl && use video_cards_nvidia; then + opencl=enable + fi + + local openmp=disable + if use openmp && tc-has-openmp; then + openmp=enable + fi + + local myconf="--without-windows-font-dir" + if use truetype; then + myconf="$(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)" + fi + + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable static-libs static) \ + $(use_enable hdri) \ + --${opencl}-opencl \ + --with-threads \ + --without-included-ltdl \ + --with-ltdl-include="${EPREFIX}/usr/include" \ + --with-ltdl-lib="${EPREFIX}/usr/$(get_libdir)" \ + --with-modules \ + --with-quantum-depth=${depth} \ + $(use_with cxx magick-plus-plus) \ + $(use_with perl) \ + --with-perl-options='INSTALLDIRS=vendor' \ + --with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \ + $(use_with bzip2 bzlib) \ + $(use_with X x) \ + $(use_with zlib) \ + $(use_with autotrace) \ + $(use_with gs dps) \ + $(use_with djvu) \ + --with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \ + $(use_with fftw) \ + $(use_with fpx) \ + $(use_with fontconfig) \ + $(use_with truetype freetype) \ + $(use_with gs gslib) \ + $(use_with graphviz gvc) \ + $(use_with jbig) \ + $(use_with jpeg) \ + $(use_with jpeg2k jp2) \ + --without-lcms \ + $(use_with lcms lcms2) \ + $(use_with lqr) \ + $(use_with lzma) \ + $(use_with openexr) \ + $(use_with png) \ + $(use_with svg rsvg) \ + $(use_with tiff) \ + $(use_with webp) \ + ${myconf} \ + $(use_with wmf) \ + $(use_with xml) \ + --${openmp}-openmp +} + +src_test() { + if has_version ~${CATEGORY}/${P}; then + emake -j1 check + else + ewarn "Skipping tests because installed version doesn't match." + fi +} + +src_install() { + default + + if use perl; then + find "${ED}" -type f -name perllocal.pod -delete + find "${ED}" -depth -mindepth 1 -type d -empty -delete + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + +}