bump, this should fix bug #206925 and bug #206937.

Package-Manager: portage-2.1.4.1

4 files changed, 164 insertions, 2 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 3295b4753898..c71259d2c82f 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.261 2008/01/21 00:32:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.262 2008/02/03 15:18:47 maekke Exp $
+
+*imagemagick-6.3.8.3 (03 Feb 2008)
+
+  03 Feb 2008; Markus Meier <maekke@gentoo.org>
+  +files/imagemagick-6.3.8.3-hpgl.patch, +imagemagick-6.3.8.3.ebuild:
+  bump, this should fix bug #206925 and bug #206937.
 
   21 Jan 2008; Markus Meier <maekke@gentoo.org>
   +files/imagemagick-6.3.7.9-doc.patch, imagemagick-6.3.7.9.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 8cb87770f58b..b02f18cb4861 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX imagemagick-6.3.0.5-configure-windows-fonts.patch 584 RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f SHA1 db467ddc0c056425c790eafe5c6a72d6a8a0cd98 SHA256 47b8831abce2295ddcb51965e8759f32ef1d6f910e889f059dfcc6312ec09604
 AUX imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 SHA1 4a8c1122849a2362786cc3cbf165e57a123ade4c SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5
 AUX imagemagick-6.3.0.5-no-lMagick.patch 685 RMD160 01693f7d6074391848e2a536d077044f9adaef59 SHA1 40b837f853d3853f58949991262c010aa091ecb8 SHA256 09bbaa9ed82ba495392b8f2aad1dd28542f3b1b1d8bc7cf4dd75f936b042ca9a
 AUX imagemagick-6.3.0.5-parallel-build.patch 436 RMD160 68ede460a0aee676fa6f3a0dd7f90235bcf09f6a SHA1 14b19aa92d86be6db4fad68f13530f415c03fbdf SHA256 95958bf107327f7f1d598f4ca9357a2f0bb31464754865e611c4b754e2b72990
 AUX imagemagick-6.3.3-docs.patch 605 RMD160 5efee8976d9bab8308fdb7d167ab85f5e9247026 SHA1 5b989f21e4b2295541b64abb86869761b4a41b67 SHA256 e08792995e61887cdbac5b1ab9f31500840d5be6e73164be02e1ad5412bce602
 AUX imagemagick-6.3.7.9-doc.patch 660 RMD160 cdd9e744d4708a2254c3949ee9fed20845c93b91 SHA1 0b42f37ac3ba822908056563d3bb35e0c0429906 SHA256 fbd73289353c0dca7a621b85664c84aa14fb9a758f59f669731f9cb412207e8f
+AUX imagemagick-6.3.8.3-hpgl.patch 1852 RMD160 b6a2b0d1ceacf58a41723e95683aaaee3c050df5 SHA1 05c916506e750811ed76a31542563ac00e3c66f2 SHA256 44321e3a899345d21144e6b4715aba024daf3ccffa96187465eccf74886b6711
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 DIST ImageMagick-6.3.0-5.tar.bz2 5384739 RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e SHA1 c9f24810d2edc3d04886d32fe69a362c7415e79f SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30
 DIST ImageMagick-6.3.3-8.tar.bz2 5633820 RMD160 fe9ad987909ae1364257de54463ff1f06240f8c8 SHA1 3a8593f0b5e5458647b3bc954e477eb925672f67 SHA256 e2b557f971fa5875647ad4c848025a095eb5784a4296d884ff162212eab8db4e
@@ -12,6 +16,7 @@ DIST ImageMagick-6.3.4-9.tar.bz2 5813934 RMD160 cab331e23c1a49ac9db403d823fa807e
 DIST ImageMagick-6.3.5-10.tar.bz2 7571418 RMD160 b8436a7a5ada2793177f47621d031c89753b770c SHA1 f2fb1b73895a335c553c40b705af7ea179700316 SHA256 a4d26fb438b15502cc4fb7842111d75d0bd4958c484b3d1bbe25dc60b4e63f84
 DIST ImageMagick-6.3.5-9.tar.bz2 7645732 RMD160 6d2e74a1b8de26a095c2185a8b2c21259e9fb79b SHA1 71de22d770a4cb3de94c1925a03fba6d16e71513 SHA256 60ae398533a48b9edba17f1ede68525fd6aca143aaa8b430bc4c4ece40554596
 DIST ImageMagick-6.3.7-9.tar.bz2 7506758 RMD160 fe5deec4b46b15f09ddad05419dcd5c31bd55fb5 SHA1 4be3bb6396736078ff4eb78407097d8c9a16f7af SHA256 60de02c4fb32211c1871173889d7046affbdd3d2d77f215604a2feddd1d168e8
