5 files changed, 47 insertions, 72 deletions
diff --git a/dev-util/catkin/catkin-0.8.8.ebuild b/dev-util/catkin/catkin-0.8.8-r1.ebuild
index 9beef5a6357f..ba684b880877 100644
--- a/dev-util/catkin/catkin-0.8.8.ebuild
+++ b/dev-util/catkin/catkin-0.8.8-r1.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/gtest.patch"
 )
 
 src_prepare() {
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 9beef5a6357f..ba684b880877 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/gtest.patch"
 )
 
 src_prepare() {
diff --git a/dev-util/catkin/files/gtest.patch b/dev-util/catkin/files/gtest.patch
new file mode 100644
index 000000000000..106b7e2886e8
--- /dev/null
+++ b/dev-util/catkin/files/gtest.patch
@@ -0,0 +1,45 @@
+From d9302318dece61acd0caa27d56f3817838f8f333 Mon Sep 17 00:00:00 2001
+From: seanyen <seanyen@microsoft.com>
+Date: Thu, 6 Aug 2020 18:59:07 -0700
+Subject: [PATCH] Adding the new GTest search logic for Vcpkg.
+
+---
+ cmake/test/gtest.cmake | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+Index: catkin-0.8.8/cmake/test/gtest.cmake
+===================================================================
+--- catkin-0.8.8.orig/cmake/test/gtest.cmake
++++ catkin-0.8.8/cmake/test/gtest.cmake
+@@ -337,6 +337,31 @@ if(TARGET gtest AND TARGET gtest_main AN
+     set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
+   endif()
+ else()
++  # attempt to find the modern GTest config.
++  find_package(GTest 1.8.1 QUIET CONFIG)
++  if(GTest_FOUND AND TARGET GTest::gtest AND TARGET GTest::gtest_main)
++    set(GTEST_FOUND TRUE)
++    add_library(gtest ALIAS GTest::gtest)
++    add_library(gtest_main ALIAS GTest::gtest_main)
++    set(GTEST_INCLUDE_DIRS)
++    set(GTEST_LIBRARY_DIRS)
++    set(GTEST_LIBRARIES gtest)
++    set(GTEST_MAIN_LIBRARIES gtest_main)
++    set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES})
++  endif()
++  if(GTest_FOUND AND TARGET GTest::gmock AND TARGET GTest::gmock_main)
++    set(GMOCK_FOUND TRUE)
++    add_library(gmock ALIAS GTest::gmock)
++    add_library(gmock_main ALIAS GTest::gmock_main)
++    set(GMOCK_INCLUDE_DIRS)
++    set(GMOCK_LIBRARY_DIRS)
++    set(GMOCK_LIBRARIES gmock)
++    set(GMOCK_MAIN_LIBRARIES gmock_main)
++    set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
++  endif()
++endif()
++
++if(NOT GTEST_FOUND)
+   find_package(GTest QUIET)
+ endif()
+ if(NOT GMOCK_FOUND OR NOT GTEST_FOUND)
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 6c6c8fdeb905..e7ce25efd74d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1 @@
-DIST diffoscope-154.tar.gz 1571220 BLAKE2B 84b7a282180b4f8d3b374dac8e3514b3bb7d3fda3b40db757dad98e011112174da27a35243bd9b23f2b905ea59dc8c9a85d9cef6d436d9c705ca57b379dfb7b4 SHA512 f3a21deb9542c7ec7fc9929685d57ef97739d86f8e5227e212aaf3984a53df88f3224b2f4ba6254fde76f1858cbae83fea138e3c914a47625a62c6e6607ed28f
 DIST diffoscope-155.tar.gz 1571389 BLAKE2B 320f352d6d0dcdf231ac246188f698eacbf08bc3b3194e28c09e5e38a143e0718408309483087d81a57a9f5810aadd545caa8cb32390441f1f5b79f7639a768d SHA512 785e08aa9b2420d0e1fed63804c199b198344d991f04ebb402e18de45f8154ea7bf68a2e4b1551744600f5e99f750e798b89c5cc2fad09d56a8b018b0559c2ee
diff --git a/dev-util/diffoscope/diffoscope-154.ebuild b/dev-util/diffoscope/diffoscope-154.ebuild
deleted file mode 100644
index 89af8c5865e2..000000000000
--- a/dev-util/diffoscope/diffoscope-154.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"