16 files changed, 94 insertions, 47 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index f5013bec0304..edf6f4083abd 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index aa90259a4395..e24b9c372cc6 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 834 BLAKE2B 80fa4d32a8543d1f97bc42dd74151414843be6af37f264f0dc487da6defd662c2853dca1ba00bfd7c9e5242e821ae208d712eb7cdf809230e9dabe1c56846da3 SHA512 e4d6b4a3669a4a847ddf54c75b2ce42612d340574c35041f9f992c941e126696e7198228f46d17faeb79e738441f5b6d91aca0ea939bd81bdfbc84cd8f878a1b
+EBUILD atkmm-2.28.0.ebuild 833 BLAKE2B 77c226ba62ee7e4155822abf50d7a045575ce8973b88d6a7dd902f17323e4daa7dac24828505e05b14f6f40f350e3384f39d6e0325909959527a9e0bba405889 SHA512 3ca72494cbeae225c767137dc007fee2852873fd97be5b8392f3f6dbd9990d9617ba0fa302f85520b31b5bb2383af1ddbf773554afaf4dca390d9c893915cd88
 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 5ecf570c6077..2abe9fd60953 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/catch/Manifest b/dev-cpp/catch/Manifest
index 196b0a2d97dd..e2c22ebf53f2 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,9 +1,11 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
 DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f SHA512 ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d
+DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6
 EBUILD catch-1.12.2.ebuild 803 BLAKE2B acbd83bf8eb3f430fe160db5d944677ab624aa9bd14e363ff41dfddbdd1c03dcbdcd8c7dcee78c6a1f541a55229ad680dbc347dacd846c03c6c7b96f1e0ce322 SHA512 1ad95762728b22ab9f6d73742b82b17697089cbaed9d53e18b17c82cf6759a50dd29113d35808a38892a21613050e057d0c2effcbdc134590046b3bd80a7c915
 EBUILD catch-1.9999.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
 EBUILD catch-2.5.0.ebuild 916 BLAKE2B 9a7efd65afb6de239b60e4323b23dc8b4aba7279ac7b17b2cd6a7c5db56b54b2bbc70d54cfe30d9a061e38d0c97c1c998858869911416f7d1470c393630e0d70 SHA512 fccb13c55cddcf03ed55d92ff32f19c173a96a4bf2c6123d53ebf0bc14565252c2d7363579342274f9b00f29ca35b3b92187bfc5986c43a9d08341784f451869
 EBUILD catch-2.7.0.ebuild 918 BLAKE2B 5a12b57986cc2962aaacdc4cad8f6e4ef3457cc93e651c50baa4a0c1c8959d75ae4f6015aab639fe3f791ed1cc66c0f587b860fea31073ffb1f502ff18828731 SHA512 05ae02b9b2b81b08075077b3fe324ea016d3b130543bccd459c09857336a712fb3dc41c24b741b48a12c7c5b941a288bfcebcdafd13a57f991a9799b2221488d
