gentoo resync : 26.12.2017

5 files changed, 3 insertions, 91 deletions

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"
-}