17 files changed, 152 insertions, 93 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9830474f0dba..2cee8dc053fb 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index db721d8c1021..0a5b14edffed 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -2,7 +2,7 @@ AUX catch-2.3.0-python-automagic.patch 1007 BLAKE2B 33a5c7fb715e5b312c28216ded81
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.3.0.tar.gz 506374 BLAKE2B f692eb0933ca578edf0f15cb83139d2fab03390b3980a686ea495101165d612c848b642ad1e7233bce5bb164c80958c9cbfbc229e72a1ae6947aa4dffdf27556 SHA512 e9a089b504c339e87bda0fb1a4040d9d19c932a4bc7dca41bdad6edfcf8c428f4152ff1e0c898dfdf6b20bd5d901c343bed00ad89351fa5182f3c106e0fb4b03
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
-EBUILD catch-1.12.2.ebuild 804 BLAKE2B 7e640284ac14bb08909f6f1d3cb1c8f9c0c44b84f68b03dd3b3b65a27f43a10440b4c0ef734d27c425d27bd39b38cc7825e5a99a2a6a333abbb82316e395a47b SHA512 09f4944ae6b0a95b89c310ab8e9df3461efa4674f833274498d18f94a999785862274aaaaaa6cacce1c8b9c59365d3426e602b0d3735fe829e4a63a9dc935ad0
+EBUILD catch-1.12.2.ebuild 803 BLAKE2B acbd83bf8eb3f430fe160db5d944677ab624aa9bd14e363ff41dfddbdd1c03dcbdcd8c7dcee78c6a1f541a55229ad680dbc347dacd846c03c6c7b96f1e0ce322 SHA512 1ad95762728b22ab9f6d73742b82b17697089cbaed9d53e18b17c82cf6759a50dd29113d35808a38892a21613050e057d0c2effcbdc134590046b3bd80a7c915
 EBUILD catch-1.9999.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
 EBUILD catch-2.3.0.ebuild 1029 BLAKE2B 472cd9eb3b96e8c7bf766b42477f881ff3421dcd81617905fda7e6c530a457150f2dc4d543bfb73aa352a49713960d1db3a9758a55714b1dc100b697fc039ddd SHA512 7523558c0b75881959da3aec3d529c8bffb33f5d3bd9bbe409726845cde139b9a166d348a36e0e6742e045677f2142580925b950b605b7b4e318b1aaf5f8d276
 EBUILD catch-2.5.0.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
index 66c092f781d0..8f80ebe3e71c 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 76ebb2de7881..30f01c83d950 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -2,6 +2,6 @@ DIST glibmm-2.56.0.tar.xz 6859520 BLAKE2B 8d7f0120de211002d587e6ec0d3750dcdce60a
 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.0.ebuild 1633 BLAKE2B 18f75726ccc969a8985bc2b04ef257277fb4eb7bde203030e09f3eba1f1a25d96a5d2a4318346c176b9a54c62a00ffadf4f045987f89f4d8cc448677c56311a2 SHA512 0827bac28286463c413d8bce0f25420e467c47f49771ca414fa5f12c357daf420a49c763ad2265ba14ba66a051387990d5f06d9fe6e9c757a1c9325f84c6c496
