Version bump wrt security #428718 by "taaroa"

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

3 files changed, 167 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 284080bca5d4..f73b808a8ecb 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # 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.485 2012/07/31 04:15:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.486 2012/07/31 14:38:09 ssuominen Exp $
+
+*imagemagick-6.7.8.7 (31 Jul 2012)
+
+  31 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.7.8.7.ebuild:
+  Version bump wrt security #428718 by "taaroa"
 
 *imagemagick-6.7.8.5 (31 Jul 2012)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 69bcba610c1a..e29b6d566406 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -4,19 +4,21 @@ Hash: SHA1
 DIST ImageMagick-6.7.6-4.tar.xz 7576636 SHA256 612910aca97c345e21901cb3b2b45b485029f196d02c3c42fc3354fc824b811e SHA512 04c1efd29c63c5923deb2f73d423178c3acef81c133090aa44223baa40c2ad79a430a3051bfd313641b098e2b37bddcb09aebd8a92fc131288364240be128917 WHIRLPOOL 5b9efe697c87b061a6ad7c98d4aa5a73f53632c1ef521e0a34df894a8371364d76ab992d62f6d49aaf48802ff5a2591f11edbd947f008bf35b249d4b3b59ad68
 DIST ImageMagick-6.7.7-5.tar.xz 7602596 SHA256 5a978f28e4e4e8f5a5d553fa0a673beccc440ce9bd5119a26464f63168cba714 SHA512 f3deab7707a2faf446d99a6326b86709767d26dd1634ce957699a1ca2f902f5cbfc08cbd9e7cea14ab6123e230da79c25cd8eacc07f7f91e83e9057dab4083a9 WHIRLPOOL 8fffefb11016cb60c652e53a6fc60dc30e30748e4a47eb5b34fb00efdaaddffaa131d9d8faa20495aed5c69fa5bd48118b569a20d7faeea5f292036c07b47c9b
 DIST ImageMagick-6.7.8-5.tar.xz 7816820 SHA256 7f0370a759cbed10e95dc4b22ad6baf40bd65b5ac706a07c803229292303e4b8 SHA512 8ff30501270b4df79a21108286706246933573d77645ed14ffeebffdf5aa0a6aec02016402804f1cc29467b3d8f74010505e94bd62e8f3579c0300d4b02742b2 WHIRLPOOL 98a051f2f18583633b0dbd493c1b3b2a86700794a8884d1684588f4258a394315e2dca7694f39570948bcd888d6ae305ed0656670bd49b3ba1ec6bf730cc5643
+DIST ImageMagick-6.7.8-7.tar.xz 7830744 SHA256 593e09bec0e6def3f9d6d6b0f7970ddd37dd9420a1286ce27e3f4ba26b78f114 SHA512 76b30887a40e6c74006a0e17f848893901bf001d68b4bf4ab6f38bf3147bf8b1fffa7e0a3aca8acb46bd65c6489aee6f9c28606f43d46b00cf9be2b6a93290dc WHIRLPOOL 2b746348aa058e4c2ef1096c62254f7694d7cc32bb23ee36f8a6b9f8fbb4603a98c2d473d0656004d40923b124c9d882842fec700fbac4900eaba1a5a102164a
 EBUILD imagemagick-6.7.6.4.ebuild 4221 SHA256 64b42379dbf8f3a6bd058067146587930a1ad2a7dc632956843244f8c31a345a SHA512 f9fcd98c7ee03282aa5abd59c827e0531f68d484640e856ac0748183a40304eee60a1796f4370c07574b7707d2798d198e004c25d9998e5482f0655d17b0a5b8 WHIRLPOOL b6d9310ee21151d9c4b082a566b0572a6ab9ed482c43e633e18b974daa761285126ff125edddf37e0e134e5fae344c0f51688f561bbebf00ee9e41bdc6027e87
 EBUILD imagemagick-6.7.7.5.ebuild 4337 SHA256 08ee4cef82ed0e0a10923cd57085251d086b1936e1f35af190758828a82a4c03 SHA512 a4719003f8b3a51b3a5316888760686ef2286927476bc2e18a3ea860f185c907c12089de8ffada230aaf07cf382371f77fbb5d9143eadb81d86d390a73ef2865 WHIRLPOOL 63a68cefc7b7343551b2526aa5497240aaf6ad0ac73cde267051d78ee6f9dccf6c47c4d94f2af3265a6f7f7ce50325b9acd2dc95ff2590fcd13229ad1c2924b9
 EBUILD imagemagick-6.7.8.5.ebuild 4255 SHA256 e4ce9e38b7e1b3c8645d5383a60502c9bdd9899173e575bec1fd6369f28c2a4f SHA512 ee933eb3dad337fa3568d595cccdae8cb6de6bfd2497eee104f0f860a16a84ada821adb6846cdca174deb4f82239dd147753c9ade0c0349eca23f139f2a58ca0 WHIRLPOOL 6c5cc40d33f78290523470d3127567b2d7838609c68924f4d21b154f3060e0abdb63975109241acd47e085a8bd9f797b57157957cf3a04d42a1b65bea8587df0