+DIST ImageMagick-6.3.8-3.tar.bz2 8792547 RMD160 31e8c34c654f207d8f1a216ed6184530aad8c96d SHA1 6a9ff40bf6f8812216298b2fad79c55d8900479b SHA256 d5df4328a660c94613a9587fd7386e13a00d5c4e115fd86b94205d21bdc33f8b
 EBUILD imagemagick-6.3.0.5-r1.ebuild 2926 RMD160 f89c77a293acc34ca2d8082c049fed844d553e1d SHA1 5f204e9013eed6f8bd0a7123f6dfa6a58ed98797 SHA256 4c7175928979c627fbc843eec474e6ec6532fb0b306da6e8c1086fb6c58232c7
 EBUILD imagemagick-6.3.0.5.ebuild 2894 RMD160 7a2ea72fb5b2c2d17b9d9dc9b091673f276e3a12 SHA1 173a4f97670736e16683a6a86768019007c63724 SHA256 971cff9e5dba0e6b99e85d5764add8ab8272b26339f81304112c7c742d9fa9a8
 EBUILD imagemagick-6.3.3.ebuild 2690 RMD160 78f27e2aea0e06ff092328d4082b6a6d0857270e SHA1 769b0d4df8008cf2992e5d2daa53b67db67af6d9 SHA256 a993f97c6064baf130c3183c60a26de325ab10ba409b5dff0af4203275103822
@@ -20,5 +25,13 @@ EBUILD imagemagick-6.3.4.ebuild 2699 RMD160 ec3ea0cfce3bb848a8bd5663594af3508d39
 EBUILD imagemagick-6.3.5.10.ebuild 3049 RMD160 96173689b9fbe5113923e455bb5f49d821f34329 SHA1 9c0c8606abd5438ccaa9f6945870fc190a98f08d SHA256 02e17636b371ef56b3abefa9553b030c77760d29198840c59df7802e5e5be6aa
 EBUILD imagemagick-6.3.5.9.ebuild 3037 RMD160 71e25a9e117aa9057b019c85bdaf3313c1b3eb52 SHA1 989cc82a0aa14ceffe0012ee402cebb4626abc74 SHA256 273e62d7437ff287a33ca8d6a6209089158c0d7b14b70b69d2b5a3f60ee38f78
 EBUILD imagemagick-6.3.7.9.ebuild 3344 RMD160 106c2874a144b4b7184dfe457d0ca564d771c277 SHA1 95fd95871d0b0a9871ec9f2fdbba2c786c7d3ee1 SHA256 99e46e9f3c7da52fd3a5d47c1957b86393196626219ee52e5d9c98cae17ad531
