12 files changed, 138 insertions, 30 deletions
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 33e8cb467ff2..ae695f6edae7 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -1,10 +1,12 @@
 DIST Catch-1.10.0.tar.gz 375205 SHA256 cb752cbc8033d7c967d6bd7bc3eed428f6d05f2511945db819d4a18a46853ada SHA512 07ea6c8fbef849000c69009478fc895fe520420d835a57881b832f8181ca28f04030027ab0f8614d590cff1c36d06598bd4f5723f44e252c3a2566da1be1341e WHIRLPOOL 74bc82eecbafa289c3abec540ebc47b0239eaf6224eaf6d408a88871e03338994d361194f6d92b15096f3c2a0672a24af424db5f490923be3638d1ed0f17a355
 DIST Catch-1.11.0.tar.gz 376132 SHA256 9e6111577e6dad2513a4229355f162023568af6a352d303367930758bed60f30 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132 WHIRLPOOL b6d02053ce4eea0242cfe4d4fd5f5842b9279fc804c69837d7a2f9b652a1b2f768912fc10a20dae148757c9ff6aabdcf69daf6e85e652165871e58891ab57ef5
 DIST Catch-2.0.0-develop.6.tar.gz 395416 SHA256 c66a7ecd0710ed27663a122f388872563456f83df654d22cc6a56a76315c59d3 SHA512 079172f063da06453d434d1b74b9a4ffeb45b40c90657ea410d6695756f23c581b1d574a88ab6537082df4e6e703e7bc9ce9084653abdc2a7033018e65a1bf5e WHIRLPOOL 9b7e2a72d43e52af3329f7f25e578dc07cdd1a81cf43dcbd0e22be68d56fa96595f1ece91769c14c006e2c64aa526cec1a70fa59a067f0c8a022851ece927af0
+DIST Catch2-2.0.1.tar.gz 397154 SHA256 5f31b93712e65d363f257ad0f0c02cfbed7a3988979d5f320ad7771e513d4cc8 SHA512 df6dc480aa208c6c39c8b36d06295883345f925b7ec579e9f0f7a68c816b90dbc3c2ece32926a6458646f7412027212f1b4c3cb28f217f411d3a56580f6edc32 WHIRLPOOL a55e66c8073bb3a7efaf732a35a6095eb464c7796e9c13d6fa1c56e843eac10e43e21d2024b025dd2a98f468d4f0469ed250084f1d08305138265b79340546c8
 EBUILD catch-1.10.0.ebuild 729 SHA256 68040d3e200c318fbac8f3decfefa8b7242a03e022ad6ded2befc6b9c89de704 SHA512 34875c7820d83b27feca0a96e6d3fa80c9f4a671dbd86a68c1ce3dba2c5ee60fe81aaccdaac63a43fbd1d41e7de0a8bc6fd81719378a1e90bdc35ae2891b8053 WHIRLPOOL ace1bd83ffa181b19a5e4762a8ca5a12adde6c68d91ecb8bf378f113cb223521ae9b9bde7cea44be9d99e738c3365b624384ef17e003e7c085829f5fcfa4fe76
 EBUILD catch-1.11.0.ebuild 729 SHA256 68040d3e200c318fbac8f3decfefa8b7242a03e022ad6ded2befc6b9c89de704 SHA512 34875c7820d83b27feca0a96e6d3fa80c9f4a671dbd86a68c1ce3dba2c5ee60fe81aaccdaac63a43fbd1d41e7de0a8bc6fd81719378a1e90bdc35ae2891b8053 WHIRLPOOL ace1bd83ffa181b19a5e4762a8ca5a12adde6c68d91ecb8bf378f113cb223521ae9b9bde7cea44be9d99e738c3365b624384ef17e003e7c085829f5fcfa4fe76
