Version bump; switch from media-libs/jasper to media-libs/openjpeg for jpeg2k support.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 180 insertions, 5 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index d05b0e4bc854..a290316d2748 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.522 2014/01/12 11:34:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.523 2014/01/20 18:54:04 ssuominen Exp $
+
+*imagemagick-6.8.8.2 (20 Jan 2014)
+
+  20 Jan 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.8.8.2.ebuild:
+  Version bump; switch from media-libs/jasper to media-libs/openjpeg for jpeg2k
+  support.
 
   12 Jan 2014; Markus Meier <maekke@gentoo.org> imagemagick-6.8.8.1.ebuild:
   use subslot operator deps where possible
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 02b5194d8276..aa931aff25b7 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -8,18 +8,24 @@ DIST ImageMagick-6.8.6-1.tar.xz 7463396 SHA256 8cf52dafa7269f872b54394fa57f9b55c
 DIST ImageMagick-6.8.6-8.tar.xz 7537236 SHA256 8ce81b1cbc6615bc634c9bdb539025957a299744323706c3d72c9a8bdc72ddbe SHA512 5ef4eda528afc1be24e9f157884f11def0f815b40c7a0df7917abed34e09806c63013504d8a79e6b246f9348e902f9ce0a803bb5f7009337a324befbb6bdaae1 WHIRLPOOL 2c88b5d6ca03440a1b890a32a119a3fe429e80a5021741b001188dbbfa902fcb7268c4d5369e36bbbbdad13adc835efcc0f69b3bcf65159eb20d485cfd64b136
 DIST ImageMagick-6.8.7-5.tar.xz 7505296 SHA256 266601bfc6896785df1e4bb5b83ef3d54a5c2dcc11530c403ed968a6cf9bc1b2 SHA512 daba8a73a0be82c6f4577c58d8fd64f03bec18cc7642b7c0df52a25b8de558aab182f7a1443c741db808ecff533c7ef4481a628d07cff643b50989259c45b7d2 WHIRLPOOL 6a253087aff0814463deeb3423bc8b2150eb51b669d921035a937562b2e6260dc9657a584fbde9573370f1373c387c5795016c74595e920404e4fc6f1a17acc0
 DIST ImageMagick-6.8.8-1.tar.xz 7527812 SHA256 1ce766720e07c61a9993c3c226425d8b1b7a18fd8ffb1841c2380a7d622c107b SHA512 f6eb9789fce84d6b982ed7397410179b5acb7dfdfe75afa485b89cd483d01d5cd8f74e2f589c2eca13a358f46915fcbd9445784bb5e721232bbbafb6a77b135b WHIRLPOOL b4e6ec9b5d89be3d5185786889fa57c5d7782c5608a9b32f68da33097c56234e9f49b81df0e4e16a412cdad704fa8f346a7884cb715a8d411edeae488e8bc300
+DIST ImageMagick-6.8.8-2.tar.xz 7439160 SHA256 26f939b9663e21f28028a1cac912231d2930481aec1779c55b9b71617032430e SHA512 6f6335c6878ffad57f81fe6ed6b1595c0c94a8413ba0c62d97116d20a4ec9cffe423e00a8492c3b1e9c8dfcd2d284aa5fcaea8b70d784fda6e9680715f6941ee WHIRLPOOL 7653697cd4268c1c80d610cfdfa496c21939497482dec5462c0b55cc582851cbc54d55dc2403ebe59963a37ec0f2d8a88223576dd040048299f4e10fc8cc1c59
 EBUILD imagemagick-6.7.8.7.ebuild 4262 SHA256 4999aaa5ca86a056bad155e48656256225c9dd4d918ecf17d41fdc563f6b8786 SHA512 635eeff5cc3ebf2277b30bd318630969ba017b5bbe9c50707473f1cd0de04ea6213b39d6b30f74654920c5ad637c4e8f33c8602a712d4edbce5d9d10f22fdba6 WHIRLPOOL 8ac9a2691c239605087eda39ed6b2d2c2a0ee08a477beec4eac7883ba4e6c92511026eba449d7e8db5d95bb626c1785ab33c13460a9f570e79ebd0df477652db
 EBUILD imagemagick-6.8.6.1.ebuild 4284 SHA256 48159b8d51d9245dd50015dc622b3c355115e6d54ea9f30f939f3a3ee2924124 SHA512 15153776de1706442b369cdec7dc7d181d3d7b8899769256fcff03b8936723f1e75653c44f82bf60518db474be677b9ae757e87595dddf1b3a57478ff0468c5c WHIRLPOOL c1150bdb4f1850021b239d8f6fd2e3ee313fb298e517f1458bdeebe99d8ed4fbb6f734f3679d2bc6f2c66b5e0e478eb665a1aa22d45912c1fd1685305f0426e4
 EBUILD imagemagick-6.8.6.8-r1.ebuild 4614 SHA256 3dddfef8648a8ca870ea2452950687645b7c4f793390e700dd22cf022dd2d408 SHA512 a06851ca35f86445e51ee6bd682054f2897d119df479b9bc9f2d0e30d4ea7575ba7c1a2b1d76dd055837501afadca46286775cf975e215a5aa49e51d2421b67f WHIRLPOOL 77a87160573cc51727cc13e5ff7480ffc76e5c0771b181bfd4e5efcc5ff0d95cbf0d4b126350310602e7a4722636673cad18cfd99577e86d7ad87870c5cd47ff
 EBUILD imagemagick-6.8.6.8.ebuild 4346 SHA256 5741890d4a1f48280481b5db16d87badfd528528cbaa902541a4317a7b0b79a8 SHA512 24031845c6c77af2966cb8161a9e3f541885f391f7c5275812eff6b0914cc2ea592481d3a44b7e0a65c126ef497dd9ba729fd88b1aff91e0111da38558b1dc54 WHIRLPOOL b35d517317e9d59a71093714e82b76dbdc8c6bbfee0a3c567079acd34f0747da672be46fc196dcceb08c905845e95ca7b1bfdd33e9f6a48f9c3fbfb3a31d4941
 EBUILD imagemagick-6.8.7.5.ebuild 4672 SHA256 f8754bee18587d9369506b497333bf112f4cd047b8a63ea0e55e70740103ac4c SHA512 2885ecd558adab502fc787318e800a19091d14a496313c5550e9616b28b0c8880edd7c44fc7d7fbb2a94ff08254d671f874343dd49083ee2897e183654f178f1 WHIRLPOOL 93b693a416be23a4096df218ae5ba70f3eaddb085208449e33a70e1d80392d71aecc7af46186324ba1dd343ab9780c6f4eda01301f11e7a3ffcfabad620883a2
 EBUILD imagemagick-6.8.8.1.ebuild 4682 SHA256 7c06918121f2c206d6f9596684617c76f988c190a99eb8bb74234abeba87ef18 SHA512 7ae969cb7e6eb40b56d7909300a5c6598dde953d78e1c8d4ee8240756af4ccbb221e5a43559d08acb3413b405d65b913f91f97cdb31d575b5226c57a62dc39b0 WHIRLPOOL a1de6dadfe6c4b90efeddd29f564534d84bad04f5dc9184427c4baaad61688e502da387fef1f2507862addaae868b3f158c79236bbb3c57c6c2f4934224f2b2e
