public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.7.8.7.ebuild imagemagick-6.7.9.9.ebuild ChangeLog
@ 2013-01-21  3:42 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-21  3:42 UTC (permalink / raw
  To: gentoo-commits

vapier      13/01/21 03:42:51

  Modified:             imagemagick-6.7.8.7.ebuild
                        imagemagick-6.7.9.9.ebuild ChangeLog
  Log:
  Disable search of libtool files (like ltdl.la) as well as -I/-L build paths #383929 by Francesco Riosa.
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.9                  media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild

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

Index: imagemagick-6.7.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- imagemagick-6.7.8.7.ebuild	4 Oct 2012 14:56:57 -0000	1.8
+++ imagemagick-6.7.8.7.ebuild	21 Jan 2013 03:42:51 -0000	1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.8 2012/10/04 14:56:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.9 2013/01/21 03:42:51 vapier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator libtool
@@ -85,8 +85,8 @@
 		$(use_enable opencl) \
 		--with-threads \
 		--without-included-ltdl \
-		--with-ltdl-include="${EPREFIX}"/usr/include \
-		--with-ltdl-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-ltdl-include='' \
+		--with-ltdl-lib='' \
 		--with-modules \
 		--with-quantum-depth=${depth} \
 		$(use_with cxx magick-plus-plus) \



1.2                  media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild

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

Index: imagemagick-6.7.9.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imagemagick-6.7.9.9.ebuild	4 Oct 2012 15:22:18 -0000	1.1
+++ imagemagick-6.7.9.9.ebuild	21 Jan 2013 03:42:51 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.1 2012/10/04 15:22:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.2 2013/01/21 03:42:51 vapier Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator libtool
@@ -85,8 +85,8 @@
 		$(use_enable opencl) \
 		--with-threads \
 		--without-included-ltdl \
-		--with-ltdl-include="${EPREFIX}"/usr/include \
-		--with-ltdl-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-ltdl-include='' \
+		--with-ltdl-lib='' \
 		--with-modules \
 		--with-quantum-depth=${depth} \
 		$(use_with cxx magick-plus-plus) \



1.497                media-gfx/imagemagick/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- ChangeLog	4 Oct 2012 15:22:18 -0000	1.496
+++ ChangeLog	21 Jan 2013 03:42:51 -0000	1.497
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.496 2012/10/04 15:22:18 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.497 2013/01/21 03:42:51 vapier Exp $
+
+  21 Jan 2013; Mike Frysinger <vapier@gentoo.org> imagemagick-6.7.8.7.ebuild,
+  imagemagick-6.7.9.9.ebuild:
+  Disable search of libtool files (like ltdl.la) as well as -I/-L build paths
+  #383929 by Francesco Riosa.
 
 *imagemagick-6.7.9.9 (04 Oct 2012)
 





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

* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.7.8.7.ebuild imagemagick-6.7.9.9.ebuild ChangeLog
@ 2013-01-21  5:18 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2013-01-21  5:18 UTC (permalink / raw
  To: gentoo-commits

vapier      13/01/21 05:18:23

  Modified:             imagemagick-6.7.8.7.ebuild
                        imagemagick-6.7.9.9.ebuild ChangeLog
  Log:
  Fix cross-compiling with freetype while upstream sorts it out.
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.10                 media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild

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

Index: imagemagick-6.7.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- imagemagick-6.7.8.7.ebuild	21 Jan 2013 03:42:51 -0000	1.9
+++ imagemagick-6.7.8.7.ebuild	21 Jan 2013 05:18:23 -0000	1.10
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.9 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.10 2013/01/21 05:18:23 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator libtool
+inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -67,6 +67,7 @@
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7.8.7-freetype.patch
 	elibtoolize # for Darwin modules
 }
 



1.3                  media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild

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

Index: imagemagick-6.7.9.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- imagemagick-6.7.9.9.ebuild	21 Jan 2013 03:42:51 -0000	1.2
+++ imagemagick-6.7.9.9.ebuild	21 Jan 2013 05:18:23 -0000	1.3
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.2 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.3 2013/01/21 05:18:23 vapier Exp $
 
 EAPI=4
-inherit multilib toolchain-funcs versionator libtool
+inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
 
@@ -67,6 +67,7 @@
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.7.8.7-freetype.patch
 	elibtoolize # for Darwin modules
 }
 



