gentoo resync : 22.06.2019

11 files changed, 20 insertions, 56 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index abd94220dfd3..30aa9afd88ba 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest
index d9bc1da42cd0..d9ebb0ae11c5 100644
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@@ -2,5 +2,5 @@ AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801a
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
 DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795
-EBUILD gcab-1.2.ebuild 1149 BLAKE2B cbb50f2b167bbc92a95e04b1d6de5f780c0da37620773bfc225a28bb454fdca04e5684ad5869bccd1fa0c750dc6eabf2049ec078feeb365a92848dd81c793e7f SHA512 366cad5fe303d0ceb0e4dd43cb83a97a2f388937b4b5f55b5fbaa166d1b0249d08042219d846223454da8f1968814a0eee1518c6e6c94fa8823f017dc3855fb1
+EBUILD gcab-1.2.ebuild 1147 BLAKE2B dccd20fa084e1a7fe497620cf1a758c436ca692a1dac19455d6f9c5d87ae550f32eee26464c98d0121ce77b7b1e0775c909c15d7fb87d7dcb2885afa48982a41 SHA512 8b08e6bca5a47aa47752db217640e97eb95597e5e5139d5cf36c005d0e06ee72df23a049770d2324666d844150ef9c72fb80efbc12c59fdaec48b94c74e1178f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild
index 17126e5f55be..42a9c1bf8d98 100644
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ b/app-arch/gcab/gcab-1.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/hardlink/Manifest b/app-arch/hardlink/Manifest
index e083ec285f52..518bd46231fc 100644
--- a/app-arch/hardlink/Manifest
+++ b/app-arch/hardlink/Manifest
@@ -1,7 +1,5 @@
 DIST hardlink-0.3.2.tar.bz2 15479 BLAKE2B dd6cfc312ed75dc6d9e37b898215ed90efe4734c5974297c9e29a51a69c9b2d4e91d9aa3bca1d42679307eecd95ee46e6f636c211d1ceafef1ea52428761d1ec SHA512 1d027f7b2f1974c950044fa8872dc58101800ca557a4d66406652fb43f64653f7dd39a70f4ac65f5f6bca9116de4ce44aeba2ef1fe446834641ba5c4c5604dff
 DIST hardlink_0.2.0.tar.gz 12478 BLAKE2B 42918fbacdd230796e59f6ae7968599a90b63cc35876872ef34919377d6489c6c99d06f201a122f5859a283cea2672dbcc207e04c6b5ca0c54ab4e2f4178a970 SHA512 963fe90aa09e2bd548722b5c7f047fbd54fddf37967333e86251d7e5d1c646108ce90d78e7efeb8af6b9169b9a0bc5bc8b744afe1e813390f3e0bd535ce22005
-DIST hardlink_0.3.0.tar.xz 14440 BLAKE2B cfbd02b008d49b129e0b75f67bf45d904e89a1e585d0e05e959770a4367ad0f5823f24cb4f3f6715310c749ba368ac00d378f8eb967a1b4437335eecee8a5077 SHA512 22a8945ce5dac74b05bb1231959823aec0cd364d6db9ad808df4acf232d894170c006ac1e88509604ce1859d41bd4a5d91e2b12c8010aa7fc7e19a77922c4486
-EBUILD hardlink-0.2.0.ebuild 949 BLAKE2B 4bc9cadbbd21a5fff33192e3c132e37e25ed17519dab483ae6b699a03da912a2236fbfb6e6065052f5202b36d601fbbb6fa84abf01b6e8cd98a784d9911360a5 SHA512 632ea6bb7ef4d9bd78ab185ccf6028b41731146d15eecebaef2c9f623c3f2c0112b8b1265c3808d7ef728f47f7c2c664eeb670abf3871720c48a43b92537cba8
-EBUILD hardlink-0.3.0-r1.ebuild 966 BLAKE2B a2f6cf8dea6d6c8ba93bf3b8ee6e386a57012e54f7517401c3cf5aa7736687e8babda74f6baf54659ca3d49ef126c7c6738001bbab046b345298f9ec3356e881 SHA512 f54012d84a0850952180598e64151b419af2027715d3a3eb42a7640447558a658f94407e71745da1a019162d81da1b18851bf3c1723db438b691d0c53a291836
-EBUILD hardlink-0.3.2.ebuild 1038 BLAKE2B 5eb50bfc5aeea4500e0d05a257888b278daabf17232d0fdf668892664deb3bbc0f0d21edd35768f27ceb62172a5afa5809a92616c500c852b25ee3be32298336 SHA512 79e9e35f9414931e34dfbeed805f4d427c5dba3562fb5e631aa8819097ca65d59386b21e7784896c20ccae8e169f9cda0eb2274d5bdc958337bb6983ffb768bf
+EBUILD hardlink-0.2.0.ebuild 985 BLAKE2B 04207e034de33f2cd8b40e9f5a0165362646dea99a6222b202c360bb703fb4e67ddb51aed9b8b0bb15f2ae7f0973c07b820ab597ec573c91dfaa9cc791c978ec SHA512 1043e76c0e975e2cc53003bcbc82b55e24dc9576ca880542464551b550a904b9ec12055ecc7dedd4c68acf2e40e992e9bd975a60b248a3025fb9013feb161d54
+EBUILD hardlink-0.3.2.ebuild 1076 BLAKE2B 6a0d9ac49371bb12f77899d7994b596ce654ea904f80800ad407260d7a4c97ee01e62e6d1f71e5e1468ee82624207ec2330d48b739c46832eb2bb280ae0873ef SHA512 d96f33ede57e1d190f4993c2928808b13005746bce63272359a3d1af5ee5a4e7c327e5d7caefbfe4023738db19c8898056fbeab036bc57725a27295e7db64ba5
 MISC metadata.xml 375 BLAKE2B d148dcbae6b75d007f0fdb447b3e0a866df0468da507482ce60fbf4dc8f758053bc4fd9d5179f07915576dc10a96102c797747cb499199f55d22c7a989cc10a2 SHA512 1f14b085ab758738cc521af00de93bd47ca037f6b59fff96352c72e8f4acae7fa2bb5a8aa2df9eb865d992035a9c57c0b976cbe5f6033e4a77250e9101b22b7c
