Update!

2 files changed, 90 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f93e5598f7d3..cec9e7fc56d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,33 +7,33 @@ pkgbase = ros-melodic-gazebo-ros
 	license = Apache 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
+	makedepends = ros-melodic-std-srvs
 	makedepends = ros-melodic-tf
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-gazebo-msgs
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-roscpp
 	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-roslib
-	makedepends = ros-melodic-std-srvs
+	makedepends = ros-melodic-cmake-modules
+	makedepends = ros-melodic-dynamic-reconfigure
 	makedepends = ros-melodic-geometry-msgs
+	makedepends = ros-melodic-roslib
 	makedepends = ros-melodic-rosgraph-msgs
-	makedepends = ros-melodic-cmake-modules
 	makedepends = ros-melodic-gazebo-dev
+	makedepends = ros-melodic-roscpp
+	makedepends = ros-melodic-gazebo-msgs
+	makedepends = ros-melodic-std-msgs
 	makedepends = tinyxml
+	depends = ros-melodic-std-srvs
 	depends = ros-melodic-tf
-	depends = ros-melodic-std-msgs
-	depends = ros-melodic-gazebo-msgs
+	depends = ros-melodic-geometry-msgs
 	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-roscpp
 	depends = ros-melodic-roslib
-	depends = ros-melodic-std-srvs
-	depends = ros-melodic-geometry-msgs
 	depends = ros-melodic-rosgraph-msgs
 	depends = ros-melodic-gazebo-dev
+	depends = ros-melodic-roscpp
+	depends = ros-melodic-gazebo-msgs
+	depends = ros-melodic-std-msgs
 	depends = tinyxml
-	depends = python2
-	source = ros-melodic-gazebo-ros-2.8.4-0.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/2.8.4-0.tar.gz
-	sha256sums = fde5c96dfbdfcd8550ae4b731d199348b50955157f0bc114f754c5a55170ca8a
+	depends = python
+	source = ros-melodic-gazebo-ros::git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git
+	sha256sums = SKIP
 
 pkgname = ros-melodic-gazebo-ros
 
diff --git a/PKGBUILD b/PKGBUILD
index 9eea8e90d038..0d28b6a7de95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
+# Script generated with import_catkin_packages.py.
+# For more information: https://github.com/bchretien/arch-ros-stacks.
 pkgdesc="ROS - Provides ROS plugins that offer message and service publishers for interfacing with Gazebo through ROS."
 url='http://gazebosim.org/tutorials?cat=connect_ros'
 
@@ -10,73 +10,88 @@ arch=('any')
 pkgrel=1
 license=('Apache 2.0')
 
-ros_makedepends=(ros-melodic-tf
-  ros-melodic-std-msgs
-  ros-melodic-gazebo-msgs
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-roscpp
-  ros-melodic-catkin
-  ros-melodic-roslib
-  ros-melodic-std-srvs
-  ros-melodic-geometry-msgs
-  ros-melodic-rosgraph-msgs
-  ros-melodic-cmake-modules
-  ros-melodic-gazebo-dev)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]}
-  tinyxml)
+ros_makedepends=(
+	ros-melodic-std-srvs
+	ros-melodic-tf
+	ros-melodic-catkin
+	ros-melodic-cmake-modules
+	ros-melodic-dynamic-reconfigure
+	ros-melodic-geometry-msgs
+	ros-melodic-roslib
+	ros-melodic-rosgraph-msgs
+	ros-melodic-gazebo-dev
+	ros-melodic-roscpp
+	ros-melodic-gazebo-msgs
+	ros-melodic-std-msgs
+)
 
-ros_depends=(ros-melodic-tf
-  ros-melodic-std-msgs
-  ros-melodic-gazebo-msgs
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-roscpp
-  ros-melodic-roslib
-  ros-melodic-std-srvs
-  ros-melodic-geometry-msgs
-  ros-melodic-rosgraph-msgs
-  ros-melodic-gazebo-dev)
-depends=(${ros_depends[@]}
-  tinyxml
-  python2)
+makedepends=(
+	'cmake'
+	'ros-build-tools'
+	${ros_makedepends[@]}
+	tinyxml
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/gazebo_ros/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+ros_depends=(
+	ros-melodic-std-srvs
+	ros-melodic-tf
+	ros-melodic-geometry-msgs
+	ros-melodic-dynamic-reconfigure
+	ros-melodic-roslib
+	ros-melodic-rosgraph-msgs
+	ros-melodic-gazebo-dev
+	ros-melodic-roscpp
+	ros-melodic-gazebo-msgs
+	ros-melodic-std-msgs
+)
 
-# Tarball version (faster download)
-_dir="gazebo_ros_pkgs-release-release-melodic-gazebo_ros-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('fde5c96dfbdfcd8550ae4b731d199348b50955157f0bc114f754c5a55170ca8a')
+depends=(
+	${ros_depends[@]}
+	tinyxml
+	python
+)
+
+_dir=${pkgname}
+source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git")
+sha256sums=('SKIP')
+
+prepare() {
+	cd ${srcdir}/${_dir}
+	git checkout upstream
+	_pkgname=$(echo ${pkgname} | sed 's/ros-lunar-//' | sed 's/-/_/g')
+
+	if [ -d ${_pkgname} ]; then
+		git subtree split -P ${_pkgname} --branch ${_pkgname}
+		git checkout ${_pkgname}
+	fi
+}
 
 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
+	# 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
 
-  # Create build directory
-  [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  cd ${srcdir}/build
+	# 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 2 ${srcdir}/${_dir}
+	# Fix Python2/Python3 conflicts.
+	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
-  # Build project
-  cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
+	# Build the project.
+	cmake ${srcdir}/${_dir} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+		-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
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
+	cd "${srcdir}/build"
+	make DESTDIR="${pkgdir}/" install
 }