Corrected patch, thanks for noting this nattfood

Package-Manager: portage-2.1.2_pre1

3 files changed, 58 insertions, 55 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index c9e7f5033191..506ec75c7c44 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.199 2006/09/21 02:22:12 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.200 2006/09/22 13:47:34 mcummings Exp $
+
+  22 Sep 2006; Michael Cummings <mcummings@gentoo.org>
+  files/imagemagick-perl.patch:
+  Corrected patch, thanks for noting this nattfood
 
 *imagemagick-6.2.9.5-r1 (21 Sep 2006)
 
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index d9484675c9ce..3261efd3cb29 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -13,10 +13,10 @@ AUX imagemagick-6.2.6.0-png.patch 875 RMD160 823769a96c888e8b6d4e557e8f277c266ad
 MD5 3a625c970bf9758e93f8204938de8f50 files/imagemagick-6.2.6.0-png.patch 875
 RMD160 823769a96c888e8b6d4e557e8f277c266ad3528f files/imagemagick-6.2.6.0-png.patch 875
 SHA256 40ea21cafb7e70b70d3ac8e2c0a50699ef3af879c75f9af4e5816479babc2427 files/imagemagick-6.2.6.0-png.patch 875
-AUX imagemagick-perl.patch 1684 RMD160 939a3424685ba79b885bcc91831a889f9e51e890 SHA1 ca8c6403eb479e747e0c90ebb4692c6a87fbb00b SHA256 28a83f72abc02291d06c8d62d74f255709f9d2f22fd34ff252ba7448cfb2e935
-MD5 7343546c4837d0ed38343e57ebb28faf files/imagemagick-perl.patch 1684
-RMD160 939a3424685ba79b885bcc91831a889f9e51e890 files/imagemagick-perl.patch 1684
-SHA256 28a83f72abc02291d06c8d62d74f255709f9d2f22fd34ff252ba7448cfb2e935 files/imagemagick-perl.patch 1684
+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
 AUX imagemagick-perlmagick.patch 1193 RMD160 eee56765fa35231e06ced89bdf6da2852df535aa SHA1 58026e25a440adb385b1ad2cad0d6ca780cb8ad8 SHA256 f5beca823effc89792fbb5a420d0a06a66f52dbc2f299a22fe73db1ab9900122
 MD5 0ec169e44bbf685be7f25684344ff9a6 files/imagemagick-perlmagick.patch 1193
 RMD160 eee56765fa35231e06ced89bdf6da2852df535aa files/imagemagick-perlmagick.patch 1193
@@ -55,10 +55,10 @@ EBUILD imagemagick-6.2.9.5.ebuild 2812 RMD160 366334ae06fbee7904a298caf754c622a8
 MD5 e645249ed67d461e509a77232ab5b070 imagemagick-6.2.9.5.ebuild 2812
 RMD160 366334ae06fbee7904a298caf754c622a8ff5e04 imagemagick-6.2.9.5.ebuild 2812
 SHA256 e54601aa2cb912a9ae31d8d8ed46ab6d0a1a3f077af6f4714937c6d72224d771 imagemagick-6.2.9.5.ebuild 2812
-MISC ChangeLog 30012 RMD160 5a885357f72995e668e2cbc4a0a9ae2528ce836d SHA1 619142230917ed2f946eaa5c28b49a0d5bc6e249 SHA256 8dc5f97fea2ca234017532e8361952490ab91a7d70a7d6f7ed811a701f2535f4
-MD5 af47b1803b869f9a314947b612655dad ChangeLog 30012
-RMD160 5a885357f72995e668e2cbc4a0a9ae2528ce836d ChangeLog 30012
-SHA256 8dc5f97fea2ca234017532e8361952490ab91a7d70a7d6f7ed811a701f2535f4 ChangeLog 30012
+MISC ChangeLog 30151 RMD160 315d160dd741c219396d08b5b55c6aad41636eee SHA1 41c650b3707e06c60b55e16e49f3f65ab06f6774 SHA256 ddef0b127767fd0c7c4d78bb131f87b632b8ac5250e58cc335a87df971ef103b
+MD5 6fff5758fb58b36c6b581816f5f5a510 ChangeLog 30151
+RMD160 315d160dd741c219396d08b5b55c6aad41636eee ChangeLog 30151
+SHA256 ddef0b127767fd0c7c4d78bb131f87b632b8ac5250e58cc335a87df971ef103b ChangeLog 30151
 MISC metadata.xml 224 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad SHA1 07c66bc3a581bf683765507da34f69623cb94ad8 SHA256 d7920747aa57936d24496c8ee5016502a9acc8108a5b01e8d1b813813d4250b3
 MD5 3dc350be33069338fa083ca16ec11cc8 metadata.xml 224
 RMD160 00e125be58c08e634a6053e3d265d2f36aab18ad metadata.xml 224
