gentoo resync : 31.03.2018

10 files changed, 12 insertions, 38 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f2bf62cd2ff5..36cb62832f3d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index b696ae94f0b0..215b6bc62b66 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 452 BLAKE2B 3648892f66fdf17c3d674b9cff31cae0221e1626d3a424bc8e7722791c9072c229e8666260acbf085e3637d29b423103eb6567ab2f178b93d85316677c7f12b6 SHA512 50d75230349a6ea5af4f27c4c00badf443f03bbc3d925693e140e8ce1dec9a7a3a89fbba9f5845498e0d14376fc7e188a69c95e19127da0130862bcac6f2ffca
+EBUILD dtach-0.9.ebuild 457 BLAKE2B 7d96eaea83b6eb190cf4cb9c48b01598660b5c44ea74bf6c56a06721b910c5a50afff8a5e1087cfba9e5bd706bc63dfb448692e2b00b181ae6789048b7c5e7f4 SHA512 81ed11fb3f9e266a4c542ca9ab2074c8f0e1f13dec25f94ac554f8cbffbcb52bfb8ffb3407205adfc7fde1cdeb03d034b3e8a96587e4bdbb9cd7fdfca11bb17a
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 6a29ca611e31..d27f96f87a96 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 5cbc73a3fc14..fcaf138c43b0 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,5 +1,5 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
 DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
 EBUILD khard-0.11.4.ebuild 1056 BLAKE2B c76efd9de7fafd0627daad28594c11de71d65d2315dee87dc1dab7ae80d02fca7d82e8d11fe525c74b4caf45fbc1422e5ae3593fb28a3eec9e82ef25a956124d SHA512 02a4b8786589a7fedd7e922f3f217d0172bc01f434bfe34246d0f8d93e3e78e25d0e7ebfcfa2f556a6e720b868a39d1a8965413aa5356698824997aca581d2eb