+EBUILD catch-2.9.1.ebuild 918 BLAKE2B 5a12b57986cc2962aaacdc4cad8f6e4ef3457cc93e651c50baa4a0c1c8959d75ae4f6015aab639fe3f791ed1cc66c0f587b860fea31073ffb1f502ff18828731 SHA512 05ae02b9b2b81b08075077b3fe324ea016d3b130543bccd459c09857336a712fb3dc41c24b741b48a12c7c5b941a288bfcebcdafd13a57f991a9799b2221488d
 EBUILD catch-9999.ebuild 918 BLAKE2B 6a64f80865b8d399a9f24885eacc2538985c224ff1eb9cde10a3e0c6aeaa08c84ce2e69dbcad48d8f69cd8fadd732bd01c0f97f87873ac3080491372ab567730 SHA512 4f053c94484263c8dc6240cfbe42458fdf393605b5dcbaa4425648a8c3871cd8928f6ed0fd8c13e904c37089b9483bd60dc6b71809699b5fe1e98fdc2177def5
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
new file mode 100644
index 000000000000..1a7d1ed8fba5
--- /dev/null
+++ b/dev-cpp/catch/catch-2.9.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
+else
+	MY_P=${PN^}2-${PV}
+	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${MY_P}
+fi
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/catchorg/Catch2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCATCH_ENABLE_WERROR=OFF
+		-DBUILD_TESTING=$(usex test)
+	)
+	use test &&
+		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/gflags/Manifest b/dev-cpp/gflags/Manifest
index 880d281b99d2..483835358b0d 100644
--- a/dev-cpp/gflags/Manifest
+++ b/dev-cpp/gflags/Manifest
@@ -1,6 +1,7 @@
 DIST gflags-2.2.0.tar.gz 96408 BLAKE2B 571f07dd0972cec201eae8ce66d5e0592abb6ddb81bcf3c539f38861f0cd379de2db20ba99eab885ba030235938816d7a61e589b74a61743de7cdb2710646854 SHA512 e2106ca70ff539024f888bca12487b3bf7f4f51928acf5ae3e1022f6bbd5e3b7882196ec50b609fd52f739e1f7b13eec7d4b3535d8216ec019a3577de6b4228d
 DIST gflags-2.2.1.tar.gz 96985 BLAKE2B 065dac9cf5d878e4179cb6d56ddf240052a552b72036fd06cb83197d9772a9b97fa544f809c6e1efd6f9ad8cd0222872fc6292c44bc013c5f70e235bcc5b290c SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9
 EBUILD gflags-2.2.0.ebuild 1023 BLAKE2B e8fc99aa6658c936050a32d6ab69bd4855a59f88e4deed9a18c1772ce5665662f166e4098594389fd65d9d5befd6d47303361f72bb6f9c69bf1b1eba783eece7 SHA512 a6ba0ee030170d8ca78a21df9196c43a3dbd55c7154e68053ab03fb41f1d6c4404af31dc0840df592927bd13abf6d3580ca7ae9f3cb2861c6bd9646b0ce6e09b
+EBUILD gflags-2.2.1-r1.ebuild 1000 BLAKE2B dbeda2805d735612e11772bc1c3503387bb9c61cb2e500da1a9d8b04c464be878bcce8d3424647733b4e38bf215d6933ef2b625e5dcf5fae1e9c2826febfe429 SHA512 c493a1299143974e4258a110b39807f2d31adf4bbbd48d8c65b816272da7fcb7754055f2a23ba0fd557dd0a0849a10370af29e531df8a0f455a6b8fc7cf96fb2
 EBUILD gflags-2.2.1.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
-EBUILD gflags-9999.ebuild 1030 BLAKE2B 03b755376e1339389264e50fe248801f8b5e280cc8069b45beda8bb8a9135373b047e3dee8e32bc2d9745b5639b6b95d065a0e747e1e06266c0945b6e5ae2e05 SHA512 e295339b15b1c234fa5f2c3b996eff23ab4aea666f06f970a8e66afcc0697ef8328e3334f672785488da462889003a71db87aa59be8f1b49a397d49fc1c99d3a
+EBUILD gflags-9999.ebuild 1000 BLAKE2B dbeda2805d735612e11772bc1c3503387bb9c61cb2e500da1a9d8b04c464be878bcce8d3424647733b4e38bf215d6933ef2b625e5dcf5fae1e9c2826febfe429 SHA512 c493a1299143974e4258a110b39807f2d31adf4bbbd48d8c65b816272da7fcb7754055f2a23ba0fd557dd0a0849a10370af29e531df8a0f455a6b8fc7cf96fb2
 MISC metadata.xml 303 BLAKE2B ffe806891bf2b398e66676c5a17dbbcf2b53a1738a92d994828aecd33bf52dae92d9f2631d262f2c5c375b7f4c6918c9011f03ed94a0bc6a50f2475ee4620537 SHA512 80f049b850a5f55f33964fd8776aa4b510d9937022caac6d3817d583ae3089dd5cc73bd44b8ef48e867a706fd9223861001759281903ee1a1a467149ca7bf37e
