Version bump

(Portage version: 2.1_pre3-r1)

4 files changed, 140 insertions, 23 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index edeef0fdc6e4..1025928a0d51 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.171 2006/01/14 13:01:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.172 2006/01/26 21:35:59 sekretarz Exp $
+
+*imagemagick-6.2.6.0 (26 Jan 2006)
+
+  26 Jan 2006; Karol Wojtaszek <sekretarz@gentoo.org>
+  +imagemagick-6.2.6.0.ebuild:
+  Version bump
 
   14 Jan 2006; Fabian Groffen <grobian@gentoo.org>
   imagemagick-6.2.5.5.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 85b61f802275..502ca92b3a54 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,33 +1,35 @@
-MD5 5511a30e523ec782cd0fbfe640fdb64e imagemagick-6.2.4.2.ebuild 2669
-MD5 e19c87c295801b257a8101aec523eaeb imagemagick-6.2.5.5.ebuild 2791
-MD5 33cea0a2ca49cd60e596d6167b5a0cb0 imagemagick-6.2.1.5.ebuild 2583
-MD5 69a5874fa82f391a16169d13ab7e8f97 imagemagick-6.2.2.3.ebuild 2576
-MD5 52ba268f638346ebc1598863ce4b705c imagemagick-6.2.1.5-r1.ebuild 2608
-MD5 4a944fd0845cf1ffc4651141bb76fbc5 imagemagick-6.2.0.4.ebuild 2281
-MD5 93b2c6a6f1385d05b35ae5406b8a2800 imagemagick-6.2.5.2.ebuild 2705
-MD5 bab8142fa9a306ebdbd683edabd8eb99 imagemagick-6.2.2.0.ebuild 2576
-MD5 ba4ddb58c87859514dc6fdb4c45d3a0c imagemagick-6.2.0.6.ebuild 2290
-MD5 d07c1ad811fbc83b076177a93522b077 imagemagick-6.2.5.4.ebuild 2769
-MD5 26d349b9ac3126394eca1640b90c1e66 imagemagick-6.1.8.8.ebuild 2317
-MD5 05d71d7340a6ab59648cffa7a8c44a3f imagemagick-6.2.4.2-r1.ebuild 2700
-MD5 449d2301f9c762eec261b9f8c9c37245 imagemagick-6.2.2.0-r1.ebuild 2600
-MD5 7dfb4405a63809d960ee9310247940a2 ChangeLog 25341
-MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
-MD5 b5d84037b0b239b91aed56ce2fb75e25 imagemagick-6.2.2.3-r1.ebuild 2652
-MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504
+MD5 5b3c3d26d0c9b64447493c2335173669 ChangeLog 25478
 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
 MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5 73
+MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5-r1 73
 MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0 73
+MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0-r1 73
 MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3 73
+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 f86059fc03b4de0b8206e43d853dce57 files/digest-imagemagick-6.2.5.5 73
-MD5 ab68adfb9efb0f004017b018e622b96a files/digest-imagemagick-6.2.1.5-r1 73
-MD5 0cd85649e1efbcb3e9631a8cde085b60 files/digest-imagemagick-6.2.2.0-r1 73
-MD5 83dfdae9306c5c8a11423558fe92f6fe files/digest-imagemagick-6.2.2.3-r1 73
-MD5 151be5e2bac5482ef9302c47ce86e1a3 files/digest-imagemagick-6.2.4.2-r1 73
-MD5 0ec169e44bbf685be7f25684344ff9a6 files/imagemagick-perlmagick.patch 1193
+MD5 8049e561a83d03f774789ea586875fe1 files/digest-imagemagick-6.2.6.0 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
+MD5 ba4ddb58c87859514dc6fdb4c45d3a0c imagemagick-6.2.0.6.ebuild 2290
+MD5 52ba268f638346ebc1598863ce4b705c imagemagick-6.2.1.5-r1.ebuild 2608
+MD5 33cea0a2ca49cd60e596d6167b5a0cb0 imagemagick-6.2.1.5.ebuild 2583
+MD5 449d2301f9c762eec261b9f8c9c37245 imagemagick-6.2.2.0-r1.ebuild 2600
+MD5 bab8142fa9a306ebdbd683edabd8eb99 imagemagick-6.2.2.0.ebuild 2576
+MD5 b5d84037b0b239b91aed56ce2fb75e25 imagemagick-6.2.2.3-r1.ebuild 2652
+MD5 69a5874fa82f391a16169d13ab7e8f97 imagemagick-6.2.2.3.ebuild 2576
+MD5 05d71d7340a6ab59648cffa7a8c44a3f imagemagick-6.2.4.2-r1.ebuild 2700
+MD5 5511a30e523ec782cd0fbfe640fdb64e imagemagick-6.2.4.2.ebuild 2669
+MD5 93b2c6a6f1385d05b35ae5406b8a2800 imagemagick-6.2.5.2.ebuild 2705
+MD5 d07c1ad811fbc83b076177a93522b077 imagemagick-6.2.5.4.ebuild 2769
+MD5 e19c87c295801b257a8101aec523eaeb imagemagick-6.2.5.5.ebuild 2791
+MD5 4d60551d90dc6c204ad134dd6c3a8aef imagemagick-6.2.6.0.ebuild 2792
+MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.2.6.0 b/media-gfx/imagemagick/files/digest-imagemagick-6.2.6.0
new file mode 100644
index 000000000000..86bc3e26a268
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.2.6.0
@@ -0,0 +1 @@
+MD5 4ff40a92bba825d8cb9447ca454698a0 ImageMagick-6.2.6-0.tar.bz2 5139235
diff --git a/media-gfx/imagemagick/imagemagick-6.2.6.0.ebuild b/media-gfx/imagemagick/imagemagick-6.2.6.0.ebuild
new file mode 100644
index 000000000000..71cac86a67ae
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.2.6.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.6.0.ebuild,v 1.1 2006/01/26 21:36:00 sekretarz Exp $
+
+inherit eutils perl-app 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 ~ppc-macos ~ppc64 ~sh ~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? ( || ( ( x11-libs/libXext
+				x11-libs/libXt
+				x11-libs/libICE
+				x11-libs/libSM
+			)
+			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
+	X? ( || ( x11-proto/xextproto
+			virtual/x11 )
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	chmod +x config.sub
+	epatch "${FILESDIR}"/${PN}-6.2.5.4-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-app_src_prep
+		perl-app_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
+}