public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.6.1.7.ebuild ChangeLog
@ 2010-05-10 18:51 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-05-10 18:51 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/05/10 18:51:11

  Modified:             ChangeLog
  Added:                imagemagick-6.6.1.7.ebuild
  Log:
  Version bump.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.393                media-gfx/imagemagick/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.393&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.393&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.392&r2=1.393

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- ChangeLog	28 Apr 2010 12:25:40 -0000	1.392
+++ ChangeLog	10 May 2010 18:51:11 -0000	1.393
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.392 2010/04/28 12:25:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.393 2010/05/10 18:51:11 ssuominen Exp $
+
+*imagemagick-6.6.1.7 (10 May 2010)
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +imagemagick-6.6.1.7.ebuild:
+  Version bump.
 
   28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
   imagemagick-6.6.1.2.ebuild:



1.1                  media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?rev=1.1&content-type=text/plain

Index: imagemagick-6.6.1.7.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.1 2010/05/10 18:51:11 ssuominen Exp $

EAPI=3
inherit multilib toolchain-funcs versionator

MY_P=ImageMagick-$(replace_version_separator 3 '-')

DESCRIPTION="A collection of tools and libraries for many image formats"
HOMEPAGE="http://www.imagemagick.org/"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"

LICENSE="imagemagick"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="autotrace bzip2 cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg
jpeg2k lcms lqr openexr openmp perl png q32 q8 raw static-libs svg tiff
truetype wmf X xml zlib"

RDEPEND=">=sys-devel/libtool-2.2.6b
	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:0 )
	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 )
	svg? ( >=gnome-base/librsvg-2.9.0 )
	tiff? ( >=media-libs/tiff-3.5.5 )
	truetype? ( =media-libs/freetype-2* )
	wmf? ( >=media-libs/libwmf-0.2.8 )
	X? (
		x11-libs/libXext
		x11-libs/libXt
		x11-libs/libICE
		x11-libs/libSM
	)
	xml? ( >=dev-libs/libxml2-2.4.10 )
	zlib? ( sys-libs/zlib )
	!dev-perl/perlmagick
	!media-gfx/graphicsmagick[imagemagick]"
DEPEND="${RDEPEND}
	app-arch/xz-utils
	>=sys-apps/sed-4
	X? ( x11-proto/xextproto )"

S=${WORKDIR}/${MY_P}

RESTRICT="perl? ( userpriv )"

src_prepare() {
	sed -i \
		-e "/^DOCUMENTATION_RELATIVE_PATH/s:=.*:=${PF}:" \
		configure || die
}

src_configure() {
	local depth=16

	use q8 && depth=8
	use q32 && depth=32

	local openmp=disable

	# 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 has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then
			openmp=enable
		fi
	fi

	econf \
		--disable-dependency-tracking \
		$(use_enable static-libs static) \
		$(use_enable hdri) \
		--with-threads \
		--without-included-ltdl \
		--with-ltdl-include="${EPREFIX}/usr/include" \
		--with-ltdl-lib="${EPREFIX}/usr/$(get_libdir)" \
		--with-modules \
		--with-quantum-depth=${depth} \
		$(use_with cxx magick-plus-plus) \
		$(use_with perl) \
		--with-perl-options='INSTALLDIRS=vendor' \
		--with-gs-font-dir="${EPREFIX}/usr/share/fonts/default/ghostscript" \
		$(use_with bzip2 bzlib) \
		$(use_with X x) \
		$(use_with zlib) \
		$(use_with autotrace) \
		$(use_with gs dps) \
		$(use_with djvu) \
		--with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
		$(use_with fftw) \
		$(use_with fpx) \
		$(use_with fontconfig) \
		$(use_with truetype freetype) \
		$(use_with gs gslib) \
		$(use_with graphviz gvc) \
		$(use_with jbig) \
		$(use_with jpeg) \
		$(use_with jpeg2k jp2) \
		$(use_with lcms) \
		$(use_with lqr) \
		$(use_with openexr) \
		$(use_with png) \
		$(use_with svg rsvg) \
		$(use_with tiff) \
		--with-windows-font-dir="${EPREFIX}/usr/share/fonts/corefonts" \
		$(use_with wmf) \
		$(use_with xml) \
		--${openmp}-openmp
}

src_test() {
	if has_version ~${CATEGORY}/${P}; then
		emake -j1 check || die
	else
		ewarn "Skipping tests because installed version doesn't match."
	fi
}

