gentoo resync : 26.12.2017

12 files changed, 97 insertions, 95 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c52af0de1ee7..956e938fc604 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 99a9b5e3feee..7356933040d8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,5 +20,5 @@ DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e
 EBUILD cmake-3.10.0.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
 EBUILD cmake-3.10.1.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
 EBUILD cmake-3.8.2.ebuild 5714 BLAKE2B 3043b071ed597f37a7a07d9613e5010031d64be5849443dec86ba96892d7afd96c6c8b6a210964fa909da360e1ada9bdef47d82f61ac62ac7812455785af1bee SHA512 951eb5e34e58de94697a01c91f45b43f8d1045cef4eb3d9fa3fa9c8a0c36ce66f4f8656cc2e16b3d62d56cf59d4e59af17ab6972ddca87c9e14821b2703fde4c
-EBUILD cmake-3.9.6.ebuild 5975 BLAKE2B 966f47861af4e92e2a5a13aa0f05b2c6ebde75a5c6fe78a3b688c6c5c138ccbf3ecc0557ad601d729c86340986c6486efdf6fa245a2161fa9c31bf3ad27bae32 SHA512 b7f3c9d2f72a708e19359b8a0737aecbaacf09ce7b817c785789008353ad758ff7ce889a10e52bce5ac3cfcda4cc1a518f7a49a553e902e3a53e10dc2177849c
+EBUILD cmake-3.9.6.ebuild 5970 BLAKE2B d584414aea4d341fe1094cb8db94a82ebc0a6a0e5dd9d465fc4c9c4710f1d70fb6a6408d3ac492570eb369d029db5631c684ad0950ddd3e272d6fbdbf6f525d7 SHA512 5713177f82121c27f8703b523bf6db833554ff10fbdc907e5e2767b6297eecb32d7a7859777ebd8d39a64fc28fd281ee50cd4977bb0b6a2cbb99b8e862abd3d3
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index 48cd86d38774..b0e1849c4aac 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index d08acb6ea741..e17ad9d230e7 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,9 @@
 DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87facb652d0cc17be3c7cfac5e38ee3558d06cbfe4167fb27f32a07eba92e9836100b236ed604c897c8af89349230 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
 DIST cucumber-3.0.1.gem 265216 BLAKE2B 5bf7e2e28f268dde043a5b24ec18cac7ff1e00443d0aa80acb9ade5419c94c3854bfb58c24a88d7db7d9a00aa6576c5a2ff46c1092cd89629d73c6ed6f3c83ba SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b
+DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 EBUILD cucumber-1.3.20-r1.ebuild 2172 BLAKE2B c77fe5c6d6f6fee2edbf04758c1dacad34a7366d3b3c6db97b0c9c0ae08e1b05f12397db76f86cc2dac3c2f3ef5f46d779ef9d7e8051801b2cf425a75fbcba5e SHA512 b0fa2c24c9cb0ba916e9339f904a567562ab0d22337bfc0e92fcc0c28ab386780c689b5aeb5fa5bdb8fa8fb6054866d1f89573ebc0c20206dccc6dfebad8f28e
 EBUILD cucumber-2.4.0-r1.ebuild 2444 BLAKE2B 66189805faf95c9ba5ecd4c1bef55365c44dc5b78c0dc242845ab9306b093da954941d50084a9ab57a694495b6a58c50ce9405d6b967eea3ee7ba098cbbf88f4 SHA512 279ca04694712066d6e77032106f50553b2d1958f9c895c0955619c13bac98d0b3ee04adcfd4352be2cfab846789b15ef41b21a742f452945dbc3b9db5b34383
 EBUILD cucumber-3.0.1.ebuild 2462 BLAKE2B 1da85d20495b7ed10cbacb2eb96c557aff56d95375c78458e98e5b549f5274f96050d0486c3639f37ada9f09b8d7a3934a767d54822bf53d97eb685fab21230d SHA512 781b54a7757bb5ebf95b91a81b97ff6236234f9f1bb7cf93cb36187c31dace53ef9409a4ce07556bb86fa1a83ef91f235053355e6543a9e51b4beb4dcc162d1f
