Fix bug #155804.

Package-Manager: portage-2.1.2-r9

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index f9bc81a83cbe3d1d86f5d2ebc738f5d6536ecbaa..aee75f1cc81612771b0eb70c703da98d479ca511 100644 (file)
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.212 2007/02/08 16:01:46 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.213 2007/02/15 17:57:41 jer Exp $
+
+  15 Feb 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/imagemagick-6.3.0.5-no-lMagick.patch, imagemagick-6.3.0.5.ebuild:
+  Fix bug #155804 while sekretarz is MIA. Cross fingers. Thanks to kojiro for
+  the final patch.
 
   08 Feb 2007; Daniel Drake <dsd@gentoo.org>
   -files/imagemagick-6.2.5.4-docs.patch,

diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 1558f9c30405c25b553f1431eeaac8d3400dfbd2..626c041b768862092278a6fb5c0ec1909bfe2e52 100644 (file)
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX imagemagick-6.3.0.5-configure-windows-fonts.patch 584 RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f SHA1 db467ddc0c056425c790eafe5c6a72d6a8a0cd98 SHA256 47b8831abce2295ddcb51965e8759f32ef1d6f910e889f059dfcc6312ec09604
 MD5 341f63fcb7d8052a356761cf6ae8d0d6 files/imagemagick-6.3.0.5-configure-windows-fonts.patch 584
 RMD160 363bf343b3b4deaa9772c0a2b3d79f618c36a14f files/imagemagick-6.3.0.5-configure-windows-fonts.patch 584
@@ -9,19 +6,23 @@ AUX imagemagick-6.3.0.5-docs.patch 528 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2e
 MD5 e43f5cda62b2eda3e6a257b806b2386d files/imagemagick-6.3.0.5-docs.patch 528
 RMD160 35a0d80f0db036dbf2bbc3e71af02d6a2eb9f1d0 files/imagemagick-6.3.0.5-docs.patch 528
 SHA256 97885116857d5bf64f7217852be42f04d42366a9e7235c6b7bd13201ca23abb5 files/imagemagick-6.3.0.5-docs.patch 528
+AUX imagemagick-6.3.0.5-no-lMagick.patch 685 RMD160 01693f7d6074391848e2a536d077044f9adaef59 SHA1 40b837f853d3853f58949991262c010aa091ecb8 SHA256 09bbaa9ed82ba495392b8f2aad1dd28542f3b1b1d8bc7cf4dd75f936b042ca9a
+MD5 176b8c8344b81fc7d4e64b5374667223 files/imagemagick-6.3.0.5-no-lMagick.patch 685
+RMD160 01693f7d6074391848e2a536d077044f9adaef59 files/imagemagick-6.3.0.5-no-lMagick.patch 685
+SHA256 09bbaa9ed82ba495392b8f2aad1dd28542f3b1b1d8bc7cf4dd75f936b042ca9a files/imagemagick-6.3.0.5-no-lMagick.patch 685
 AUX imagemagick-perl.patch 1864 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 SHA1 cb52a2281f2fa2930fe948e91619f5a012e2f8a0 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad
 MD5 d4ff8f64c60d78f04bac78748164f3fb files/imagemagick-perl.patch 1864
 RMD160 da9d7b2f4f61630f551707ecaffe3c4362c575a0 files/imagemagick-perl.patch 1864
 SHA256 282b83f713de099eb45af947e6d9eded5f51a51d285ceb5486744c93132e23ad files/imagemagick-perl.patch 1864
 DIST ImageMagick-6.3.0-5.tar.bz2 5384739 RMD160 1e1fb1a0d3a782c63fb2f31fe575066fa556621e SHA1 c9f24810d2edc3d04886d32fe69a362c7415e79f SHA256 04a4f6116fab2ab631f3cb42bcdcb5e39e60fa862af5da9decba3eadb5298e30
