Update to 3.0.0 and noetic

2 files changed, 16 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef36eb53a380..8a81565e4bb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
-pkgbase = ros-melodic-geneus
+pkgbase = ros-noetic-geneus
 	pkgdesc = ROS - EusLisp ROS message and service generators.
-	pkgver = 2.2.6
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = https://wiki.ros.org/geneus
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-genmsg
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-genmsg
-	source = ros-melodic-geneus-2.2.6.tar.gz::https://github.com/jsk-ros-pkg/geneus/archive/2.2.6.tar.gz
-	sha256sums = 82837e184338f14024a78aac5cac700d5de8a935d3de2d3ac41bd9e4213cec45
+	makedepends = ros-noetic-genmsg
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-genmsg
+	source = ros-noetic-geneus-3.0.0.tar.gz::https://github.com/jsk-ros-pkg/geneus/archive/3.0.0.tar.gz
+	sha256sums = 1a5b418d217c35c67db7f779642863f81637f9d6a396f491fee24b8074555f89
 
-pkgname = ros-melodic-geneus
+pkgname = ros-noetic-geneus
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ffa63a72840..59fbb5a86316 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,16 @@
 pkgdesc="ROS - EusLisp ROS message and service generators."
 url='https://wiki.ros.org/geneus'
 
-pkgname='ros-melodic-geneus'
-pkgver='2.2.6'
+pkgname='ros-noetic-geneus'
+pkgver='3.0.0'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-	ros-melodic-genmsg
-	ros-melodic-catkin
+	ros-noetic-genmsg
+	ros-noetic-catkin
 )
 
 makedepends=(
@@ -22,7 +22,7 @@ makedepends=(
 )
 
 ros_depends=(
-	ros-melodic-genmsg
+	ros-noetic-genmsg
 )
 
 depends=(
@@ -31,29 +31,23 @@ depends=(
 
 _dir="geneus-${pkgver}"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/jsk-ros-pkg/geneus/archive/${pkgver}.tar.gz")
-sha256sums=('82837e184338f14024a78aac5cac700d5de8a935d3de2d3ac41bd9e4213cec45')
+sha256sums=('1a5b418d217c35c67db7f779642863f81637f9d6a396f491fee24b8074555f89')
 
 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
 }