-EBUILD khard-0.12.2.ebuild 1091 BLAKE2B 1ca26abe6df8231997245f32b64b4a47366eec81e0acacb7867a41d3e3ce477c10dda779c076ca9fe067a7be0bfd83c23f829224de46e8ad59a51ac6fa83d611 SHA512 d17264b2be3b752c6c25cd132695d364dc8a1ea606a103a2c49de1c9410501933a3dd18bdc1e096df155276330aabde9259be6cd0fa0055731482ed6d0e798e2
+EBUILD khard-0.12.2.ebuild 1090 BLAKE2B 8e0a2f408bcaf31f68e5cc83f5ba66b54d1343b3955bbeeaf0e1a477a2cbfb011a8fcda54a2e5f93b214c140470e0ff6e6dade7f353f520b57e6a75a41e7fa6e SHA512 132f2dd71a58c81fc626a0969e7abb1d7484c3dd59a370ce2d5c18dfd6447cc1f7d33711883dc4eab01385e094517d8ce7b71c5d8063788aa798f63176b09f29
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
index 16e47a8553ee..70319cd49ce7 100644
--- a/app-misc/khard/khard-0.12.2.ebuild
+++ b/app-misc/khard/khard-0.12.2.ebuild
@@ -15,7 +15,7 @@ if [ "${PV}" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/scheibler/khard"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/lockfile-progs/Manifest b/app-misc/lockfile-progs/Manifest
index d5d80625b9c6..b1a96cf82571 100644
--- a/app-misc/lockfile-progs/Manifest
+++ b/app-misc/lockfile-progs/Manifest
@@ -1,6 +1,4 @@
 AUX Makefile 1906 BLAKE2B 9c294471555a7dbe6d4342e8af7c744731c05ab22adc2192eb94da5e166c5a94705e328ca600055e722d8610869d20246fab741ef494f6e68d987c913e8054cb SHA512 c3ebd2f737fc664b37e235a0a68f50ebe80f00dbc522566520edb9827771344d022531c50283be5eaddd26d72295faae2676ef58838dd65797c74059719d826d
-DIST lockfile-progs_0.1.16.tar.gz 155901 BLAKE2B e1bd7d3ac4e67fc4600c50486d353bb0b4bae37ee32513ecb3e5d943ab950b093461d167ae20ec61ef9561509eb31a89c34971114e463e3241206c069c73ce84 SHA512 374879dbfeb1f0e555a2fa0fa3ea77cbee0a70a492d52695b9b7bce284c0a8b7878978d64d6ec03d2cd6799f31a6a3e6bac7d00d857f90a08acda2e74ef6dee4
 DIST lockfile-progs_0.1.17.tar.gz 14833 BLAKE2B 3e67aee40a8700c330eb8dd1f9ae3973d50f733333825a3e176434586357e9bbb3db9d480f6a778d383c5dbaca03d3cde90291c7668e3b9bc425b93a0b53fa2b SHA512 9d912e1a518fe9c02054beb25c4591df6db55cc2fe9b7049fb85368465bd9ced9660bb0a809ee60a7effbdc6524613c40fa69d9d27fc2cfc964f41b7486c3596
-EBUILD lockfile-progs-0.1.16.ebuild 604 BLAKE2B 419c695d4bb534803f1850e6e5977b5ac7df6999227b14606d6373132031f1d0e35203ab4e1789e9c5ca095b1fe6594c9a8e4a3274b9ceaaa8353d1c11c1efe8 SHA512 53d3a4ca44132e777d509670d56617f896adbc870ed629b1c3d595f9ef2fc979d1bc5ed77009cdfd22f2772853c126c432ce1db7e186ae3add7753b3826a1126
-EBUILD lockfile-progs-0.1.17.ebuild 767 BLAKE2B 059a1849c2ca0981aac52c5be7cc502ff4955282f4e539eda2be545d71a6d3573d3fa5eff7149ce2b9aa04248588fbdf4b1a8e799a6c72361c062451fed7fc9d SHA512 6819371929731bfe299f39cae39ec8bbfa79e35b64c1d1fed43f8e1c41f11fe348b60c1b9fc47612dea23eca8a1760db0fdb0a72aea0c2cbd3819754257eb6dd
+EBUILD lockfile-progs-0.1.17.ebuild 760 BLAKE2B 1369da0fa34669b7c4398c7cc7e0f861aea9809a340778bf43bebc92242ca524f15d0f39746b53fecbdd37a514f51375cc89c963687257a549ac9327cf8f8cea SHA512 3d1c74cf0fcd9727d8f527cde863c93f98b9c8c3d63209ef12edb0fc5991f2367cab26074b320c8e94ee6574592fff2a043fe5a2d461deb13bedeef0670ac63d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
deleted file mode 100644
index 78f700557741..000000000000
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
-HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc s390 sh sparc x86"
-IUSE=""
-
-DEPEND="net-libs/liblockfile"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/main"
-
-src_prepare() {
-	# Provide better Makefile, with clear separation between compilation
-	# and installation.
-	cp "${FILESDIR}/Makefile" . || die
-}
diff --git a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
index da52cb8a7404..2fb294180f22 100644
--- a/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
+++ b/app-misc/lockfile-progs/lockfile-progs-0.1.17.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 inherit toolchain-funcs
 
 DESCRIPTION="Programs to safely lock/unlock files and mailboxes"
-HOMEPAGE="http://packages.debian.org/sid/lockfile-progs"
+HOMEPAGE="https://packages.debian.org/sid/lockfile-progs"
 SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ~s390 ~sh sparc x86"
 IUSE=""
@@ -30,5 +30,5 @@ src_compile() {
 
 src_install() {
 	# Makefile has no notion of PREFIX, bindir, and the like
-	emake DESTDIR="${ED}" install || die
+	emake DESTDIR="${ED}" install
 }
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index a41bb8d4233e..05bf60132f94 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -5,7 +5,7 @@ DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
-EBUILD pax-utils-1.2.2-r2.ebuild 1627 BLAKE2B 4cb00aa04ebbca333f1b1cc3c5db6580f592bd3a7dab1c87a8aa7eaa4250ca1f261442f0d662960e41fc659048672487d5674f930be972732239fe6e48bc4646 SHA512 ef06d06f27ed726e14e196ead496fc72c0f7426d45f35839527ed1fb8c5ebfc3ecca4aa8bf41cc5e35d00cbbe01d77aa45a1dbf8dccf88d72610098fa2e9257c
+EBUILD pax-utils-1.2.2-r2.ebuild 1626 BLAKE2B c945be7e4d84b173c95dd4a28708391b8e2b567c34c17ab9da93540222502a48164af2fba53fc011f58765181c42aaafc05037d45fbf4679fd6bd552c552c44a SHA512 b8d31329259a107b1c4c3d94fd6500a13eb37c8364ebfe6b914610c1d1c96961ab157d2b436589374cfc88f3b543c364cf3ee99d8f2884a5197f6236d448e4c9
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
 EBUILD pax-utils-1.2.3.ebuild 1483 BLAKE2B 102f63510a9af44db68c8c623664ca1dedfab0a87cfaadcca54286f7a0df0ae4184c0088178b52ad91e11cd9833aa9d0c12b15c06120265983c640103e4eb993 SHA512 dafd182a3de2e06246a5687cdcf65b6a5a78f64453bf40b753ab2fa48056214e0dd15b03ad7603cf213649270c0c12c500cb2715bfed5596f5853d70221568e2
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
index ad52984becec..13e834f918f9 100644
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )