From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 14 Dec 2020 13:26:14 +0000
Subject: gentoo resync : 14.12.2020

---
 dev-python/fcl/Manifest                            |  3 +-
 dev-python/fcl/fcl-0.0.12-r1.ebuild                | 36 ++++++++++++++++++
 dev-python/fcl/fcl-0.0.12.ebuild                   | 43 ----------------------
 .../files/fcl-0.0.12-fix-compiling-on-lld.patch    | 12 ++++++
 4 files changed, 50 insertions(+), 44 deletions(-)
 create mode 100644 dev-python/fcl/fcl-0.0.12-r1.ebuild
 delete mode 100644 dev-python/fcl/fcl-0.0.12.ebuild
 create mode 100644 dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch

(limited to 'dev-python/fcl')

diff --git a/dev-python/fcl/Manifest b/dev-python/fcl/Manifest
index 2143e860f895..15225b7a2b7f 100644
--- a/dev-python/fcl/Manifest
+++ b/dev-python/fcl/Manifest
@@ -1,3 +1,4 @@
+AUX fcl-0.0.12-fix-compiling-on-lld.patch 400 BLAKE2B d50568d13ad303c9c56a604d5ff8bcfaa537298cbda7b48628c07637ae7364aedf88fb57a04c601765ef1ff5280d609fc50dd06270d9cce32085f19d3c3b1e08 SHA512 4e668d7ac21a0fd326db170d64a3ac0cd931dfd5657546682033c30ad86d7d29ad845a5be4110b8cae2cdfd5ad1a784f3792eb7a8b0fd665f17614dab30a0c9b
 DIST python-fcl-0.0.12.tar.gz 17204 BLAKE2B 594d466270160e71e67d99f1745b382c3b1f7754adeb9ba58443e4370e14496e45f4a7619eb7d41db22766f75fe841e088609014bf5a9ff5a6b7ee526b34eca2 SHA512 3b5462206e63e17c646edeeedb268474cc6df1ff12d64d4de0c46bcc281787a42b6306778d2fe5d4d3b2e23bc0ed86e092c9a39b74d019638c771ac5c9d9f8ce
-EBUILD fcl-0.0.12.ebuild 880 BLAKE2B e6b401bf06c027386ef067dc4ec03d4071e78db035a7c408055a27d2a6fd3b7142b42059f74c0c4aca615db08b0a7cbb2ce9f9a989810a2e64486210070d3567 SHA512 d39c3ce60715e3432f0fc397ae6cf56df8971e0a98bf95940f3ad735aa6e079f77c3969ea212ca06b693abc728e7e0360f0f4d9cd230d16ad76b5e942756e498
+EBUILD fcl-0.0.12-r1.ebuild 777 BLAKE2B db7d60ca6ff0a3ac0c1d41620e727039eabab3be4f6f54f0a526917028203057a64283170c7fa8650262afd6fe33f2dd0e34dead41085d62b640a296e49ea8b2 SHA512 5d8f2c604b448208747360ea5b56dd19061922587da2265d3202a03f41dab798b5053c8cbcc5cab4a9a52dce72c86bed2d538b87cc79a95647fd07e8fa5ad91d
 MISC metadata.xml 690 BLAKE2B 9ffe7a20279a393ab054e5f14e03b567b6c9a22da79a0f4abf44a534bb217931a0a2774e8ab03fbfe28028b664ed45654d5687bd44eb5ab7461f16a1bae82f8a SHA512 8d59da8cedbed47d103b8fe47fc05b16533008c8ab8e5d684ffad836d4a06c9c139a1c3800d2922e4ee68f432924dd363e99b233c167be8b585a4eb8a4de72dc
diff --git a/dev-python/fcl/fcl-0.0.12-r1.ebuild b/dev-python/fcl/fcl-0.0.12-r1.ebuild
new file mode 100644
index 000000000000..27910fbb1371
--- /dev/null
+++ b/dev-python/fcl/fcl-0.0.12-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="python-fcl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python bindings for the Flexible Collision Library"
+HOMEPAGE="https://github.com/BerkeleyAutomation/python-fcl https://pypi.org/project/python-fcl/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	~sci-libs/fcl-0.5.0
+	sci-libs/octomap
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-fix-compiling-on-lld.patch )
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" test/test_fcl.py -v || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/fcl/fcl-0.0.12.ebuild b/dev-python/fcl/fcl-0.0.12.ebuild
deleted file mode 100644
index 49e3bde5d1ce..000000000000
--- a/dev-python/fcl/fcl-0.0.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-MY_PN="python-fcl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python bindings for the Flexible Collision Library"
-HOMEPAGE="https://github.com/BerkeleyAutomation/python-fcl https://pypi.org/project/python-fcl/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	~sci-libs/fcl-0.5.0
-	sci-libs/octomap
-"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r example
-	fi
-
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	"${EPYTHON}" test/test_fcl.py -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch b/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
new file mode 100644
index 000000000000..0e3cf7a54196
--- /dev/null
+++ b/dev-python/fcl/files/fcl-0.0.12-fix-compiling-on-lld.patch
@@ -0,0 +1,12 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,8 +21,7 @@
+         include_dirs = ['/usr/include',
+                         '/usr/local/include',
+                         '/usr/include/eigen3']
+-        lib_dirs = ['/usr/lib',
+-                    '/usr/local/lib']
++        lib_dirs = ['/usr/local/lib']
+         
+         if 'CPATH' in os.environ:
+             include_dirs += os.environ['CPATH'].split(':')
-- 
cgit v1.2.3