diff --git a/app-arch/hardlink/hardlink-0.2.0.ebuild b/app-arch/hardlink/hardlink-0.2.0.ebuild
index 169f891ede6c..d2c3f14fffd6 100644
--- a/app-arch/hardlink/hardlink-0.2.0.ebuild
+++ b/app-arch/hardlink/hardlink-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
-RDEPEND="dev-libs/libpcre"
+RDEPEND="dev-libs/libpcre
+	!>=sys-apps/util-linux-2.34[hardlink]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/app-arch/hardlink/hardlink-0.3.0-r1.ebuild b/app-arch/hardlink/hardlink-0.3.0-r1.ebuild
deleted file mode 100644
index c6a18f731076..000000000000
--- a/app-arch/hardlink/hardlink-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="A tool which replaces copies of a file with hardlinks"
-HOMEPAGE="https://jak-linux.org/projects/hardlink/"
-SRC_URI="https://jak-linux.org/projects/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-RDEPEND="dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( README ${T}/README.rsync )
-
-src_prepare() {
-	default
-	sed -i -e '/^CF/s:?=:+=:' -e '/^CF/s:-O2 -g::' Makefile || die
-
-	cat <<-EOF > "${T}"/README.rsync
-	https://hardlinkpy.googlecode.com/svn/trunk/hardlink.py has regex '^\..*\.\?{6,6}$'
-	for excluding rsync temporary files by default.
-
-	To accomplish same with this version, you can use following syntax:
-	# hardlink -x '^\..*\.\?{6,6}$'
-
-	This was discussed at https://bugs.gentoo.org/416613
-	EOF
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
diff --git a/app-arch/hardlink/hardlink-0.3.2.ebuild b/app-arch/hardlink/hardlink-0.3.2.ebuild
index 7eca7686d2a2..04acefe5304e 100644
--- a/app-arch/hardlink/hardlink-0.3.2.ebuild
+++ b/app-arch/hardlink/hardlink-0.3.2.ebuild
@@ -11,9 +11,12 @@ SRC_URI="https://salsa.debian.org/jak/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 
-RDEPEND="dev-libs/libpcre"
+RDEPEND="
+	dev-libs/libpcre
+	!>=sys-apps/util-linux-2.34[hardlink]
+"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 4dc863cbd4f3..3e2822c414d8 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -3,7 +3,7 @@ AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400
 AUX rpm-4.9.1.2-libdir.patch 1056 BLAKE2B 5be54a8109c2c24fcd0c197c0a62e433047ac4f84c7239fed6ee9830611de98b7a0bf0e7675b861c27a436b73dad64dee674e2780644ad712164beafbfa2276e SHA512 505faa54ccf196891f1e2231c776f8eadf547bf2003a495c90a2e5e4c93e31aadae5bac70541d316643a8aca85a1b2a3dc6b0ae2601834534ccded06a4a5fabc
 DIST rpm-4.14.1.tar.bz2 4103880 BLAKE2B 3fa7579a251b02ec89943b5505ad9ca7303a444eb64b1018fc74bc6dfb1c19d4f30d96189172c4450925f3357174cde70b298116b53b9155223b52a593a67aea SHA512 29e95eaaf40a6ddf7f23446ea6cb8a1dcd12a45d4965595a705cb9130890d772a40ecfa475b189865da51248b3d2414e4f4b1a40cbfd7ca538c482d87c50a218
 DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
-EBUILD rpm-4.14.1-r1.ebuild 3381 BLAKE2B 2879ce331def5838c70d1103afb61b3ed033f30b90538d0455f27e314d89627b9ac293aaddb1ccd29893118b18ed1eb7e23f8f1386cf8b408847388457e1f648 SHA512 bef11e5de295892100f8005739550960c73c2d6f31f56eaca404761c90f7bfb9eae675b0d97bc465548d049ecee6e241875b703940f43b1d02aa97d133b5ec8c
-EBUILD rpm-4.14.1.ebuild 3235 BLAKE2B dc139004dab0f0ed6908e26f62abe156459e4600ef40c263f77f4689971c8c44c6ece7c1fbf5b62f601ff106d550318a70edb973412a8b6433e7c4551e007ced SHA512 2e0dfd327c6c50575bcac7b414d9149accbbd5c3bb5bd04c13ffb748eec681762958cf341dd89546839b3c4b49cfb82d55bcddabf3a8931b97f113bf9fab0abb
-EBUILD rpm-4.14.2.1.ebuild 3434 BLAKE2B ff78e40955a55544325a4c9c9fa49cae5ff607534d3d32767b0de794628d7eb6936818d9549c7437b4241fa9571bb9e61ce1d5069e81f16aa36244285b56b52e SHA512 39e238ee2fae8d062c04e6fb02160681a200c767c9aac246c83eafa6ff65a4d7e9f3270f9f4e2b2270d3c8a3363532c7d9d44ae3808c8f85502d5533ec36f78f
+EBUILD rpm-4.14.1-r1.ebuild 3378 BLAKE2B ab21c2c5d3905e96714fd2b7c3a36fdaa48d653d2a20e2f0ee6691332fa766a75062d7796228b597c62cdfdf34a26b4d94aa8c0903aa99bb4496d76cdcf845db SHA512 53b989149750de0fceb54d078bfac14e7fe8fef10d8f20571121dd9dbddcabf094e9cffe7f563b3e765a38f0e57066d35de9624ab9c6c1a141bf51140fdd632a
+EBUILD rpm-4.14.1.ebuild 3232 BLAKE2B defbcce58975a000c217ef7b0d15207eaa4606a595668d58eeb1d7275373b58a6adf9b0770ffd4d4db26ed73ab479ca3309bb13e101f389613687c6b0627defa SHA512 b8f39f1a6beac35dab8cce8e35727bc6832dbedf32b28df19f76c0db50071055485869227fc4dfcc6cab21f3ca69797ce5e451b0aa55ff25b578987ba0f34fd7
+EBUILD rpm-4.14.2.1.ebuild 3431 BLAKE2B f098254f82fd5fd0c5723beb775c82e89b695d6b6da5ac3b033cbf8b9c0a5f91574a44fe27c553121448053e2dc62dd307913ba0b489860d495dea457dc27411 SHA512 721d3607ea841b3ef130b2eca2fd823fa8218e202df194ec2a24d7fe4715af5e47c863d284fcb0d6fd5d3cb81ff83bea7a9c560881ef619e77bd306d3a773370
 MISC metadata.xml 337 BLAKE2B d01523bdc86c3b93ae548f601265338290470dcb578a79757ba7d3b2c4be257c89e76c97b5d411f9271d9ee754981a004b03e2a5cfe9b6bd56e32932796771c9 SHA512 20a89c9f7af0c1a7dd5f325eb3c1af65044a6f09e6ea8c70033bf35819ee18faf8c3a0ee2cebcbc0849a84e962dbbdd2111e02b3369d0feccf3719dc0bcfa6cc
diff --git a/app-arch/rpm/rpm-4.14.1-r1.ebuild b/app-arch/rpm/rpm-4.14.1-r1.ebuild
index c34b6839654a..9e08501a7c0b 100644
--- a/app-arch/rpm/rpm-4.14.1-r1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
 DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org
+HOMEPAGE="https://rpm.org
 	https://github.com/rpm-software-management/rpm"
 SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
diff --git a/app-arch/rpm/rpm-4.14.1.ebuild b/app-arch/rpm/rpm-4.14.1.ebuild
index 05513ac2d37a..29d7e38050ae 100644
--- a/app-arch/rpm/rpm-4.14.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6} )
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
 DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org
+HOMEPAGE="https://rpm.org
 	https://github.com/rpm-software-management/rpm"
 SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
 
diff --git a/app-arch/rpm/rpm-4.14.2.1.ebuild b/app-arch/rpm/rpm-4.14.2.1.ebuild
index 7d1e6c3e0568..ec73a8f530a3 100644
--- a/app-arch/rpm/rpm-4.14.2.1.ebuild
+++ b/app-arch/rpm/rpm-4.14.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit autotools flag-o-matic perl-module python-single-r1 eapi7-ver
 
 DESCRIPTION="Red Hat Package Management Utils"
-HOMEPAGE="http://www.rpm.org
+HOMEPAGE="https://rpm.org
 	https://github.com/rpm-software-management/rpm"
 SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"