1.498                media-gfx/imagemagick/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- ChangeLog	21 Jan 2013 03:42:51 -0000	1.497
+++ ChangeLog	21 Jan 2013 05:18:23 -0000	1.498
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.497 2013/01/21 03:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.498 2013/01/21 05:18:23 vapier Exp $
+
+  21 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/imagemagick-6.7.8.7-freetype.patch, imagemagick-6.7.8.7.ebuild,
+  imagemagick-6.7.9.9.ebuild:
+  Fix cross-compiling with freetype while upstream sorts it out.
 
   21 Jan 2013; Mike Frysinger <vapier@gentoo.org> imagemagick-6.7.8.7.ebuild,
   imagemagick-6.7.9.9.ebuild:





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

* [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.7.8.7.ebuild imagemagick-6.7.9.9.ebuild ChangeLog
@ 2013-02-01 14:44 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-02-01 14:44 UTC (permalink / raw
  To: gentoo-commits

scarabeus    13/02/01 14:44:53

  Modified:             imagemagick-6.7.8.7.ebuild
                        imagemagick-6.7.9.9.ebuild ChangeLog
  Log:
  Use subslots to make rmagic automatically rebuild with update. Fixes bug#430636.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

Revision  Changes    Path
1.11                 media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild

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

Index: imagemagick-6.7.8.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- imagemagick-6.7.8.7.ebuild	21 Jan 2013 05:18:23 -0000	1.10
+++ imagemagick-6.7.8.7.ebuild	1 Feb 2013 14:44:53 -0000	1.11
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.10 2013/01/21 05:18:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.8.7.ebuild,v 1.11 2013/02/01 14:44:53 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
@@ -12,7 +12,7 @@
 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 



1.4                  media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild

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

Index: imagemagick-6.7.9.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- imagemagick-6.7.9.9.ebuild	21 Jan 2013 05:18:23 -0000	1.3
+++ imagemagick-6.7.9.9.ebuild	1 Feb 2013 14:44:53 -0000	1.4
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.3 2013/01/21 05:18:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.9.9.ebuild,v 1.4 2013/02/01 14:44:53 scarabeus Exp $
 
-EAPI=4
+EAPI=5
 inherit multilib toolchain-funcs versionator libtool eutils
 
 MY_P=ImageMagick-$(replace_version_separator 3 '-')
@@ -12,7 +12,7 @@
 SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 



1.499                media-gfx/imagemagick/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- ChangeLog	21 Jan 2013 05:18:23 -0000	1.498
+++ ChangeLog	1 Feb 2013 14:44:53 -0000	1.499
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.498 2013/01/21 05:18:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.499 2013/02/01 14:44:53 scarabeus Exp $
+
+  01 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> imagemagick-6.7.8.7.ebuild,
+  imagemagick-6.7.9.9.ebuild:
+  Use subslots to make rmagic automatically rebuild with update. Fixes
+  bug#430636.
 
   21 Jan 2013; Mike Frysinger <vapier@gentoo.org>
   +files/imagemagick-6.7.8.7-freetype.patch, imagemagick-6.7.8.7.ebuild,





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

end of thread, other threads:[~2013-02-01 14:44 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-21  5:18 [gentoo-commits] gentoo-x86 commit in media-gfx/imagemagick: imagemagick-6.7.8.7.ebuild imagemagick-6.7.9.9.ebuild ChangeLog Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2013-02-01 14:44 Tomas Chvatal (scarabeus)
2013-01-21  3:42 Mike Frysinger (vapier)

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