Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyECLib/, dev-python/PyECLib/files/
Date: Wed, 26 Aug 2015 21:58:55
Message-Id: 1440626123.397435fe31fe7a8e7b615232b0fc0c64c701a619.prometheanfire@gentoo
1 commit: 397435fe31fe7a8e7b615232b0fc0c64c701a619
2 Author: Matthew Thode <mthode <AT> mthode <DOT> org>
3 AuthorDate: Wed Aug 26 21:52:54 2015 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 26 21:55:23 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397435fe
7
8 dev-python/PyECLib: really fix it this time...
9
10 Package-Manager: portage-2.2.20.1
11
12 dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild | 5 ++++-
13 dev-python/PyECLib/PyECLib-1.0.7.ebuild | 2 +-
14 dev-python/PyECLib/files/PyECLib-usr-local.patch | 4 ++--
15 3 files changed, 7 insertions(+), 4 deletions(-)
16
17 diff --git a/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild b/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild
18 index 772f076..46a3b94 100644
19 --- a/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild
20 +++ b/dev-python/PyECLib/PyECLib-1.0.7-r1.ebuild
21 @@ -26,5 +26,8 @@ PATCHES=(
22
23 python_install() {
24 distutils-r1_python_install
25 - sed -i "s/^libdir.*$/libdir='\/usr\/lib'/g" "${D}"/usr/lib/libgf_complete.la || die
26 + # sed -i "s/^libdir.*$/libdir='\/usr\/lib'/g" "${D}"/usr/lib/libgf_complete.la || die
27 + # sed -i "s/^dependency_libs.*$/dependency_libs=''/g" "${D}"/usr/lib/libgf_complete.la "${D}"/usr/lib/libJerasure.la || die
28 + # package installs broken la files...
29 + rm "${D}"/usr/lib/*.la || die
30 }
31
32 diff --git a/dev-python/PyECLib/PyECLib-1.0.7.ebuild b/dev-python/PyECLib/PyECLib-1.0.7.ebuild
33 index cf533ff..acfd959 100644
34 --- a/dev-python/PyECLib/PyECLib-1.0.7.ebuild
35 +++ b/dev-python/PyECLib/PyECLib-1.0.7.ebuild
36 @@ -26,5 +26,5 @@ PATCHES=(
37
38 python_install() {
39 distutils-r1_python_install
40 - sed -i "s/^libdir.*$/libdir='\/usr\/lib'/g" "${D}"/usr/lib/libgf_complete.la || die
41 + rm "${D}"/usr/lib/*.la || die
42 }
43
44 diff --git a/dev-python/PyECLib/files/PyECLib-usr-local.patch b/dev-python/PyECLib/files/PyECLib-usr-local.patch
45 index d2697c4..2d923b2 100644
46 --- a/dev-python/PyECLib/files/PyECLib-usr-local.patch
47 +++ b/dev-python/PyECLib/files/PyECLib-usr-local.patch
48 @@ -32,8 +32,8 @@
49 - libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
50 - (topdir + "/" + locallibsrcdir + "/src/.libs ")]
51 + libdirs = []
52 -+ #libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
53 -+ # (topdir + "/" + locallibsrcdir + "/src/.libs ")]
54 ++ libdirs = [ (topdir + "/" + locallibsrcdir + "/.libs "),
55 ++ (topdir + "/" + locallibsrcdir + "/src/.libs ")]
56 for d in libdirs:
57 libflags = libflags + " -L" + d
58 default_library_paths.append(d)