version bump, RESTRICT userpriv when perl USE-flag is enabled wrt bug #269448, fixes bug #269987, improve message in src_test, remove old

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 16 insertions, 184 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 1b105780819d..4ddd2d416ea8 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,13 @@
 # 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.346 2009/05/22 14:38:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.347 2009/05/24 18:06:32 maekke Exp $
+
+*imagemagick-6.5.2.7 (24 May 2009)
+
+  24 May 2009; Markus Meier <maekke@gentoo.org> -imagemagick-6.4.8.3.ebuild,
+  -imagemagick-6.4.9.2.ebuild, +imagemagick-6.5.2.7.ebuild:
+  version bump, RESTRICT userpriv when perl USE-flag is enabled wrt bug
+  #269448, fixes bug #269987, improve message in src_test, remove old
 
   22 May 2009; Raúl Porcel <armin76@gentoo.org> imagemagick-6.5.1.0.ebuild:
   arm/ia64//s390/sh stable wrt #268858
diff --git a/media-gfx/imagemagick/imagemagick-6.4.8.3.ebuild b/media-gfx/imagemagick/imagemagick-6.4.8.3.ebuild
deleted file mode 100644
index c40adf181921..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.4.8.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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.4.8.3.ebuild,v 1.9 2009/03/17 11:40:24 loki_val Exp $
-
-EAPI="2"
-
-inherit eutils multilib perl-app toolchain-funcs
-
-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"
-
-LICENSE="imagemagick"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="bzip2 +corefonts djvu doc fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k
-	lcms nocxx openexr openmp perl png q8 q32 raw 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 )
-	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
-	!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
-	# see bug #223825
-	if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
-		if [[ $(gcc-version) != "4.3" ]] ; then
-			ewarn "you need sys-devel/gcc-4.3 to be able to use openmp, disabling."
-			myconf="${myconf} --disable-openmp"
-		else
-			myconf="${myconf} --enable-openmp"
-		fi
-	else
-		elog "disabling openmp support"
-		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-gs-font-dir=/usr/share/fonts/default/ghostscript \
-		$(use_enable hdri) \
-		$(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 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() {
-	# make check only works after make install,
-	# --> only run if this version is already installed
-	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
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.4.9.2.ebuild b/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild
index 0e2fa94ef603..e59df257253b 100644
--- a/media-gfx/imagemagick/imagemagick-6.4.9.2.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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.4.9.2.ebuild,v 1.2 2009/03/17 11:40:24 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.5.2.7.ebuild,v 1.1 2009/05/24 18:06:32 maekke Exp $
 
 EAPI="2"
 
@@ -15,6 +15,8 @@ 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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -54,6 +56,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
+	openmp? ( >=sys-devel/gcc-4.3.0[openmp] )
 	X? ( x11-proto/xextproto )"
 
 S="${WORKDIR}/${MY_P2}"
@@ -95,20 +98,6 @@ src_configure() {
 		myconf="${myconf} --without-rsvg"
 	fi
 
-	#openmp support only works with >=sys-devel/gcc-4.3
-	# see bug #223825
-	if use openmp && built_with_use --missing false sys-devel/gcc openmp; then
-		if [[ "$(gcc-version)" == "4.2" ]] ; then
-			ewarn "you need >=sys-devel/gcc-4.3 to be able to use openmp, disabling."
-			myconf="${myconf} --disable-openmp"
-		else
-			myconf="${myconf} --enable-openmp"
-		fi
-	else
-		elog "disabling openmp support (gcc is not built with openmp support)"
-		myconf="${myconf} --disable-openmp"
-	fi
-
 	use truetype && myconf="${myconf} $(use_with corefonts windows-font-dir /usr/share/fonts/corefonts)"
 
 	econf \
@@ -134,6 +123,7 @@ src_configure() {
 		$(use_with jpeg2k jp2) \
 		$(use_with lcms) \
 		$(use_with openexr) \
+		$(use_enable openmp) \
 		$(use_with png) \
 		$(use_with svg rsvg) \
 		$(use_with tiff) \
@@ -145,8 +135,9 @@ src_configure() {
 }
 
 src_test() {
-	# make check only works after make install,
-	# --> only run if this version is already installed
+	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