Version bump, bug #72920

3 files changed, 97 insertions, 8 deletions

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 1cd2ceca60fd..e78f8ea47e71 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,23 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a02eccce931bcc8cc03cf3627b4ad349 ChangeLog 15969
 MD5 e980059c7096f465cb2bccabace338b7 imagemagick-6.0.8.1.ebuild 2318
+MD5 c8679dc2f0dd912551550cd87104a8fd imagemagick-6.1.6.0.ebuild 2164
+MD5 21164aa03ef6b5d3b6e01b533dcb5cbb imagemagick-6.1.0.1.ebuild 2314
 MD5 4e0fa55531b0ab61c5acf57b2fb56a98 imagemagick-6.1.3.2.ebuild 2121
 MD5 f19af0ef30a8a2d0ce755af988260532 imagemagick-6.1.3.4.ebuild 2154
-MD5 21164aa03ef6b5d3b6e01b533dcb5cbb imagemagick-6.1.0.1.ebuild 2314
+MD5 a02eccce931bcc8cc03cf3627b4ad349 ChangeLog 15969
 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
 MD5 e062fa3ebd357a9601dd723f20fe1971 imagemagick-6.0.7.1.ebuild 2311
+MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73
 MD5 95b9bca1e2ef2b6fed9919fcc59b1462 files/digest-imagemagick-6.0.8.1 73
+MD5 a4a32e0f76d7fe0b204a2d408fc52158 files/digest-imagemagick-6.1.0.1 73
 MD5 2dd9ba895922b7d6bb513572bb851254 files/digest-imagemagick-6.1.3.2 73
 MD5 88435dc2f0a4064ae49313f41419695d files/digest-imagemagick-6.1.3.4 73
-MD5 a4a32e0f76d7fe0b204a2d408fc52158 files/digest-imagemagick-6.1.0.1 73
+MD5 4dbe04f2c27a20911e1080d591674997 files/digest-imagemagick-6.1.6.0 73
 MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598
-MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBrAr/roRuSHgZdywRAifoAJwKZsFdpz0Unx+p2Z8cS+LZITed8gCfRobS
-7BMFnzanr6gVOhS2WB38GOc=
-=BLII
+iD8DBQFBsjtUZ/iYVBmujdURAg7YAJ9DYJf1r4AEBuJ3kYRBmIynoHhUmACfeEvm
+rHam9zllZN2pihPmWhniPiE=
+=OxV/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/digest-imagemagick-6.1.6.0 b/media-gfx/imagemagick/files/digest-imagemagick-6.1.6.0
new file mode 100644
index 000000000000..fc5a2e78ffd4
--- /dev/null
+++ b/media-gfx/imagemagick/files/digest-imagemagick-6.1.6.0
@@ -0,0 +1 @@
+MD5 c40549e22bdc7f8b74ed44381bf1fee5 ImageMagick-6.1.6-0.tar.bz2 4558525
diff --git a/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild b/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild
new file mode 100644
index 000000000000..6ee902a06247
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.6.0.ebuild,v 1.1 2004/12/04 22:33:35 sekretarz Exp $
+
+inherit libtool flag-o-matic eutils
+
+MY_PN=ImageMagick
+MY_P=${MY_PN}-${PV%.*}
+MY_P2=${MY_PN}-${PV%.*}-${PV#*.*.*.}
+
+S=${WORKDIR}/${MY_P}
+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="as-is"
+SLOT="0"
+# PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU.
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx"
+
+DEPEND=">=sys-apps/sed-4
+	app-arch/bzip2
+	sys-libs/zlib
+	X? ( virtual/x11 )
+	cups?   ( 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 )
+	graphviz? ( media-gfx/graphviz )
+	fpx? ( media-libs/libfpx )"
+
+RDEPEND="${DEPEND}
+		>=sys-devel/libtool-1.5.2-r6"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	chmod +x config.sub
+}
+
+src_compile() {
+	econf \
+		--enable-shared \
+		--enable-lzw \
+		--without-hdf \
+		--with-threads \
+		--with-bzlib \
+		--with-modules \
+		--with-zlib \
+		$(use_with X x) \
+		$(use_with wmf) \
+		$(use_with fpx) \
+		$(use_with perl) \
+		$(use_with jbig) \
+		$(use_with tiff) \
+		$(use_with lcms) \
+		$(use_with xml2 xml) \
+		$(use_with jpeg jp2) \
+		$(use_with jpeg jpeg) \
+		$(use_with mpeg mpeg2) \
+		$(use_with cups gslib) \
+		$(use_with graphviz dot) \
+		$(use_with truetype ttf) || die "econf failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install
+
+	#bug 69705
+	rm -f ${D}/usr/lib/libltdl*
+
+	dosed "s:-I/usr/include ::" /usr/bin/Magick-config
+	dosed "s:-I/usr/include ::" /usr/bin/Magick++-config
+
+}