diff options
Diffstat (limited to 'dev-python/catkin_pkg')
| -rw-r--r-- | dev-python/catkin_pkg/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild (renamed from dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild) | 3 | ||||
| -rw-r--r-- | dev-python/catkin_pkg/catkin_pkg-9999.ebuild | 3 | ||||
| -rw-r--r-- | dev-python/catkin_pkg/files/summary_single_line.patch | 19 |
4 files changed, 26 insertions, 4 deletions
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest index d9ca414d410a..a0fa2f0449d3 100644 --- a/dev-python/catkin_pkg/Manifest +++ b/dev-python/catkin_pkg/Manifest @@ -1,7 +1,8 @@ AUX catkin_prefix2.patch 1741 BLAKE2B 31884cff0d6150e458fd76fadff86e16f0d76d73c2422c2a5c02ae45a8494de939e141a1eca5caf0e3de37b12e1456ff7a83eb2fc550f2b5f5b25a204db6d51c SHA512 e6a04b6d53676acb3f9f20ce76040a4b2ed9da72bd32fd7d27419d0602ce9c05826128af055f1f498e1e3299525e665a4af1987ba9eec6889f6d7ed493dd813b AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1aab4c253c83045ae6792dc5420c516c53f354d64aa45389f99c50e7ba34db6ccc7d00845444e409804f3dfa SHA512 7ef9d36aaa9fe88fc8f3ce60c233e4ad92facd04dfe9bfbfd496d96659f2e977702e6cb0ce5ec1654cfc8773b91b5e5ee83ac6634599c30b015c1c40c6564e9e AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164 +AUX summary_single_line.patch 886 BLAKE2B 0fb24b9297a5a65e891204cb02c1bc4d7d9ad3739fea95b27e4069a2007248c9cb481c226d0da08f9a3906bbb8e1591ddce3f3ef29a4db0428eee0a8c74dd8f6 SHA512 78f3e5180778dbfbe7f945f7dc33dab284267985564dab974c33d4998d2ff44f2a17c52b83925b8f9ced38c5c4731a1028ac28989ffe617d49f5954857d3c1e1 DIST catkin_pkg-0.4.23-gh.tar.gz 64677 BLAKE2B 7bdd6e748561fd7e1193bdc85373e621bba0f1f80452c85c9d90d3b7cf758a83596376dae841b0ccac56a4ba7732111d464a47bc50cf4d9f29fb607f00ec66d7 SHA512 f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee -EBUILD catkin_pkg-0.4.23.ebuild 1296 BLAKE2B 568af171ed276b7f7297b80fd002ca8329128fc4d614409ff55bf73c7d7f5ee050922f101daabcf916771b050f159ef0ecf717876230f825c269219b141c1b5a SHA512 a1b0fb2f162ee7d2a04e3e88a73290ba994cacceb474868f93950228228bc7c0db7c9d497e0c66206ebd21ebd77bfc22fccedbedf1ea5e4802ba3c4e3f07ace0 -EBUILD catkin_pkg-9999.ebuild 1296 BLAKE2B 568af171ed276b7f7297b80fd002ca8329128fc4d614409ff55bf73c7d7f5ee050922f101daabcf916771b050f159ef0ecf717876230f825c269219b141c1b5a SHA512 a1b0fb2f162ee7d2a04e3e88a73290ba994cacceb474868f93950228228bc7c0db7c9d497e0c66206ebd21ebd77bfc22fccedbedf1ea5e4802ba3c4e3f07ace0 +EBUILD catkin_pkg-0.4.23-r1.ebuild 1337 BLAKE2B 349aca1219565ffdf12426bbf2dee65eaac03fcee7c856c54b7ed9ce7bcaa633a55406481429a4639c8f6854d8b7125404ee6706b441728500db6eb5b5be4775 SHA512 36e6c70263e1220fb017c950ba33945618a10a9d8dd5d06aab2ab36d7745dd3211e9a9029eb0909ed56bb0b71ba4797e1f3a90849da09a7a8fbc988a7318a755 +EBUILD catkin_pkg-9999.ebuild 1337 BLAKE2B 349aca1219565ffdf12426bbf2dee65eaac03fcee7c856c54b7ed9ce7bcaa633a55406481429a4639c8f6854d8b7125404ee6706b441728500db6eb5b5be4775 SHA512 36e6c70263e1220fb017c950ba33945618a10a9d8dd5d06aab2ab36d7745dd3211e9a9029eb0909ed56bb0b71ba4797e1f3a90849da09a7a8fbc988a7318a755 MISC metadata.xml 391 BLAKE2B 47b8c26f89a501bb1701d68c80d0027b09cbb52fe46f639f119814fc589c21d7ecce01c5e0cfabfc579c3385fa16b974913b31481f9761573e61c2d14ad94786 SHA512 b9a7270d2ab39db2b7f08c2cc7386424f642ce43e031ee256cb6081f9ac0f9446ab6af0b3cca641a97d3cd88b6eadbae3b127f219a1eda9dd59e1ac0bc2ff75e diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild index 677f0b8d9890..22de5978719b 100644 --- a/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild +++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild @@ -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() { diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild index 677f0b8d9890..22de5978719b 100644 --- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild +++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild @@ -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() { diff --git a/dev-python/catkin_pkg/files/summary_single_line.patch b/dev-python/catkin_pkg/files/summary_single_line.patch new file mode 100644 index 000000000000..d24c284da9ea --- /dev/null +++ b/dev-python/catkin_pkg/files/summary_single_line.patch @@ -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) |