gentoo resync : 30.06.2019

14 files changed, 188 insertions, 23 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 394d256dec28..f5013bec0304 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index 7adf0c29d123..aa90259a4395 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,5 +1,5 @@
 DIST atkmm-2.24.2.tar.xz 849784 BLAKE2B 2cd96268cf727de1ebe83428e98f1d21f8dbd1a72ef01be80ec28d169ff0ae9ac375bbbd1a530f3c47b60b49a40e317fe39645d74f6be3c017edcb9735bc0236 SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
 DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc
 EBUILD atkmm-2.24.2.ebuild 852 BLAKE2B 26f9d3d5ded68cb0da224ed19cb04771bc148d29b4dc312da97bd2e5c133f90efe086bbe12626b844120a13f131a7c85478e07c90aa292b8c92667e269475ed1 SHA512 17fcb05ffaf5b624a7157b7e08c918818785a05c99a9c8cb76a5128e68d53d197c517a9f93309f17e98562536207c558bb5c72f7cc5984b202bb9dd5e98601db
-EBUILD atkmm-2.28.0.ebuild 835 BLAKE2B 2e3c6a5e470f32ab0fee621c463fd79408a5afc67000d2f8a3b6baf94fbedb62a7b27de1dce712c928abd941e84fe38709f6e0d71dc2dac9f4d4ea2e47cdc214 SHA512 3c00b9a4c32259598cf7b5f2d2756a7e4d9d68b4a666b368c28fd40396bde8d4a19c60bcfb1c2979b73aac6be4daefa837fdf9487c77cdfcba9609f93fbcf3ce
+EBUILD atkmm-2.28.0.ebuild 834 BLAKE2B 80fa4d32a8543d1f97bc42dd74151414843be6af37f264f0dc487da6defd662c2853dca1ba00bfd7c9e5242e821ae208d712eb7cdf809230e9dabe1c56846da3 SHA512 e4d6b4a3669a4a847ddf54c75b2ce42612d340574c35041f9f992c941e126696e7198228f46d17faeb79e738441f5b6d91aca0ea939bd81bdfbc84cd8f878a1b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 7231760dccb2..5ecf570c6077 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/commoncpp2/Manifest b/dev-cpp/commoncpp2/Manifest
index 17911339e7a9..1c37a50dd8a0 100644
--- a/dev-cpp/commoncpp2/Manifest
+++ b/dev-cpp/commoncpp2/Manifest
@@ -3,10 +3,11 @@ AUX 1.8.1-autoconf-update.patch 1735 BLAKE2B 8c33d1fb88b3a186e59581f19d97aa2315a
 AUX 1.8.1-configure_detect_netfilter.patch 641 BLAKE2B edc5958760633efef678aa0d64cb4d054bb3968f56590ea3e9a0674fa2e01bddc3f6b78622c940072f2ca7843e47d0b6594aced3afc235cef9bca7c940d7205d SHA512 d4c3af631ab0ef37cb5943cd17ba6481e229af3537e73769f13ed6fe45e2671a9e9ee8f14f2243e95fd8b17d4a8dbb2c7945a5de9e4ce3f29e842779c55d0ea0
 AUX 1.8.1-fix-buffer-overflow.patch 442 BLAKE2B bfc345bc3d2df77a48e9b35b6462221fab11cd7ba2589f076b83284a5a24a60f6978f8338c287058bdb747bd58ff08cb6dc825250a005ead327c74f58f39d3b4 SHA512 4c3cece95f4a32ee2b37b37f84462aeda43c2d25c2eb5cfaf4bfbbe2bdc2d7db7c2ead2f6150bb108ea124fc29c277371d1d0f415a6b26df98f515d910cb3e8b
 AUX 1.8.1-fix-c++14.patch 1220 BLAKE2B 10df79cc01b26b5df35ede979743cc2d18598fb47d2d83a30b5b0d11264495965d3af7f84ba6e28e4219cae0742b5293ec2f8c60870cf9a7585e7b999fab2e11 SHA512 222c21e7b0b4e035ec3a36edb5b9e68d345550781f21a8c075835bf6f27ee46f62469a17f4cec3c1c1bb69741661dbcc7071c51c964006201ed8c3ff48a60c80
