gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 51 deletions

diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index e0aab9bb7f0a..e5fc618725fc 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,6 +1,4 @@
-DIST libnsl-1.1.0.tar.gz 209148 BLAKE2B 1fe1cbd279f317c0ca74a635e7cb7a35e3c70055f8f590b6814b2d40f1daaf381ec9d9710e0bbb894489d251788a135550848714e8b015bf237cf41d72feabf0 SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd
 DIST libnsl-1.2.0.tar.gz 209188 BLAKE2B 4249cfbf0b5391790f5e5f81e4eb0be963e5fdc0c32a9400d4128e717d93da49f8751caf8de3bb4ba1a23b8670a0e4f8e750f38f4612dd0cc97db4c157421a06 SHA512 30115aa679a04ad01f55cff9dd1890b4c41c730a9bac2adab5add9ae03a0b4687c5f4b6e3b8652ecbb074eefac8faee3f1f13ea60d42cf4432db8a575ca72cd8
-EBUILD libnsl-0-r1.ebuild 565 BLAKE2B 85155d509cb198333da9ca33f6e595f5705b2d04613288da4b2692c527089a4070486811a49d3da1bb012e94598eab58d774e2b66f71df84661c19749b7f3062 SHA512 5b29ac839d03d1016e9e741ca1a792863522a821b1fcfd95a84ab742af01ef64ae549e339c9af480e2e3fdee8d9c9aca12fb839d67f3a690cc958365587f5654
-EBUILD libnsl-1.1.0-r3.ebuild 890 BLAKE2B 4f4a8e17f3019f88b4502ceba4fd331fcf37637a82558914d3aeb458479beb659020e3a6d54c05b1037072c589797884e2f078fedc7f034992e361f05bf87780 SHA512 b0c13fccc712948bc7a413d6fc7818841c4a979e0b5305d2c3b6a89be77d870f5e987b7792d61bec9d3b0e591d6812c5b9e34a16d3c05fa68900db57493acc9b
-EBUILD libnsl-1.2.0.ebuild 914 BLAKE2B e38ac90dec5e176c0d4768237865994abc448d50da656db669b8310c24c4c4da63f30cac8ee63a76b85d9b25c6dcf0c79c124f51b204bffb758b390a89c81b99 SHA512 8857f457f4a226e0fe8b67f9665b292c19ed9d1630c40eab376d2b456ddae8af034f8edbaa9a3b29024dd4b7f6ee7e838dd91619857ab18b94e6f88faab2b036
+EBUILD libnsl-0-r1.ebuild 563 BLAKE2B 325c98382e7856ed41ac658faa1c04929efdc4d76b3d1322c205ab2b444b8ba50221eaad6f978ce30c559abe1fadf340275d7b8af7d1288530884dd3fd19bcd5 SHA512 31c4acc1d8dae45d91487347ce12fdb5a810da3a5dab1314d8e7109a99f160b966623cbf0c0abe8032715000458924e63d1247d3b06adae2aa2b3ce190611744
+EBUILD libnsl-1.2.0.ebuild 912 BLAKE2B 2c54230426a08b3386164f648d13544d9d36a527d7833939d4d5e50378d13ea91244eb2c96fc412d9910405ca9fd0c8fb6e5aa369bdb1ef0ca53777162bcab7d SHA512 ba5ace865d7579200347b521c997f7c53438a6107b1a3b477a99c9d8afe07ff3c0e2af1b9f00a7d79d7c08379509904d7b37786ba52aa8bc727097902929797b
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/libnsl/libnsl-0-r1.ebuild b/net-libs/libnsl/libnsl-0-r1.ebuild
index ee2ea685bfbf..c88ba31c3c3e 100644
--- a/net-libs/libnsl/libnsl-0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 
 SLOT="0/1"
 LICENSE="LGPL-2.1+"
-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=""
 
diff --git a/net-libs/libnsl/libnsl-1.1.0-r3.ebuild b/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
deleted file mode 100644
index cb8d1099aade..000000000000
--- a/net-libs/libnsl/libnsl-1.1.0-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
-HOMEPAGE="https://github.com/thkukuk/libnsl"
-SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="LGPL-2.1+"
-
-# Stabilize together with glibc-2.26!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE=""
-
-DEPEND="
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<sys-libs/glibc-2.26
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-shared
-		--disable-static
-	)
-	ECONF_SOURCE=${S} econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 013966713b92..5b773a32bc35 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
 LICENSE="LGPL-2.1+"
 
 # Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""