commit:     397435fe31fe7a8e7b615232b0fc0c64c701a619
Author:     Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Wed Aug 26 21:52:54 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 21:55:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397435fe

dev-python/PyECLib: really fix it this time...

Package-Manager: portage-2.2.20.1

 dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild       | 5 ++++-
 dev-python/PyECLib/PyECLib-1.0.7.ebuild          | 2 +-
 dev-python/PyECLib/files/PyECLib-usr-local.patch | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild 
b/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild
index 772f076..46a3b94 100644
--- a/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild
@@ -26,5 +26,8 @@ PATCHES=(
 
 python_install() {
        distutils-r1_python_install
-       sed -i "s/^libdir.*$/libdir='\/usr\/lib'/g" 
"${D}"/usr/lib/libgf_complete.la || die
+       # sed -i "s/^libdir.*$/libdir='\/usr\/lib'/g" 
"${D}"/usr/lib/libgf_complete.la || die
+       # sed -i "s/^dependency_libs.*$/dependency_libs=''/g" 
"${D}"/usr/lib/libgf_complete.la "${D}"/usr/lib/libJerasure.la || die
+       # package installs broken la files...
+       rm "${D}"/usr/lib/*.la || die
 }

diff --git a/dev-python/PyECLib/PyECLib-1.0.7.ebuild 
b/dev-python/PyECLib/PyECLib-1.0.7.ebuild
index cf533ff..acfd959 100644
--- a/dev-python/PyECLib/PyECLib-1.0.7.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.0.7.ebuild
@@ -26,5 +26,5 @@ PATCHES=(
 
 python_install() {
        distutils-r1_python_install
-       sed -i "s/^libdir.*$/libdir='\/usr\/lib'/g" 
"${D}"/usr/lib/libgf_complete.la || die
+       rm "${D}"/usr/lib/*.la || die
 }

diff --git a/dev-python/PyECLib/files/PyECLib-usr-local.patch 
b/dev-python/PyECLib/files/PyECLib-usr-local.patch
index d2697c4..2d923b2 100644
--- a/dev-python/PyECLib/files/PyECLib-usr-local.patch
+++ b/dev-python/PyECLib/files/PyECLib-usr-local.patch
@@ -32,8 +32,8 @@
 -            libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
 -                        (topdir + "/" + locallibsrcdir + "/src/.libs ")] 
 +            libdirs = []
-+            #libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
-+            #            (topdir + "/" + locallibsrcdir + "/src/.libs ")] 
++            libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
++                        (topdir + "/" + locallibsrcdir + "/src/.libs ")] 
              for d in libdirs:
                  libflags = libflags + " -L" + d
                  default_library_paths.append(d)

Reply via email to