src_install() {
	emake DESTDIR="${D}" install || die
	dodoc AUTHORS.txt ChangeLog NEWS.txt README.txt

	if use perl; then
		find "${D}" -type f -name perllocal.pod -delete
		find "${D}" -depth -mindepth 1 -type d -empty -delete
	fi
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.6.1.7.ebuild ChangeLog
@ 2010-05-17 15:34 Jeremy Olexa (darkside)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa (darkside) @ 2010-05-17 15:34 UTC (permalink / raw
  To: gentoo-commits

darkside    10/05/17 15:34:46

  Modified:             imagemagick-6.6.1.7.ebuild ChangeLog
  Log:
  Import Gentoo Prefix modifications, as discussed with maintainer. bug 319869
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?r1=1.1&r2=1.2

Index: imagemagick-6.6.1.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imagemagick-6.6.1.7.ebuild	10 May 2010 18:51:11 -0000	1.1
+++ imagemagick-6.6.1.7.ebuild	17 May 2010 15:34:45 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.1 2010/05/10 18:51:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.2 2010/05/17 15:34:45 darkside Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator
@@ -13,7 +13,7 @@
 
 LICENSE="imagemagick"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg
 jpeg2k lcms lqr openexr openmp perl png q32 q8 raw static-libs svg tiff
 truetype wmf X xml zlib"
@@ -78,6 +78,8 @@
 		if has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then
 			openmp=enable
 		fi
+	elif use openmp && has_version sys-devel/gcc-apple && version_is_at_least 4.2.1 $(gcc_version) ; then
+		openmp=enable
 	fi
 
 	econf \
@@ -135,7 +137,7 @@
 	dodoc AUTHORS.txt ChangeLog NEWS.txt README.txt
 
 	if use perl; then
-		find "${D}" -type f -name perllocal.pod -delete
-		find "${D}" -depth -mindepth 1 -type d -empty -delete
+		find "${ED}" -type f -name perllocal.pod -delete
+		find "${ED}" -depth -mindepth 1 -type d -empty -delete
 	fi
 }



1.396                media-gfx/imagemagick/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.396&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.396&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.395&r2=1.396

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -r1.395 -r1.396
--- ChangeLog	13 May 2010 21:02:20 -0000	1.395
+++ ChangeLog	17 May 2010 15:34:45 -0000	1.396
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.395 2010/05/13 21:02:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.396 2010/05/17 15:34:45 darkside Exp $
+
+  17 May 2010; Jeremy Olexa <darkside@gentoo.org>
+  imagemagick-6.6.1.7.ebuild:
+  Import Gentoo Prefix modifications, as discussed with maintainer. bug
+  319869
 
   13 May 2010; Joseph Jezak <josejx@gentoo.org> imagemagick-6.6.1.2.ebuild:
   Marked ppc stable for bug #319195.






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.6.1.7.ebuild ChangeLog
@ 2010-05-23 11:53 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-05-23 11:53 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/05/23 11:53:36

  Modified:             imagemagick-6.6.1.7.ebuild ChangeLog
  Log:
  Use tc-has-openmp function from toolchain-funcs.eclass to check libgomp availability.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild?r1=1.2&r2=1.3

Index: imagemagick-6.6.1.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imagemagick-6.6.1.7.ebuild	17 May 2010 15:34:45 -0000	1.2
+++ imagemagick-6.6.1.7.ebuild	23 May 2010 11:53:36 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.2 2010/05/17 15:34:45 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.6.1.7.ebuild,v 1.3 2010/05/23 11:53:36 ssuominen Exp $
 
 EAPI=3
 inherit multilib toolchain-funcs versionator
@@ -73,12 +73,7 @@
 
 	local openmp=disable
 
-	# 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 has_version =sys-devel/gcc-$(gcc-version)*[openmp] ; then
-			openmp=enable
-		fi
-	elif use openmp && has_version sys-devel/gcc-apple && version_is_at_least 4.2.1 $(gcc_version) ; then
+	if use openmp && tc-has-openmp; then
 		openmp=enable
 	fi
 



1.399                media-gfx/imagemagick/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.399&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?rev=1.399&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/imagemagick/ChangeLog?r1=1.398&r2=1.399

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- ChangeLog	18 May 2010 15:11:49 -0000	1.398
+++ ChangeLog	23 May 2010 11:53:36 -0000	1.399
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.398 2010/05/18 15:11:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.399 2010/05/23 11:53:36 ssuominen Exp $
+
+  23 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  imagemagick-6.6.1.7.ebuild:
+  Use tc-has-openmp function from toolchain-funcs.eclass to check libgomp
+  availability.
 
   18 May 2010; Jeroen Roovers <jer@gentoo.org> imagemagick-6.6.1.2.ebuild:
   Stable for HPPA (bug #319195).






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-05-23 11:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-10 18:51 [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.6.1.7.ebuild ChangeLog Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2010-05-17 15:34 Jeremy Olexa (darkside)
2010-05-23 11:53 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox