version bump, install perl modules into correct location by tove in bug #294590

Package-Manager: portage-2.2_rc61/cvs/Linux i686

3 files changed, 197 insertions, 2 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 5236af89b2ef..b502bc8ebda3 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.377 2009/12/26 17:38:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.378 2009/12/28 15:37:28 maekke Exp $
+
+*imagemagick-6.5.8.8 (28 Dec 2009)
+
+  28 Dec 2009; Markus Meier <maekke@gentoo.org> +imagemagick-6.5.8.8.ebuild:
+  version bump, install perl modules into correct location by tove in bug
+  #294590
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> imagemagick-6.5.2.9.ebuild,
   imagemagick-6.5.4.10.ebuild, imagemagick-6.5.7.0.ebuild:
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 095e229a939c..9581c7b2bcd3 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ImageMagick-6.5.2-9.tar.bz2 8819668 RMD160 01aa6604339eaee031b06aae27a4074ac36a88e1 SHA1 1eb8cb876742dba833917c30b10bfef215d4f261 SHA256 5bc9958ce4db8d36c6bd92f8e7c95aafc63aeb03694cdf1fdd4b3f3ae953ef4c
 DIST ImageMagick-6.5.4-10.tar.bz2 8819304 RMD160 b48f8b8c0c9ec8cc01a38eee45868d540b3845db SHA1 87fd01d4399c8caba2f505c35618117b5296a1cc SHA256 b27117bfafc989ce74214db116a5b3bd1fda0e501839faab09c715c8647cd8eb
 DIST ImageMagick-6.5.7-0.tar.bz2 8709712 RMD160 a15e1aba983c4bac7b73d4b992fe0fc56bf4f665 SHA1 f48b6708b9dc055938219108f77fc4369b962ffc SHA256 ceefefcfe2e670f2f5a52a8f2575ba99e445aaa3204a44736832436adc5eb642
+DIST ImageMagick-6.5.8-8.tar.bz2 8711782 RMD160 1417878f2adae344f840807710e7f9485d5945ce SHA1 15212833489826f7d2d919d1442309d6dc504402 SHA256 3a81e6c6759f6266dd18e8bb6c6c6791d5af8871e2dc2e50fb9c9362f3e689eb
 EBUILD imagemagick-6.5.2.9.ebuild 4868 RMD160 daa91a0e2db50e0450f2f6ed4b35910cba9b909e SHA1 00fdd574223265fb8cfe344fe22bdbf591fecce8 SHA256 8092331f339e8b2f3bda2925dab69948b9e32c93a6919e93d7053cc9f6400dfe
 EBUILD imagemagick-6.5.4.10.ebuild 5039 RMD160 e314999828e0c4daaf3f6b6dfda536807d2c732f SHA1 9ddb71dacb9bb31f6f21df18715f13a5fc592181 SHA256 cba7f7d52fb1b40fa45880f73869e6d8f2f32ef0a9acf21a885da373a1257a49
 EBUILD imagemagick-6.5.7.0.ebuild 5029 RMD160 2e7d1c450df2f79c4bb5e1b83995f7ae449f972a SHA1 90c12a21aa473724fd260dcf5044fa3054e88f4e SHA256 e4e630f6171ad83ea295d328e34d9a546ce3ec5cfb0ef1ee99721dab772acf07
-MISC ChangeLog 56632 RMD160 fc1657c632b949887902bb8f05d9ba600edcb302 SHA1 fc5519c6cbf25261a858388c050ef9dc86630c00 SHA256 07734a1c4949b467df6481259ef91f8604db9e607431c16fca3197f6f20bbed1
+EBUILD imagemagick-6.5.8.8.ebuild 5063 RMD160 8e37dfaa1fc661a1dcdc2fdb61310ebc3f42f667 SHA1 9cdb5352ddba692ec8bf6e9fd2bc660b2a60af8f SHA256 77ea4a870c7f0b0ced249743a8e9a4b5d19afb4a01648f18da4b4de50bd89098
+MISC ChangeLog 56833 RMD160 4a906ac4a6717763f8bd55d663a3d055345dc28c SHA1 8fa4a2ccf46d4efd7d93a205d8914c2ae9a1d5e0 SHA256 39452d4092934365f101ac8da91c8df6b52cf819ff4c79a1b48fa282eb9cd84d
 MISC metadata.xml 813 RMD160 1a299d749c40a81c6255e74b055d51bb2574947d SHA1 28be5abfb85ef530e3ec5a84678e914175435ed4 SHA256 53592450b5a53784153fc95d665dee08392968adab41bd3032ad759778bde31b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAks40Q8ACgkQkKaRLQcq0GLp8wCffXM+am/vdubCSMjl2OC1W2KA
