From eadcdcfcafccbe934bbc698449e150e45a32eef6 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 28 Dec 2017 18:09:29 +0100 Subject: dev-ros/qt_gui_cpp: add missing := dep on tinyxml2 and console bridge Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild | 34 +++++++++++++++++++++++++++ dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8.ebuild | 32 ------------------------- dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 4 +++- 3 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild delete mode 100644 dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8.ebuild diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild new file mode 100644 index 00000000000..0216c3788c0 --- /dev/null +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" +KEYWORDS="~amd64" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + >=dev-ros/pluginlib-1.9.23 + dev-libs/tinyxml2:= + >=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}] + dev-libs/tinyxml + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] + dev-libs/boost:= + dev-libs/console_bridge:= +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}/libdir.patch" +) diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8.ebuild deleted file mode 100644 index 86bdc7a0140..00000000000 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.8.ebuild +++ /dev/null @@ -1,32 +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/ros-visualization/qt_gui_core" -KEYWORDS="~amd64" -PYTHON_COMPAT=( python2_7 ) -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtwidgets:5 - >=dev-ros/pluginlib-1.9.23 - >=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}] - dev-libs/tinyxml - >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] - dev-libs/boost:= -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}/libdir.patch" -) diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild index 7f9db0b2c98..0216c3788c0 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -19,10 +19,12 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 + dev-libs/tinyxml2:= >=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] dev-libs/boost:= + dev-libs/console_bridge:= " DEPEND="${RDEPEND} virtual/pkgconfig -- cgit v1.2.1