+EBUILD cucumber-3.0.2.ebuild 2607 BLAKE2B 41708899dd89fdb08e9b5fa278e98453bef068bee4182d624de91bd8f83d99d93208c9631671102dd746e344dbc25f94ce9e75c7822586650c1565557d31099d SHA512 a81658edb50692c31ad7ea53b60db33108fc77cc31862d4b030d536d4fa5d4a885f7653e99f32fc9cb52b31cc46335057b45df4934c2406b58fa76d012624fa5
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild
new file mode 100644
index 000000000000..4b4428203cf5
--- /dev/null
+++ b/dev-util/cucumber/cucumber-3.0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+# Documentation task depends on sdoc which we currently don't have.
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
+SLOT="0"
+IUSE="examples test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/rspec:3
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/syntax-1.0.0
+		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
+		>=dev-ruby/json-1.7
+		>=dev-util/cucumber-3
+		>=dev-ruby/mime-types-2.99:2
+	)"
+
+ruby_add_rdepend "
+	>=dev-ruby/builder-2.1.2:*
+	dev-util/cucumber-core:3.0
+	dev-util/cucumber-expressions:4.0
+	>=dev-util/cucumber-wire-0.0.1:0
+	>=dev-ruby/diff-lcs-1.1.3
+	dev-ruby/gherkin:4
+	>=dev-ruby/multi_json-1.7.5
+	>=dev-ruby/multi_test-0.1.2
+"
+
+all_ruby_prepare() {
+	# Remove development dependencies from the gemspec that we don't
+	# need or can't satisfy.
+	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid dependency on unpackaged cucumber-pro
+	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
+
+	# Avoid harmless failing spec
+	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
+		spec/cucumber/formatter/html_spec.rb || die
+
+	# Avoid failing features on new delegate and forwardable behavior in ruby
+	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
+
+	# Avoid dependency on git
+	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
+		-e '/git ls-files/d' cucumber.gemspec || die
+
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+
+	rm -f Gemfile.lock || die
+}
+
+each_ruby_prepare() {
+	# Use the right interpreter
+	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	if use examples; then
+		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
+	fi
+}
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 0cb5aa0a1fea..21860477e39d 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -2,6 +2,6 @@ AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca119
 DIST mdds-1.2.3.tar.bz2 287079 BLAKE2B 84f0a36dc7af566ba79c86695cc70de9b924de5a221041d3d721a93f40589a0bd19167e66e17d6811e2bcea8fa9ff2423b29b6fe13a9011ecf3de05f1bc99032 SHA512 e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d
 DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
 EBUILD mdds-1.2.3.ebuild 945 BLAKE2B f9c56d7135f13e59119e0bf72ce2b7c5cc8438afe3a48aa88302707c4503704a576a9bf2ed7cd9b3981fca2fed9aea1c605cba7893a3a9d1d6b6153301917717 SHA512 37843f2ad2bd96b4c4372922617a4ca67befa8b7d27977e6bdc86dd5a37bc9a65c4213a3b463648eff2d599bcf0a4f7821becd8bf8bb9cf4f8d22479cb8040e9
-EBUILD mdds-1.3.1.ebuild 949 BLAKE2B 2d7f90389ac78c19a8b984e25a393a32da8e57c2ed6b09006653c52183176066ea88265157cc423d4b18de80e4555e11c6cf17db80cd0e7f705f41a91577b098 SHA512 fbdce865186281d17dce6a783854c49d76073756154eb1044b369eb0287600aff4cc725610687dc06d4da1f63b332b284d2e2f51618de472497f5c200505cf10
+EBUILD mdds-1.3.1.ebuild 948 BLAKE2B ba7eaaf8a6a0f99c575c8bae10a4e5d87633282e874e3b3227069db15abaecc0d952e1e3b375b63d2190faf23236097680567db2d1a9df6337ad5796a17a3c10 SHA512 cb27659a68a6fc71b2ccb56174196eb17089211d6ea7e947b7062c9a0ae91979b712d1dbd4cadfecc487f4a31046bdb69a2621affb8a541eecdf4621819980a1
 EBUILD mdds-9999.ebuild 963 BLAKE2B 7a08f3367a54b451b33a648c89f44779588d8b241f4df6b9a23e7f1828219a8837391df471b3f516616113444f0a77726324a31ce1f61e9a61dea6bde4ef6369 SHA512 30fc4b8185294db0dc04c3194259961976a48f7ef13944015f5f85b68076bd959f4674513366ec5c8b138c53cd43ed46d8d213701c7dea36bf87d26532cb7569
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
index ac7784206be7..a1634f386055 100644
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ b/dev-util/mdds/mdds-1.3.1.ebuild
@@ -17,7 +17,7 @@ SLOT="1/1.2"
 IUSE="valgrind"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
 DEPEND="${RDEPEND}"
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index d095e87075d2..20c42a38e221 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,9 +1,4 @@
-AUX uncrustify-0.59-unistdh.patch 473 BLAKE2B 9cc71ce263fbea899a1fa7490a6cdb74c649b69a532425286a7f78b96f4d25b06293ffc27efac581771a5ac8ddc4ff21832bd4d04de557278558e233419e6032 SHA512 a7ed9c1e0a587dc9923085c7a830192fece50ba18c2a19617de60209e051ec44d517d337738c7948454669b3d2061625379cacb301e44d239b3c2b90b09e6114
-DIST uncrustify-0.59.tar.gz 983822 BLAKE2B b73ef70bf4175433d1e7ad9c2f0adca251af55ccc0e7892d3d4e4a987854eb4285fe2d2da3b66d8765a64a2cc3ad50c23ceb494b0d8afa54ab64f399aa97fa3f SHA512 eb228ecb63f777e90ecca44bdef2312fbca2cdbdf9dd899e1f67e9917265667584796b983050138bae39773ab2627e3c3035e519f64dfe51475f207a0e3af900
 DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