-EBUILD catch-1.9999.ebuild 707 SHA256 e8a81107ea1e93892d478d69ab16f11b5744b6639aaa703c28ebf1e7ad2ea6ba SHA512 6e90857b7e4c85f2cfc7b59aeccdc3c39ea7a40e9ff919cd4ad5d83ec4ddf5051207e36c53221faacf8caa843905c9b8680bf00388815745b3bfeaef25bf7196 WHIRLPOOL 7db5e206662bd85d4286f70e5ac4513c6bd6a1f660e167b7b9cf5f3ba9721f9d76e2daa3fc75c4dda597f2b26a62c0839647d62b6115ad95eaf271e8f6c0147e
+EBUILD catch-1.9999.ebuild 560 SHA256 902a825f78ae416b3b908618a2ccc33722cd2a55836f92b6c905447163fe9061 SHA512 70cb380180bbd0aa6887cca66d1291be81f0f05a93841a8ef12c764ed20fc95ae8b3f97117c6a3721b432cca6bfb272d8b7bf6826c57af171f57909502fcae8a WHIRLPOOL 90f9ce58f1ed10f349aa9121297925c981b4765cf9957702c3a7e2269bd374665222daac088ca0d3c220640d32ca33e66f6038aafb369209eb58f503b5798926
 EBUILD catch-2.0.0_pre6.ebuild 785 SHA256 9cd40fdb22e2c307ad8bf076eba3c2572629760bf67fe33630bc7f84fb38ebbd SHA512 4deb9ac51dcdfd855218e5e295b130d50759dec771a8c52b6f115c6ffdf47cd6e66aac432c7b8c0c175c0664516ea688028928fbd013bd273b3ccb635f75ee8e WHIRLPOOL ec16567800d4790d3d7572806c064ff75a6f1eec8f427cf928ae3046703b7b09286934cc288fc68a8711c433e4479113afd23d32fe89df6ebc2137b40555df12
-EBUILD catch-9999.ebuild 707 SHA256 ed59a7469ee7728d4705386bdb6b5587c3091ac431eb213255a9d6cbcd8d1d21 SHA512 dfc28162810e160a6e28271aa0ca186ab98c6b68ad5c16f8aab04749d2613611bcc5e79ac34e248863115098f2aab86d61f7049b12de516d35034229287155cc WHIRLPOOL 9932111f8e312dc492c989e79b62d5892f43feaa7a9cb0b24e33b48a872ff420991cfca47a6a9be5858525b7d2f659ef8bbef33c3b866b17c1f95fda2f5889b8
+EBUILD catch-2.0.1.ebuild 604 SHA256 ba225c7c766df5a14d46578a5654793ec2883bf82fb51acf02422bd571b662fb SHA512 287b2eb5e7b641bdb18611974f0e69e2b999cfa5e49b481ffd804fb53680750f8468c279a3137cb5cc2d810e8af1e999671e2f969387237586244c7e06cf2e63 WHIRLPOOL 1f9583505539b66584089748512302b6413f5162b29f8a3036941cbf349482046e8f82f28983111f40521aab0ce6ba0480fdd234e5310112b256b6212e0efc49
+EBUILD catch-9999.ebuild 539 SHA256 b4bfa959aa6a7aed3d0712d29339ef62a6f1daff597c87c02d2b84760d58abdc SHA512 034d2afbc80114b6dfe83b3a75fc96ef3a0eaecee02fbbc1532391aae2b32b5fedca36916d01de98754b8de2849c9bf82940838bd55f026f166841d885784e80 WHIRLPOOL d932a58c90c6e1c24afbe069c5f1735080f2726c67da234a7a307aea4ff06b8a443bddcda258a9670c9f01ed0fe77b26881ea985461c2c1eb884ed3c571a29ac
 MISC ChangeLog 822 SHA256 6b5973127235800b701c7bf9ef7e49cdf5dc1580bffa84b6a0a3aeb45f927559 SHA512 bc828926c3e652b44d13723cf9ff5013e5e63054d6224258cf750031b9d5b8439289909e5e578b3e112f07d63b899aed36cd4db6b76b29cf6c9ad3b08eafe409 WHIRLPOOL 41257140dcaa6d82495e60d40aeed5be8677341e54c15897d2533cb3902f38c58a98d0e009708b66178f29bbcc383c075e52a740b613cd13389cb6253bd37dcf
 MISC metadata.xml 329 SHA256 ea78728410ffd353f45c387376fe22660f22452a43e7f4a6ab330be5392a3541 SHA512 a6bc13d759be7cb9ff9c4b754927720ccb73268fec3d6065e3eb873bbf17f9500a50db27962b69890784ec5dfc7bcfcbadaa2c3c867c31e46dbc72a9f3a3f7b0 WHIRLPOOL 7518e576860daa5fb269353e50d982193b2ca07c0cdc7e8c0c9a193a7fa46eecbad75b88b67d0bc14276c1fdc72e62aa28058bfa94431c1a45463ae97b69837d
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index 8949a527ca65..4cad4e13c4b7 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/philsquared/Catch.git"
-EGIT_BRANCH=master
+EGIT_BRANCH=Catch1.x
 inherit cmake-utils git-r3
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -14,21 +14,16 @@ SRC_URI=""
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
+src_configure() {
+	local mycmakeargs=(
+		-DNO_SELFTEST=$(usex !test)
+	)
 	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
 }
 
 src_install() {
-	# same location as used in fedora
-	insinto /usr/include/catch
-	doins -r include/.
+	cmake-utils_src_install
 	dodoc -r docs/.
 }
diff --git a/dev-cpp/catch/catch-2.0.1.ebuild b/dev-cpp/catch/catch-2.0.1.ebuild
new file mode 100644
index 000000000000..309a5dc46c30
--- /dev/null
+++ b/dev-cpp/catch/catch-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P=${PN^}2-${PV}
+
+DESCRIPTION="Modern C++ header-only framework for unit-tests"
+HOMEPAGE="https://github.com/philsquared/Catch"
+SRC_URI="https://github.com/philsquared/Catch/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DNO_SELFTEST=$(usex !test)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc -r docs/.
+}
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index 5ca782d46a21..5a244d42728d 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -4,7 +4,6 @@
 EAPI=6
 
 EGIT_REPO_URI="https://github.com/philsquared/Catch.git"
-EGIT_BRANCH=catch2
 inherit cmake-utils git-r3
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
@@ -14,21 +13,16 @@ SRC_URI=""
 LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="test"
 
-# CMake is only used to build & run tests, so override phases
-src_configure() { :; }
-src_compile() { :; }
-
-src_test() {
+src_configure() {
+	local mycmakeargs=(
+		-DNO_SELFTEST=$(usex !test)
+	)
 	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_test
 }
 
 src_install() {
-	# same location as used in fedora
-	insinto /usr/include/catch
-	doins -r include/.
+	cmake-utils_src_install
 	dodoc -r docs/.
 }
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
new file mode 100644
index 000000000000..91bd15403138
--- /dev/null
+++ b/dev-cpp/gsl/Manifest
@@ -0,0 +1,3 @@
+DIST gsl-0_pre20171105.tar.gz 55870 SHA256 5adc4b4ba53102099f63b898da161469a854d4fd47e90195421fbe8bd8b50352 SHA512 0db9cae9af710c45f66d1e2b73e2002f921876d400165d13dbe9ede7aa9335249458a9f97d4eda4cff0b3a5ceebb6ef84b631310921011fedee8776fcec89e6a WHIRLPOOL 98e26057646f6be4cc6632901b2b45c5e46218e9048cd64561f7f118ee0e8feadeca3ca66a0b73a36a431b666fe7946c6f864dbcf97296bae3945b2350dcf2e5
+EBUILD gsl-0_pre20171105.ebuild 601 SHA256 a4af0e6e7b67764dd5ce20812dc9a4ef99d4dbad8965fd240febd4a3b82b3cbc SHA512 1f01a505b9716fafe174435051fe5a41168bf5aa7d9c2b3c46b3dac8848f3e9d31b6c7dedbc67323e9fa813f45d365e06c790eb57d0680cdcd8307e478c19714 WHIRLPOOL bd84e3a567d1cb3f591a15b74f4fba81cbdc155fe1f575f9e607f50218b5bb6557aa2b669cffef89dd8878eef43856bf4e5d2364b733cc99fef1380725f2d17d
+MISC metadata.xml 546 SHA256 3cd9eeace91b6051efc370efe6b50d769f70bf8e9792bf9d5a01c9778a94b3e9 SHA512 e5aa4be86c8c44e14384ec27e0a7a14f246ee60a1b789d97bd67ef5d00553f09449aa6ec0eb51fd4a6b17d25e8ccffe6b9a7921056bc406acf758ae2de6bd958 WHIRLPOOL 830e9853e86c727411fdede9b11f73334a17cb97a1b0ca963cfa7b68f50d68b5cf2224e8ed6d5e65d91233e476c336e1aaf45201d20f9b133d1fe01f87277c5d
diff --git a/dev-cpp/gsl/gsl-0_pre20171105.ebuild b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
new file mode 100644
index 000000000000..78ac010145e7
--- /dev/null
+++ b/dev-cpp/gsl/gsl-0_pre20171105.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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/${PN}/tarball/d10ebc6555b627c9d1196076a78467e7be505987 -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( >=dev-cpp/catch-1.11.0 )"
+
+src_configure() {
+	local mycmakeargs=( -DGSL_TEST=$(usex test) )
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/gsl/metadata.xml
new file mode 100644
index 000000000000..57bf76b92106
--- /dev/null
+++ b/dev-cpp/gsl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@taujhe.de</email>
+		<description>Jan Henke</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Microsoft's implmentation of the Guideline Support Library.</longdescription>
+	<upstream>
+		<remote-id type="github">Microsoft/GSL</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 70bd688fa8c2..49794cf1ccb8 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -5,7 +5,7 @@ DIST gtkmm-3.22.2.tar.xz 12341028 SHA256 91afd98a31519536f5f397c2d79696e3d53143b
 EBUILD gtkmm-2.24.5.ebuild 1707 SHA256 c31b78328e143c0aeba2ce35a0cad3291eb37b771e8fec7816e059046f887835 SHA512 4ab9947a206d75184943a05607013b173ec49efee27a20ffc5db8c2f666cfa94defc0fc8e28fd50591876113211eee110c83c2fb150a780d029be1942f3fd559 WHIRLPOOL a0c1a1a4c8d5ad213950b97611499d42b2e282aa96ddd0f39758114e8b73b731f44089a3b65425b2669b189bc1ec2d40dbfea971e4dac3cc0c5ff7499166c2ef
 EBUILD gtkmm-3.22.0.ebuild 1823 SHA256 d45a256e8da13dd6ef8b79c0e0f3a459764c8b671190e55d49d89853ad430547 SHA512 d7a40269f7bdb123bc0a353036ceaccd5bc65298754f2136b2785e756d6f1cbcc47191a8fc9247db33face1739efc0a9772b0f4c559e65d6311f8f66c414efc9 WHIRLPOOL 82dc1508d2443f8566c1e555651da210c9353d1f3158553e43ca17eb3bff2b1766a84b9a8371e000c9bd5a0d0cb996c3cf53edd502f16bc4b853705eeb159c8b
 EBUILD gtkmm-3.22.1.ebuild 1832 SHA256 4621ab610d9779fcba458dc1e14ba86db14297fd2c5ebaba4f597bf68c4291dc SHA512 678b6bab37c80e33b7e0b8a85d76ea0c3d1139d456a7f5ccd23c0dd69ca0f7018cacd9dfd26cb4db45fc4fe4e96968b6065fc90173cb9f57cca220dd6d476c1e WHIRLPOOL e28ab6cdc23a88a6a207ab5cbc836603dbebff01ef74ec621d0641e175dce704a19c96c1266c97934705f5571000bbb92c1051079a94c5dc88cbd444cf042bfa
-EBUILD gtkmm-3.22.2.ebuild 1832 SHA256 4621ab610d9779fcba458dc1e14ba86db14297fd2c5ebaba4f597bf68c4291dc SHA512 678b6bab37c80e33b7e0b8a85d76ea0c3d1139d456a7f5ccd23c0dd69ca0f7018cacd9dfd26cb4db45fc4fe4e96968b6065fc90173cb9f57cca220dd6d476c1e WHIRLPOOL e28ab6cdc23a88a6a207ab5cbc836603dbebff01ef74ec621d0641e175dce704a19c96c1266c97934705f5571000bbb92c1051079a94c5dc88cbd444cf042bfa
+EBUILD gtkmm-3.22.2.ebuild 1830 SHA256 7c052ba1a28493d73ee00855711f63eb82adeab575f0d3cd7311f76a58bbcce6 SHA512 2e6881524094f834e655f380f2ccff52e9c51934ce8ed5c8f03d2fb0bc32954a677f239c3130ae934064ead27efa8137d90e35a6881328f4827fc8bcfda0836f WHIRLPOOL 5bcb8f9bf7b8ad87e1e5e405697583a4b505c1db63d31e1aa3f10d7e5a746f86046c68f59ea00991c101d4a59f09dae08fc1138dae52dee4fd21ed7434acf1b6
 MISC ChangeLog 10433 SHA256 d99a8b10e652e556435401887af4b3115fac862c8967ac9143af3f298a3d11fb SHA512 c4e2560b952c63dec6b77abd6cc986b2670046001f0fe5eb52d6f1cd4ec6875aef11776afeebb6bde35ca514733c3124678ad3f0a598457e73422525dbbffb17 WHIRLPOOL 50819ff5d5ccb639d4e6c02f4b2bcba2ab8bccb8957ae5d0e801f2f1cf9797d7af656c954d3072ccd242da599aae7615244f24b20dd99fabe07b850fcba62b51
 MISC ChangeLog-2015 40078 SHA256 d09f2a06327f14c989f860c93b23b2fa8f9897c5bca685f25dd0265cd00c5f67 SHA512 1e40be0ed704d9c73df0bba45f0ef23e39fab79701867704be155b05ffbf4494ef1121fbfc017a6fe7e0bc9afad8b95d91dd6f57218aed933a0c275b4424e87f WHIRLPOOL 75a381e892a3879555d3334c9fbef707d3236b1d452a2e469bcdb17b0fa7d4d70a4cae1f55361dd72d3467ba5a054e0d517c7b5e6547e4f34bbf8bcd8bc63aa1
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/dev-cpp/gtkmm/gtkmm-3.22.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.22.2.ebuild
index d11b218d5120..e335fe20efe1 100644
--- a/dev-cpp/gtkmm/gtkmm-3.22.2.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.22.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~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/waylandpp/Manifest b/dev-cpp/waylandpp/Manifest
index 9ea75a27256d..eafdb283eda7 100644
--- a/dev-cpp/waylandpp/Manifest
+++ b/dev-cpp/waylandpp/Manifest
@@ -1,6 +1,8 @@
 DIST waylandpp-0.1.0.tar.gz 166427 SHA256 117df357cbd1f272737b6379e05925b38bad41bafda02761017530053fa950e7 SHA512 e0521ea99eeb7ae196ed9c8759e10d28406c5b99534b52ac51845cdd9c384ff820e4cc1fec65c537a0d071046746884793da122c72f6e75e7df4bca089d19eca WHIRLPOOL 1d589fbe1884dbd38547a0957b07533e3029cca7453618375227d87afa90fa36eded62283bf302139920860c90b250aeaca9b48e0f8098b0f9f8bbaffa889067
 DIST waylandpp-0.1.2.tar.gz 166624 SHA256 fabf0b512285abea77678d9e079009569e9eb3fd98c6b851d50bc5b6c781c7d8 SHA512 2304390be26134561fb69e208a6bafd0e9789e6b212ff2f46384c6ed50ae1c9eca3f06a3b4958c8e710cc1a0be61ed84c7ff292ec7011dbb0396cd2d83363f7f WHIRLPOOL 2633f41c0038c5f353ce7d9771c09d7a60ade11e9e7d0209180fb9f450437b37c3feebc955568335ce3371aae9b5083ab3425a8256157c5e7f94e0bd009ea3df
+DIST waylandpp-0.1.4.tar.gz 168409 SHA256 fc767573f7334525839221ac52e3dc4b56ebaf3f7a7cdaf4f05eb6baa6dd88ab SHA512 3f2e9bca0776c02ec3b7a4f76a34214333e0663e2ab81d81cfbc37e1f14bda47e16b3840386b961d47ca993207b0b9f4d4859b621f22fe4e3653c4b14842e001 WHIRLPOOL 75f2ebf6725fcbfa414bfede676289167ec1118964479f2c3b23233183684769eb59d12dceb20359fe9d444f2934e032fd883c1bf2682339c8523b2eeda753e8
 EBUILD waylandpp-0.1.0.ebuild 1246 SHA256 1b7183e6bb860de9ca3c0d7cbd83c52cd205fde16d5c5466bbab98c24d1c9015 SHA512 cdeb50fcad7a3630338a1b830c81313ae2af699ff3b3dc7f16c2b4cd20fe25a55821afbbb56d741ba10d0352429683160fe22bb5f54f6e3c28a5d0716465cc6c WHIRLPOOL 35907aaa7db7e609c924b005878e19d595c05095822ef8a0bab94572e2a54f2a32e5a26c0607697b938a1eb1b20c3e114f3b96052a010423d6d3ece3afd54a13
 EBUILD waylandpp-0.1.2.ebuild 1276 SHA256 8edc86903c7dad272fe8c4fcfb62ac446c5d376ec6c8c1390c88924c56abca46 SHA512 d41b8ce0f9f0fcc4c5ba5a0eccea6498a0750cf441d2bfe995d38a6ecc1c8d8e94d01147b28e9c1fcb0da6c45c593c27637eece7462cdd045e8f5441678d3182 WHIRLPOOL 64ddecf9cd8a050df66bd2bdd09c5bc1b0915a4c83836ac8900c7ff426310281400189794181e3a3136305d7b8442c14c4b2224f09a5f1fa0bb63c8a1ed2093c
-EBUILD waylandpp-9999.ebuild 819 SHA256 95ff742da3778881abc9fcfd02db6bc24a722aa3b4b470038f42358bb8f4f785 SHA512 4249b09702cfcef96a581fce9ddafbefbacd7f413b0e31552cf92d0774296491da53764057f60c1dd6b9535501bc05388a0e6bc8ee3ac1dc7e7675c61b7408ae WHIRLPOOL b7e5dd03ed1c493a1a103ad1df05151a2bea688e3d4aa1e6c23ec24eee70d6f8684b683891d6da409f8612eedb5ec7edef35bd63b499212869ab247a4b6ffb73
+EBUILD waylandpp-0.1.4.ebuild 824 SHA256 b956780546286b2ed2d8aac9e691759296e876a5baaaeb6897d09119d8b048ee SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750 WHIRLPOOL 5b8b3d3800d77b889e4ce9eb407eaf3dc169ec318ce1f441edb1450b1cb5c2b1e3b17eb55acc48c3a80bf2454a798a26a8605711a859d6178e96ea086af434cc
+EBUILD waylandpp-9999.ebuild 824 SHA256 b956780546286b2ed2d8aac9e691759296e876a5baaaeb6897d09119d8b048ee SHA512 af76bd5c8fee9b019cde74af63bc56a0c740ddfd2455a7e86672b94773dc3c946e1d7d912134d3d8371e12bb5202de3521f385a30797c7553f6454bf59ff9750 WHIRLPOOL 5b8b3d3800d77b889e4ce9eb407eaf3dc169ec318ce1f441edb1450b1cb5c2b1e3b17eb55acc48c3a80bf2454a798a26a8605711a859d6178e96ea086af434cc
 MISC metadata.xml 401 SHA256 6d2ad3537b9cbd1ec77967cd7a3328fb8c12360300384302262a43974b225f5a SHA512 3501904a23158eeae58c78bcc7cc3549bd877cf13f6490a8d63a0586ed080c28e27a6d302a9170020b571460dd0ca64acde471d765c8880bb2427d6c8ed76ada WHIRLPOOL 3fe818326b7246911153f2f6e8c269a3c2c890e270353e6ceba0e5f97d25da84a389d764a62e363b3cd93abb185813b723522277bf6e03ced8895df75466da01
diff --git a/dev-cpp/waylandpp/waylandpp-0.1.4.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.4.ebuild
new file mode 100644
index 000000000000..e8100f35eb98
--- /dev/null
+++ b/dev-cpp/waylandpp/waylandpp-0.1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+DESCRIPTION="Wayland C++ bindings"
+HOMEPAGE="https://github.com/NilsBrause/waylandpp"
+
+LICENSE="MIT"
+IUSE="doc"
+SLOT="0/$(get_major_version)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/NilsBrause/waylandpp.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-libs/wayland-1.11.0
+	media-libs/mesa[wayland]
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index 73572d42b7ab..e8100f35eb98 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
 
 	cmake-utils_src_configure