-EBUILD imagemagick-6.3.0.5.ebuild 2902 RMD160 e3fd5e8ba1a58fdfdc1953bd6768456098395d1a SHA1 0306efff3ade4cfa3e621d8cfc15561d7c0e3c87 SHA256 478704d779db74019c6732e1ecfb9999e6d71155e3ba9b3758162e82b83d3fdb
-MD5 b2d61c489f0ccc4c940cfb7a2f7ece10 imagemagick-6.3.0.5.ebuild 2902
-RMD160 e3fd5e8ba1a58fdfdc1953bd6768456098395d1a imagemagick-6.3.0.5.ebuild 2902
-SHA256 478704d779db74019c6732e1ecfb9999e6d71155e3ba9b3758162e82b83d3fdb imagemagick-6.3.0.5.ebuild 2902
-MISC ChangeLog 31806 RMD160 4bbf42bc44b76f6e5e16eb14ace6994281748b6f SHA1 b1b2b08f66bdc9fa6cb0f1f39948fd641b0b3ddd SHA256 ba33df453850bc364a9c35b6247efc3b7461f20f06e5c0228aca6a9593306fea
-MD5 406f682bb8944c3f80b905fcc0d04ae4 ChangeLog 31806
-RMD160 4bbf42bc44b76f6e5e16eb14ace6994281748b6f ChangeLog 31806
-SHA256 ba33df453850bc364a9c35b6247efc3b7461f20f06e5c0228aca6a9593306fea ChangeLog 31806
+EBUILD imagemagick-6.3.0.5.ebuild 2897 RMD160 756024fa60bb253aa1b210f45d738d5f387216d2 SHA1 357915e26ae878ca5e49b02ef8be7e46e7dd9983 SHA256 37afae4438a6ee89f1c937fecf6709e1ca6aaeab5d3ae472a0729dd0be45f34e
+MD5 5188955a33394a098f3a006a56dca527 imagemagick-6.3.0.5.ebuild 2897
+RMD160 756024fa60bb253aa1b210f45d738d5f387216d2 imagemagick-6.3.0.5.ebuild 2897
+SHA256 37afae4438a6ee89f1c937fecf6709e1ca6aaeab5d3ae472a0729dd0be45f34e imagemagick-6.3.0.5.ebuild 2897
+MISC ChangeLog 32026 RMD160 73d1aa9d7fa19dd062cc9e87ab8a8114f82fb98b SHA1 4952fbd02fd498b848b7afcab0b3fba8a6c6b7ca SHA256 4d0447356894a83f5f13c148b63160b4d91681d18ebc139f52b2dc7038b74380
+MD5 facc023f19f2138cbfffb702630eec1f ChangeLog 32026
+RMD160 73d1aa9d7fa19dd062cc9e87ab8a8114f82fb98b ChangeLog 32026
+SHA256 4d0447356894a83f5f13c148b63160b4d91681d18ebc139f52b2dc7038b74380 ChangeLog 32026
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -29,10 +30,3 @@ SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3 metadata
 MD5 0d12f992e50e9939892f4d4681d0b4a5 files/digest-imagemagick-6.3.0.5 265
 RMD160 3b12a2962e36cf4831ec9bc578749a2a8d76fc64 files/digest-imagemagick-6.3.0.5 265
 SHA256 8997c64672cad644af5b2a211a8da22f360cf80e561e83182d57bafa71d0287f files/digest-imagemagick-6.3.0.5 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzv0R8bi6rjpTunYRAtkgAJ9FE+c6DhxHguuHPj/hJISsHnAn7ACgrJ1g
-dZEz34eqFinW0tMMjQsT+Zw=
-=Gsho
------END PGP SIGNATURE-----

diff --git a/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch
new file mode 100644 (file)
index 0000000..4140ba6
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-6.3.0.5-no-lMagick.patch
@@ -0,0 +1,15 @@
+--- PerlMagick/Makefile.PL.in.orig     2006-09-19 10:53:54.000000000 -0400
++++ PerlMagick/Makefile.PL.in  2007-02-15 08:39:41.000000000 -0500
+@@ -53,10 +53,10 @@
+    'CCFLAGS'     => "$Config{'ccflags'} @CFLAGS@",
+ 
+    # Linker flags for building an executable
+-   'LDFLAGS'    =>  "-L../magick/.libs -lMagick $Config{'ldflags'}",
++   'LDFLAGS'    =>  "-L../magick/.libs  $Config{'ldflags'}",
+ 
+    # Linker flags for building a dynamically loadable module
+-   'LDDLFLAGS'  => "-L../magick/.libs -lMagick $Config{'lddlflags'}",
++   'LDDLFLAGS'  => "-L../magick/.libs  $Config{'lddlflags'}",
+ 
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'       => '@BIN_DIR@',

diff --git a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
index 75055785dd9236edee595bcaaec8e46e525d6f34..bf93883609b44485a66923fa26b7805ae43d4432 100644 (file)
--- a/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.11 2007/02/11 11:24:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.3.0.5.ebuild,v 1.12 2007/02/15 17:57:41 jer Exp $
 
 inherit eutils multilib perl-app
 
@@ -54,7 +54,7 @@ src_unpack() {
        chmod +x config.sub
        einfo ${S}
        epatch "${FILESDIR}"/${PN}-6.3.0.5-docs.patch
-#      epatch "${FILESDIR}"/imagemagick-perl.patch
+       epatch "${FILESDIR}"/${P}-no-lMagick.patch
 
        # from bug #146713, sent upstream
        epatch "${FILESDIR}"/${P}-configure-windows-fonts.patch