| 1 |
commit: ec697969872d1eaadcaa9cb904160de37d65b523 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 30 15:01:07 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 30 15:02:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec697969 |
| 7 |
|
| 8 |
dev-util/catkin: bump to 0.8.8 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/catkin/Manifest | 1 + |
| 14 |
.../catkin/{catkin-9999.ebuild => catkin-0.8.8.ebuild} | 17 +++++++---------- |
| 15 |
dev-util/catkin/catkin-9999.ebuild | 17 +++++++---------- |
| 16 |
3 files changed, 15 insertions(+), 20 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest |
| 19 |
index dba3fbac5c5..5ff51930aca 100644 |
| 20 |
--- a/dev-util/catkin/Manifest |
| 21 |
+++ b/dev-util/catkin/Manifest |
| 22 |
@@ -2,3 +2,4 @@ DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941 |
| 23 |
DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45 |
| 24 |
DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6 |
| 25 |
DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae |
| 26 |
+DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979 |
| 27 |
|
| 28 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-0.8.8.ebuild |
| 29 |
similarity index 91% |
| 30 |
copy from dev-util/catkin/catkin-9999.ebuild |
| 31 |
copy to dev-util/catkin/catkin-0.8.8.ebuild |
| 32 |
index adf1b136a8c..124af520da9 100644 |
| 33 |
--- a/dev-util/catkin/catkin-9999.ebuild |
| 34 |
+++ b/dev-util/catkin/catkin-0.8.8.ebuild |
| 35 |
@@ -11,7 +11,7 @@ fi |
| 36 |
|
| 37 |
PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
| 38 |
|
| 39 |
-inherit ${SCM} cmake-utils python-r1 python-utils-r1 |
| 40 |
+inherit ${SCM} cmake python-r1 python-utils-r1 |
| 41 |
|
| 42 |
DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" |
| 43 |
HOMEPAGE="http://wiki.ros.org/catkin" |
| 44 |
@@ -37,9 +37,7 @@ RDEPEND=" |
| 45 |
" |
| 46 |
DEPEND="${RDEPEND} |
| 47 |
test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" |
| 48 |
-BDEPEND=" |
| 49 |
- dev-util/cmake |
| 50 |
-" |
| 51 |
+BDEPEND="" |
| 52 |
|
| 53 |
PATCHES=( |
| 54 |
"${FILESDIR}/tests.patch" |
| 55 |
@@ -49,7 +47,6 @@ PATCHES=( |
| 56 |
"${FILESDIR}/catkin_prefix_path_util_py_v2.patch" |
| 57 |
"${FILESDIR}/package_xml.patch" |
| 58 |
"${FILESDIR}/etc.patch" |
| 59 |
- "${FILESDIR}/egginfo.patch" |
| 60 |
) |
| 61 |
|
| 62 |
src_prepare() { |
| 63 |
@@ -61,7 +58,7 @@ src_prepare() { |
| 64 |
-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ |
| 65 |
-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ |
| 66 |
cmake/*.cmake || die |
| 67 |
- cmake-utils_src_prepare |
| 68 |
+ cmake_src_prepare |
| 69 |
} |
| 70 |
|
| 71 |
catkin_src_configure_internal() { |
| 72 |
@@ -71,7 +68,7 @@ catkin_src_configure_internal() { |
| 73 |
-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" |
| 74 |
) |
| 75 |
python_export PYTHON_SCRIPTDIR |
| 76 |
- cmake-utils_src_configure |
| 77 |
+ cmake_src_configure |
| 78 |
} |
| 79 |
|
| 80 |
src_configure() { |
| 81 |
@@ -84,17 +81,17 @@ src_configure() { |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
- python_foreach_impl cmake-utils_src_compile |
| 86 |
+ python_foreach_impl cmake_src_compile |
| 87 |
} |
| 88 |
|
| 89 |
src_test() { |
| 90 |
unset PYTHON_SCRIPTDIR |
| 91 |
- python_foreach_impl cmake-utils_src_test |
| 92 |
+ python_foreach_impl cmake_src_test |
| 93 |
} |
| 94 |
|
| 95 |
catkin_src_install_internal() { |
| 96 |
python_export PYTHON_SCRIPTDIR |
| 97 |
- cmake-utils_src_install |
| 98 |
+ cmake_src_install |
| 99 |
if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then |
| 100 |
dodir /usr/bin |
| 101 |
for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do |
| 102 |
|
| 103 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild |
| 104 |
index adf1b136a8c..124af520da9 100644 |
| 105 |
--- a/dev-util/catkin/catkin-9999.ebuild |
| 106 |
+++ b/dev-util/catkin/catkin-9999.ebuild |
| 107 |
@@ -11,7 +11,7 @@ fi |
| 108 |
|
| 109 |
PYTHON_COMPAT=( python{3_6,3_7,3_8} ) |
| 110 |
|
| 111 |
-inherit ${SCM} cmake-utils python-r1 python-utils-r1 |
| 112 |
+inherit ${SCM} cmake python-r1 python-utils-r1 |
| 113 |
|
| 114 |
DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS" |
| 115 |
HOMEPAGE="http://wiki.ros.org/catkin" |
| 116 |
@@ -37,9 +37,7 @@ RDEPEND=" |
| 117 |
" |
| 118 |
DEPEND="${RDEPEND} |
| 119 |
test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )" |
| 120 |
-BDEPEND=" |
| 121 |
- dev-util/cmake |
| 122 |
-" |
| 123 |
+BDEPEND="" |
| 124 |
|
| 125 |
PATCHES=( |
| 126 |
"${FILESDIR}/tests.patch" |
| 127 |
@@ -49,7 +47,6 @@ PATCHES=( |
| 128 |
"${FILESDIR}/catkin_prefix_path_util_py_v2.patch" |
| 129 |
"${FILESDIR}/package_xml.patch" |
| 130 |
"${FILESDIR}/etc.patch" |
| 131 |
- "${FILESDIR}/egginfo.patch" |
| 132 |
) |
| 133 |
|
| 134 |
src_prepare() { |
| 135 |
@@ -61,7 +58,7 @@ src_prepare() { |
| 136 |
-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \ |
| 137 |
-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \ |
| 138 |
cmake/*.cmake || die |
| 139 |
- cmake-utils_src_prepare |
| 140 |
+ cmake_src_prepare |
| 141 |
} |
| 142 |
|
| 143 |
catkin_src_configure_internal() { |
| 144 |
@@ -71,7 +68,7 @@ catkin_src_configure_internal() { |
| 145 |
-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" |
| 146 |
) |
| 147 |
python_export PYTHON_SCRIPTDIR |
| 148 |
- cmake-utils_src_configure |
| 149 |
+ cmake_src_configure |
| 150 |
} |
| 151 |
|
| 152 |
src_configure() { |
| 153 |
@@ -84,17 +81,17 @@ src_configure() { |
| 154 |
} |
| 155 |
|
| 156 |
src_compile() { |
| 157 |
- python_foreach_impl cmake-utils_src_compile |
| 158 |
+ python_foreach_impl cmake_src_compile |
| 159 |
} |
| 160 |
|
| 161 |
src_test() { |
| 162 |
unset PYTHON_SCRIPTDIR |
| 163 |
- python_foreach_impl cmake-utils_src_test |
| 164 |
+ python_foreach_impl cmake_src_test |
| 165 |
} |
| 166 |
|
| 167 |
catkin_src_install_internal() { |
| 168 |
python_export PYTHON_SCRIPTDIR |
| 169 |
- cmake-utils_src_install |
| 170 |
+ cmake_src_install |
| 171 |
if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then |
| 172 |
dodir /usr/bin |
| 173 |
for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do |
Archives