-DIST uncrustify-0.66.tar.gz 1435142 BLAKE2B c16146af69a20e8dc8850c2b4534fe75dcb0b245463a966076183db01167958661339a47f57624e73cf23dc92713866e8418d572e779f0033d2202d42ba6f66f SHA512 607486c6c34ab1551707c0c5e1c4ce73d53f518f9db478734a3af6711569b0c91e371d9b88b4fc3c34a4d9459feba32c24c87b82bd2c2645fa9d9a6a674f429d
-EBUILD uncrustify-0.59.ebuild 726 BLAKE2B e602810aa9893de194ca4205b9ac0136ce62b364d29299d33f050925938cc64d193d0130006bbb0011a58646e1c040bdf81ed2d3376cfbcedf257b378653aa6c SHA512 a0aa2fca968e77a7eb0d92d183d97cea5d19a781c28d48167ecbd1b410560436cfd3c31b57876cea5aca4afabad0db76c5a4cfcbd10b0f8a8a72913ca8c7da5e
-EBUILD uncrustify-0.66.1.ebuild 768 BLAKE2B e165cd2ee7f56a3244cd9b315d03203a549e5c33215e5d05c4a3fffdc4ca7eeb3146f36521cb82605dff7c131b51947536172b20541b85a6ca396182b534ed36 SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9
-EBUILD uncrustify-0.66.ebuild 768 BLAKE2B e165cd2ee7f56a3244cd9b315d03203a549e5c33215e5d05c4a3fffdc4ca7eeb3146f36521cb82605dff7c131b51947536172b20541b85a6ca396182b534ed36 SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9
+EBUILD uncrustify-0.66.1.ebuild 775 BLAKE2B 64727ab17bc2c317acd512299a09308d97a253ee1bb6ce00f00e9857d3425a830b5087389dd4dbb1cab4f317ceb8c7993668f21ebaa685fe81ceea436ee6f149 SHA512 04ea97f08d9f2ecdc5ab773e2f0905f59915645786916743bb0b2a53c0b8ef384e75d309a79a3b0501a76e11a2dd15e97bb8cf0221fccaa98ffc477ae828e3ed
 EBUILD uncrustify-9999.ebuild 768 BLAKE2B e165cd2ee7f56a3244cd9b315d03203a549e5c33215e5d05c4a3fffdc4ca7eeb3146f36521cb82605dff7c131b51947536172b20541b85a6ca396182b534ed36 SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9
 MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/files/uncrustify-0.59-unistdh.patch b/dev-util/uncrustify/files/uncrustify-0.59-unistdh.patch
deleted file mode 100644
index 275c21aba339..000000000000
--- a/dev-util/uncrustify/files/uncrustify-0.59-unistdh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-open/close/etc. are defined in unistd.h, GCC 4.7 is stricter in this and
-breaks the build, bug #413859.  Upstream already applied a similar
-change for another issue, so next release should be fine.
-
---- uncrustify-0.59/src/uncrustify.cpp
-+++ uncrustify-0.59/src/uncrustify.cpp
-@@ -24,6 +24,9 @@
- #include <cstdlib>
- #include <cstring>
- #include <cerrno>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
- #include <fcntl.h>
- #include "unc_ctype.h"
- #ifdef HAVE_SYS_STAT_H
diff --git a/dev-util/uncrustify/uncrustify-0.59.ebuild b/dev-util/uncrustify/uncrustify-0.59.ebuild
deleted file mode 100644
index 38fc0c4aa6b7..000000000000
--- a/dev-util/uncrustify/uncrustify-0.59.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="test? ( =dev-lang/python-2* )"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-unistdh.patch
-}
-
-src_test() {
-	cd tests
-	python2 run_tests.py || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/dev-util/uncrustify/uncrustify-0.66.1.ebuild b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
index d0891fcae6c3..27705c31b229 100644
--- a/dev-util/uncrustify/uncrustify-0.66.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
@@ -5,11 +5,11 @@ EAPI=6
 
 if [[ $PV == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	SRC_URI=""
 	scm_eclass=git-r3
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${P}
 fi
diff --git a/dev-util/uncrustify/uncrustify-0.66.ebuild b/dev-util/uncrustify/uncrustify-0.66.ebuild
deleted file mode 100644
index d0891fcae6c3..000000000000
--- a/dev-util/uncrustify/uncrustify-0.66.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ $PV == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	scm_eclass=git-r3
-else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${P}
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1
-
-DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
-HOMEPAGE="http://uncrustify.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-
-python_test() {
-	cd tests
-	${EPYTHON} run_tests.py || die "tests failed"
-}