[gentoo-commits] repo/gentoo:master commit in: app-shells/powerline/, app-shells/powerline/files/

[gentoo-commits] repo/gentoo:master commit in: app-shells/powerline/, app-shells/powerline/files/

[Matthew Thode]

commit:     f216ce5fd9fdcaefe20b7f72eca0ad8fa32e19d2
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 20:00:16 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 20:00:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f216ce5f

app-shells/powerline: fix respecting ldflags

Closes: https://bugs.gentoo.org/726700
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 app-shells/powerline/files/2.7-ldflags.patch              | 15 +++++++++++++++
 .../{powerline-2.7.ebuild => powerline-2.7-r1.ebuild}     |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/app-shells/powerline/files/2.7-ldflags.patch b/app-shells/powerline/files/2.7-ldflags.patch
new file mode 100644
index 00000000000..077c28af2a0
--- /dev/null
+++ b/app-shells/powerline/files/2.7-ldflags.patch
@@ -0,0 +1,15 @@
+diff -Naur powerline-status-2.7/setup.py powerline-status-2.7.new/setup.py
+--- powerline-status-2.7/setup.py	2018-08-12 14:41:44.000000000 -0500
++++ powerline-status-2.7.new/setup.py	2020-06-01 14:56:25.977968288 -0500
+@@ -30,9 +30,10 @@
+ 		from distutils.ccompiler import new_compiler
+ 		compiler = new_compiler().compiler
+ 		cflags = os.environ.get('CFLAGS', str('-O3'))
++		ldflags = os.environ.get('LDFLAGS', str(''))
+ 		# A normal split would do a split on each space which might be incorrect. The
+ 		# shlex will not split if a space occurs in an arguments value.
+-		subprocess.check_call(compiler + shlex.split(cflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
++		subprocess.check_call(compiler + shlex.split(cflags) + shlex.split(ldflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
+ 
+ try:
+ 	compile_client()

diff --git a/app-shells/powerline/powerline-2.7.ebuild b/app-shells/powerline/powerline-2.7-r1.ebuild
similarity index 93%
rename from app-shells/powerline/powerline-2.7.ebuild
rename to app-shells/powerline/powerline-2.7-r1.ebuild
index 946e4c10304..623ac6d9568 100644
--- a/app-shells/powerline/powerline-2.7.ebuild
+++ b/app-shells/powerline/powerline-2.7-r1.ebuild
@@ -25,3 +25,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/2.7-ldflags.patch
+)

[gentoo-commits] repo/gentoo:master commit in: app-shells/powerline/, app-shells/powerline/files/

[Michał Górny]

commit:     7dd18e6b5f9f1349bab98e681d66c8454d078439
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 17 09:47:35 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 17 10:28:25 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dd18e6b

app-shells/powerline: Remove old (EAPI 7)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-shells/powerline/Manifest                |  1 -
 app-shells/powerline/files/2.7-ldflags.patch | 15 ---------------
 app-shells/powerline/powerline-2.7-r3.ebuild | 28 ----------------------------
 3 files changed, 44 deletions(-)

diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index 0987e129805b..41d2857bb211 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1,2 +1 @@
 DIST powerline-2.8.4.tar.gz 369057 BLAKE2B 1e43bd30e5efef99c0658fd4388fef198db1fd637c3fe368c4f64dcc477b81ea4c38a90c7dad99762050400a79d169de7966f64e00349e787d92fe50de2d9613 SHA512 758356725b24545adc2680871eaf79147ea6c79746bcbd6eaba731b2e86542275854ba6de970e47a2938fbe29dbd933f5208d8bb6b1586ee1f383249a963f7c8
-DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517

diff --git a/app-shells/powerline/files/2.7-ldflags.patch b/app-shells/powerline/files/2.7-ldflags.patch
deleted file mode 100644
index 077c28af2a07..000000000000
--- a/app-shells/powerline/files/2.7-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur powerline-status-2.7/setup.py powerline-status-2.7.new/setup.py
---- powerline-status-2.7/setup.py	2018-08-12 14:41:44.000000000 -0500
-+++ powerline-status-2.7.new/setup.py	2020-06-01 14:56:25.977968288 -0500
-@@ -30,9 +30,10 @@
- 		from distutils.ccompiler import new_compiler
- 		compiler = new_compiler().compiler
- 		cflags = os.environ.get('CFLAGS', str('-O3'))
-+		ldflags = os.environ.get('LDFLAGS', str(''))
- 		# A normal split would do a split on each space which might be incorrect. The
- 		# shlex will not split if a space occurs in an arguments value.
--		subprocess.check_call(compiler + shlex.split(cflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
-+		subprocess.check_call(compiler + shlex.split(cflags) + shlex.split(ldflags) + ['client/powerline.c', '-o', 'scripts/powerline'])
- 
- try:
- 	compile_client()

diff --git a/app-shells/powerline/powerline-2.7-r3.ebuild b/app-shells/powerline/powerline-2.7-r3.ebuild
deleted file mode 100644
index b761ad56034e..000000000000
--- a/app-shells/powerline/powerline-2.7-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..12} )
-PYPI_NO_NORMALIZE=1
-PYPI_PN="powerline-status"
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="The ultimate statusline/prompt utility"
-HOMEPAGE="https://github.com/powerline/powerline"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/powerline/powerline"
-	EGIT_BRANCH="develop"
-else
-	inherit pypi
-	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}"/2.7-ldflags.patch
-)