fixed perl binding thanks to Yoann

(Portage version: 2.0.53_rc3)

5 files changed, 53 insertions, 30 deletions

diff --git a/dev-libs/libprelude/ChangeLog b/dev-libs/libprelude/ChangeLog
index 04694fe021b0..607e19a8df5b 100644
--- a/dev-libs/libprelude/ChangeLog
+++ b/dev-libs/libprelude/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libprelude
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.36 2005/10/01 04:31:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.37 2005/10/02 23:36:07 dragonheart Exp $
+
+*libprelude-0.9.0-r2 (02 Oct 2005)
+
+  02 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  files/libprelude-0.9.0-perlpathfix.patch, -libprelude-0.9.0-r1.ebuild,
+  +libprelude-0.9.0-r2.ebuild:
+  fixed perl binding thanks to Yoann
 
 *libprelude-0.9.0-r1 (01 Oct 2005)
 
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 85322228061e..e7f55e32eed1 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8d319557101b5dc5e5a68e842be0065b ChangeLog 5932
+MD5 ee071edb687d4b8688c277043ed94a53 ChangeLog 6105
 MD5 4df78be1fea7023bd39fa475deb50465 files/digest-libprelude-0.8.10-r1 69
-MD5 13a4e2272babddf5894aeea10c46ac64 files/digest-libprelude-0.9.0-r1 69
-MD5 a2ad3653e21b791601a8cfb9ea80792a files/libprelude-0.9.0-perlpathfix.patch 980
+MD5 13a4e2272babddf5894aeea10c46ac64 files/digest-libprelude-0.9.0-r2 69
+MD5 dcf37eea640fa68fa888992a00393b90 files/libprelude-0.9.0-perlpathfix.patch 1934
 MD5 5530b51e2aabfdddb68f05ba69c95171 libprelude-0.8.10-r1.ebuild 1099
-MD5 683a54faed52ab9e14bbdb962caee933 libprelude-0.9.0-r1.ebuild 1514
+MD5 0a28cb42d441582627246dba76552642 libprelude-0.9.0-r2.ebuild 1390
 MD5 58ac7b9f0648503cb1ef46d0e5c96a12 metadata.xml 224
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPn/VI1lqEGTUzyQRAl/PAJ9gd6gNsb0dL+ru2kr2WaxaU0/pqwCfeYYc
-z3j2zE3YuK6XTOyIEGM1i94=
-=Trar
------END PGP SIGNATURE-----
diff --git a/dev-libs/libprelude/files/digest-libprelude-0.9.0-r1 b/dev-libs/libprelude/files/digest-libprelude-0.9.0-r2
index c29d078ad71a..c29d078ad71a 100644
--- a/dev-libs/libprelude/files/digest-libprelude-0.9.0-r1
+++ b/dev-libs/libprelude/files/digest-libprelude-0.9.0-r2
diff --git a/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch b/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch
index 233fb5335c30..58ba632c598b 100644
--- a/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch
+++ b/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch
@@ -1,14 +1,45 @@
---- libprelude-0.9.0/bindings/perl/Makefile.PL.in.orig	2005-10-01 14:05:32.000000000 +1000
-+++ libprelude-0.9.0/bindings/perl/Makefile.PL.in	2005-10-01 14:05:56.000000000 +1000
-@@ -6,7 +6,7 @@
+--- libprelude-0.9.0/bindings/Makefile.am.orig	2005-10-03 09:25:29.000000000 +1000
++++ libprelude-0.9.0/bindings/Makefile.am	2005-10-03 09:26:15.000000000 +1000
+@@ -44,7 +44,7 @@
  
- my %attributs = (NAME => 'Prelude',
- 		 INC => '-I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error @PTHREAD_CFLAGS@',
--		 LIBS => ["-L@top_builddir@/src/.libs -lprelude", "-L$ENV{LIBDIR} -lprelude @libprelude_libs@ @LIBADD_DL@ @PTHREAD_LIBS@" ],
-+		 LIBS => ["-lprelude", "-L$ENV{LIBDIR} -lprelude @libprelude_libs@ @LIBADD_DL@ @PTHREAD_LIBS@" ],
- 		 LDDLFLAGS => "-L@top_builddir@/src/.libs @PTHREAD_CFLAGS@ $Config{lddlflags}");
  
- if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
+ perl-build:
+-	cd perl && $(MAKE)
++	cd perl && $(MAKE) LD_RUN_PATH=""
+ 
+ python-build:
+ 	cd python && $(PYTHON) setup.py build
+@@ -56,7 +56,7 @@
+ #
+ # Workaround invalid Makefile generated by MakeMaker when UTF-8 is enabled.
+ #
+-	cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) install
++	cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) LD_RUN_PATH="" install
+ endif
+ 
+ if HAVE_PYTHON
+--- libprelude-0.9.0/bindings/Makefile.in.orig	2005-10-03 09:25:23.000000000 +1000
++++ libprelude-0.9.0/bindings/Makefile.in	2005-10-03 09:26:38.000000000 +1000
+@@ -374,7 +374,7 @@
+ @HAVE_SWIG_TRUE@	$(SWIG) -I$(top_srcdir)/bindings -I$(top_srcdir)/src/include -I$(top_srcdir)/src/libprelude-error -o $@ -python -noproxy -interface _prelude -module _prelude libprelude.i
+ 
+ perl-build:
+-	cd perl && $(MAKE)
++	cd perl && $(MAKE) LD_RUN_PATH=""
+ 
+ python-build:
+ 	cd python && $(PYTHON) setup.py build
+@@ -383,7 +383,7 @@
+ #
+ # Workaround invalid Makefile generated by MakeMaker when UTF-8 is enabled.
+ #
+-@HAVE_PERL_TRUE@	cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) install
++@HAVE_PERL_TRUE@	cd perl && DESTDIR=$(DESTDIR) LANG="" $(PERL) Makefile.PL && $(MAKE) LD_RUN_PATH="" install
+ 
+ @HAVE_PYTHON_TRUE@	cd python && $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ 
+--- libprelude-0.9.0/bindings/perl/Makefile.PL.in.orig	2005-10-03 09:26:51.000000000 +1000
++++ libprelude-0.9.0/bindings/perl/Makefile.PL.in	2005-10-03 09:27:19.000000000 +1000
 @@ -21,7 +21,7 @@
  if ( -w $Config{"sitelib"} ) {
      $attributs{"INSTALLDIRS"} = "site";
diff --git a/dev-libs/libprelude/libprelude-0.9.0-r1.ebuild b/dev-libs/libprelude/libprelude-0.9.0-r2.ebuild
index 005f15ec4963..e85e49d18171 100644
--- a/dev-libs/libprelude/libprelude-0.9.0-r1.ebuild
+++ b/dev-libs/libprelude/libprelude-0.9.0-r2.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/dev-libs/libprelude/libprelude-0.9.0-r1.ebuild,v 1.2 2005/10/01 12:23:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-0.9.0-r2.ebuild,v 1.1 2005/10/02 23:36:07 dragonheart Exp $
 
 inherit perl-module flag-o-matic
 
@@ -36,11 +36,6 @@ src_compile() {
 		$(use_enable perl) \
 		$(use_enable python) \
 		|| die "econf failed"
-	#if use perl
-	#then
-#		make -C bindings perl/Makefile || die
-#		sed -i -e "s:^LD_RUN_PATH.*::" bindings/perl/Makefile
-#	fi
 
 	emake -j1 || die "emake failed"
 	# -j1 may not be necessary in the future