-MISC ChangeLog 39139 RMD160 1dbb9007c4a5e20ffd8e96eddcee8970ac9dd8b3 SHA1 12b9c573d58eefcf984bc7dfa42df247d988add4 SHA256 ae2b4d01d3ae8573b9e9800de674ebc1da3fadbf83c7e46f594d6e2400a29551
+EBUILD imagemagick-6.3.8.3.ebuild 3612 RMD160 8c8486143dd6e39b48b81455436b413ffe261757 SHA1 6593ba7329305874a566e31300a26afeb2fd6853 SHA256 ee1f41dc55c0e35f7429d6caa77b120d2d748aba150294f1f0e17b5c4f6f5c4e
+MISC ChangeLog 39347 RMD160 b450e7f84fca3e27e91b5de6cdd481096fcaea2d SHA1 4cf7c1948050515cb09552295f2c2fb947b003eb SHA256 d0051165632543c04a504fc34e55a9bf5e8a2552cab0bb2f7a8654e03c10821d
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHpdurkKaRLQcq0GIRAuZLAJ4vqKFpoaxIZBF6bt4tbVBFGiX7lACfVBsG
+c4CmO8EqORV98p1Vc06/KvU=
+=Re8m
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.8.3-hpgl.patch b/media-gfx/imagemagick/files/imagemagick-6.3.8.3-hpgl.patch
new file mode 100644
index 000000000000..74cd240639e6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.8.3-hpgl.patch
@@ -0,0 +1,12 @@
+diff -ru ImageMagick-6.3.8-orig/config/delegates.xml.in ImageMagick-6.3.8/config/delegates.xml.in
+--- ImageMagick-6.3.8-orig/config/delegates.xml.in	2008-02-02 18:33:18.000000000 +0100
++++ ImageMagick-6.3.8/config/delegates.xml.in	2008-02-02 18:33:45.000000000 +0100
+@@ -67,7 +67,7 @@
+   <delegate decode="gplt" command="&quot;@EchoDelegate@&quot; &quot;set size 1.25,0.62     set terminal postscript portrait color solid; set output &quot;%o&quot;; load &quot;%i&quot;&quot; &gt; &quot;%u&quot;;&quot;@GnuplotDecodeDelegate@&quot; &quot;%u&quot;"/>
+   <delegate decode="hdr" command="&quot;@HDRDecodeDelegate@&quot; &quot;%i&quot; &quot;%o&quot;"/>
+   <delegate decode="hpg" command="&quot;@HPGLDecodeDelegate@&quot; -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;     mv -f `basename &quot;%o&quot;` &quot;%o&quot;"/>
+-  <delegate decode="hpgl" command="if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then     @HPGLDecodeDelegate@ -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;     mv -f `basename &quot;%o&quot;` &quot;%o   else     echo &quot;You need to install hp2xx to use HPGL files with ImageMagick.&quot;     exit 1   fi"/>
++  <delegate decode="hpgl" command="if [ -e @HPGLDecodeDelegate@ -o -e /usr/bin/@HPGLDecodeDelegate@ ]; then     @HPGLDecodeDelegate@ -q -m eps -f `basename &quot;%o&quot;` &quot;%i&quot;;     mv -f `basename &quot;%o&quot;` &quot;%o&quot;;   else     echo &quot;You need to install hp2xx to use HPGL files with ImageMagick.&quot;;     exit 1;   fi"/>
+   <delegate decode="htm" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+   <delegate decode="html" command="&quot;@HTMLDecodeDelegate@&quot; -U -o &quot;%o&quot; &quot;%i&quot;"/>
+   <delegate decode="https" command="&quot;@WWWDecodeDelegate@&quot; -s -k -o &quot;%o&quot; &quot;https:%M&quot;"/>
diff --git a/media-gfx/imagemagick/imagemagick-6.3.8.3.ebuild b/media-gfx/imagemagick/imagemagick-6.3.8.3.ebuild
new file mode 100644
index 000000000000..b41897d5fd20
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.3.8.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.8.3.ebuild,v 1.1 2008/02/03 15:18:47 maekke Exp $
+
+inherit eutils multilib perl-app
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2"
+
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms nocxx
+	openexr perl png q8 q32 svg tiff truetype X wmf xml zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( media-libs/libfpx )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( virtual/ghostscript )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( >=media-libs/lcms-1.06 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	png? ( media-libs/libpng )
+	svg? ( >=gnome-base/librsvg-2.9.0 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* media-fonts/corefonts )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	!dev-perl/perlmagick
+	!sys-apps/compare"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/libtool-1.5.2-r6
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use djvu && ! built_with_use app-text/djvu threads; then
+		eerror "app-text/djvu has to be built with threads support."
+		die "build app-text/djvu with USE=\"threads\""
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# fix doc dir, bug 91911
+	sed -i -e \
+		's:DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}":DOCUMENTATION_PATH="/usr/share/doc/${PF}":g' \
+		"${S}"/configure || die
+
+	# bug 206925
+	epatch "${FILESDIR}"/${P}-hpgl.patch
+}
+
+src_compile() {
+	local quantum
+	if use q32 ; then
+		quantum="${quantum} --with-quantum-depth=32"
+	elif use q8 ; then
+		quantum="${quantum} --with-quantum-depth=8"
+	else
+		quantum="${quantum} --with-quantum-depth=16"
+	fi
+
+	econf \
+		--with-ltdl-include=/usr/include \
+		--with-ltdl-lib=/usr/$(get_libdir) \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		${quantum} \
+		$(use_enable hdri) \
+		$(use_with truetype windows-font-dir /usr/share/fonts/corefonts) \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with bzip2 bzlib) \
+		$(use_with djvu) \
+		$(use_with fontconfig) \
+		$(use_with fpx) \
+		$(use_with gs dps) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg jpeg) \
+		$(use_with jpeg2k jp2) \
+		$(use_with lcms) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with truetype freetype) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		$(use_with zlib) \
+		$(use_with X x) \
+		$(use_with openexr) \
+		|| die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation of files into image failed"
+
+	# dont need these files with runtime plugins
+	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
+
+	use doc || rm -r "${D}"/usr/share/doc/${PF}/{www,images,index.html}
+	dodoc NEWS ChangeLog AUTHORS README.txt
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}