Update to noetic and 1.8.5

2 files changed, 22 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46919c842de5..8fd7ba7c15ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
-pkgbase = ros-melodic-bond
+pkgbase = ros-noetic-bond
 	pkgdesc = ROS - A bond allows two processes, A and B, to know when the other has terminated, either cleanly or by crashing.
-	pkgver = 1.8.3
-	pkgrel = 2
+	pkgver = 1.8.5
+	pkgrel = 1
 	url = https://www.wiki.ros.org/bond
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-std-msgs
-	source = ros-melodic-bond-1.8.3.tar.gz::https://github.com/ros/bond_core/archive/1.8.3.tar.gz
-	sha256sums = 9f2bd791abc0356f47235db7e2b042479e6a091cf2cd969d0918a8e0c76b632d
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-std-msgs
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-std-msgs
+	source = ros-noetic-bond-1.8.5.tar.gz::https://github.com/ros/bond_core/archive/1.8.5.tar.gz
+	sha256sums = 19e683f3c1ce7ec442e0e46708cdf7bbbb48c2a14ca4cbca858609fc1be931c5
 
-pkgname = ros-melodic-bond
+pkgname = ros-noetic-bond
 
diff --git a/PKGBUILD b/PKGBUILD
index 4cd4e48f85ac..60a861c4c91b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@
 pkgdesc="ROS - A bond allows two processes, A and B, to know when the other has terminated, either cleanly or by crashing."
 url='https://www.wiki.ros.org/bond'
 
-pkgname='ros-melodic-bond'
-pkgver='1.8.3'
+pkgname='ros-noetic-bond'
+pkgver='1.8.5'
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-message-generation
-	ros-melodic-std-msgs
-	ros-melodic-catkin
+	ros-noetic-message-generation
+	ros-noetic-std-msgs
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -22,8 +22,8 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-message-runtime
-	ros-melodic-std-msgs
+	ros-noetic-message-runtime
+	ros-noetic-std-msgs
 )
 
 depends=(
@@ -32,29 +32,23 @@ depends=(
 
 _dir="bond_core-${pkgver}/bond"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/bond_core/archive/${pkgver}.tar.gz")
-sha256sums=('9f2bd791abc0356f47235db7e2b042479e6a091cf2cd969d0918a8e0c76b632d')
+sha256sums=('19e683f3c1ce7ec442e0e46708cdf7bbbb48c2a14ca4cbca858609fc1be931c5')
 
 build() {
 	# Use ROS environment variables.
 	source /usr/share/ros-build-tools/clear-ros-env.sh
-	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
 	# Create the build directory.
 	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
 	cd ${srcdir}/build
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-		-DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-		-DPYTHON_BASENAME=.cpython-37m \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }