| 1 |
commit: 217730a60a538e7e1156dee0d3ac0bc0641a1780 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 4 12:27:04 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 4 12:27:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217730a6 |
| 7 |
|
| 8 |
dev-ros/geneus: allow pkg dupes |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/740046 |
| 11 |
Closes: https://bugs.gentoo.org/740038 |
| 12 |
Closes: https://bugs.gentoo.org/740036 |
| 13 |
Closes: https://bugs.gentoo.org/740028 |
| 14 |
Closes: https://bugs.gentoo.org/739280 |
| 15 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 16 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-ros/geneus/files/allow_dupes.patch | 13 +++++++++++++ |
| 19 |
.../geneus/{geneus-3.0.0.ebuild => geneus-3.0.0-r1.ebuild} | 1 + |
| 20 |
dev-ros/geneus/geneus-9999.ebuild | 1 + |
| 21 |
3 files changed, 15 insertions(+) |
| 22 |
|
| 23 |
diff --git a/dev-ros/geneus/files/allow_dupes.patch b/dev-ros/geneus/files/allow_dupes.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..60c79b7fb8d |
| 26 |
--- /dev/null |
| 27 |
+++ b/dev-ros/geneus/files/allow_dupes.patch |
| 28 |
@@ -0,0 +1,13 @@ |
| 29 |
+Index: geneus-3.0.0/src/geneus/geneus_main.py |
| 30 |
+=================================================================== |
| 31 |
+--- geneus-3.0.0.orig/src/geneus/geneus_main.py |
| 32 |
++++ geneus-3.0.0/src/geneus/geneus_main.py |
| 33 |
+@@ -53,7 +53,7 @@ def usage(progname): |
| 34 |
+ def get_pkg_map(): |
| 35 |
+ pkg_map = {} |
| 36 |
+ for ws in workspaces.get_spaces(): |
| 37 |
+- pkgs = packages.find_packages(ws) |
| 38 |
++ pkgs = packages.find_packages_allowing_duplicates(ws) |
| 39 |
+ for pkg in pkgs.values(): |
| 40 |
+ # packages.find_packages(workspaces.get_spaces()) returns package in high-priority-first-order, so we should not overwirte package map which is already found |
| 41 |
+ # https://github.com/ros-infrastructure/catkin_pkg/blob/fa4b136b16e2d2886ab97257684f6bff243edefb/src/catkin_pkg/workspaces.py#L43 |
| 42 |
|
| 43 |
diff --git a/dev-ros/geneus/geneus-3.0.0.ebuild b/dev-ros/geneus/geneus-3.0.0-r1.ebuild |
| 44 |
similarity index 89% |
| 45 |
rename from dev-ros/geneus/geneus-3.0.0.ebuild |
| 46 |
rename to dev-ros/geneus/geneus-3.0.0-r1.ebuild |
| 47 |
index 3f4bbffd97c..6143a01472c 100644 |
| 48 |
--- a/dev-ros/geneus/geneus-3.0.0.ebuild |
| 49 |
+++ b/dev-ros/geneus/geneus-3.0.0-r1.ebuild |
| 50 |
@@ -15,3 +15,4 @@ IUSE="" |
| 51 |
|
| 52 |
RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]" |
| 53 |
DEPEND="${RDEPEND}" |
| 54 |
+PATCHES=( "${FILESDIR}/allow_dupes.patch" ) |
| 55 |
|
| 56 |
diff --git a/dev-ros/geneus/geneus-9999.ebuild b/dev-ros/geneus/geneus-9999.ebuild |
| 57 |
index 3f4bbffd97c..6143a01472c 100644 |
| 58 |
--- a/dev-ros/geneus/geneus-9999.ebuild |
| 59 |
+++ b/dev-ros/geneus/geneus-9999.ebuild |
| 60 |
@@ -15,3 +15,4 @@ IUSE="" |
| 61 |
|
| 62 |
RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]" |
| 63 |
DEPEND="${RDEPEND}" |
| 64 |
+PATCHES=( "${FILESDIR}/allow_dupes.patch" ) |
Archives