gentoo resync : 25.08.2020

4 files changed, 7 insertions, 56 deletions

diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index acdd00cc93e9..9917d119a24d 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,8 +1,4 @@
 AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2017.2.7.tar.gz 460082 BLAKE2B 3274be8d0ed28f996d1cb521bdca63c3671b913ef9fb3c4aed98c76a040d2eab719a48da6eea042b7dc59322c05c3a8fe4d193236e49c75d0fc90c8fd2b39501 SHA512 07c21a4d80f1d67657cc824bbd46279620008374af48dfa92547e6373cee5a48509fabf269b55911bdb1d63660c5581cb362b7ea469f0ca00317e5d32084b73c
-DIST mavlink-gbp-release-2017.5.5.tar.gz 3943384 BLAKE2B 839ec17ad02b880b392a50a3171da2f8fc6159830ccfa6f383c5535f00599f094a4ee277d3e860bb430462e4df94fc749421ef34989056589676b360f7356165 SHA512 8c4a746187ee3c18cb9f236d77e942fb96ee8fc4ad561f0391290a9113cf0cb018f13916e67030a8ca60bfbc163cb54315747f78230057bc41154afe62c66859
-DIST mavlink-gbp-release-2019.11.11.tar.gz 4101019 BLAKE2B aa2e09fab46d82bbe463b637bc02551ba512c011892663ecc7e187070f2591ec7f7aa249d1b294fadbea86c82a8f02a3a3219e16662f92508c399fd9251df391 SHA512 112a6c0055c68eaaa289237a3d94b89a632ccbe22344a1e923e3ded2273fb32a54515febba8a9e97590af10402cec3e414f286c012ed7605ced98822509eedad
-EBUILD mavlink-gbp-release-2017.2.7-r1.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
-EBUILD mavlink-gbp-release-2017.5.5.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
-EBUILD mavlink-gbp-release-2019.11.11.ebuild 573 BLAKE2B d5d788a838d60fed8a941509a923d7a34e388bdf9a3df6aa536e7b9bf47d6920a646db08f168530684ee2e2fe343d7b48773ef0b21c418bd63dbb26b02215c8a SHA512 8c1d6792aa4ffd6ec0b3d532dd33d8d9e9350cccb2d4df5656b58d173cf4ad38ff78deb46e4b0dd00ab6bdc4957f2c762cc5cbef5a89e95a450cabb7f6e0cd3a
+DIST mavlink-gbp-release-2020.7.7.tar.gz 4130271 BLAKE2B e9e6759da3734fe918e1c9441ca823a62d8629f08e3b049a1817103ddd7dca14098f69842b4d38f3fda991f7c9020e9cde84315eb1c8b47ae9785c7c26957420 SHA512 bd23f9f4cfba941ef928e79d5c26d6c310189eefbd1c29f019b688c5d2a07cccf1bcf6212d516cccff28fdcfbc3cff0f585eb5e7640fc011eab252e0222cee46
+EBUILD mavlink-gbp-release-2020.7.7-r1.ebuild 563 BLAKE2B 75b26d4d4d13d45a52cb31a6603a84679093b32b6161d3d03009ea8057a773edd0bcb18ec4d6d21681bf45d793e8d7f7bcff965f9d27829f258fa660e8cfae73 SHA512 36b7e697a6db198c8477a4997d51361c4d5fa3deb826907ab61239c373efdfe0249e0a5d3a1f4c17277e3ebfca739d7788dadf6ca93adb6a36ea9cc5397ceb9a
 MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
deleted file mode 100644
index de8d9845ba24..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/kinetic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/kinetic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
deleted file mode 100644
index de8d9845ba24..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/kinetic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/kinetic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
-PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild
index a8c6412274a2..86036c60a87e 100644
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7-r1.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/melodic/mavlink/
+EGIT_BRANCH="release/noetic/mavlink"
+VER_PREFIX="${EGIT_BRANCH}/"
 VER_SUFFIX=-${PV#*_p}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-EGIT_BRANCH="release/melodic/mavlink"
 DESCRIPTION="MAVLink message marshaling library"
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+RDEPEND="$(python_gen_cond_dep "dev-python/future[\${PYTHON_USEDEP}]")"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
 PATCHES=( "${FILESDIR}/gentoo.patch" )