-MISC ChangeLog 76935 SHA256 de9d9ddddcc13dc1ea2020257669cc869888ace37538d799b692bf4921d0030b SHA512 33bada9f757566a631264f5dd75b3e70320ea60553fe17c4d15ddee1384163d5e0016ad2b39b97bc3ba5df6be779fc128dbabc54705d03c5848a6f9692ed9776 WHIRLPOOL c28277f027bd9833719abfaab57b15d4961d74b4a623b4914f54f8bbc41d4ac7e5757749bc52ca0e68dedd8ec01132512b26a43108a178c252d57faa3241aa27
+EBUILD imagemagick-6.8.8.2.ebuild 4693 SHA256 6a23749854cd5afc769979d895605d347046689ef6037014f949ead23cf46440 SHA512 fa59fb06757f96dc148b0d1753def92e03663705be01586748f1aa5a9d1b8e32b1b8ec3ce126f1780f5d5b6900d792ae383eb2014342b9835b9a2766e46ccf13 WHIRLPOOL b48ae18dadb0c8827305152ab79f0f25c965d845161be79d3dbd1ddd3ded6d3f1cc1a1e01e6bb8d50a98ce1d66d0e35a94c167d25c54ca14f2513abe2402c8d1
+MISC ChangeLog 77151 SHA256 698d3c311b86abb409021242bc3a75528b4850894dd4aa2fcab65e4f48eab372 SHA512 4c7398c63eec530f56cc5f6ac6a207b890d07440f4cab9c9d7694c9db97d6227cd16f8063b51250d0876c5ef60e6de165d7e15954a695faf8d909c17d4bfb2b5 WHIRLPOOL c0fe2e2544c84a627befb17e9a260c3c1dbc29ea9e3c0f9a1ebba9c4f2d92c0e2e5b67f26c1ca1c863b43611141105906d5ac0196ae94c8b30018e282e8f8e12
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLSf4QACgkQkKaRLQcq0GIQBgCdF7LbBxY1Lwq/B3Fygg8gHGSr
-OM0AnjXsxBcfY5Dqs/R/1dEWzAc7lsiK
-=mLy3
+iQEcBAEBCAAGBQJS3XAMAAoJEEdUh39IaPFNHyYH/3/4KpNHnunM/5HXLykVCgEg
+A4RKqxrn0drUydB0qiV2s8JOAI3plR98u96C8ECzu5c9orTr69Fpq7xH66AH5sd7
+3ZZVWjbakzA6wunXLdW6m4w/1ipR33OyVeIiFlha0l5IRw02TeQ3fuBhBkFZGTNR
+B4mpOW5+QwV0HYxBJWyRrgL7BFsG5K4HUdzbOtFz+OMwFxsWpQz2W4vd7FAa8Ics
+6QOFhQtjzADS68Aq5qORm0DQSEsx7am4KwFuAD784B6gfMWG9eLr5QDWC//749od
+MklrMUhjxnp1govID0KCRFVWBwP017zwXLLakc01FL8lHSQTtszuHXYc9bm2LHU=
+=/auO
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.2.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.2.ebuild
new file mode 100644
index 000000000000..aa954119fe52
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.2.ebuild,v 1.1 2014/01/20 18:54:04 ssuominen Exp $
+
+EAPI=5
+inherit multilib toolchain-funcs versionator libtool flag-o-matic eutils
+
+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/${PV}"
+# KEYWORDS="~alpha ~ia64 ~ppc64 ~sparc ~amd64-fbsd" dropped because of missing KEYWORDS in app-text/mupdf wrt #491876
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~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 hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango pdf perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	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 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2 )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	pdf? ( app-text/mupdf:0= )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2 )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	elibtoolize # for Darwin modules
+
+	# http://bugs.gentoo.org/472766
+	shopt -s nullglob
+	cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${cards}"; then
+		addpredict "${cards}"
+	fi
+	shopt -u nullglob
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable opencl) \
+		--with-threads \
+		--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/urw-fonts \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with postscript 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 postscript gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(use_with pdf mupdf) \
+		$(use_with openexr) \
+		$(use_with pango) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P}; then
+		emake -j1 check
+	else
+		ewarn "Skipping testsuite because installed version doesn't match."
+	fi
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}