gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/geneus: allow pkg dupes

Browse Source 
Closes: https://bugs.gentoo.org/740046
Closes: https://bugs.gentoo.org/740038
Closes: https://bugs.gentoo.org/740036
Closes: https://bugs.gentoo.org/740028
Closes: https://bugs.gentoo.org/739280
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2020-09-04 14:27:04 +02:00
parent 0b6da079de
commit 217730a60a
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dev-ros/geneus/files/allow_dupes.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: geneus-3.0.0/src/geneus/geneus_main.py
===================================================================
--- geneus-3.0.0.orig/src/geneus/geneus_main.py
+++ geneus-3.0.0/src/geneus/geneus_main.py
@@ -53,7 +53,7 @@ def usage(progname):
def get_pkg_map():
pkg_map = {}
for ws in workspaces.get_spaces():
- pkgs = packages.find_packages(ws)
+ pkgs = packages.find_packages_allowing_duplicates(ws)
for pkg in pkgs.values():
# packages.find_packages(workspaces.get_spaces()) returns package in high-priority-first-order, so we should not overwirte package map which is already found
# https://github.com/ros-infrastructure/catkin_pkg/blob/fa4b136b16e2d2886ab97257684f6bff243edefb/src/catkin_pkg/workspaces.py#L43

1
dev-ros/geneus/geneus-3.0.0.ebuild → dev-ros/geneus/geneus-3.0.0-r1.ebuild
View File

@@ -15,3 +15,4 @@ IUSE=""
RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/allow_dupes.patch" )

1
dev-ros/geneus/geneus-9999.ebuild
View File

@@ -15,3 +15,4 @@ IUSE=""
RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/allow_dupes.patch" )