From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 16 Sep 2020 09:32:48 +0100
Subject: gentoo resync : 16.09.2020

---
 dev-ros/geneus/Manifest                |  5 +++--
 dev-ros/geneus/files/allow_dupes.patch | 13 +++++++++++++
 dev-ros/geneus/geneus-3.0.0-r1.ebuild  | 18 ++++++++++++++++++
 dev-ros/geneus/geneus-3.0.0.ebuild     | 17 -----------------
 dev-ros/geneus/geneus-9999.ebuild      |  1 +
 5 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 dev-ros/geneus/files/allow_dupes.patch
 create mode 100644 dev-ros/geneus/geneus-3.0.0-r1.ebuild
 delete mode 100644 dev-ros/geneus/geneus-3.0.0.ebuild

(limited to 'dev-ros/geneus')

diff --git a/dev-ros/geneus/Manifest b/dev-ros/geneus/Manifest
index 972aac766d24..60aaf9ddb82d 100644
--- a/dev-ros/geneus/Manifest
+++ b/dev-ros/geneus/Manifest
@@ -1,4 +1,5 @@
+AUX allow_dupes.patch 777 BLAKE2B c2972b303dbff81c8b18420dde90d63f3c133b55a9e05e4e4cd12a9645fde9c9b2d56e1c33c9081ae64f7baa158346d2b4900b0060c5a9ace94a6d85a68f13d7 SHA512 6e317b791ea5db181baba06b2e113a2b4c3b35ee758bd5e388cc79c1198fe8bd1b6e606ae7cde3758bed3dacfab54b092f1d2c0e833f0c281a65cd28e19ab646
 DIST geneus-3.0.0.tar.gz 21401 BLAKE2B 4e7b779956e8c03676ea315664bb7e669cef31112f4b45fb3cd784cdca78e7c344dcd34ab0c6ad42940cc8c1a7648385334ecb84d9a41379bf033aa60ff7baf5 SHA512 f97cd44628d11fd9be4a369dac931b94e4789b032a6f22cf11f84666a0f6750326581146821e995ffa44c3bfcfbff6ac7075c50af0ead9682620fbdf75e84da1
-EBUILD geneus-3.0.0.ebuild 375 BLAKE2B 179cb85f56907d02b97115029a50574ae201032f9e354e06b0a0c5b0453fc735fd42b34bfbd065d13c58937c91539c1a31400e7e667f1f22b0652771e00c5636 SHA512 1417687fa08c64acb5bf922a60500026d2cc024b7605462ddb326deb795d3249a15404f4dc44d119a950b116778ee30ffc48b9f8e3b4121001e42038348c99c8
-EBUILD geneus-9999.ebuild 375 BLAKE2B 179cb85f56907d02b97115029a50574ae201032f9e354e06b0a0c5b0453fc735fd42b34bfbd065d13c58937c91539c1a31400e7e667f1f22b0652771e00c5636 SHA512 1417687fa08c64acb5bf922a60500026d2cc024b7605462ddb326deb795d3249a15404f4dc44d119a950b116778ee30ffc48b9f8e3b4121001e42038348c99c8
+EBUILD geneus-3.0.0-r1.ebuild 419 BLAKE2B c161e8edf7fcfc68bae6c26c7f037c9c22b6ae766f9fd9de40d16fe2b4fc5910836714e8e14e37460aeeae8a3af58b80f9f75c3444b6fcf307748fa1e7ecc1a7 SHA512 9d81d74a68bc8053ff7083690eab62141819b4513ea10de5e9d5610c2c39af9f6278422c69c042b4e2e087269fbcce508a6ba45e037c67e345876f322427e94c
+EBUILD geneus-9999.ebuild 419 BLAKE2B c161e8edf7fcfc68bae6c26c7f037c9c22b6ae766f9fd9de40d16fe2b4fc5910836714e8e14e37460aeeae8a3af58b80f9f75c3444b6fcf307748fa1e7ecc1a7 SHA512 9d81d74a68bc8053ff7083690eab62141819b4513ea10de5e9d5610c2c39af9f6278422c69c042b4e2e087269fbcce508a6ba45e037c67e345876f322427e94c
 MISC metadata.xml 332 BLAKE2B a24bf94d452832939c570e02b18234732d90f1fd266843a9503d5062938ef59482137d2b12795ccd0bb8742abcc2ede1ba7336f6f3a13647e5f2b79375d7f030 SHA512 31f145f147c19fd15f90fa280eba4580ce22dbef5dc9477f97932f5dd306061a7bcc26aaa62074ccbd3eafd413dd4dbb307ca8410b030c061550e70ee40607ba
diff --git a/dev-ros/geneus/files/allow_dupes.patch b/dev-ros/geneus/files/allow_dupes.patch
new file mode 100644
index 000000000000..60c79b7fb8d4
--- /dev/null
+++ b/dev-ros/geneus/files/allow_dupes.patch
@@ -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
diff --git a/dev-ros/geneus/geneus-3.0.0-r1.ebuild b/dev-ros/geneus/geneus-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..6143a01472c4
--- /dev/null
+++ b/dev-ros/geneus/geneus-3.0.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="EusLisp ROS message and service generators"
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/allow_dupes.patch" )
diff --git a/dev-ros/geneus/geneus-3.0.0.ebuild b/dev-ros/geneus/geneus-3.0.0.ebuild
deleted file mode 100644
index 3f4bbffd97ca..000000000000
--- a/dev-ros/geneus/geneus-3.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="EusLisp ROS message and service generators"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/geneus/geneus-9999.ebuild b/dev-ros/geneus/geneus-9999.ebuild
index 3f4bbffd97ca..6143a01472c4 100644
--- a/dev-ros/geneus/geneus-9999.ebuild
+++ b/dev-ros/geneus/geneus-9999.ebuild
@@ -15,3 +15,4 @@ IUSE=""
 
 RDEPEND="dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/allow_dupes.patch" )
-- 
cgit v1.2.3