fixed rpath issues bug #105759 thanks to Jason Wever

Package-Manager: portage-2.0.52-r1

diff --git a/dev-libs/libprelude/ChangeLog b/dev-libs/libprelude/ChangeLog
index 474fffd50fdc153d0a94f564f63a32e1a2ab40aa..04694fe021b07346f1df560f10988cf1cdc6a729 100644 (file)
--- 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.35 2005/09/23 03:21:11 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/ChangeLog,v 1.36 2005/10/01 04:31:00 dragonheart Exp $
+
+*libprelude-0.9.0-r1 (01 Oct 2005)
+
+  01 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libprelude-0.9.0-perlpathfix.patch, -libprelude-0.9.0.ebuild,
+  +libprelude-0.9.0-r1.ebuild:
+  fixed rpath issues bug #105759 thanks to Jason Wever
 
 *libprelude-0.9.0 (23 Sep 2005)
 

diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 8deca3dcbb43a0d47b7e10755af5bc5efdfd6544..d87289288b1c47e3cbbe0f8b65d7c8a3f6e139eb 100644 (file)
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -1,6 +1,7 @@
-MD5 7506e6da257b642e5d21ea1cb5e17878 libprelude-0.9.0.ebuild 1345
-MD5 5530b51e2aabfdddb68f05ba69c95171 libprelude-0.8.10-r1.ebuild 1099
 MD5 da084f095441680a7866321ec5e07385 ChangeLog 5684
+MD5 5530b51e2aabfdddb68f05ba69c95171 libprelude-0.8.10-r1.ebuild 1099
 MD5 58ac7b9f0648503cb1ef46d0e5c96a12 metadata.xml 224
+MD5 43997824f5479dbf3592c7bee116d7f4 libprelude-0.9.0-r1.ebuild 1523
+MD5 a2ad3653e21b791601a8cfb9ea80792a files/libprelude-0.9.0-perlpathfix.patch 980
 MD5 4df78be1fea7023bd39fa475deb50465 files/digest-libprelude-0.8.10-r1 69
-MD5 13a4e2272babddf5894aeea10c46ac64 files/digest-libprelude-0.9.0 69
+MD5 13a4e2272babddf5894aeea10c46ac64 files/digest-libprelude-0.9.0-r1 69

diff --git a/dev-libs/libprelude/files/digest-libprelude-0.9.0 b/dev-libs/libprelude/files/digest-libprelude-0.9.0-r1
similarity index 100%
rename from dev-libs/libprelude/files/digest-libprelude-0.9.0
rename to dev-libs/libprelude/files/digest-libprelude-0.9.0-r1

diff --git a/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch b/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch
new file mode 100644 (file)
index 0000000..233fb53
--- /dev/null
+++ b/dev-libs/libprelude/files/libprelude-0.9.0-perlpathfix.patch
@@ -0,0 +1,20 @@
+--- 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 @@
+ 
+ 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@") ) {
+@@ -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/libprelude/libprelude-0.9.0.ebuild b/dev-libs/libprelude/libprelude-0.9.0-r1.ebuild
similarity index 84%
rename from dev-libs/libprelude/libprelude-0.9.0.ebuild
rename to dev-libs/libprelude/libprelude-0.9.0-r1.ebuild
index 4d12fd057f0227f7e421a0b8b3780ff70a81e740..75f7a354533afe175d06216e8f332ee2bc3b1d36 100644 (file)
--- a/dev-libs/libprelude/libprelude-0.9.0.ebuild
+++ b/dev-libs/libprelude/libprelude-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/libprelude/libprelude-0.9.0.ebuild,v 1.1 2005/09/23 03:21:11 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libprelude/libprelude-0.9.0-r1.ebuild,v 1.1 2005/10/01 04:31:00 dragonheart Exp $
 
 inherit perl-module flag-o-matic
 
@@ -26,6 +26,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
+       epatch ${FILESDIR}/${P}-perlpathfix.patch
 #    grep -qs 'include.*fts.h' prelude-adduser/prelude-adduser.c || die "remove lfs filter"
        filter-lfs-flags
 }
@@ -35,6 +36,12 @@ 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
 }

diff --git a/dev-libs/libpreludedb/ChangeLog b/dev-libs/libpreludedb/ChangeLog
index d5a1625d6ab17d55aa5332a2775ebb8e20d2832e..92f5e4b50a765b7701426763d5df840ed74affc9 100644 (file)
--- 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 5fb2c8aa113a42895e5fa349f52acd284ef896e1..c4f936c0d327a787b8d2022decc58e58a6c15e1f 100644 (file)
--- 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
similarity index 100%
rename from dev-libs/libpreludedb/files/digest-libpreludedb-0.9.0
rename to 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 (file)
index 0000000..9943028
--- /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
similarity index 88%
rename from dev-libs/libpreludedb/libpreludedb-0.9.0.ebuild
rename to dev-libs/libpreludedb/libpreludedb-0.9.0-r1.ebuild
index dd662d3e0407e0707a1ff1455fdecb5b020834a9..5b81947ca0c240be5ca2ca82fb7011feff3a9aef 100644 (file)
--- 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
 }