Fixed linking problems with perlmagick when livesystem doesn't have imagemagick's libs, bug #93078

(Portage version: 2.0.51.22-r1)

4 files changed, 32 insertions, 31 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index e27937f8e14b..668a34571327 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.154 2005/06/03 16:18:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.155 2005/06/06 16:10:13 sekretarz Exp $
+
+  06 Jun 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/imagemagick-perlmagick.patch, -files/perlpatch.diff,
+  imagemagick-6.2.2.3-r1.ebuild:
+  Fixed linking problems with perlmagick when livesystem doesn't have
+  imagemagick's libs, bug #93078
 
   03 Jun 2005; Luca Barbato <lu_zero@gentoo.org> metadata.xml:
   Metadata fix
diff --git a/media-gfx/imagemagick/files/imagemagick-perlmagick.patch b/media-gfx/imagemagick/files/imagemagick-perlmagick.patch
new file mode 100644
index 000000000000..463665439490
--- /dev/null
+++ b/media-gfx/imagemagick/files/imagemagick-perlmagick.patch
@@ -0,0 +1,23 @@
+diff -Naur ImageMagick-6.2.2.orig/PerlMagick/Makefile.PL.in ImageMagick-6.2.2/PerlMagick/Makefile.PL.in
+--- ImageMagick-6.2.2.orig/PerlMagick/Makefile.PL.in	2005-05-08 22:42:15.000000000 +0200
++++ ImageMagick-6.2.2/PerlMagick/Makefile.PL.in	2005-06-05 22:46:03.615750560 +0200
+@@ -53,16 +53,16 @@
+    'CCFLAGS'     => "$Config{'ccflags'} @CFLAGS@",
+ 
+    # Linker flags for building an executable
+-   'LDFLAGS'    =>  "-L@MAGICKLIBDIR@ $Config{'ldflags'}",
++   'LDFLAGS'    =>  "-L@MAGICKLIBDIR@ -L@top_srcdir@ -L@top_srcdir@/magick/.libs $Config{'ldflags'}",
+ 
+    # Linker flags for building a dynamically loadable module
+-   'LDDLFLAGS'  => "-L@MAGICKLIBDIR@ $Config{'lddlflags'}",
++   'LDDLFLAGS'  => "-L@MAGICKLIBDIR@ -L@top_srcdir@ -L@top_srcdir@/magick/.libs $Config{'lddlflags'}",
+ 
+    # Install PerlMagick binary into ImageMagick bin directory
+    'INSTALLBIN'	=> '@BIN_DIR@',
+ 
+    # Library specification
+-   'LIBS'	=> ['-L@MAGICKLIBDIR@ -lMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
++   'LIBS'	=> ['-L@MAGICKLIBDIR@ -L@top_srcdir@ -L@top_srcdir@/magick/.libs -lMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+ 
+    # Perl binary name (if a Perl binary is built)
+    'MAP_TARGET'	=> 'PerlMagick',
diff --git a/media-gfx/imagemagick/files/perlpatch.diff b/media-gfx/imagemagick/files/perlpatch.diff
deleted file mode 100644
index 2bd242f378fd..000000000000
--- a/media-gfx/imagemagick/files/perlpatch.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in	Fri Aug  9 15:02:07 2002
-+++ Makefile.in.new	Tue Aug 13 12:36:23 2002
-@@ -683,12 +683,12 @@ perl-sources:
- 	touch perl-sources
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+#@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install && \
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install)
-+#@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@uninstall-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	echo "Uninstall not supported for PerlMagick"
-@@ -715,8 +715,8 @@ perl-sources:
- @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) -f Makefile.aperl CC='@CC@' test
- 
- @WITH_PERL_TRUE@clean-perl: $(PERLMAKEFILE)
--@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' clean && rm -f Makefile.old PerlMagick
--@WITH_PERL_TRUE@	rm -f perl-sources
-+#@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' clean && rm -f Makefile.old PerlMagick
-+#@WITH_PERL_TRUE@	rm -f perl-sources
- 
- @WITH_PERL_TRUE@distclean-perl: clean-perl
- 
diff --git a/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild
index a655a759b633..210c2b8536aa 100644
--- a/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild,v 1.2 2005/05/19 13:14:04 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.2.2.3-r1.ebuild,v 1.3 2005/06/06 16:10:13 sekretarz Exp $
 
 inherit libtool flag-o-matic eutils perl-module
 
@@ -49,6 +49,7 @@ src_unpack() {
 	cd ${S}
 
 	chmod +x config.sub
+	epatch ${FILESDIR}/imagemagick-perlmagick.patch
 }
 
 src_compile() {