gentoo resync : 22.06.2019

4 files changed, 10 insertions, 46 deletions

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"