diff --git a/dev-cpp/gflags/gflags-2.2.1-r1.ebuild b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..95cd79c7ef3d
--- /dev/null
+++ b/dev-cpp/gflags/gflags-2.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gflags/gflags"
+else
+	SRC_URI="https://github.com/gflags/gflags/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Google's C++ argument parsing library"
+HOMEPAGE="http://gflags.github.io/gflags/"
+
+LICENSE="BSD"
+SLOT="0/2.2"
+IUSE="static-libs test"
+
+# AUTHORS.txt only links the google group
+DOCS=( ChangeLog.txt README.md )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		# avoid installing .cmake/packages, e.g.:
+		# >>> /tmp/portage/dev-cpp/gflags-9999/homedir/.cmake/packages/gflags/a7fca4708532331c2d656af0fdc8b8b9
+		-DREGISTER_INSTALL_PREFIX=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/gflags/gflags-9999.ebuild b/dev-cpp/gflags/gflags-9999.ebuild
index 91f405e1e9bf..95cd79c7ef3d 100644
--- a/dev-cpp/gflags/gflags-9999.ebuild
+++ b/dev-cpp/gflags/gflags-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit cmake-multilib
 
@@ -25,7 +25,6 @@ DOCS=( ChangeLog.txt README.md )
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_STATIC_LIBS=$(usex static-libs)
 		-DBUILD_TESTING=$(usex test)
 		# avoid installing .cmake/packages, e.g.:
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index d08d4d3c8a9b..33998d1fab45 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 1637 BLAKE2B 7ba8ee96ee80e15af59b6cf4727996e3c765854f56b721487d38799a0201be4bd9faa07524a3296390c26e29c778004b613a4dfc4a9ee625bd03da2c5ead612a SHA512 65458bdc69f78fa0fe9cc8964454ff324ee0a87f628ced40993be60919619f1c82a9b24ba9b55bb44795206b2994c5d89ed97914758197cee432d0df9da09c6a
+EBUILD glibmm-2.58.1.ebuild 1636 BLAKE2B 351df4babc0162c625c5ea497b5cfcf5b1bb9309e6ebe2d30c7af49f5c0f144788c57064a9a9fe423b75f3abbf88cfd7ca4c198470c75119a269a4d10dd56f2b SHA512 d8ec9b30d2892c535875e19c3f8e16c056ab5767838370aaca0ff865ccd3932d069f984add5e81f29e9c918ce642aab6f6c4999b1f1b9e895145bad6b86d733b
 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 a9f305840f00..8602539bccc4 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 2ab6a0afcde6..38914e1c1216 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 1830 BLAKE2B ab1298dc6f689bf6a4b48a7da62b7126b37d6c6bf2b1b47be4d968cd95a174277db493f561188343fc38cb4945d80fcc5077eb905d7171db77d070e63969db6d SHA512 26a9e653ea101154cb807b1472c4dcc9ab6915681738be7dce1211c80ebe2c9aa1d546f168fe9238d63385785f4fed2513e2fb88a4fdc4a295d698646fd9fec4
+EBUILD gtkmm-3.24.1.ebuild 1829 BLAKE2B c885a92d2f8face4c177efca6d7792066f4135b9aab518acda4b3575b7227f8c79add7ee50dca4c95604ac93f7fc7b07d0425d7baba912de32484d2c175caa7e SHA512 a28a376d08b57df18113acc11f3b51d28f251cba8d994f1bac54875be6d1004d353f77994e8589310bcf7263fcaee4f98f5deb72114bfd4eb368760acb7048e9
 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 0efe1f3ab76b..b6cb158df236 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/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 019fecce21a2..5b0b4a51e4aa 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,8 +1,6 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