-EBUILD glibmm-2.56.1.ebuild 1636 BLAKE2B e1b45990cd3dfb1b941f3c4d0f3405339a8880568f4ef7ca0a8c158e24651b423cf26eeca3440586606e61bd2466c0f6b92c81ccbbb84b0c59f8045b3519d5c1 SHA512 39496736a9969841e94512c153aba2222330b660edeec4f0cf446d4c69ab900c8a381a14d36597f4e38da71ec65eec1a77b622c2ef847eabc1863cd149a98883
+EBUILD glibmm-2.56.1.ebuild 1635 BLAKE2B d6afc672164ae571260c336d275054d5391518b9bfeeab4dc9655bff5aaa9d7a6a0ae44e4f7d40acde198dcad6d8d420188f20142f10325b087398796450f8bc SHA512 e9180b85feebcbda7f1373c8b2c176f475d944b7188457595fbff0b094c8187e526975d2558132b40ebe046660da8ae54437f9cba146f7bfe3b62a2c623e531b
 EBUILD glibmm-2.58.1.ebuild 1642 BLAKE2B e4b73b9141ac3c353dd3d5b6a6236018af9fc6da61a796a8fc2cb01f97e4c8db1675efb7481d832084765098eea357406c8c7a7e44a899443856e8e5fb854802 SHA512 9d7ed5de34212bf2312c97cf04ce2d0a78436cd031d5a02cd43ca0725cdda9b8f5cfb5ca86aff91dc989c677e6fcbf6608db8d44b6cc46f0df98f95b65852c1e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.56.1.ebuild b/dev-cpp/glibmm/glibmm-2.56.1.ebuild
index fb2d25aec0f1..7775820da618 100644
--- a/dev-cpp/glibmm/glibmm-2.56.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.56.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/gtest/Manifest b/dev-cpp/gtest/Manifest
index 55afef6bdda5..c9ba28ae02aa 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -11,6 +11,6 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
 EBUILD gtest-1.8.0-r1.ebuild 1675 BLAKE2B f8a6b9b08d866c033a118c8ca3476a8f9498fbf77b5bfa33b426055d33b70cc0edf6ce48eb17bd1e4704a93030809132d13f9a1d8d294974c2382b7888950fa1 SHA512 7907cf89410817ec053db1db83707d5f5885eedd7f64acf3d0861ca27ea701b370402087452dffbeb357b2d174d91d23929abf36f621b3c9082515718f3ab367
 EBUILD gtest-1.8.0.ebuild 1638 BLAKE2B 9b1191e4df593f03d611f3c98cef475aeaa4017b114cef3cdea0be4a8cdc3f146c0d753c9b428cccc70bae96603b0b433f4129721e96aff9ac71297bb082c868 SHA512 4e63602328af1e3bcafbf5b41ea6829cdf31d7670a78ad906522c00f7627642d9a5492da81d9a16c7c581407c8f4dcf05be6bc1e79d9f45cdddde2ce6725caf3
-EBUILD gtest-1.8.1.ebuild 1692 BLAKE2B e7925414d786b5dee7a5ad9a883cccf2f223d20ad2a58afed6a4bdefbdabc114b96c1e9b87d749595ee6681b6772cdebc83db8980b6d9a96395866e8645b5d11 SHA512 e8c4940ba012e5be45bc6fa565a5754774b97de5b86cffdef2b67e7454709c15f189ed9f1a26a2324ebd120019bbd37478400fb43d57f728c7e54815c688644f
+EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 7c6053a0f3d8d5f97199dd8a36b14739bc3db47a103ef5476bf46924c984e6e60745c073bd3fdf75d5a45ddcbacb226dafbc9dad2f373d13322a643a2238253b SHA512 edeb30abe53c77ec4797d9a15188b988c1981a2ceba3779c3014685c6c4a03e760f117b92264117562b504694aacfb3a9c42a9c934ae3c6c0f503edeafa7e510
 EBUILD gtest-9999.ebuild 1692 BLAKE2B e7925414d786b5dee7a5ad9a883cccf2f223d20ad2a58afed6a4bdefbdabc114b96c1e9b87d749595ee6681b6772cdebc83db8980b6d9a96395866e8645b5d11 SHA512 e8c4940ba012e5be45bc6fa565a5754774b97de5b86cffdef2b67e7454709c15f189ed9f1a26a2324ebd120019bbd37478400fb43d57f728c7e54815c688644f
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
index 7a444173666d..7c94971afdca 100644
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/google/googletest"
 else
 	SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-release-${PV}
 fi
 
