gentoo resync : 01.12.2017

5 files changed, 8 insertions, 51 deletions

diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 6ffd5be63098..9c8bdcc69411 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,8 +1,5 @@
-DIST html-xml-utils-6.9.tar.gz 311449 SHA256 9cf401dc84ca01752adf1f2d9862c4f227bb089504ed9d03d7fd40603e87fab2 SHA512 590a04e91130d7daecc4c1935808d872f3d49967be345060039bae5986b70be3be40104bc215524017a08c5492671a1fd96b63028f26f84faa400a9fbd283778 WHIRLPOOL b89b0bf5225256af2a0464429f2aa7eb1171ea982afc02ae0377e7cbd0633ee33cd39069bb0cd9056c712c20e7568b3716e448b1b8e47a9eb92193076734c353
-DIST html-xml-utils-7.0.tar.gz 334696 SHA256 e7d30de4fb4731f3ecd4622ac30db9fb82e1aa0ab190ae13e457360eea9460b0 SHA512 305578c135972c64e048962734c4794ed3a386a4bc3194cb14277fbe5bfcdb01a13a32bcf751d1216b3e89244ab778235c8cfb12d412fdfe1bf26229b5e23732 WHIRLPOOL 00452006f08853580eadb3179f3c57e31ef9909bd7170b2f5abe588031147ac1a39525d4de3f0e3a60bcd1f896c5866ecdcc6786d543e5417044344c6c7799f1
-DIST html-xml-utils-7.1.tar.gz 319559 SHA256 ec0efd2263b864bb7e0ae5c59f02c43c5d8aebd0e1c0d2bfce391e665766d56e SHA512 a17328500552ad28136a08d0c7dd992d53afbc853ffd8930b516b3218915f4f159234f27af66d135a51dc25eb6c35e6f14d6f0006bdfc2abf351ac8298334d48 WHIRLPOOL 2ac829710c4e1c8b8bf6e89676b0ed6847dac9e2445e7628b47bd0c5397cb02b890cb4d5c8411fb236ecde2815b3879a54cad3eab1348839eb1eddc1e3f4868f
-EBUILD html-xml-utils-6.9-r1.ebuild 534 BLAKE2B 1f7264907e1f8828afd6a7c3fe35562a7e7a49127b2d0ca882a3138b008e5c21b7e65db14c80b6bf9c70231e92caf8641ad036960747e08c800ece94febb6760 SHA512 39cc174c62a8c96d16d00987ac39c4160b4c12804c4ddb0d21cc2bb49ddb5226c12c196416f7f9a0700667ab83f6a471a76b3dab95685f667aebae5add450cc0
-EBUILD html-xml-utils-6.9.ebuild 521 BLAKE2B 82fce8230895bd97ab3d0cd3eca472d4e94a827654f410b94c2f7d9fdc958ea569c15871413524acba4da23a66817ae8e0c433636f3cd5e2c3e269d1d8ce98d4 SHA512 624d91296ebae1488e978eef8c477da23d096a08ebb16a60c92d2862bbe09f0a80694a635870801c00e6e59cfe2f3c601eaac232e2ce76539d89149020f22d15
-EBUILD html-xml-utils-7.0.ebuild 715 BLAKE2B 2ee2e25c5dd1b1c09fdeef388f227959401995e55fa63e5bea3ff641b63cead8749eb830298fce0b1d20a07dfd3ab8c7390b4529ddfb1277d17f9369fd7be1a0 SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea
-EBUILD html-xml-utils-7.1.ebuild 721 BLAKE2B e2c36b49f88f453d075cb5849007954a2713b0e2e23a859993dae2d684ae0ebd548a78ac1117223764a21bd01598067850a577aba887c180505d5d1ca940f8dd SHA512 079501e0517bb3bb3e17254f1c62894aa6c0b3caf56709cd83812d391166e9372b983202cdc2a94980173fbab332be9cca8088d519e9b856c50b02e8152f059c
+DIST html-xml-utils-7.1.tar.gz 319559 BLAKE2B 4c07a13a6b59c9d336a5620f2c9b1109fc5289339348d287136ac91f5dd508780a97dc9e30ae361c1c8237ecfa16996a6cd79cb4eaf6d9b6ba9bd97806009fd2 SHA512 a17328500552ad28136a08d0c7dd992d53afbc853ffd8930b516b3218915f4f159234f27af66d135a51dc25eb6c35e6f14d6f0006bdfc2abf351ac8298334d48
+DIST html-xml-utils-7.4.tar.gz 343008 BLAKE2B 29c8e437afabd04fd511d3498c94cfe8ef027478b7bd4d0390635a5dd18be20971413217ba083e7fb7b82d9b10a9d943b8a90f761cd6ab192829ee64a11a0952 SHA512 88a527c29ef23b34ecb778085aafd399943764a18a3e4b39ff27b3e2cc3effa84b9ffe7c2a0df80fb27a38a7e4d4ceef6db91da46cbb2b4f9fd59903d4868a20
+EBUILD html-xml-utils-7.1.ebuild 720 BLAKE2B 713315b969084c59ce214f5a47ac4226f388ed9c3a46567d159efde9c6d16d330928fc28714c678d10eda8c36bd346ef2b50400c006247111550edf2f2b78ab1 SHA512 990a5c37f41781133dcc916e22ffd5fca9e1570411df9552552ea547cd8847683b6c4f9c3d80989e44643533777e861da96d7d33e4621e59ab12722216547b01
+EBUILD html-xml-utils-7.4.ebuild 724 BLAKE2B b848b468185c966cf1df0ae6bd23620687afeeaff4cc6daaa334015ed5a4cf9f5458193c96598004a1ea31d2e5f578ab749eff7b2f6547f9d9600c3c91f1139e SHA512 7ceedb6d8ce7288edf2582f37af8e6bf4d48421dcb740578c8666fadd0b4dd0dfbc1f3ab1e340c5bbb4825549fb87ecae7feb09672ab60f7acbd805e3242d15a
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9-r1.ebuild
deleted file mode 100644
index 8f754f220aba..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-6.9-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
deleted file mode 100644
index f7eba1b63be6..000000000000
--- a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
-SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
-HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
-}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
index 38e21f4c0f04..a55cccd45c2e 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/app-text/html-xml-utils/html-xml-utils-7.0.ebuild b/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
index 9d9c59066edf..080b0bdc12c5 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.0.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,8 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 LICENSE="W3C"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+
+RESTRICT="test"
 
 RDEPEND="net-misc/curl"
 DEPEND="${RDEPEND}"