Version bump to fix png support, and fix #80198 (USE=cups->gs), #93115 (respect USE=nocxx/perl/png/gs), and install doc files properly #91911.

Package-Manager: portage-2.0.53_rc7

5 files changed, 154 insertions, 6 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index c581f69b1b6c..2cc18d4cd5f7 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.166 2005/10/29 20:02:51 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.167 2005/11/05 07:18:38 vapier Exp $
+
+*imagemagick-6.2.5.4 (05 Nov 2005)
+
+  05 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/imagemagick-6.2.5.4-docs.patch, +imagemagick-6.2.5.4.ebuild:
+  Version bump to fix png support, and fix #80198 (USE=cups->gs), #93115
+  (respect USE=nocxx/perl/png/gs), and install doc files properly #91911.
 
   29 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
   imagemagick-6.2.4.2-r1.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index faca5a35cb4f..6b30a9214be0 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c7a473cc9988b5b87b7da634cafc14a3 ChangeLog 24248
+MD5 1d054c23cda5a5d73ad576e4d8856379 ChangeLog 24552
 MD5 42fd34630ded62400ed31be1426e3b32 files/digest-imagemagick-6.1.8.8 73
 MD5 b5fd28bb0167a5ab5f5422e7335a5c11 files/digest-imagemagick-6.2.0.4 72
 MD5 3463dd071a5d891ab69d1797c256df76 files/digest-imagemagick-6.2.0.6 72
@@ -14,7 +14,9 @@ MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3-r1 73
 MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2 73
 MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2-r1 73
 MD5 36bddbdde99d4acb74564afdbbfcabae files/digest-imagemagick-6.2.5.2 73
+MD5 4736bc9de8d4560b65df7cc6ce51ba96 files/digest-imagemagick-6.2.5.4 73
 MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
+MD5 0437a3eeba135410aca694c2eae65720 files/imagemagick-6.2.5.4-docs.patch 958
 MD5 0ec169e44bbf685be7f25684344ff9a6 files/imagemagick-perlmagick.patch 1193
 MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
 MD5 4a944fd0845cf1ffc4651141bb76fbc5 imagemagick-6.2.0.4.ebuild 2281
@@ -28,11 +30,12 @@ MD5 6ddba8488efcce8504bb7c7143f55345 imagemagick-6.2.2.3.ebuild 2582
 MD5 3c5815b5f5801d71e285a0f674393dba imagemagick-6.2.4.2-r1.ebuild 2705
 MD5 f83f94636e500cc9b4e38e637e19eeaa imagemagick-6.2.4.2.ebuild 2678
 MD5 cc6c155e7a58cc1d780b805d3f4fdab1 imagemagick-6.2.5.2.ebuild 2714
+MD5 8826342ea723637a8588bba1fc8fb19d imagemagick-6.2.5.4.ebuild 2634
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDZF+8gIKl8Uu19MoRAm6rAJ0fcERbqjlWq28i6irlYMhrtnzNEQCfVqcy
-EKNDQZ/2HTIyXcLqQixxN1Y=
-=6uFI
+iD8DBQFDbF0PgIKl8Uu19MoRAkI0AJ0ad4lhi5erN7/i9KX8CGbaUR3+oQCeO+BF
+REqCquuiKxUurjxtiMzlw0E=
+=9Q0U
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.5.4 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.5.4
new file mode 100644
index 000000000000..2238fe47ab09
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.5.4
@@ -0,0 +1 @@
+MD5 0c89ca5bc773ea41f77afb6f4099f7bd ImageMagick-6.2.5-4.tar.bz2 5044618
diff --git a/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch b/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
new file mode 100644
index 000000000000..8953ef0ce664
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.2.5.4-docs.patch
@@ -0,0 +1,39 @@
+Better control what doc files we install and where
+
+--- configure
++++ configure
+@@ -45956,7 +45956,11 @@
+ 
+ #
+ # Path to ImageMagick document files
++if test "x${PF}" = "x" ; then
+ MagickDocumentSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++else
++MagickDocumentSubdir="${PF}"
++fi
+ MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
+ MagickDocumentPathDefine="${MagickDocumentPath}/"
+ if test "$native_win32_build" = 'yes'
+--- Makefile.in
++++ Makefile.in
+@@ -4532,10 +4532,7 @@
+ 
+ # Architecture independent data files installed in the package's data directory
+ docdir = $(MagickSharePath)
+-doc_DATA = \
+-	LICENSE \
+-	ChangeLog \
+-	NEWS
++doc_DATA = 
+ 
+ @MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = magick-version # $(TXT2HTML_TARGETS)
+ 
+@@ -4547,7 +4544,7 @@
+ #
+ 
+ # Install HTML files
+-pkgdocdir = $(MagickDocumentPath)
++pkgdocdir = $(MagickDocumentPath)/html
+ DOCDIRS = images www www/api www/Magick++
+ HTML_INSTALL_DATA_TARGETS = install-data-html
+ 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild b/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
new file mode 100644
index 000000000000..961e95469f21
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.5.4.ebuild,v 1.1 2005/11/05 07:18:38 vapier Exp $
+
+inherit eutils perl-module multilib
+
+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="mirror://sourceforge/imagemagick/${MY_P2}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="-*" #~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="bzip2 doc fpx graphviz gs jbig jpeg lcms mpeg nocxx perl png tiff truetype X wmf xml2 zlib"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	X? ( virtual/x11 )
+	gs? ( virtual/ghostscript )
+	lcms? ( >=media-libs/lcms-1.06 )
+	mpeg? ( >=media-video/mpeg2vidcodec-12 )
+	png? ( media-libs/libpng )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	truetype? ( =media-libs/freetype-2* )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
+	!dev-perl/perlmagick
+	graphviz? ( media-gfx/graphviz )
+	fpx? ( media-libs/libfpx )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/libtool-1.5.2-r6"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod +x config.sub
+	epatch "${FILESDIR}"/${P}-docs.patch
+	epatch "${FILESDIR}"/imagemagick-perlmagick.patch
+}
+
+src_compile() {
+	econf \
+		--with-threads \
+		--with-modules \
+		--without-perl \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with bzip2 bzlib) \
+		$(use_with fpx) \
+		$(use_with gs gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg jpeg) \
+		$(use_with jpeg jp2) \
+		$(use_with lcms) \
+		$(use_with mpeg mpeg2) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with truetype ttf) \
+		$(use_with wmf) \
+		$(use_with xml2 xml) \
+		$(use_with zlib) \
+		$(use_with X x) \
+		|| die "econf failed"
+	emake || die "compile problem"
+
+	if use perl ; then
+		cd PerlMagick
+		perl-module_src_prep
+		perl-module_src_compile
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dosed "s:-I/usr/include ::" /usr/bin/Magick{,++}-config
+
+	# dont need these files with runtime plugins
+	rm -f "${D}"/usr/$(get_libdir)/*/*/*.{la,a}
+
+	! use doc && rm -r "${D}"/usr/share/doc/${PF}/html
+	dodoc NEWS ChangeLog AUTHORS README.txt QuickStart.txt Install-unix.txt
+
+	if use perl ; then
+		cd PerlMagick
+		perl-module_src_install
+	fi
+}