+AUX 1.8.1-fix-gcc9.patch 1222 BLAKE2B d5f93bb1f34ef563d6cf88007f859891e49a8e5bb561a9f702346407c1b3e6bd3fa535b6d0c3ceaefb6b50ef094aa2e91895565b893b453e774de8cc62fa5843 SHA512 b8c2b4a530418bedfa73b89fe8b4e659e38141ca9f4998d4f5217cfc05355263408e7ec2f726e5f8e8283165725c38c454ce92dd8d3cdf920858d70e63070199
 AUX 1.8.1-gnutls-3.4.patch 1229 BLAKE2B a4936cce4fff5a7935c2bd077add555fa8d9b229afaaec545e78c1f6a7d34f35f7168c2381183ceaf4fd56bd1318a9505305ae59e77c87d9813f485e1aa6936d SHA512 92db4deba0ae612fda5873224641d35d5637a48d553d0afee7749c5477ca19a62640656d4781d101db5b545ddd962ce7c11a6edf33d128b031cafebf3cf6db77
 AUX 1.8.1-libgcrypt.patch 1054 BLAKE2B fc96efbbc132972035ca9622cd21427e8d662a3ee3aa3972690305ca14da04d7665b17d33f4b9d16e5128575ee4d378e031b57cc579d777845fc65c3cbab4abe SHA512 76f444739b370681d1b619b78cc77867da197f149c19d036d9d8b430a7a59d697c7ab30529582c308f77bc584a003dc0701d8c06003329589ade652babe5edd2
 AUX 1.8.1-libressl.patch 427 BLAKE2B 2943df26ccd7401b845200ab263a531dbeacab4bfd6a280b0597191b391d45e218946fc5cf1e5230bd066b30270b6fd5f9d2e78e26472598ddedb4eb81827417 SHA512 9ef9a53cc4eb60e72a0049e7b3012df487ca3383c2a1908998df04dd37743125057614a235f9995c3840ade4bd96c19f13e1fa2c726b44c9a0f4fdbcb707a874
 AUX 1.8.1-parallel-build.patch 261 BLAKE2B 71e639f976d1c1893f7e3285cecda841f4c90b1c2a153edda527c47804df8821a14a3c340544a9e0860fb4047af2772f036c0e10380b4025b4538e40082046b2 SHA512 e06ca32ffd811897859ef7bf06f3b7998eaa56c7fcbb01f971ec32b6e75c4242e3a2ed5a1bdaa28c02bae08bfbb386d65ebed3e50e2de759d056f085f1f49c1f
 DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe
-EBUILD commoncpp2-1.8.1-r4.ebuild 1628 BLAKE2B f66de5ac8273b9a35a70925123d1d9454f37eabe81c3c00d1dd93a68e94b6ab0f749be3ae3014ffe8c8ead6db9b50e80fa73081564a0b880e82ea9517c448f71 SHA512 b8c6c63d6ab22730f21a3c0141a518489160f55700d96638e26725266058a949f0a5d72c013eeeda776aa932530dc3845ad841af7e0bea19a110039e7e4a1d54
+EBUILD commoncpp2-1.8.1-r4.ebuild 1650 BLAKE2B 632f5f153cceed58a850675a0a6c74959435cc657204966052fdd9f1424bc90fb90b42474ea75d17f5f1b4c1d6858741c58f8a4e8ea598e05ee7027971be2dec SHA512 4c871d508b722beef2df44c2f29f42988ae487f360b1a7206f58f32313d37dac1e6101b4141ae9c0e2cba925af5d219899816820cb025d73cffbe58a02e0fecd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
index 6f8faaf756bf..d8c63727a4e3 100644
--- a/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
+++ b/dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="C++ library offering portable support for system-related services"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/commoncpp/"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="debug doc examples gnutls ipv6 libressl ssl static-libs"
 
 RDEPEND="