diff --git a/dev-cpp/gtkglextmm/Manifest b/dev-cpp/gtkglextmm/Manifest
index 0ae853973891..46f0aa6dc907 100644
--- a/dev-cpp/gtkglextmm/Manifest
+++ b/dev-cpp/gtkglextmm/Manifest
@@ -1,5 +1,4 @@
 AUX gtkglextmm-1.2.0-aclocal.patch 516 BLAKE2B 2d45435ad7a5c9780e2325b39ff4ea50fe904147b9392a9e0bf8cea4af9bb9ea99804ad7e9cd9afa79af857697d851c3ad6617f887d9042792734e2be218d84d SHA512 291eeb4506c2ab21d61b10ce8ce1000651af6236edcf24a0b09c9e975cf9cfabaabbb8414b55372682fd3fbfac4c2b67b0f5dc62a34529b6a1e51c05cc77a079
 DIST gtkglextmm-1.2.0.tar.bz2 623815 BLAKE2B 14c44242f4d083915fa119a75d98bc913ba9c5177660c9e9dc728dcb801d98a100b294621dba9c857cc369dbe098c586c42e61f1407fc935b66ea9705a7b3f94 SHA512 94e66bc295000bb3f3352f58c9848372a4c23586dcc52450806c73e3e0630ab2b51291b347da16bba853b658deb070218203a031d906fc2ff051386dd065aba9
-EBUILD gtkglextmm-1.2.0-r1.ebuild 856 BLAKE2B 4fc9e24c9a144b227b5de8d2ace40ac2ebf33710c15712f28a7dc84e6d978bd0ead9f73e040b49f8ac1050f46454265d31070440e89ec8503edb9a2ba6587b4e SHA512 7d212becea718e07bff371517e876c0df8a66b4ec0312940ff07fac73ae1962581eb0c75c62df3fe2eec8693e9e75c83e1d710f311145782b7235389a8c903ee
 EBUILD gtkglextmm-1.2.0-r2.ebuild 996 BLAKE2B a5521d58d06d9bb89c38842b8282d9e0cdaa4e430da23cc86f29abc9276ed99f3455b2d05a70bd7805729f099261533d93c794772b6874608377aec7c5b51ddf SHA512 ed0bf139a4c6e06ef46a88c94577756d5886556721a6656406949936c32e211714d739ebfa0506ffcfd72691f2430862b048fa031991c7ccbee5005d5f18d7c4
 MISC metadata.xml 331 BLAKE2B 214f9245eccb98bed5314d370a2e16d8605c46629c656c05a22c1a037e7aeeb9d3255f24203405b148fc73276241db48243303a86abea879c08a944025cc51b4 SHA512 8c9768b7a27485752cb816de376d4e9e352e6522e42eb489d41aab48f0fd47541483913c7fec9ec4bbdfea3aa846c35bedab83ac2524901635337a7111f14ab9
