Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/powerline/, app-shells/powerline/files/
Date: Mon, 01 Jun 2020 20:00:40
Message-Id: 1591041630.f216ce5fd9fdcaefe20b7f72eca0ad8fa32e19d2.prometheanfire@gentoo
1 commit: f216ce5fd9fdcaefe20b7f72eca0ad8fa32e19d2
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 1 20:00:16 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 1 20:00:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f216ce5f
7
8 app-shells/powerline: fix respecting ldflags
9
10 Closes: https://bugs.gentoo.org/726700
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
13
14 app-shells/powerline/files/2.7-ldflags.patch | 15 +++++++++++++++
15 .../{powerline-2.7.ebuild => powerline-2.7-r1.ebuild} | 4 ++++
16 2 files changed, 19 insertions(+)
17
18 diff --git a/app-shells/powerline/files/2.7-ldflags.patch b/app-shells/powerline/files/2.7-ldflags.patch
19 new file mode 100644
20 index 00000000000..077c28af2a0
21 --- /dev/null
22 +++ b/app-shells/powerline/files/2.7-ldflags.patch
23 @@ -0,0 +1,15 @@
24 +diff -Naur powerline-status-2.7/setup.py powerline-status-2.7.new/setup.py
25 +--- powerline-status-2.7/setup.py 2018-08-12 14:41:44.000000000 -0500
26 ++++ powerline-status-2.7.new/setup.py 2020-06-01 14:56:25.977968288 -0500
27 +@@ -30,9 +30,10 @@
28 + from distutils.ccompiler import new_compiler
29 + compiler = new_compiler().compiler
30 + cflags = os.environ.get('CFLAGS', str('-O3'))
31 ++ ldflags = os.environ.get('LDFLAGS', str(''))
32 + # A normal split would do a split on each space which might be incorrect. The
33 + # shlex will not split if a space occurs in an arguments value.
34 +- subprocess.check_call(compiler + shlex.split(cflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
35 ++ subprocess.check_call(compiler + shlex.split(cflags) + shlex.split(ldflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
36 +
37 + try:
38 + compile_client()
39
40 diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7-r1.ebuild
41 similarity index 93%
42 rename from app-shells/powerline/powerline-2.7.ebuild
43 rename to app-shells/powerline/powerline-2.7-r1.ebuild
44 index 946e4c10304..623ac6d9568 100644
45 --- a/app-shells/powerline/powerline-2.7.ebuild
46 +++ b/app-shells/powerline/powerline-2.7-r1.ebuild
47 @@ -25,3 +25,7 @@ RESTRICT="!test? ( test )"
48
49 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
50 RDEPEND=""
51 +
52 +PATCHES=(
53 + "${FILESDIR}"/2.7-ldflags.patch
54 +)