-	sys-libs/zlib
+	sys-libs/zlib:=
 	ssl? (
 		gnutls? (
 			dev-libs/libgcrypt:0=
@@ -28,8 +29,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.3.6 )"
 
-HTML_DOCS=()
-
 PATCHES=(
 	"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
 	"${FILESDIR}/1.8.0-glibc212.patch"
@@ -40,31 +39,29 @@ PATCHES=(
 	"${FILESDIR}/1.8.1-fix-c++14.patch"
 	"${FILESDIR}/1.8.1-gnutls-3.4.patch"
 	"${FILESDIR}/1.8.1-libressl.patch" # bug 674416
+	"${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012
 )
 
-pkg_setup() {
-	use doc && HTML_DOCS+=( doc/html/. )
-}
-
 src_prepare() {
 	default
 	eautoreconf
 }
 
 src_configure() {
-	use ssl && local myconf=( $(usex gnutls '--with-gnutls' '--with-openssl') )
-
 	econf \
 		$(use_enable debug) \
 		$(use_with ipv6) \
+		$(use_with ssl $(usex gnutls gnutls openssl)) \
 		$(use_enable static-libs static) \
-		$(use_with doc doxygen) \
-		"${myconf[@]}"
+		$(use_with doc doxygen)
 }
 
-src_install () {
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
 	default
-	prune_libtool_files
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 
 	dodoc COPYING.addendum
 
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
new file mode 100644
index 000000000000..795e44178c64
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-fix-gcc9.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/686012
+In file included from ../inc/cc++/thread.h:50,
+                 from thread.cpp:41:
+../inc/cc++/string.h:734:35: error: friend declaration of ‘std::istream& getline(std::istream&, ost::String&, char, size_t)’ specifies default arguments and isn’t a definition [-fpermissive]
+  734 |     friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
+      |                                   ^~~~~~~
+
+--- a/inc/cc++/string.h
++++ b/inc/cc++/string.h
+@@ -58,6 +58,9 @@
+ 
+ class MemPager;
+ 
++class String;
++__EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
++
+ /**
+  * This is a generic and portable string class.  It uses optimized
+  * memory allocation strategies to efficiently handle smaller string
+@@ -731,7 +734,7 @@
+      * @param delim deliminator to use.
+      * @param size optional size limitor.
+      */
+-    friend __EXPORT std::istream &getline(std::istream &is, String &str, char delim = '\n', size_t size = 0);
++    friend std::istream &getline(std::istream &is, String &str, char delim, size_t size);
+ 
+     /**
+      * Stream the content of our string variable directly to a C++
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index cc3d1fa908cd..d08d4d3c8a9b 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,5 +1,5 @@
 DIST glibmm-2.56.1.tar.xz 6841240 BLAKE2B db0e1402f322fd31138cf4db2fc2fabb6fb9896f226f98bd524fe005f0e3412f6973774571b7ec79a9e3c79f6622b0969a55dc91631cc996906dd1e558ad4fe8 SHA512 fd5ad19c5dcba484573520e1d00b5bbb600ee805ab8cd9c0d985880cc1bcbe67ad31fa9f2b5789b5892eddd6be345e3f308593e5ef021e1cfda132e4235fb735
 DIST glibmm-2.58.1.tar.xz 6778632 BLAKE2B e51e43cb9361147627c2ffc4c232bd8b15d935cc3a20a4fa8d98f5be9c45f7dd635aab69177d033cf65a6e39cee53bcc723be56cc8db966e88b00b5f9cb1f29a SHA512 c1a67412e6de3853557318cd921e6e73874a14ffd3cb51fc158b0d45fb1d5c2560e011b3b0be7f8cf8afee13952e824625d832e5237288b974c2ba20a6f042cb
 EBUILD glibmm-2.56.1.ebuild 1633 BLAKE2B 18f75726ccc969a8985bc2b04ef257277fb4eb7bde203030e09f3eba1f1a25d96a5d2a4318346c176b9a54c62a00ffadf4f045987f89f4d8cc448677c56311a2 SHA512 0827bac28286463c413d8bce0f25420e467c47f49771ca414fa5f12c357daf420a49c763ad2265ba14ba66a051387990d5f06d9fe6e9c757a1c9325f84c6c496
-EBUILD glibmm-2.58.1.ebuild 1638 BLAKE2B 63f97416592cbb862ea369ffce456129c9c1e54238efe078f34cc926f6f8adab30a0d08264df76408e20053c1cd95411be4f336d09a8131882e64f538ec80ea0 SHA512 68dfe970c6160d19fe950c2a1c29c347a6b32097d8427e9763c9744e876f04698351766e44276895bd0d95b21cdfe783b4d5ab6e8c8c79c524331f29b25a1b05
+EBUILD glibmm-2.58.1.ebuild 1637 BLAKE2B 7ba8ee96ee80e15af59b6cf4727996e3c765854f56b721487d38799a0201be4bd9faa07524a3296390c26e29c778004b613a4dfc4a9ee625bd03da2c5ead612a SHA512 65458bdc69f78fa0fe9cc8964454ff324ee0a87f628ced40993be60919619f1c82a9b24ba9b55bb44795206b2994c5d89ed97914758197cee432d0df9da09c6a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.58.1.ebuild b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
index 6c4bf79012f8..a9f305840f00 100644
--- a/dev-cpp/glibmm/glibmm-2.58.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.58.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index f255f1bf5d0a..2ab6a0afcde6 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -3,5 +3,5 @@ DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc8
 DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
 EBUILD gtkmm-2.24.5.ebuild 1539 BLAKE2B bcde9c3cabad5325df0293ea9bd8dafaa68245222b0cd8e378b41bbfb7d026265a1f3dbdab7120cf6d43d7108917be08556b4958aa9623cefbd99da321c7c435 SHA512 0333f5d68fd5d7f5d14c8e7c765b5b9723d2842068751be364d8b7e52ebc8ddb22afb77f846236ac92a48918674ad0da713f277f20e8dbec398d91038f97bda2
 EBUILD gtkmm-3.24.0.ebuild 1827 BLAKE2B 5f4d0c994812f59a60e75ee4d10b181be8a439079c5bdb076da907b942d964d027262e637b704497155d0baa002553aa47d1dcee5ff43c13d521c62b0e47ea21 SHA512 1d27ebed4aa2f6cf4f74b20042f507f816d97b3b0813bb62e20996f388434cb4b51cc733b67241eddd742fb16c73398ef266c16a283319c018cf1e7addf87182
-EBUILD gtkmm-3.24.1.ebuild 1831 BLAKE2B 903b736d1ef33b24d83f3efc00c1ad312a59e2ce0ed41caa133206827025b8c102f81d939bf3d47c063b7baca2b21caf1b6ba82956f8f162b70264850e434ce2 SHA512 4587c6fd98425d13f2f0add2618a08876c378cc40fc37d0b8081d870dfaa5c28a649f26787e82062df99a6ed3fb28b4f480e5be9809e55b6b14db04185ca65be
+EBUILD gtkmm-3.24.1.ebuild 1830 BLAKE2B ab1298dc6f689bf6a4b48a7da62b7126b37d6c6bf2b1b47be4d968cd95a174277db493f561188343fc38cb4945d80fcc5077eb905d7171db77d070e63969db6d SHA512 26a9e653ea101154cb807b1472c4dcc9ab6915681738be7dce1211c80ebe2c9aa1d546f168fe9238d63385785f4fed2513e2fb88a4fdc4a295d698646fd9fec4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
index 017eae5402f1..0efe1f3ab76b 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index a9b3bfceb050..58c824c7f5a5 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -1,5 +1,6 @@
 DIST nlohmann_json-3.5.0.tar.gz 114796008 BLAKE2B 94caa0374be1d38230cb13b8cd9deb3da04e4b81d361ce6baf54c1bad231945a94df74683a31660dc98413dbf23ea7596c6ed1da9cda9e02add7d7c6568973e3 SHA512 e2874e10e12070e8e1b9c01f41ce24002a3859c4aca8bf46083ea08e68f44ed6725bdcdf8e592b1e50d69975d506836c62a8e10fc6da00f0844c149dd6676996
 DIST nlohmann_json-3.6.1.tar.gz 118862808 BLAKE2B 257508b33480741bd4438fe928869c0744a5e84806fa4e068b048bfc0e665802a45f31bc740c14f74e7a0384df18b9bba58a0e001750b1a800ea00cd1712b280 SHA512 e0565ccdee34e89a6836a97f039c04a0bac445b44f6f323918ea424b34e4577688a4f4f72d5ef1ec0b53d159bfe87e8e9c97b70ef98231ea463f59f05e16eb2a
 EBUILD nlohmann_json-3.5.0.ebuild 642 BLAKE2B 6febe4e494834b7b050fcb4bfe2556b364dd2ef0d61bf2f83d837ec8a30bef517c80e67d1676e2b65957debf642fd2da5e8fdbeeaf16159149d8a96fef4fb165 SHA512 649bd0a762be3b89acfbcba0c49c683f5ac8a5ed4d07180033930ed7446d48a989781d2b2d5a2671bcaf7be02e5ff4e562d0186bd1c4d2b4c40a8b6a78993e99
+EBUILD nlohmann_json-3.6.1-r1.ebuild 799 BLAKE2B 894500c6780bc4a1942a71223041c169b9ec77b4923d165c774980c44383c4ba544bbdde94a5c5ef1e1031247273ddf6c25d55d8a3bfbc4acd76c5381c22627f SHA512 e8f4373087c0f348605c5ccbbc27886ea552aaea4700930c7faf4521c0e01980c4dc77108c1a8eab8e4906a0f039cd6858d592519b1e5c61b78ba3836fada3e0
 EBUILD nlohmann_json-3.6.1.ebuild 642 BLAKE2B 6febe4e494834b7b050fcb4bfe2556b364dd2ef0d61bf2f83d837ec8a30bef517c80e67d1676e2b65957debf642fd2da5e8fdbeeaf16159149d8a96fef4fb165 SHA512 649bd0a762be3b89acfbcba0c49c683f5ac8a5ed4d07180033930ed7446d48a989781d2b2d5a2671bcaf7be02e5ff4e562d0186bd1c4d2b4c40a8b6a78993e99
 MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..13acfc9d9c82
--- /dev/null
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.6.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="JSON for Modern C++"
+HOMEPAGE="https://github.com/nlohmann/json https://nlohmann.github.io/json/"
+SRC_URI="https://github.com/nlohmann/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+DOCS=( ChangeLog.md README.md )
+
+S=${WORKDIR}/json-${PV}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJSON_BuildTests=$(usex test)
+		-DJSON_MultipleHeaders=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && emake -C doc
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dodoc -r doc/html
+}
diff --git a/dev-cpp/sourcetrail/Manifest b/dev-cpp/sourcetrail/Manifest
index c0039149d839..106c7f4ca47e 100644
--- a/dev-cpp/sourcetrail/Manifest
+++ b/dev-cpp/sourcetrail/Manifest
@@ -1,5 +1,7 @@
 DIST sourcetrail-2018.3.55.tar.gz 74278615 BLAKE2B e046acfb90cdb495ff28c3dcf4530129cc569a0e9c481f127f656059f80575e4be22e9b63a8b6f00ffdac977ca930ad7a3c4d0e1aa7912af711150afbef03707 SHA512 b8fccc4bae55abf5c5a05418b37c665817c860cc27e314f8ccb69665a63b90ef68485c2395fc899f1112a05def8e95068d7a5c92db399f1d3f7a203a09107767
 DIST sourcetrail-2019.1.11.tar.gz 76120891 BLAKE2B 865c8a510a544705e130e3ec7bc82f1e7ca16d4dee2fa27849dd3530a92a20ef47ed909765ac08c8106ee0e992e3b4a03e79ef7094fb1593c4088b7d8e356423 SHA512 9022873572aef796fcbacf079c37b916d645aacd1479cc79fcddbfd8c561d0004c97202c46812b60d8c539dae3d68bd805da101678ebd1518ce13c3e58009ac9
+DIST sourcetrail-2019.2.39.tar.gz 84960185 BLAKE2B a515da1a0c6a061d7db843b9bef3b1d419fdbea361c4f5465d32a4a9bfc018575a334de739354de2e249facb7ea6d342329c445990173303fce4fb818da8131d SHA512 5603d7c2fe84c58a13dc682bad6bdbd807b15a9fd7c73c6633f8a7d9e051a660916b3a03b9a5244e2cb4243492586d555a98f0cc464f7405c02f36ef655c8959
 EBUILD sourcetrail-2018.3.55-r1.ebuild 2645 BLAKE2B 068f43ee9af82004cb42f0e208f181908fd9d4a915ccdb4f2ce7b1ab7e0c1330cf047d2e0f3d3e68c2a30e4bf8596620c0a876120713d2100b8c8cfd43fb9876 SHA512 52016969c9b16fad78b45081dcf8415a1b64906ab5396585f3528d6bf5599de466c230101186577c3ce26f8091ff4fca979ea32b5c77f82e16ba6ec579847716
 EBUILD sourcetrail-2019.1.11.ebuild 2645 BLAKE2B 068f43ee9af82004cb42f0e208f181908fd9d4a915ccdb4f2ce7b1ab7e0c1330cf047d2e0f3d3e68c2a30e4bf8596620c0a876120713d2100b8c8cfd43fb9876 SHA512 52016969c9b16fad78b45081dcf8415a1b64906ab5396585f3528d6bf5599de466c230101186577c3ce26f8091ff4fca979ea32b5c77f82e16ba6ec579847716
+EBUILD sourcetrail-2019.2.39.ebuild 2631 BLAKE2B eb34b9af6e122ff8b07385ca66b2708a293c04c1c667dd19f1deab233e5c8524868a4b8c5e5be810954e06fcc466706d5279b6c3f6a396b6e7504c271420d5b4 SHA512 60eec98c2839717f02af04f785de4d2cea3f58d3b06036ebe1f4a5e917721bb6d78b7a02e7937c710c0ba0eefed03cc8ef3ccfedadf07a7283ccd981a31b17ac
 MISC metadata.xml 445 BLAKE2B d04d2bd24a8c19606568123ce7a5f5b35a68bafd35728972b887232dd0bf501902ec4e91ebd2c782396d8a945fa6a456765c974dd45f7c004d5b543ff5e8e9e1 SHA512 d3682126116eb02bb50564213649fcac41f0c44fbcf481016bdcc0193fff7b71a64631883a2df21113c85d141f7c5fea3d463dd8c5a102ef24d9b69e1029b677
diff --git a/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
new file mode 100644
index 000000000000..3989b699749e
--- /dev/null
+++ b/dev-cpp/sourcetrail/sourcetrail-2019.2.39.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A cross-platform source explorer for C/C++ and Java"
+HOMEPAGE="https://www.sourcetrail.com/"
+SRC_URI="https://www.sourcetrail.com/downloads/${PV}/linux/64bit -> ${P}.tar.gz"
+
+LICENSE="Sourcetrail || ( GPL-2 GPL-3 LGPL-3 ) BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples selinux"
+RESTRICT="mirror bindist"
+
+DEPEND="dev-util/patchelf"
+
+RDEPEND="
+	|| (
+		dev-libs/openssl-compat:1.0.0
+		=dev-libs/openssl-1.0*:*
+	)
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:1.2
+	sys-libs/libudev-compat
+	virtual/opengl
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	selinux? ( sys-libs/libselinux )
+"
+
+S="${WORKDIR}/Sourcetrail"
+QA_PREBUILT="*"
+
+src_install() {
+	# This removes the rpath entries with $$ORIGIN
+	# since they trigger warnings when merging
+	for f in "Sourcetrail" "sourcetrail_indexer"; do
+		rpath=$(patchelf --print-rpath "${f}" 2>/dev/null)
+		new_rpath=${rpath//\$\$ORIGIN\/lib\/:/}
+		patchelf --set-rpath "${new_rpath}" "${f}" || die
+	done
+
+	# Remove bundled libraries
+	rm -f lib/libXi.so.6 lib/libXxf86vm.so.1 lib/libXrender.so.1 lib/libXfixes.so.3 lib/libXext.so.6 \
+		lib/libXdamage.so.1 lib/libxcb* lib/libXau.so.6 lib/libX11-xcb.so.1 lib/libX11.so.6 \
+		lib/libudev.so.0 lib/libEGL.so.1 lib/libgbm.so.1 lib/libglapi.so.0 lib/libGL.so.1 \
+		lib/libdrm.so.2 lib/libfontconfig.so.1 lib/libfreetype.so.6 lib/libcrypto.so lib/libssl.so \
+		lib/libpng12.so.0 lib/libselinux.so.1 || die
+	insinto /opt/sourcetrail
+	doins -r EULA.txt README data lib plugin
+	use examples && doins -r user
+	exeinto /opt/sourcetrail
+	doexe Sourcetrail sourcetrail_indexer Sourcetrail.sh resetPreferences.sh
+	into /opt
+	newbin - sourcetrail <<-EOF
+		#! /bin/sh
+		exec /opt/sourcetrail/Sourcetrail.sh "\$@"
+	EOF
+	local size
+	for size in 48 64 128 256 512; do
+		newicon -s "${size}" "setup/share/icons/hicolor/${size}x${size}/apps/sourcetrail.png" \
+			"sourcetrail.png"
+	done
+	sed -i -e 's|Exec=/usr/bin/sourcetrail|Exec=/opt/bin/sourcetrail|' \
+	       -e 's/Utilities;//' "setup/share/applications/sourcetrail.desktop" \
+	          "setup/share/applications/sourcetrail.desktop" || die
+	domenu "setup/share/applications/sourcetrail.desktop"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}