diff --git a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild
deleted file mode 100644
index 93ebb6e6a98a..000000000000
--- a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ bindings for gtkglext"
-HOMEPAGE="https://projects.gnome.org/gtkglext/"
-SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
-
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-SLOT="1.0"
-LICENSE="GPL-2 LGPL-2.1"
-
-RDEPEND="
-	>=x11-libs/gtkglext-1
-	>=dev-libs/libsigc++-2.0
-	>=dev-cpp/glibmm-2.4:2
-	>=dev-cpp/gtkmm-2.4:2.4
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Remove docs from SUBDIRS so that docs are not installed, as
-	# we handle it in src_install.
-	sed -i -e 's|^\(SUBDIRS =.*\)docs\(.*\)|\1\2|' Makefile.in || \
-		die "sed Makefile.in failed"
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	if use doc; then
-		dohtml -r docs/reference/html/*
-	fi
-}
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 1d5608f34f63..68d27e4efee4 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,9 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.22.2.tar.xz 12341028 BLAKE2B cac55d0358be4be50ff2d603b245a34af4bab0a046332ac6a7159ea7dece8bce8cd53c532ce499cf3172e8f69455de0378946640ad363e33ddd2a5c38e6843ca SHA512 6e96b543e459481145ee0f56f31a7ad2466bd8ccdd2abf3205998aecede73d235149ca6e5ba6e8d20a4fd5345e310870d81ac2a716d4f78d1460ed685badbdc2
 DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc893dbc1ef46f1dd33e2c9050ea77e00a1cb7ce1f3832568fd9865c977dbc71a461923c285331372371a5f235369 SHA512 94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac
+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.22.2.ebuild 1830 BLAKE2B a94019630550703e0fed33bdf6728bc483077a0e52e804f369c576306ef4f395bd37d5bf53d52bb53492f3ccc18d0bdf3e7bba68fe86cb5649091e0681a823f1 SHA512 b43a93016963292bb8c5725eb9ea0b0d0faefc6aff6293722c5db5058c76220b0d339b9e227001c6f557f9229ab13064fd025fc95d8f31fd8d4f8590052ed8bd
 EBUILD gtkmm-3.24.0.ebuild 1828 BLAKE2B 4f166e4be2021650dd1f92608480a89d87a4155fe68cd9e198bfc86b1f1684a7ae2e75208ecef093bd9d8144fd756783b43656b10fcbe0994d385465ead59bf2 SHA512 c7eb48244030f811522ec569f5c040eb6bf554d1a2315d9f5b3f09720308416fce25f9bcaec8d6bd6a5178612d72bc2a2821b41662103f819e10118b43b261e6
+EBUILD gtkmm-3.24.1.ebuild 1836 BLAKE2B 27b87b5c8447d5827ba9af8de40a97ed9c5c2629f15ebf9475cd317b02d7e5a2a2a1231514f9685fd3f416bec88971d1afd87dc814f21dc93f354a6b90cdc441 SHA512 c37b6d42f8786d7289b0970e74f3d4a109285161dae2ab9a88e630bdc2ac08a55eaf03c6d39a0fea091ace3a7c7272e3c2755bc96dccd1756381432e186afc55
 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
new file mode 100644
index 000000000000..c9ea21833962
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+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"
+
+IUSE="aqua doc test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
+	>=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+# eautoreconf needs mm-common
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed 1 failed"
+	fi
+
+	# don't waste time building examples
+	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--enable-api-atkmm \
+		$(multilib_native_use_enable doc documentation) \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend)
+}
+
+multilib_src_test() {
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+	find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
+	dodoc -r demos
+}
diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest
index b8cf14cbbc8b..a27519e079ec 100644
--- a/dev-cpp/libjson-rpc-cpp/Manifest
+++ b/dev-cpp/libjson-rpc-cpp/Manifest
@@ -1,4 +1,6 @@
 DIST libjson-rpc-cpp-1.1.1.tar.gz 179249 BLAKE2B bd8b737f76bceaa1be73d89a1f75472d8eae6f3da57a4da5a5a9eee2a52ba06034bcb4404e6b65368f6be1967c1a8b40f71e3bfbaa58f65b0ac8dced1b3f43af SHA512 64043aee3227262da41b56f6d53e4f8f9a56d3a43b695200020b47fb7eb6e121cf086b6e121c0eccecf381be90d77910d0f4371254d147f33310af4584a7d433
+DIST libjson-rpc-cpp-1.2.0.tar.gz 180074 BLAKE2B e44f4ada4430db178949d89c3db8db18b716347d88c4f41fe558a88053ca3e2e4085fee28a87d32f710f76d57e0de9510383bc04e17adec36b754e3db2466d94 SHA512 b03507c9e9dc370d0efe94c3a69b25cbc06b99907a6c145034a283d38d7dd2188a1af89d0ce05837fde28ff96b5bd7bb0903f5865f3eae01d275929a68ea5f99
 EBUILD libjson-rpc-cpp-1.1.1-r1.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
+EBUILD libjson-rpc-cpp-1.2.0.ebuild 1578 BLAKE2B 3c8940a09c2e38ce6be94e3585e1d2ccf65a84cc3115f9eb29e5da9bdb057626032991f352bc93f7c730916a27487e04c1a5eb398593da9481adf61109b4424c SHA512 6ddad0199299a5fbfb5c5a9b6b1e953734509d405a1d5d3d41c29bb62224a8641cd922ea0af0b2824f622583ba6a843bc96383f5655fbbe21b08ef5887dab533
 EBUILD libjson-rpc-cpp-9999.ebuild 1578 BLAKE2B 94d3a0d77ee6c007928c0f90b503a7b0ac041c783fdcd87766ae2ba09c4d419906dd06ac0ecdd9b23a86e78295961e3f5f1ca8ba14ed1514ee4d61074885c095 SHA512 c0dab0ba3eff39b3c8af50c562d3bc3e7ee714cd8cc4daaed3df1f78ef4ac373987b3b8c57c363697d0fd11f04add0e4bd810297919ad7eb11c84caa8e19f0b0
 MISC metadata.xml 906 BLAKE2B fe2f020896cc35c9c27fe082bf7a844086445b8943690c35de3de091041473b0a211370e335908470faf1bfdf0fb64b4b6aee75dfd527683d173c3e9fc8d9cf9 SHA512 037b5942cdde13abab5f527cdb8fced709b88bbebb754497279b1d60e7c90789115ecc2f579c38111c2acf32a3baf2643b470e55deb9de36bc498e9665091a83
diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild
new file mode 100644
index 000000000000..2ab94282c0a9
--- /dev/null
+++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-1.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++"
+HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp"
+SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +http-client +http-server redis-client redis-server +stubgen test"
+
+RDEPEND="
+	dev-libs/jsoncpp:=
+	http-client? ( net-misc/curl:= )
+	http-server? ( net-libs/libmicrohttpd:= )
+	redis-client? ( dev-libs/hiredis:= )
+	redis-server? ( dev-libs/hiredis:= )
+	stubgen? ( dev-libs/argtable:= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/catch:0 )"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHTTP_CLIENT=$(usex http-client)
+		-DHTTP_SERVER=$(usex http-server)
+		-DREDIS_CLIENT=$(usex redis-client)
+		-DREDIS_SERVER=$(usex redis-server)
+		# they have no deps
+		-DTCP_SOCKET_CLIENT=ON
+		-DTCP_SOCKET_SERVER=ON
+		-DUNIX_DOMAIN_SOCKET_CLIENT=ON
+		-DUNIX_DOMAIN_SOCKET_SERVER=ON
+		# they are not installed
+		-DCOMPILE_EXAMPLES=OFF
+		-DCOMPILE_STUBGEN=$(usex stubgen)
+		-DCOMPILE_TESTS=$(usex test)
+		-DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch2"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && emake -C "${BUILD_DIR}" doc
+}
+
+src_test() {
+	# Tests fail randomly when run in parallel
+	local MAKEOPTS=-j1
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use doc && dodoc -r "${BUILD_DIR}"/doc/html
+}
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index ff9bfb2c9e58..019fecce21a2 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -3,6 +3,6 @@ AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0d
 DIST ms-gsl-1.0.0.tar.gz 58920 BLAKE2B 46b71ec1fe57ec311a53895498c375c2313ed1f2858cd6b67d19d92ef10230707ce14fb757c00c92ea3475d787cda400cc449c34d54a54a3d0123f71b87b11ad SHA512 cde55df9540fd08ca8d29a74b2cff360686aa75b01ee1c48bd9782a2d70d1b6eae712a51eaf9b60453f859e466df00345b0a2893137d16490cea8ee54362f7da
 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
 EBUILD ms-gsl-1.0.0.ebuild 730 BLAKE2B 5aaeb7b07a5f949614256d7cdbc4aa2eade4a5f9ad5ebb729bc13b1df3a43ce5fb13a7d8cc6ba9fb23891f6d70eaeee391ebe7bec2d1c14eacb77aa9b6329004 SHA512 9d5e8ca174656262b9968371a4d0966091c88c95549224b7f35240ae180e3df02f1a1177c8c88fbfeaf05d1ed8e781db3819a4b70ef776762e69582b6b191c55
-EBUILD ms-gsl-2.0.0.ebuild 756 BLAKE2B 5acdf1f9807c684dc81c7fea023668d6bf752b7e49a3ff38845fce3c404fbe5ebc583b30d644ed56cbd84a09f89a5cd9331d50ed929266588e7281949570a25c SHA512 b5868347431555bc1d864b0a7d8d55d675242b0b051fa3379560e9103e6eaae72e72006da6c5dc5c0856c1f7582ef4f08cf52a1c4e6b64492fadcdeb2ea6e582
+EBUILD ms-gsl-2.0.0.ebuild 755 BLAKE2B efe23fb1b9b5489c595b3699f81eb7ee33f7332ae2fc115893dd0a4420258bb61f0d7143640c2a111ccb691f40881b0bc3edb35c072974854cb60dd8267f1805 SHA512 ae17558fee9dc4cd20782bfe073eef32b5e5181726ef49c7723f8f4e39b6f1aa50a832ce621a5069b815cf48b0119eec2b84869f04eb13bf9abf8976bfb1440d
 EBUILD ms-gsl-9999.ebuild 711 BLAKE2B ff612a5f984d24926a7dbc401db50c817031d470c5bf994f9b5085c77851bc15d16439014931024c42daf75df3f9a3edf3b7e206b7d9197317211409692b8c32 SHA512 3bafae58327c7fe393e49a4cf2b29b8c717fa144df47613d9171d1175187e7c75642a1eb98f9a91087573024157963366facba1c7fd0b0b1924fbf98647e3f0a
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
index 8b35d4ea2e67..5eccf76caa0d 100644
--- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # header only library
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index 7d8014236677..f8e826bdd4f4 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,5 +1,3 @@
-DIST pangomm-2.40.1.tar.xz 810384 BLAKE2B 18b875afe43fb561cc96d24e796dbaa4f4255346ced6ea510403f48047fbd30ec7d2bb89cfd316b0b1cf709cb39982814e90899084d098ad9bb8f5d6270e399c SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f
 DIST pangomm-2.42.0.tar.xz 853064 BLAKE2B e0aac439565c4fc80c71cfdd430133373cca4c88c88484ab5b77a2a395154e3d381bc0158a9d312280f409ba325b547504016d8bc50830794dee13c199ee1e62 SHA512 2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59
-EBUILD pangomm-2.40.1.ebuild 959 BLAKE2B 5f7d3b540e523369308f236d08130e67be86bc07ada76f084afc85cbb20b493f0ab17516f2e39c09440e8e9a028cdd58e6c8c88128115681c351eef82842724d SHA512 fd8123776c3ee34cc4537c1b5f044e0dbd48abb5a252b972c1e79d2b088b3b43265b6f9066cfcbc6bffdda8fca3f556d539624436dabb8be541d454e4a11b05f
 EBUILD pangomm-2.42.0.ebuild 956 BLAKE2B b25eb2f0b8314ad3d520bcfb4d87582f03d3f3ac96891ea3a387dea5aa73b87febc6b1f4a77993564daa8952997a8ec107f8560384cf1247398fecf7e6de8a92 SHA512 27ec42924791bed5ae312be96641b4d7373ed01da7dba46ec1bd0eef0c6a67b9c0411b75ffba888279dec44a46f50481abbdfa02ae5f388d65cec8cbcff7e091
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/pangomm/pangomm-2.40.1.ebuild b/dev-cpp/pangomm/pangomm-2.40.1.ebuild
deleted file mode 100644
index 86b8765b4503..000000000000
--- a/dev-cpp/pangomm/pangomm-2.40.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="C++ interface for pango"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="1.4"
-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="
-	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.48.0:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<dev-cpp/gtkmm-2.13:2.4
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}