+wBIAoIfNELFNAmQrmJI84ZSwLnNIesAF
+=Nqkd
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild b/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild
new file mode 100644
index 000000000000..35ec7e4c00d4
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.8.8.ebuild,v 1.1 2009/12/28 15:37:28 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib perl-app toolchain-funcs versionator
+
+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://imagemagick/${MY_P2}.tar.bz2
+		 mirror://imagemagick/legacy/${MY_P2}.tar.bz2"
+
+# perl tests fail with userpriv
+RESTRICT="perl? ( userpriv )"
+LICENSE="imagemagick"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="autotrace bzip2 +corefonts djvu doc fftw fontconfig fpx graphviz gs hdri
+	jbig jpeg jpeg2k lcms lqr nocxx openexr openmp perl png q8 q32 raw svg tiff
+	truetype X wmf xml zlib"
+
+RDEPEND="
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( media-libs/libfpx )
+	graphviz? ( >=media-gfx/graphviz-2.6 )
+	gs? ( app-text/ghostscript-gpl )
+	jbig? ( media-libs/jbigkit )
+	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg2k? ( media-libs/jasper )
+	lcms? ( >=media-libs/lcms-1.06 )
+	lqr? ( >=media-libs/liblqr-0.1.0 )
+	openexr? ( media-libs/openexr )
+	perl? ( >=dev-lang/perl-5.8.6-r6 )
+	png? ( media-libs/libpng )
+	raw? ( media-gfx/ufraw )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	truetype? ( =media-libs/freetype-2*
+		corefonts? ( media-fonts/corefonts ) )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	zlib? ( sys-libs/zlib )
+	X? (
+		x11-libs/libXext
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		svg? ( >=gnome-base/librsvg-2.9.0 )
+	)
+	!dev-perl/perlmagick
+	!media-gfx/graphicsmagick[imagemagick]
+	!sys-apps/compare
+	>=sys-devel/libtool-1.5.2-r6"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${MY_P2}"
+
+pkg_setup() {
+	# for now, only build svg support when X is enabled, as librsvg
+	# pulls in quite some X dependencies.
+	if use svg && ! use X ; then
+		elog "the svg USE-flag requires the X USE-flag set."
+		elog "disabling svg support for now."
+	fi
+
+	if use corefonts && ! use truetype ; then
+		elog "corefonts USE-flag requires the truetype USE-flag to be set."
+		elog "disabling corefonts support for now."
+	fi
+}
+
+src_prepare() {
+	# 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
+}
+
+src_configure() {
+	local myconf
+	if use q32 ; then
+		myconf="${myconf} --with-quantum-depth=32"
+	elif use q8 ; then
+		myconf="${myconf} --with-quantum-depth=8"
+	else
+		myconf="${myconf} --with-quantum-depth=16"
+	fi
+
+	if use X && use svg ; then
+		myconf="${myconf} --with-rsvg"
+	else
+		myconf="${myconf} --without-rsvg"
+	fi
+
+	# openmp support only works with >=sys-devel/gcc-4.3, bug #223825
+	if use openmp && version_is_at_least 4.3 $(gcc-version) ; then
+		if built_with_use --missing false =sys-devel/gcc-$(gcc-version)* openmp ; then
+			myconf="${myconf} --enable-openmp"
+		else
+			elog "disabling openmp support (requires >=sys-devel/gcc-4.3 with USE='openmp')"
+			myconf="${myconf} --disable-openmp"
+		fi
+	else
+		elog "disabling openmp support (requires >=sys-devel/gcc-4.3)"
+		myconf="${myconf} --disable-openmp"
+	fi
+
+	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
+
+	econf \
+		${myconf} \
+		--without-included-ltdl \
+		--with-ltdl-include=/usr/include \
+		--with-ltdl-lib=/usr/$(get_libdir) \
+		--with-threads \
+		--with-modules \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir=/usr/share/fonts/default/ghostscript \
+		$(use_enable hdri) \
+		$(use_with !nocxx magick-plus-plus) \
+		$(use_with autotrace) \
+		$(use_with bzip2 bzlib) \
+		$(use_with djvu) \
+		$(use_with fftw) \
+		$(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 openexr) \
+		$(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)
+}
+
+src_test() {
+	einfo "please note that the tests will only be run when the installed"
+	einfo "version and current emerging version are the same"
+
+	if has_version ~${CATEGORY}/${P} ; then
+		emake -j1 check || die "make check failed"
+	fi
+}
+
+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.txt ChangeLog AUTHORS.txt README.txt
+
+	# Fix perllocal.pod file collision
+	use perl && fixlocalpod
+}