Version bump. Fix documentation installation to include "html" in it's path for $DOC_SYMLINKS_DIR to work wrt #424209 by Guenther Brunthaler

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

3 files changed, 170 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e4d3e551f314..14f9abf53658 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.495 2012/10/04 14:59:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.496 2012/10/04 15:22:18 ssuominen Exp $
+
+*imagemagick-6.7.9.9 (04 Oct 2012)
+
+  04 Oct 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.7.9.9.ebuild:
+  Version bump. Fix documentation installation to include 'html' in it's path
+  for $DOC_SYMLINKS_DIR to work wrt #424209 by Guenther Brunthaler
 
   04 Oct 2012; Samuli Suominen <ssuominen@gentoo.org>
   -imagemagick-6.7.6.4.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 69f2965fb602..ca6bc06315fa 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA256
 
 DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
+DIST ImageMagick-6.7.9-9.tar.xz 8363720 SHA256 706164aa20219f2f72bed9f8f2d1a998897fed61cd95cd4939be4e8fa7e1904a SHA512 41070032e7deddba17a779a985d600526c0eb32a5518db5d11aa722a65998743344105825155606dc2aab8af45ffa585f2c34e55f492662998773c1d84f880f9 WHIRLPOOL 09428d51460276d558e0c7c2bcd50b765865b59a2b243bae6f82b363c469599c2fb190d41a55d990b0474e2d9417acfb24506e3802a528ec84ab43d9283b5705
 EBUILD imagemagick-6.7.8.7.ebuild 4244 SHA256 ce099fb745e4149517f2a3463d1ecfd3eb0e07deeb8669d18ac5d6fc7316fc48 SHA512 9ff3f5aa200ffda0fe3458f0cf906ad690497b4a89e47126c78af56f19a55241f8a17077a526c997c7ae9507287c26bf0dafeabb161c9e1e0f639ca19bc025cb WHIRLPOOL 22378b9f665593654f0cb7c7723c026a6c991ec270662e3c37342b1c4ad872dd49bfb8dce50d27ccbee92f807d6bae3b9d09d74bc12b5380880a258917a2ed08
-MISC ChangeLog 73012 SHA256 12c6437ab30cac820422b1049ca426b63e06f77da6ba53c4342de1312efddfb3 SHA512 1d17aa3eb7be91c7f7dc5b72f46c90ff3418d7725fcf9963ba3b30642a541310c4be5d26ec121d8fcc5b9778b43c4f761503ddb7b5a68e12a43cf7e0c2cd0ba1 WHIRLPOOL 7e5008666fcc41c7cf809dc397d9032a97a7339516779d39137df07081c4c9bb12031706c13eebdbd22f2856cca6b685d5eb9cf47a39028847ec724d371262ad
+EBUILD imagemagick-6.7.9.9.ebuild 4396 SHA256 edd036eb45200788c8dda69ce912062feb6c26e37c616e046c57889d0849d8ee SHA512 579fae5f7f04196c0f7c4d53801517b0a4c88e9294a4ff7a922eb54eac722cd7c01e8cb34102675cd9e496b040f3ef3bfeca33222b8dcfa10804c2d00e30aca3 WHIRLPOOL 3cc074371278200666788aa45efaf4c3615e3bf007d42a7ab23a4e7180c96e28d390fd2908f96a10c32f2ef251de8be95a4aafa8b9fba143661ed4687b56f923
+MISC ChangeLog 73279 SHA256 1ef3236af2ada7df38bca47d27fabb59ddad806505672aaa4d319c918462e1b7 SHA512 ab1cb16e26f730d69ab4d77d9e0d643c84a4951735966359abc9125d83ce5fc42ed1f8cb50a3b8ee5a78f23ac4f379c745e7ee84244179404b6d5d2abbc3a7e4 WHIRLPOOL 87a3854a3d6ba345aea12433c45d6edfd763eb470523cea443b24f43df41d4af66e324703716b85cda88dc02d065b6afa93a3b792e25e375625b81a0121f79f6
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQbaPBAAoJEEdUh39IaPFNacsH/1TGPhUubwn4A3PKb8oGgBw/
-WFgRnXeeU/6lDw41JdS9fX4UvSVJrMCzx9BgRECga2NL10CMYkWSF87Hw6Uzcrv3
-VSwOjIH184oy5nL56jiQ73VRfF1wv8lL8A7k2fBzWXkyyaO9fJeTftYi2XoY6X1V
-CNTLYWfGd6+G340xWfCqYhHjJvdiIjGIAt8Zsfcq5SkLzZ4qd9fIBDCLON8RVFUN
-icoz73SZeo/iuutUwwp+HrpFgZbN9yYD3C5bJLCCwtJzWgL5Od4COOt7cx2HST01
-vf+661em8NBuNKp8xWcFWu8TLu/Wb8fceQAdW/Zd3E4D5mhMaAdx7UT8qPuFJIs=
-=228Q
+iQEcBAEBCAAGBQJQbakWAAoJEEdUh39IaPFNrIwH/0FcMSJWHMVtE6FgCVfCg9Gm
+vryih3HpPoxvE/WEXUEl8DUBBqfMrR7FpyuSv+AQ8GjS6j5YqcdVBKaEFzh+havi
+wYxl5QZe3cgZz5Ev5i1cNJc9k2q3iVoA0du44NnOl2e+OS+RuTEgKAbplNskZ6NY
+OyRnuhQxqwUkikdY+39Npkkm40bsAIo26JO0OFbj0w9GLtxFYASvCiFkGOUVFdm8
+Bqk3UsIcxG060d8fasHn76ZsoGbgoqslGLMHPg/oH5UKJzFLW1UG/2u82Mg0CNcQ
+DQ9+cvsr7X7UjXvdoSZmWBQLia835rwSa6jxsIMeTL/gy6zR+ZGk8/++S740mBs=
+=yzh+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
new file mode 100644
index 000000000000..f5b9a3af945b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.1 2012/10/04 15:22:18 ssuominen Exp $
+
+EAPI=4
+inherit multilib toolchain-funcs versionator libtool
+
+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 ~amd64-fbsd ~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 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 )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( media-libs/lcms:2 )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	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 )
+	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
+}
+
+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; }
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable 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/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 jp2) \
+		--without-lcms \
+		$(use_with lcms lcms2) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(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:=.*:='':" {} +
+}