@@ -87,7 +87,7 @@ SHA256 629523b989b4d82c8858bedb4416832ec397618e345609225dac7ac65587a319 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFEfdatG5z4I8BtQoRAnMuAJ9lDFMdQmTjyUYDK/W9ncLxjwmefwCfa/BQ
-FV7jLK8a3qEVtfB1MdduUH8=
-=yKVN
+iD8DBQFFE+l8tG5z4I8BtQoRAh7yAJwMZGTnOxjey3joT1k2L7+bTMWEuwCcD3An
+v+udyNYf+dU78AaRqR1BIpc=
+=SBLu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imagemagick/files/imagemagick-perl.patch b/media-gfx/imagemagick/files/imagemagick-perl.patch
index 7d87c70268a1..806af8b6261c 100644
--- a/media-gfx/imagemagick/files/imagemagick-perl.patch
+++ b/media-gfx/imagemagick/files/imagemagick-perl.patch
@@ -1,43 +1,42 @@
-Index: PerlMagick/Makefile.am

-===================================================================

---- PerlMagick/Makefile.am	(Revision 4660)

-+++ PerlMagick/Makefile.am	(Arbeitskopie)

-@@ -45,11 +45,10 @@

- 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)

- 

- install-exec-perl: $(PERLMAKEFILE)

--	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \

--	$(MAKE) CC='@CC@' install && \

--	$(MAKE) clean && rm -f  Makefile.old )

-+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install

- 

--all-perl:

-+all-perl: $(PERLMAKEFILE)

-+	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'

- 

- uninstall-exec-perl: $(PERLMAKEFILE)

- 	echo "Uninstall not supported for PerlMagick"

-Index: PerlMagick/Makefile.PL.in

-===================================================================

---- PerlMagick/Makefile.PL.in	(Revision 4660)

-+++ PerlMagick/Makefile.PL.in	(Arbeitskopie)

-@@ -53,16 +53,16 @@

-    'CCFLAGS'     => "$Config{'ccflags'} @CFLAGS@",

- 

-    # Linker flags for building an executable

--   'LDFLAGS'    =>  "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",

-+   'LDFLAGS'    =>  "-L../magick/.libs -lMagick $Config{'ldflags'}",

- 

-    # Linker flags for building a dynamically loadable module

--   'LDDLFLAGS'  => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",

-+   'LDDLFLAGS'  => "-L../magick/.libs -lMagick $Config{'lddlflags'}",

- 

-    # Install PerlMagick binary into ImageMagick bin directory

-    'INSTALLBIN'	=> '@BIN_DIR@',

- 

-    # Library specification

--   'LIBS'	=> ['-lMagick @MAGICK_DEP_LIBS@'],

-+   'LIBS'	=> [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ],

- 

-    # Perl binary name (if a Perl binary is built)

-    'MAP_TARGET'	=> 'PerlMagick',

+diff -Naurp ImageMagick-6.2.9.old/PerlMagick/Makefile.PL.in ImageMagick-6.2.9/PerlMagick/Makefile.PL.in
+--- ImageMagick-6.2.9.old/PerlMagick/Makefile.PL.in	2006-09-07 21:28:34.000000000 -0400
++++ ImageMagick-6.2.9/PerlMagick/Makefile.PL.in	2006-09-22 09:45:10.000000000 -0400
+@@ -53,17 +53,16 @@ WriteMakefile
+    'CCFLAGS'     => "$Config{'ccflags'} @CFLAGS@",
+ 
+    # Linker flags for building an executable
+-   'LDFLAGS'    =>  "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",
++   'LDFLAGS'    =>  "-L../magick/.libs -lMagick $Config{'ldflags'}",
+ 
+    # Linker flags for building a dynamically loadable module
+-   'LDDLFLAGS'  => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",
++   'LDDLFLAGS'  => "-L../magick/.libs -lMagick $Config{'lddlflags'}",
+ 
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+    # Library specification
+-   'LIBS'	=> ['-lMagick @MAGICK_DEP_LIBS@'],
+-
++   'LIBS'  => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ],
+    # Perl binary name (if a Perl binary is built)
+    'MAP_TARGET'	=> 'PerlMagick',
+ 
+diff -Naurp ImageMagick-6.2.9.old/PerlMagick/Makefile.am ImageMagick-6.2.9/PerlMagick/Makefile.am
+--- ImageMagick-6.2.9.old/PerlMagick/Makefile.am	2005-04-20 12:27:36.000000000 -0400
++++ ImageMagick-6.2.9/PerlMagick/Makefile.am	2006-09-22 09:44:09.000000000 -0400
+@@ -45,11 +45,10 @@ $(PERLMAKEFILE): perl-sources $(PERLMAKE
+ 	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
+ 
+ install-exec-perl: $(PERLMAKEFILE)
+-	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
+-	$(MAKE) CC='@CC@' install && \
+-	$(MAKE) clean && rm -f  Makefile.old )
++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
+ 
+-all-perl:
++all-perl: $(PERLMAKEFILE)
++	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
+ 
+ uninstall-exec-perl: $(PERLMAKEFILE)
+ 	echo "Uninstall not supported for PerlMagick"