gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/catkin_pkg: generate setup.py without newline in description

Browse Source 
Closes: https://bugs.gentoo.org/765868
Closes: https://bugs.gentoo.org/765877
Closes: https://bugs.gentoo.org/765772
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2021-01-20 21:02:33 +01:00
parent c091d5631c
commit 71f6ac45fb
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild → dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
"${FILESDIR}/infinite_loop4.patch"
"${FILESDIR}/summary_single_line.patch"
)
python_test() {

3
dev-python/catkin_pkg/catkin_pkg-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}/catkin_prefix2.patch"
"${FILESDIR}/ros_packages.patch"
"${FILESDIR}/infinite_loop4.patch"
"${FILESDIR}/summary_single_line.patch"
)
python_test() {

19
dev-python/catkin_pkg/files/summary_single_line.patch Normal file
View File

@@ -0,0 +1,19 @@
setuptools will disallow newlines in descriptions, so do not generate them
see e.g. https://bugs.gentoo.org/765868
Index: catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
===================================================================
--- catkin_pkg-0.4.23.orig/src/catkin_pkg/python_setup.py
+++ catkin_pkg-0.4.23/src/catkin_pkg/python_setup.py
@@ -99,9 +99,9 @@ def generate_distutils_setup(package_xml
data['url'] = package.urls[0].url
if len(package.description) <= 200:
- data['description'] = package.description
+ data['description'] = package.description.replace('\n', ' ')
else:
- data['description'] = package.description[:197] + '...'
+ data['description'] = package.description[:197].replace('\n', ' ') + '...'
data['long_description'] = package.description
data['license'] = ', '.join(package.licenses)