-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 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-1.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
deleted file mode 100644
index c2294e55587b..000000000000
--- a/dev-cpp/ms-gsl/ms-gsl-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Guideline Support Library implementation by Microsoft"
-HOMEPAGE="https://github.com/Microsoft/GSL"
-SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# header only library
-RDEPEND=""
-DEPEND="test? ( dev-cpp/catch:1 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use_system_catch-636828.patch"
-	"${FILESDIR}/${P}-disable_Werror-644042.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DGSL_TEST=$(usex test)
-	)
-	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 927183b73fca..88a31fd9c63c 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -2,5 +2,5 @@ AUX muParser-1.32-parallel-build.patch 680 BLAKE2B 7699b129186f0173bfbc7f742d511
 DIST muParser-2.2.5.tar.gz 761315 BLAKE2B ddb7a226cecd164929a2f45ca0c2a5d20f37cd6bba2fca919c9e534017fa087523311bade8a7be4a5a011ecd5dec0a2496ff08354d2010341bccf2e2a8276c1d SHA512 d89380ebdc0ce91d0ea38fe43419ab6ed06c47d352b9ee20e1edcce48337b464366153493e0241c373ba2880a8b419fb9541e56cda0d14915daf9b98136ee682
 DIST muParser-2.2.6.1.tar.gz 755653 BLAKE2B b3b6b8da57c0e8a0bda74038689d444ba8da00d6cce80030d8b35693209f0293874e4822c4941974be21fd4b7c09ba7df2c9cef861bc10b890aae4f641040faf SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
 EBUILD muParser-2.2.5.ebuild 863 BLAKE2B eef6d0bc10f80248f632b7f7cfc08b6336c237a1e0f37cc229df4247850eea8fc5360a1fd2057f2452ba0113b630ec1e31ce90d2ac234ad179ea61c081d84b0d SHA512 6bbd9ff70d8cb11e75c282b52fc5fec0092a7bd57baed94cda099c2b18744101d78678f9cc9a29bd9be447e2d4fa41c03fb529292b6cc7b9b79f8009f47c9108
-EBUILD muParser-2.2.6.1.ebuild 862 BLAKE2B 0c9e1b758f3ed2ea36e4e09e88a26ad38f282223acf3b569a0a53b547821f88ab81c2a43a005eb223b4178196caf4c332461a9c676683a85325536a87bf87879 SHA512 2d786a9839d4e502ec8aaf4ff4c901939ec5e3ade8ce0755b66fd0f612cf104a3eb0bd203df77b4bed1dab205a08fdb9a18cdb238fbe1214bd3ac0b979554418
+EBUILD muParser-2.2.6.1.ebuild 860 BLAKE2B 1b00a2d9089fdbc4fe20319ba99fc8bd5af556363cd394f3b64c1d97c5c9d8dc12636f4a67fa4a9d2b39be8d24c979fa3c10b678bf25afc0cf0d05a2028c1be9 SHA512 e3e0935b729c1cbaa312d47b63b5afe36e3d37d9c20a023b94f17c50420f047b2e431dd312a407e51ddf2bb36b7851732c9345ed4a4c0ea30f04e7275e40c684
 MISC metadata.xml 624 BLAKE2B fc3684b1f97031e5d63bddbe28679529add1a931930a351cc56ae5bef8395f9a05020a00557a0b1bc421e20c09ce59b5332597043f96981405c1911407948d7a SHA512 fdf266f68b3463e7f22358efbba60055512d7f7fce7a98de6f572a0b4c191c0b0b50b29676a432fa7fd604207029314ad5e43f043831d064de8c5f232fb424a5
diff --git a/dev-cpp/muParser/muParser-2.2.6.1.ebuild b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
index a5025c1f8c20..a19668ce09b1 100644
--- a/dev-cpp/muParser/muParser-2.2.6.1.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
 
 S=${WORKDIR}/muparser-${PV}