Merge updates from master

6 files changed, 69 insertions, 98 deletions

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index d29835dd047c..616ee6ecf8b9 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,2 +1 @@
-DIST tin-2.2.1.tar.xz 1378384 BLAKE2B d68157e778f272c55cb3021987beddb27e89bd31d39e985b16e51a4aa942cb59abcc6ada46611c69320e785506085210a0451227091964866b4130e99c5f1ac5 SHA512 2c5b4b50be38c168404ba55c9429355c0dd2232c580116086fa9ea24a8907ad2d71d91b2d1c533bf7ff4d24fd1946d5ba61bc0833b20d5383e013e2f18c10bbd
 DIST tin-2.4.2.tar.xz 1491388 BLAKE2B 16fab433443d5859cc9661790ff837e8f45767e7f45bafc54a8cffc94fd52cb4ee7afb98e579db49c16148b0f521374404a0f26d75a07a24c1c7a1dc5e3a57fe SHA512 70a9957d5bf5af1bb182a3f4e62795cd5862b7282b7fc0c231c3bd02d83950cdbdd502d8a2cc5eae20b29af584e4f794f03378742b47ed93fc5c61ac5bbb01b6
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 2b3330cd1660..ca0ce1646b9b 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -4,8 +4,6 @@
 <!-- maintainer-needed -->
 <use>
 <flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
-<flag name="evil">Let tin generate a message ID</flag>
-<flag name="forgery">Cancel messages posted from a different account</flag>
 <flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
 <flag name="etiquette">Enable the display off posting etiquettes</flag>
 </use>
diff --git a/net-nntp/tin/tin-2.2.1.ebuild b/net-nntp/tin/tin-2.2.1.ebuild
deleted file mode 100644
index ebf4f25d29b5..000000000000
--- a/net-nntp/tin/tin-2.2.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs versionator
-
-TIN_PV=$(get_version_component_range 1-2)
-DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
-HOMEPAGE="http://www.tin.org/"
-SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/v${TIN_PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug doc +etiquette evil forgery gpg idn ipv6 mime nls sasl socks5 spell unicode"
-
-RDEPEND="
-	dev-libs/libpcre
-	dev-libs/uulib
-	gpg? ( app-crypt/gnupg )
-	idn? ( net-dns/libidn )
-	mime? ( net-mail/metamail )
-	net-misc/urlview
-	nls? ( sys-devel/gettext )
-	sasl? ( virtual/gsasl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses[unicode?]
-	unicode? ( dev-libs/icu:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i src/Makefile.in -e 's| -s | |g' || die
-	sed -i configure -e '/CFLAGS/s|-g||g' || die
-}
-
-src_configure() {
-	if use evil || use cancel-locks; then
-		sed -i -e"s/# -DEVIL_INSIDE/-DEVIL_INSIDE/" src/Makefile.in
-	fi
-
-	if use forgery
-	then
-		sed -i -e"s/^CPPFLAGS.*/& -DFORGERY/" src/Makefile.in
-	fi
-
-	local screen="ncurses"
-	use unicode && screen="ncursesw"
-
-	tc-export AR CC RANLIB
-
-	econf \
-		$(use_enable cancel-locks) \
-		$(use_enable debug) \
-		$(use_enable etiquette) \
-		$(use_enable gpg pgp-gpg) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with mime metamail /usr) \
-		$(use_with socks5 socks) $(use_with socks5) \
-		$(use_with spell ispell /usr) \
-		--disable-mime-strict-charset \
-		--enable-echo \
-		--enable-nntp-only \
-		--enable-prototypes \
-		--with-coffee  \
-		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
-		--with-pcre=/usr \
-		--with-screen=${screen}
-}
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	default
-
-	# File collision?
-	rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
-
-	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
-	use doc && dodoc doc/{*.sample,*.txt}
-
-	insinto /etc/tin
-	doins doc/tin.defaults
-}
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 31fd120425c5..ba13fcf93e24 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1 +1,2 @@
 DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f
+DIST rtabmap-0.17.1.tar.gz 19632117 BLAKE2B 6e2bd929da4148856317f0b03197e541223d59810397fc5d282b04ace5af796028cd8cde850d89fb2f3f289ed11d155a5163132edd7e65e2bc8a1bad1d09c54a SHA512 6714d245b87012cb0432b677c87b17e3bc182df2025203f0bd63b1f4ab06d03d795de4792d3cc4fe6d1ca4db40852c15350fed3c3a6e27176ea5e764a9816cd2
diff --git a/sci-libs/rtabmap/rtabmap-0.17.1.ebuild b/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
new file mode 100644
index 000000000000..9bbe6d06b163
--- /dev/null
+++ b/sci-libs/rtabmap/rtabmap-0.17.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
+fi
+
+inherit ${SCM} cmake-utils multilib
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-melodic.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-melodic"
+fi
+
+DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
+HOMEPAGE="http://introlab.github.io/rtabmap/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples ieee1394 openni2 qt5"
+
+RDEPEND="
+	media-libs/opencv:=[qt5(-)?]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
+	sci-libs/vtk:=[qt5(-)?]
+	sys-libs/zlib
+	sci-libs/octomap:=
+	dev-libs/boost:=
+	ieee1394? ( media-libs/libdc1394 )
+	openni2? ( dev-libs/OpenNI2 )
+	qt5? (
+		dev-qt/qtwidgets:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DWITH_QT=$(usex qt5 ON OFF)"
+		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
+		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# Needed since we force ros crawling to be done only in
+	# /usr/share/ros_packages/
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+}
diff --git a/sci-libs/rtabmap/rtabmap-9999.ebuild b/sci-libs/rtabmap/rtabmap-9999.ebuild
index ec181ba72d33..9bbe6d06b163 100644
--- a/sci-libs/rtabmap/rtabmap-9999.ebuild
+++ b/sci-libs/rtabmap/rtabmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,8 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}-melodic.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${P}-melodic"
 fi
 
 DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
@@ -27,7 +28,7 @@ IUSE="examples ieee1394 openni2 qt5"
 
 RDEPEND="
 	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk]
+	sci-libs/pcl:=[openni,vtk,qt5(-)?]
 	sci-libs/vtk:=[qt5(-)?]
 	sys-libs/zlib
 	sci-libs/octomap:=