-MISC ChangeLog 71836 SHA256 0619b6e924991c2a19c686c2789e10fefe4067c2b51ce44d5d3b31b297e35bc7 SHA512 6c8bbd03ec90e99f5d3e3c3b1b9c2d45417f301f96f303d8c669446416f86f80bf1cbb48b69db4926dc51be292784a8e28dceb5628c15e086a9912a20357fab2 WHIRLPOOL db0397cfde2fae15f3a7afc3e859862941b832b3a7ae00304665c122a0fa278a15b53199b8eff141613a8a1ba3a381a8dd512918f7aa7b6e2517c72b7ed60570
+EBUILD imagemagick-6.7.8.7.ebuild 4255 SHA256 231d90e1e27166e1b0559282a69b9e3712d18996970043228f9ae9b950b0c81c SHA512 41a56ea8255d464cbef752cc61fd2efa19c13e9098729162b1152c6c3369e21e254fb36c9932084794b1ffa739aacc09e8f9ee0f88e6f0dbd7f37f574213e0a3 WHIRLPOOL 5671fa4afcc1240698ec42eaebab233fa30d579e9650948a3947a79ea6f56da39fe9b6b7e8c0ab1fa061cd0ec1c681e4fc8d9c638b07760cf8626bcb339cfd53
+MISC ChangeLog 72006 SHA256 6d4424c1952f51925435badd5be4aaae37a1af86fd3d5b31a2acc0258d97272f SHA512 9e92f9125c3bb00ea9a642f87c1d005463f191d969e732297583a79bc234a967d534b5a394f6d8341c44899388cce780e6263df1ffbbdeada23cb502d5b9f3b6 WHIRLPOOL c39dad5c9615375ace5d7c806f8bab50d11f322edeec003066faac3919765943cf0cfbc89d1659c3b80b451ffcd3dccebf043d06f7f711a61024a1e46c955e88
 MISC metadata.xml 1050 SHA256 c7fad295a9ca9207454a88d9794902dd76f732f01a439d29f94372ce9ae4af7d SHA512 d502e1038cd08123b1a0d25dccee6a4134bd8fc768c228042b546c8ee226432430107f76b506e946eb5a9b358c13115e5c6e7a1c80f3fe5b4061885263b0dbd7 WHIRLPOOL 675922fbabfacc2660f9572b61a3cee8bb0967b0df0e6e211271399dcb6edc050246344e5251e6a4a4411f8671f3c625d07f3606531662ab5b278fdcff692010
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJQF1vIAAoJEEdUh39IaPFNiesH/RerAr18eS5cEDbQAQj4uHIE
-jpZrN7yjf1cYiHe+2xTnBV3EFdoaRQkvnRDbIsX/FPCYMKKZveLyYvYhlGg2kRm/
-NiSRCqjc6+DWjjJXlPVKhIC9p0FCqMuL53P3M8lpbtpKuZN4qK8ZirVh+m37KQtz
-9CBSQcX29VzyC8yetuMOTyCH8e46hDqhWQu39Dac3ndRlUIZf/7VjZG1howvyOih
-D3YivEVL7YhNsVKsNtwvyTqgHk/GYnR80PCJ0n20i99xnZrkDxeuuqcLza8Vn/RV
-wE2CIpT0Gp7fP65wKOtmzU1JnPG67uzwSjNR1+auUOU66NEyKLAyHTrLMUxATz4=
-=Th6D
+iQEcBAEBAgAGBQJQF+2nAAoJEEdUh39IaPFN550H/j6KJ851LKVnjTJqv4wEMwCu
+ARzoRk7Dn+L7d/w0PJ2LMzGJZRx9yBNvqBJH3LquttPWXQYOIU9HcqepOFtb3m9b
+D/k11Qop2kfN5B1m05S3r8yWv3Oo+IrcJCT9SemCqel+9QIxPmLmXIXaibl2qsaB
+cmMqdhjnDQL0s9xQguaHf4KQ8SA3UB0548iGITmLYmjU+rUTdF7pm59AzPnozIJQ
+QCZBFUyMpcsgTB0lpaVa2wu5ws0OhZiHcMSa2QSJyIEg+to2JBxRsJJFn8Mns48E
++4WuCOjOHlSvcEkNYM3n1JJhcgClnbn3Q+FNz9DfP6GChKyGTONvYmp3SWlbBPY=
+=EbJR
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
new file mode 100644
index 000000000000..f2c8d518778b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild
@@ -0,0 +1,150 @@
+# 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.8.7.ebuild,v 1.1 2012/07/31 14:38:09 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() {
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	dodoc {AUTHORS,NEWS,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:=.*:='':" {} +
+}