Require libltdl:0 specifically, and allow older libtool for stable ebuilds #528294 by Pacho Ramos.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

5 files changed, 17 insertions, 9 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 98f1a4c46253..e6e8fb5b17f9 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.573 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.574 2014/11/06 05:41:10 vapier Exp $
+
+  06 Nov 2014; Mike Frysinger <vapier@gentoo.org>
+  imagemagick-6.8.8.10-r1.ebuild, imagemagick-6.8.9.7.ebuild,
+  imagemagick-6.8.9.8.ebuild, imagemagick-6.8.9.9.ebuild:
+  Require libltdl:0 specifically, and allow older libtool for stable ebuilds
+  #528294 by Pacho Ramos.
 
   05 Nov 2014; Mike Frysinger <vapier@gentoo.org>
   imagemagick-6.8.8.10-r1.ebuild, imagemagick-6.8.9.7.ebuild,
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
index 3c5d06bbb745..08cf95afed17 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.7 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.8 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
index 0934a0f0383e..445f09a8d2cc 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.4 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.5 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
index b35121a34f1e..4c40fb2e8e35 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild,v 1.2 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild,v 1.3 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
index 7ea6d237965c..174f39564c4c 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.9 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.10 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )