gentoo resync : 16.04.2018

27 files changed, 225 insertions, 27 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a659d4369375..bf049fbdb6aa 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 665c4ff32182..4840eac1e6a9 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -11,8 +11,8 @@ DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bd
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
-EBUILD boost-build-1.62.0-r1.ebuild 3916 BLAKE2B 613816f7df3ca77952d7428e1669a06e49dad9652c0d26de99d3d37a7216c91259df10b7639161216428b31eaeabd8619053756e978de612c3891991b02b59ef SHA512 56673f5714aa82b4ad00be76b7937d332814c6ac3d4e2824861ffc1565aee1d7f79050a8e4201d8f6144acd1be08f5081c997b1453724c266fcae337894178e1
-EBUILD boost-build-1.63.0.ebuild 3840 BLAKE2B cd4eeb5466dfe8127366f099be3faf36eaab4dc0e5ae430cc13585dbabd8d990a1978931aa1e7dd0536b6cb7dd106f8736de142f62d6206f261a2ccd7f4b6694 SHA512 00ef860e6513847a1b8f55bd3416c9ead3b5df26d28e4a228c5aa72eaf20fa232c107fffa3fc55a3000576f89c8aaf89d61c5ace57e6ee324d7569de6531d167
-EBUILD boost-build-1.65.0.ebuild 3840 BLAKE2B 571751732ff1d5c4dbadbc77385e86f687647f4f77beab57194176fbef4b9d1d41141d4bf16e556e783acb3f4f9e20bfc46d58fc68b25d431ace0904e7c2898b SHA512 202ac229e873d44115e9b19359b6fb5490d6fe148b3d8d46516d6e0c701233c091c0739823a004b3fe4817006ccf483edb35d48bc524db5f5b7a80fa3cfccb70
-EBUILD boost-build-1.66.0.ebuild 3909 BLAKE2B 91f52109013c96b36f583afa3b6aabd2d7979b35ab3958a1a7b848595b10eeaf2ecb063aa63120fc1aab7eaa7d3d84f7623562b5168b4efe204f7b3a078ef460 SHA512 aaf2bcadea08dec33b4a1cd201c81794625c9eb20be26035ce528ba342a552cda0b26d31f207a0e30455b2a8eb920f9cd32a2e4465eefd1e35a7c5d055f34ecb
+EBUILD boost-build-1.62.0-r1.ebuild 3917 BLAKE2B c54fa707afefaf95f734f0af209c5394fbd1840be1b17d08f85e19c490754a640742a418c1cba77ce7e30b7e8bc0ef3eb6bcd49f09997348deed50e471380c6f SHA512 c6d588a903e3b717665b93ffdf0d815ebc769e527d6e14df9a6d0726885b26e1e932862928dc246e661c32765315932c5e5b956aa3c32cc32bd39ebdf5c8bf17
+EBUILD boost-build-1.63.0.ebuild 3841 BLAKE2B 8a1bec9cd61ae7ebd6692c30372ff5f21bb766b6a91cb5cfd95879c1faa18f02b7c1b44a42d6be7ed806a5c0a6920732cd366e08fb7a8a54427415579221b54c SHA512 fd427ff4dcfcb7bb8dbf2bd3fe795dc163c55167245febcd57220fab383088b44e646d715edf44462f5db3a8ebdafb8f0396f25ebe18038d560ce6b90dd428ab
+EBUILD boost-build-1.65.0.ebuild 3841 BLAKE2B 56c4453ea28c2c183f39564a9585abb3b1096105045e22e0e14cfeece72796b7ac49f93038bd1069cf96ae90fba6a1e4f1879fcf3efc0c9cc88e19d4b6c1c3ae SHA512 51bb46c6ecf0ee0447dc1cbaf15088f077159def1db09a5ba92ecffce7a53ced2992977b8f6105461fd1e86b43fbb44f0ca37e205c928fd31dd7e8bfbc8bbcb7
+EBUILD boost-build-1.66.0.ebuild 3910 BLAKE2B b39850bbc32ec01db2976436f6e8aecbf7d72dad9c4f0dac7172864f3fbd1b67eab9f4ef181c3a6afa577dc9480b72ca8e88233a967fc9cb7c629f2cc303bac6 SHA512 47806a8831a7335fdf60da7bbb87a703ee5173b1fe04b3725ce60362c16305e787848092cbbfcde4f0333e50c3eef84078ae3c9341463877195f4bc0b4290c63
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
index 2a3d08d3323d..55f8756c65ed 100644
--- a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	tar xjf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
 }
 
 src_prepare() {
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
index 4a747cbe60fb..b9a786d1e299 100644
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.63.0.ebuild
@@ -47,7 +47,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	tar xjf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
 }
 
 src_prepare() {
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index c89c7e048e81..fb56a57e3cef 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -47,7 +47,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	tar xjf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
 }
 
 src_prepare() {
diff --git a/dev-util/boost-build/boost-build-1.66.0.ebuild b/dev-util/boost-build/boost-build-1.66.0.ebuild
index 6fb626d7b0e3..0349d767faef 100644
--- a/dev-util/boost-build/boost-build-1.66.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.66.0.ebuild
@@ -48,7 +48,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	tar xjf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
 }
 
 src_prepare() {
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
index 9d77c416411f..77a007871fc8 100644
--- a/dev-util/build/Manifest
+++ b/dev-util/build/Manifest
@@ -1,3 +1,3 @@
 DIST build-0.3.10.tar.bz2 73647 BLAKE2B 90a6d2cac1d34cb5a11bd476011c352f4073fffcb55adb62890938bbbe36d9088c6900a9297f08af3aa564569d09a36662288a9a624e9cc44a9f1b2e5dd289fe SHA512 5836da9347714d602162e050471e27330caf398cf4daf008db174797013d8c353e23f41e393166181ff0fdb08359b434cb7ca2ae6bf789376f8340046abb195f
-EBUILD build-0.3.10.ebuild 754 BLAKE2B 8f49866a4fc3ca862ab097231d58c9834b552caca675be03c1d3a163ff3a40a24fdc9b204774b96f352ed97d792cf00b8c873d5b8b3172e663f31be12de98c49 SHA512 9c25cf07642163c8f1ce096d9bfeb7d8f3bb483a79f4944f7ece3d13c87996e5d48c75afcc2dbb3f7073f55b960f3fd264991d2fbe3d181b3f5fa755086d50dc
+EBUILD build-0.3.10.ebuild 756 BLAKE2B a7b06c46cc24186dc0c447bfe1dc23341f3447aaa9b946452dc8f21cd7b5b0920f5285fab7ea37cb13873c0a489d039a9750d49552bc5884bf5cbdd994f56c05 SHA512 a4ff71aba6a8bfa9b1e20cb0a597f98c019fe0f24aebeb6cba4f39f04e16d2809e051f1b5e6221c2db6598d97653ec178138f3962f54d2ab7908d12a22819120
 MISC metadata.xml 249 BLAKE2B 5791e38f31ac36bb4b94c03962980af247ea39c8af739a949749b1b3a7705ce4031ff53f620b1e4d30c44360e3d1d37ccb186ea109ecc1036977e4e0bb3a92e9 SHA512 0b2b2d015d6d3310efdedc20cd12cb2f587c105f1e84b243d3a7dc6337dde082c16683781eba9a0cb09341756f10f651579df35837ee232309a97017ec02cbee
diff --git a/dev-util/build/build-0.3.10.ebuild b/dev-util/build/build-0.3.10.ebuild
index 059d3c00ac83..d5ebc1b8dfc7 100644
--- a/dev-util/build/build-0.3.10.ebuild
+++ b/dev-util/build/build-0.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
 inherit versionator
 
 DESCRIPTION="A massively-parallel software build system implemented on top of GNU make"
-HOMEPAGE="http://www.codesynthesis.com/projects/build/"
+HOMEPAGE="https://www.codesynthesis.com/projects/build/"
 SLOT="0"
-SRC_URI="http://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+SRC_URI="https://www.codesynthesis.com/download/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="examples"
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 65a73107f01b..1a0dfb63f6a4 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -1,4 +1,5 @@
+AUX codeblocks-16.01-gcc7.patch 1135 BLAKE2B ac57db38c781ecb7d8df0e05cad107c8a92ab205a52ff463959667b7dae18d2610ea222d80b68367d9772ded867e478325323e65c6b06cd748c5a7998511d265 SHA512 b9780f966ede4336bc49117a90a98c7131a4f49b48ce2c925d4b88d2c7d840ccf1aa00f5df022f6222d3da5e3aaf5ed1af391f2717f124a34c107a8c96dee4fb
 DIST codeblocks_16.01.tar.gz 20250097 BLAKE2B 7d3ede49b38ee3c58be30435d39ece38fd4f043a9b1cf0a3f53685ad93789ce650b5d8837f6f29f7bd73e150b527784321f7dcd3d94a767d80a8a3d4350e5905 SHA512 496ff2dbcf9a8248fa9f1060d50567d1fc6480cc9d8fc9f7d2cd532c82f4344deafe9b43f2b17d2510c74851e21acf2ca90d5cc7b61237d69a17e78e9907a63a
-EBUILD codeblocks-16.01.ebuild 960 BLAKE2B 1da2951259b1f86e0280d17df4cd579179ac06584b241edf3099ba8a957fc280d57f73962ec346e9f927ed31adef8e4e904c2152bd631ee6e2908b99e058a159 SHA512 78c459024b8d132ffc44de86445162561a6cf2201758c1a429a9f72bf510833d6974e3964a1070ae801243934d29f9ea4006b5b8b887979032b9ea3268ed6228
+EBUILD codeblocks-16.01.ebuild 1003 BLAKE2B 1a5d584b2ad287cd02b6ad23260562c7f037fbd18ed8bc5fb3b733553bb79ac824f79fe344c85a1d4d4f26b6b5193c4daf7992cabd746064337b291ce9478d80 SHA512 5c5cce9c1d88989cf5ead2a51caa02e916fc08ba4085b8511ef310abb7eea8525aa13baa3feaad88f95caf279323ee0b4690f18b7b333cfc41cb3bd95844d78a
 EBUILD codeblocks-9999.ebuild 1249 BLAKE2B e96be4c155ca8dd71b1b768d106076c36728ab5521418cb8ba722081485efbc4ebcffa95e535ee98e138ede0968ab59584a98bceb79c990b590a3f6f9efdc8d4 SHA512 a0a9d87c06df9f1dccd43fb009c4ac4261dcfcc99138193b3836d9a0e6ebeb4ef38180a3388774ffd84c17abacde95589c35e0febc425b07cbc75dbac9f9b3e6
 MISC metadata.xml 436 BLAKE2B 4a807f9ab3a6e9d0837f8972e286b6dea0a311e8ff32d1746bd688646441559a6fed92347024dee09f9bcf700e45362a014b7703fa270e02b2636f97dda894a6 SHA512 0ff3a17264a93d46efe1455778188ebd9f8bba8c9c0d7b5d6457d6c69d43db343d70f9b1f9ccfddb187ff3e827f4de05b1b632b3aafa4541b1f1f1bc20768aae
diff --git a/dev-util/codeblocks/codeblocks-16.01.ebuild b/dev-util/codeblocks/codeblocks-16.01.ebuild
index 047fa0975850..07a042e6263e 100644
--- a/dev-util/codeblocks/codeblocks-16.01.ebuild
+++ b/dev-util/codeblocks/codeblocks-16.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,8 @@ RDEPEND="app-arch/zip
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
+
 src_configure() {
 	touch "${S}"/revision.m4 -r "${S}"/acinclude.m4
 	setup-wxwidgets
diff --git a/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
new file mode 100644
index 000000000000..84cbc88696c7
--- /dev/null
+++ b/dev-util/codeblocks/files/codeblocks-16.01-gcc7.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/649248
+SVN Revision: https://sourceforge.net/p/codeblocks/code/11006
+GIT Commit: https://github.com/jenslody/codeblocks/commit/1fd6799ded8475fafaca17de9c23db767177d31b
+
+From 1fd6799ded8475fafaca17de9c23db767177d31b Mon Sep 17 00:00:00 2001
+From: jenslody <jenslody@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
+Date: Fri, 10 Feb 2017 20:56:25 +0000
+Subject: [PATCH] gcc7 build-fix: avoid template-related error
+
+---
+ src/include/scripting/sqplus/sqplus.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h
+index 73f37b24f..ae7d3c75f 100644
+--- a/src/include/scripting/sqplus/sqplus.h
++++ b/src/include/scripting/sqplus/sqplus.h
+@@ -154,10 +154,10 @@ struct ScriptStringVar : ScriptStringVarBase {
+     return safeStringCopy(s,_s.s,MaxLength);
+   }
+   bool operator == (const ScriptStringVar & _s) {
+-    return _strcmp(s,_s.s) == 0;
++    return strcmp(s,_s.s) == 0;
+   }
+   bool compareCaseInsensitive(const ScriptStringVar & _s) {
+-    return _stricmp(s,_s.s) == 0;
++    return strcasecmp(s,_s.s) == 0;
+   }
+ };
+ 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index d5517dc041f0..d114134b2ce1 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -2,10 +2,12 @@ DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4
 DIST cucumber-expressions-5.0.13.gem 17408 BLAKE2B 113554f5350dc289dea2a97530e1982f4afa00fe23da4e63d55d648e8767443c2f6c18bb2639defbe79034e709dbfd5865bdff0e11f090320132de9724994b9a SHA512 7035d3d6b9bba0f56ca15580956bbb69c3449ca75c825563217ea5773984a976e455866a0046f045573c5fcf8398887e19a87f425299a3231a077a158ccf2f97
 DIST cucumber-expressions-5.0.14.gem 17920 BLAKE2B 623b1c328703d6f9919c9fc7ffab64d26b752fe8f75d21d5ff2323aa502fe49e9b65bfb5f9f0c64c4baee3189c28e5cf05a404fd499c72fa8cf95157492a0e6e SHA512 7e44de399250d21d017a38d72e15390e9e0dc48b03755508767c5c237aebec830623428420a500bcef1bbb9db2157994b59718a731e8baca4266d1393e0b5843
 DIST cucumber-expressions-5.0.15.gem 17920 BLAKE2B 83c741f985aee1fdb316693c70f519bd82e4cb373285f0bc9976405dad143ef562cbac92263e7fbf73254713a699270cf99080ed9d3a3f85a6b982caafebeb6d SHA512 0d50975fac9b94e17f7f0388b50cf1fe98775dc34887846f72d4b1f471ff957b466b9d567fd6e0da7561860d6e2d8364c2f3490ad9e8059ee0d1cd99ebc5f386
+DIST cucumber-expressions-5.0.17.gem 17920 BLAKE2B 4b90510f296d3affa659244948913618963204f80db95043924dfdb709e0654dfb5cef55b77c048cac7e7f3cb2af4a9a49150dd77c99f9a87b68d4dbf9f54f16 SHA512 2133e53733c2e68608885df650fed6c8975e310875079ea719c5bfee7635d7b49cc1c5bcc6946ca90323243b13606222993be31bc71da55cdd091b6b93e6567d
 DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
 EBUILD cucumber-expressions-5.0.13.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 EBUILD cucumber-expressions-5.0.14.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.15.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
+EBUILD cucumber-expressions-5.0.17.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.7.ebuild 479 BLAKE2B b7b1e29bb64e1bbc364b087cc8b5ff518fd17b1a8fbb47701e009f50782cc75b46b31a90ad513443e39c82efea30a14571a2fd72b64290a9d7f8116755228ff8 SHA512 2814a2862d56e9635b0065f0bfda264a93494dcd9f57d7df70c4bf03494b9fdbf95eda5f95e739f98b7b28623c2058445bf538efd31338b8c00d9f1160138daf
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.17.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.17.ebuild
new file mode 100644
index 000000000000..832428b34fa9
--- /dev/null
+++ b/dev-util/cucumber-expressions/cucumber-expressions-5.0.17.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
+SLOT="5.0"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 44aac680a692..4e0c69341345 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -3,7 +3,7 @@ DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc5
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
-EBUILD cucumber-2.4.0-r1.ebuild 2474 BLAKE2B 903a331e64431daf17d77fa8e1edadb3d23247316562f15cc8405ac52a73345b957a9a9728b68bf951867b99f32a4c8f9e292abc942373be2665b95fac522da3 SHA512 7bd96a6b1499b4b55e1d530e12e1f275336f5497056bd529cdd83c1d1e7a9db016189e728a690d9dd4d312c23dde6cdf7cde12d1074b0d0c3721f3865e4a8ad1
+EBUILD cucumber-2.4.0-r1.ebuild 2473 BLAKE2B c2af659c58de223eacfee53adeeeaf69095aa1a84b062b5fd9f2de7797941d499e3a88cd79e99cc72e42a15d3e02fcd1e31e024114da8ade82f325d1be2992b9 SHA512 e7087af641078b13fe9bddcfadd09c03bb521a1d2473ce5a29931c923efd58d11292e4e0c97fb1365dd32be699ab6317b6cbbf69742e0377ea41dbf09f5f8321
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
 EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B a2a2e324bf54915821fe9bcc3e46976bb93774cf8e685b50fc9cb56513989cfe46912978a543211e3614cb547c7f038be79c77ab4a400f27d3373552e6cf3ecb SHA512 8ea1f237fb1838e3f36a224e2ea9b64e1c649eb711ce0c625bc2cb6d497afcbef53236302175773c799b38f401c5420b8cfb5c761a9d7ea682ca9b27560bf80b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index 928b8d1415eb..92751765ac1d 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
@@ -55,7 +55,7 @@ all_ruby_prepare() {
 	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
 		spec/cucumber/formatter/html_spec.rb || die
 
-	# Avoid specs that fail due to changes in the ruby backtrace, 
+	# Avoid specs that fail due to changes in the ruby backtrace,
 	# introduced in newer versions of dev-lang/ruby, bug 628580
 	rm -f features/docs/defining_steps/nested_steps.feature
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 38c176a29822..aedba93519da 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,10 @@
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST debootstrap_1.0.93.tar.gz 70695 BLAKE2B e0d5747dce7e2c45f5aec271b3a6f1e004ae19e58747abaa10d258f4e16383d305da28aad3a72c51e8ea513ffc15f61980ff27e141de69af5e259572b1afd089 SHA512 c5947a0aafd8f526236d98fe3da3374ef02a69b089844c89a3f5bb5f991fa29d8c2a4ecdbbc84a69a85eca242c628cd592c22e59f444b65c581b8a70d60a3f01
 DIST debootstrap_1.0.95.tar.gz 68631 BLAKE2B e102be7f263426506c5896b50f34c918d76d265e31eaac3f85b0471e6bfede598ef7ffbaaae726d03017b4bd94d482d4267ce02a67226e310687e8c70f88fe6c SHA512 cf2c32430325b19c61de6ef782d7df68a740812faf5f464d837b5b612b9ba0539f8c12876ce23ba20cc1aa23908eb4f45ca602798ee0a6eacf7489c45c5dc7cc
+DIST debootstrap_1.0.96.tar.gz 69541 BLAKE2B 4d8e063919a814014a45263cc90a51513e96eb4f0fa7837edd4426785f59373e4783a06527de8c61f3fa5c26b8d366f63f9eb1af4f32b8635329a01d52883565 SHA512 b423503aba5d1faae6ccfb5b5c0a0e19c6f0e2044464f3d32957f2bf8f4dbd98f185f6516a4781f85f000ae63d3472fb91750ca043027f284c08f248bb9d62d1
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 EBUILD debootstrap-1.0.93.ebuild 1201 BLAKE2B 2dfde0fb57862c70df7e8db42dee07cc838bedffd962ae3292b12188dabc76f07fc2b7dec8d193b681023bd5341e49a3815b601ef466507f97caf377661c52f7 SHA512 387cd06ce6abdc06eac71d92b74ad0375b33f2455483a70bb4a75649f9f6536fdbbea5acddba36eab865750d40cb4bfe8921dc1b1b96db1d897ec7fd917287d0
 EBUILD debootstrap-1.0.95.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.96.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.96.ebuild b/dev-util/debootstrap/debootstrap-1.0.96.ebuild
new file mode 100644
index 000000000000..93ffd5d2d1aa
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.96.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 9a42b6b958ca..1caddff068d4 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,7 +1,9 @@
 DIST goland-2017.3.2.tar.gz 214008724 BLAKE2B 682860f2dfaa96a97ac91eed2a49aa4ee524154df5ba10936b1cc2f816e837b21b27f9da9641c06e5b028fb44d03933abc6b64b87e286e1c38a4c08b92dd2626 SHA512 3488905d1c8944b80f24d40e910da2c04f06ee6dcc08620ffbc7b96c0214d28e00f36b85a178ee9ede8c08fda89294e0d10b99c6929eb595284fc937270e17a5
 DIST goland-2017.3.3.tar.gz 214166755 BLAKE2B b110123b521280e3b120c4277851f5e110b71d882c90ccabb4045eb0f7c2123d514674b8cb7fc726861787b699a573e3189febead8b402dbf542ac22d6787b7c SHA512 18bc2be621408107f7bcc8b359f07ee8b933a9357f21d272196b5d04d411a720bb8643ac2788ecdc4ee6313b23a39f60e3a28776622b3355d80a73e3197abee4
+DIST goland-2018.1.1.tar.gz 218213751 BLAKE2B 4fda04b45da9757e829158a8e6079cb5df9ed3c02b06268169b403258f93a70bb4861b2a85349caaabdcc6c300b95b91989f7957780c7fecf2334530e90ecf97 SHA512 642eda4359da203c282cae2ec855efde0785b59f613070d4f29cafe9ae79fd8dfdc0fac26bc27246ece7178455ab6eda1a278cccf97fd500712972b34f1c1ab2
 DIST goland-2018.1.tar.gz 217959144 BLAKE2B 7d5bf222f99b1bc580faf29f54e0f603237d0d3c096690ca9f7944daf991dfab638e788c5f11d7ff4ed59ed471ff93d9e18d69577c50be1b2df505c58ae7e495 SHA512 f731a1dd9e1c26d318bcf700ca8b7e7ce6c2868e9e65e6ccbf9e9b980bdd484d1faf3a2a0cba16d1c27a42a9cec79c95dc7faf6135d2085bbab248ebe9870149
 EBUILD goland-2017.3.2.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 EBUILD goland-2017.3.3.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
+EBUILD goland-2018.1.1.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 EBUILD goland-2018.1.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-2018.1.1.ebuild b/dev-util/goland/goland-2018.1.1.ebuild
new file mode 100644
index 000000000000..d46b730ae466
--- /dev/null
+++ b/dev-util/goland/goland-2018.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 2c819b367a38..a0e9da601754 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,5 @@
 DIST lxqt-build-tools-0.2.0.tar.xz 15552 BLAKE2B 558e1c9f43e09e51a720460592309f3f52fb7832a121ae40c8d9945ed135d6220190182a6d2311bfb9e9971f68a60f0ab7d5dcf2055301fa683dfc483170b3c6 SHA512 40349710a20d3f06761c57b5d40aa05cb194fa4b50d1e41e4bd7e6adf1beb5c7209f3d4965869a301369df17ec1d75f55aede7ab0fe88a55d692cd56d72121de
+DIST lxqt-build-tools-0.4.0.tar.xz 19988 BLAKE2B 119f2907062c08996b26170b519b9c4ce0308d6bc65dc1363fd81e064084ebe7305de7e66225e2ea3bcea899c2eaac49dcf7651b72a4f3a9d565ce4fd1d5a756 SHA512 d84cfce5db9520725e24855f99fb3125f19ff5dbac12ec6d283e9c4483497c675b32061cdea2eda533e57857be4a6eb6020049ae4f593ea61a321b2708604638
 EBUILD lxqt-build-tools-0.2.0.ebuild 503 BLAKE2B ce32303742984b29eca6a481df6f1a04e459c73661a6f7432404b5dff43fa83619dd2042ad690b03b333a2731e27e909e3d21c6668983e380d75f0ba4ae7ab30 SHA512 3d19db5002e4c194d0802226b617aee5901580286b298075fd563d9d38c76e83e9364900d8c82e6112939b1f8ea81efb2e050a2758f0b5935a862664311cd3d3
-MISC metadata.xml 240 BLAKE2B 8dd1dd10c1b3297bf08ebf11d2e047de07700e5233e26788943af60613a3faa71ff392f77a33f0065917eedc487b2f9be91bdc58635c3c51957e5be2738282c0 SHA512 84f77a0e7d17d09eea1157217fcd22ae5fc98e1569879f85b5fc950d2b2ad00168b1ec9d5d8c1f964673c55bc91d509adb2d39b5983de21d83200ef6c58b9652
+EBUILD lxqt-build-tools-0.4.0.ebuild 510 BLAKE2B c46c3b7d42d55b478e2f804dbf6c47a8d33a515daff1f419791ae685903c4f9d30ea2246c26127a7a3ae687bd3453f8ab159dc15e179864426bbead9865fca41 SHA512 528ec992a84a694ca7c77078699f9745c8d2ba54398ab2d4ee0ec46d8de29d7bc8b1ae0d04f2d32ac524f858a40c1f802c66c60d0d8abf85413945ac17786d56
+MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild
new file mode 100644
index 000000000000..68901413faee
--- /dev/null
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="LXQt Build tools"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	>=dev-libs/glib-2.50.0:=
+	dev-qt/qtcore:5
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/lxqt-build-tools/metadata.xml b/dev-util/lxqt-build-tools/metadata.xml
index a40a83a9c6a9..aa0b3609e965 100644
--- a/dev-util/lxqt-build-tools/metadata.xml
+++ b/dev-util/lxqt-build-tools/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>lxqt@gentoo.org</email>
-    <name>LXQt</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxqt/lxqt-build-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 11defc9eac15..10cc0d7e216b 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,5 +1,5 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
 DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 BLAKE2B b87fc120d6dbb1207d70bbc3324c60c41c2ac8cae8af014ba47bc15c383f7fb821924d3337b25a0b59d0ef2ad641444ed5f85e46d02cd19b07b8913d9ddaf10d SHA512 4ac086e8189d89e7a0b91e7e03352f691f09edf208017062a8fc798e6f54906f1c85112dd2780feefa6a21c8fcb582b91bdd9758f5a90c05cbd2e3042d6c87c3
-EBUILD netbeans-8.2.ebuild 6137 BLAKE2B 8b9e23c348e7dfd3d72905ebe3fd1c0b4bb1ad3e835961f47e3b2e8adac023195c6dc9eda9ec91ef7cacd44e2e8a6c4cb0acd3631b5ede6376be68f67f8ed8d7 SHA512 0fec52feb8f1577de9a9b9e5c37ae4036b10087c4aac648f90c33e07ebcc1c260b2c0e1aee7ab067b5c76a495ad87abb06702cb936e3849e8d732cceb216bdad
+EBUILD netbeans-8.2.ebuild 6137 BLAKE2B b3a41be3cda4ffa7b26224c95c288db674bde4d3fc5631417e12e32fb8d9ba6a1a8776be47af4d31ad214f8e7c1b887adccd739948ce310f1d9a0c9c6a2a4d41 SHA512 96b38333c5856e2c7f811cf4546b7a65a8d6036584a92ce5f28cc0dfaca2a71da3f3a66ae7ea147a2812ad06a99ab48de105b4c4fc2a68379ec4a38d3e9d0f53
 MISC metadata.xml 1290 BLAKE2B 6244d6034061869e8129c8edc442fae9035749f0660204b0e3cdfc4a667643b370b26ad6d34c4a6e713fa060cfca5fbfcaa1ea87da7d451204e5de758e945c66 SHA512 10b6897bd10823d399937aaf3e09c1231a6c67072723cea8a9aff002b275b76d74a62260f8416e17cc53bc6a87fa0c19d00cb428ecff4052c1c8e278211ebe70
diff --git a/dev-util/netbeans/netbeans-8.2.ebuild b/dev-util/netbeans/netbeans-8.2.ebuild
index 71c3e2eafe32..3ee81e8dc9b1 100644
--- a/dev-util/netbeans/netbeans-8.2.ebuild
+++ b/dev-util/netbeans/netbeans-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -171,7 +171,7 @@ src_prepare() {
 		einfo "Deleting bundled class files..."
 		find -name "*.class" -type f | xargs rm -vf
 
-		epatch netbeans-8.2-build.xml.patch
+		eapply netbeans-8.2-build.xml.patch
 
 		einfo "Symlinking external libraries..."
 		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 393e74406ce4..301bd0284e92 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
-EBUILD spirv-tools-2018.2.ebuild 617 BLAKE2B 7a3a6c6d7dc3a90386dd6c893a0ebf65bb1a43c7d309ae0fcc771f921769b3d35f2751f8fd60ac9b5ce859acfef5548c0b871fdb6fc46e6ab82da9f27c97eb96 SHA512 851d87e6c52a534aa17101c67746b0d827e5ca065184e09f353a506140dab8b0cf813373d7257e4954fdd49e34e65fe992d9c149fe5a75fe8beef32a4774f89f
-EBUILD spirv-tools-9999.ebuild 556 BLAKE2B d2efcc80959ac8455dd01526585b0fe62750b094bb26390b0a414e3daa1620c2248681417e8a73616299552fbabf0ede768b3c9fc4f7924977e2d71c4720b7f2 SHA512 f4ad82e40a68b811abcdb5bc9e3ca5799edede222356d5aec680f6e3f58f60b1851cc9520331c5e155def002dfde1c5861622af55f2794a9d8c0499499f9fa2a
+EBUILD spirv-tools-2018.2-r1.ebuild 822 BLAKE2B 4a7872b35a711706348ce7d5d9b169715845d0ad194bf6a60baf97a7d6198231b45cfca20536a562a237247020b5d090d23219e056bd4ac6db676a8c86992481 SHA512 6b5b2fc029db2b0b2ec88d7f112ede0681609be1e27ac1e383de8973f84d6739cffaca614391f7841bcb72766a0eaa44f8b45f6bb04633723257094ef0e14dff
+EBUILD spirv-tools-9999.ebuild 825 BLAKE2B 103363a96bb5f105c67dc49f7db53394b6eeaf4126d1224ed2eadf20e23808acea5288f6245dc58aa8fed8fff47c6bdcfd6e610aa0b83501ca65db657e0e668d SHA512 2f088ae880f902c71433f61f52b29747841f6be5b6e708214ed887adab5c7a0d34b399bc6a00d803e3048930cb3fb4b91f38266752adc1973e05a1bfe72968b1
 MISC metadata.xml 435 BLAKE2B 907f35e3f59db2ebdf69dde5e9c01e6b4dc3efeea3defcbb81dfe7b84a94518008925b3b24849c150cfe5ea80b166cf3bb93f4851db0a5c647ee27742b68df65 SHA512 7a436d1fb3280e11ab02fdfb76051788f492e03649ae6f88c8cb0b15e4432d10b40c8ee27d5a732cead38b137faf1a9af5713e28c26ea179c4d8c8b18eb59b72
diff --git a/dev-util/spirv-tools/spirv-tools-2018.2.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
index ccda02331582..fa84f40f6b7e 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.2.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
@@ -18,6 +18,8 @@ DEPEND="dev-util/spirv-headers"
 
 S="${WORKDIR}/SPIRV-Tools-${PV}"
 
+UPSTREAM_COMMIT="8d8a71278bf9e83dd0fb30d5474386d30870b74d"
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
@@ -25,3 +27,10 @@ multilib_src_configure() {
 
 	cmake-utils_src_configure
 }
+
+multilib_src_install() {
+	default
+	echo "${UPSTREAM_COMMIT}" > "${PN}-commit.h" || die
+	insinto /usr/include/"${PN}"
+	doins  "${PN}-commit.h"
+}
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index e6ecb91d83e6..e0e2f53d0e21 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -23,3 +23,12 @@ multilib_src_configure() {
 
 	cmake-utils_src_configure
 }
+
+multilib_src_install() {
+	default
+
+	# create a header file with the commit hash of the current revision
+	# vulkan-tools needs this to build
+	local revision="$(git-r3_peek_remote_ref)" &> /dev/null
+	echo "${revision}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die
+}