gentoo Easter resync : 12.04.2020

5 files changed, 6 insertions, 36 deletions

diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index c31a842c9f28..80ce33583989 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,8 +1,7 @@
 AUX rpcsvc-proto-1.4-external-libintl.patch 1718 BLAKE2B 9484dd528679c3cac286ae0aaea7491bbb54f00df14bbc7891809684d48eda81441745bf1d822c96775f02519de0f4e98ffd9f99cac86954874420586fbe35bf SHA512 92c1d8048e28ced24bae24e0bb7001cf65e6c8274b67a3ed4a1015e094201a812aa85d75ed280fca40b94a1b5c61b657dbf0afd538d7c59219abdf51c5af3f29
 DIST rpcsvc-proto-1.4.1.tar.gz 61724 BLAKE2B 4fd04b36d30561edf3bbc9f565b07a8f1450ca28d7489b63d241f0b7eb2b98640d2dc2d798b1469460f682c0774fc99a995239d7e0fe2f244852b2561b37a0fb SHA512 a75546255bc5c553ec12dc0844783907b70499eb65ea6fb9de7c0a0f669e4ef0caa717c0cbe9ba8651dc7acfb0c9c4e0fc644ebf12e0a704819fa47e6c65b8b7
 DIST rpcsvc-proto-1.4.tar.gz 59127 BLAKE2B 484c04d6a0f86d37c0057693771b7fe502166504fc419bce4dd182f76e349cf226307814a2c51b27fa0bc09e270b883cb40ae821f8bd7d7e0c9a120c4962ae34 SHA512 a29d7761ec9cca4d7d7aa6943a243771a6c7f35d303f01af84f390c8395dc5e543fad7ea28fec1be2f6ee8f2853bf22a157ad3b020057040685b6cbce9b09415
-EBUILD rpcsvc-proto-0.ebuild 479 BLAKE2B f4fde5d8542ff78e737013e93e0366ea44a27ef2fab96a0bb4c4dc43d66061968b1b2406364343c827b8afdc650e704fc62fba15660aaf097842e7b29ba7f1e3 SHA512 51fe0f823b36b5c3f73c915068c3f05948f4588990633de1e9030ea0876328d17bc71931e00850e0495f69c2898ee049de8d77ecb741426623cb207389e629c6
-EBUILD rpcsvc-proto-1.4-r1.ebuild 796 BLAKE2B 306c366e831e2aa2bd1fd7f900a708da745f20c48d12d851d9014e71b88718851645ad603ff3c3e7be1824048f1e428d95470fe87ee74d898ff80877deef7822 SHA512 3b84f4ebb089b47ba42bcf61b9eeccf2f92ed178b3ba76cdfc236c6560530b09bdc17da350e7a5852eb6338a7176e12c5f4177bff189037efdad1813761c6354
-EBUILD rpcsvc-proto-1.4.1.ebuild 752 BLAKE2B 45d27d27781b13e987436371a1fa98420f7f442efd1d6ad9aec3f32683a64a4473c01859e61f06d8e6d7f6521bb5e0ec3b9e45694e7d4c8c50e0832adb7597dd SHA512 04193d62fd8e9754297f3fb96b06c955a4ea7aea0ba481c2a03b8158bb500e08188b0e647f52fedad22afe54e8af0e21e878ff25e676fada1757f4def777a2e5
-EBUILD rpcsvc-proto-1.4.ebuild 639 BLAKE2B d889bb101dfac5514d5eebab13f64269ce63c3c1e5e5b27d05d8891c83df5eabbb965f21537defcca7ea8ec9bf70186b2858f09e49c0ffaaaad694e1f2bff931 SHA512 151e6127ed6229042e9f324aa3a75aeda3c39bfd9c3674ba15cd647ee59ae2e5c26e847fb11b4899f33b7a0e92fb7c885c83500cf439c5442803c2ee777af325
+EBUILD rpcsvc-proto-0.ebuild 477 BLAKE2B 3b41e6f21dff0388ec6db147a24b5a9294bde8676c7f4fd9178add053277e018ebbe68565eb702c58ea81d98954182e669f5ae73d7ce302c25f88cff48d35c47 SHA512 a9f8d371e81f61d357ad3833050a88d7f048cf68fe61d59b9f0d56e7c6551dea9d59fcd762906375800883d4bf2467a8e559384178dfd14369f132f1503f5099
+EBUILD rpcsvc-proto-1.4-r1.ebuild 792 BLAKE2B e10068094ccb624584282d9a0244582da2d647ac01d3188e97007aa6b50555336e03ade606e5c8524d9a1adf3d04f0b94204d96c16bfe219753a8a96ae866c0b SHA512 279a0cd728c900657e5f9455fc707a49dd2ef26f5356dd0c8c6ec3275a001328ccb7fc4261e9726b242664e8e9f1bc2e1bb4c833b6025544fd7402565147f794
+EBUILD rpcsvc-proto-1.4.1.ebuild 739 BLAKE2B 36d56f5bc792dbcd995fe3181f0a1793c115141f9790edda01935a7bc0ff00cba7792485314448b9b4f0a36caec70990655df1898b92bc5275af85c0f66e0d2d SHA512 f8b0768a5b6cb398eb24cdb9c8841af7114bd1f3d4377ccd143b7199a1403d9e6724717579e9103aaccb200d97ac84d0c8c913cc5f9b55deb2eda6bc165b8b0b
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
index bf9fff00b94e..6155980f7935 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="elibc_glibc? ( sys-libs/glibc[rpc(-)] )"
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
index 00f529920fdb..89770401b6f5 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
index 4b863b0cd4d2..6898da16fe7c 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # sys-devel/gettext is only for libintl detection macros.
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
deleted file mode 100644
index 30777161fd70..000000000000
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="rpcsvc protocol definitions from glibc"
-HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1+ BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="!<sys-libs/glibc-2.26"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# provided by sys-fs/quota[rpc]
-	rm "${ED%/}"/usr/include/rpcsvc/rquota.{x,h} || die
-}