fixed rpath issues bug #105759 thanks to Jason Wever

Package-Manager: portage-2.0.52-r1

5 files changed, 38 insertions, 6 deletions

diff --git a/dev-libs/libpreludedb/ChangeLog b/dev-libs/libpreludedb/ChangeLog
index d5a1625d6ab1..92f5e4b50a76 100644
--- a/dev-libs/libpreludedb/ChangeLog
+++ b/dev-libs/libpreludedb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpreludedb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/ChangeLog,v 1.15 2005/09/25 02:15:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/ChangeLog,v 1.16 2005/10/01 04:27:23 dragonheart Exp $
+
+*libpreludedb-0.9.0-r1 (01 Oct 2005)
+
+  01 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libpreludedb-0.9.0-perlpathfix.patch, -libpreludedb-0.9.0.ebuild,
+  +libpreludedb-0.9.0-r1.ebuild:
+  fixed rpath issues bug #105759 thanks to Jason Wever
 
   25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
   libpreludedb-0.9.0.ebuild:
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index 5fb2c8aa113a..c4f936c0d327 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -1,4 +1,4 @@
-MD5 93c51450aaa25e66bfb8629731b55355 libpreludedb-0.9.0.ebuild 1539
-MD5 36a2eef1258b23cd2a8c4684454ded0f ChangeLog 2407
+MD5 5b3209f47a4e1bbc2f179a70b7cc7a53 libpreludedb-0.9.0-r1.ebuild 1628
 MD5 46a99e432c86964e317f92a77160a836 metadata.xml 256
-MD5 e3fc591d96386006ea662c8a8f5e41fc files/digest-libpreludedb-0.9.0 70
+MD5 694ca6484c32cb78ce33e4b6f643c4ea files/libpreludedb-0.9.0-perlpathfix.patch 894
+MD5 e3fc591d96386006ea662c8a8f5e41fc files/digest-libpreludedb-0.9.0-r1 70
diff --git a/dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0 b/dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0-r1
index f72ecf352238..f72ecf352238 100644
--- a/dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0
+++ b/dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0-r1
diff --git a/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch b/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch
new file mode 100644
index 000000000000..994302885036
--- /dev/null
+++ b/dev-libs/libpreludedb/files/libpreludedb-0.9.0-perlpathfix.patch
@@ -0,0 +1,20 @@
+--- libpreludedb-0.9.0/bindings/perl/Makefile.PL.in.orig	2005-10-01 14:18:54.000000000 +1000
++++ libpreludedb-0.9.0/bindings/perl/Makefile.PL.in	2005-10-01 14:19:09.000000000 +1000
+@@ -6,7 +6,7 @@
+ 
+ my %attributs = (NAME => 'PreludeDB',
+ 		 INC => '-I@top_srcdir@/src/include @LIBPRELUDE_CFLAGS@ @LIBPRELUDE_PTHREAD_CFLAGS@',
+-		 LIBS => ["-L@top_builddir@/src/.libs -lpreludedb", "-L$ENV{LIBDIR} -lpreludedb @LIBPRELUDE_LIBS@" ],
++		 LIBS => ["-lpreludedb", "-L$ENV{LIBDIR} -lpreludedb @LIBPRELUDE_LIBS@" ],
+ 		 LDDLFLAGS => "@LIBPRELUDE_LDFLAGS@ @LIBPRELUDE_PTHREAD_CFLAGS@ $Config{lddlflags}");
+ 
+ if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
+@@ -21,7 +21,7 @@
+ if ( -w $Config{"sitelib"} ) {
+     $attributs{"INSTALLDIRS"} = "site";
+ } else {
+-    $attributs{"PREFIX"} = "$ENV{DESTDIR}/@prefix@";
++    $attributs{"PREFIX"} = "@prefix@";
+ }
+ 
+ WriteMakefile(%attributs);
diff --git a/dev-libs/libpreludedb/libpreludedb-0.9.0.ebuild b/dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild
index dd662d3e0407..5b81947ca0c2 100644
--- a/dev-libs/libpreludedb/libpreludedb-0.9.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-0.9.0-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/dev-libs/libpreludedb/libpreludedb-0.9.0.ebuild,v 1.2 2005/09/25 02:15:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild,v 1.1 2005/10/01 04:27:23 dragonheart Exp $
 
 inherit flag-o-matic
 
@@ -19,6 +19,11 @@ DEPEND="virtual/libc
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-perlpathfix.patch
+}
+
 src_compile() {
 	local myconf
 
@@ -30,7 +35,7 @@ src_compile() {
 	use python && myconf="${myconf} --enable-python" || myconf="${myconf} --enable-python=no"
 	econf ${myconf} || die "econf failed"
 
-	emake -j1 || die "emake failed"
+	LD_RUN_PATH=""	emake -j1 || die "emake failed"
 	# -j1 may not be necessary in the future
 }