gentoo resync : 29.10.2017

3 files changed, 27 insertions, 5 deletions

diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index adb11981b8ca..ae5f9cae0bb9 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -1,3 +1,4 @@
 DIST libnsl-1.1.0.tar.gz 209148 SHA256 a23cfcf7f29f168b95e821d01217600096c05be8cd5c085450cb4f160425277b SHA512 12555ed701d06247b6774c6c2759ada280ffce73820976adb4aaa48b50b97121b1805412541778dfcdd8845af6a10b2e5a9dc0eb7b953e84467d0a40ad3360cd WHIRLPOOL c347bbd72b75d1e3ab0069f802da8e4e4e4931a8a61b4abed1dd664c4576e7e22e96c012858c684ec79a981aea84460eae3a2ccb8e94aa7bfecfdd99c3e54730
-EBUILD libnsl-1.1.0.ebuild 788 SHA256 b3161b67dd23cf274629a7ff5d296e430e5fd8069ce80f4fa39b0cdc6cd2f7ff SHA512 17ba18e3557194108af91690365e5df91a05ac4719440d76a798f10a08000b809808e7f4e39f1d7b91ac32ca400d20b4aaa7e95c69a53111dc852f47fd736f61 WHIRLPOOL 2b9ab19b211648d304c4e3615d8fc437b054cf0df7d2416ad7a5ffaee3e6a0b1ba6949f8d16111556a8da8aa8564a86105f78474efa1b80d97b3d41f2fe903e6
+EBUILD libnsl-0.ebuild 508 SHA256 270e32435767db6bcac69667faf7283f7c759275666a6ec77b824bb000f87306 SHA512 8eb53fa8435bc495128897d323db8f6bc41808e01d2f59797ab901bd3b773952318917bef83e7ed7d89764fdcc6075e210dace1a164d909aecbaee7c53059ce3 WHIRLPOOL 4ccbcfe7942a3124790b9aedaa88559cd5085f4ffd4ad49e223350daead23851b11d23932b72f20e55e820be83dc0474c5c284fb2c56d5a715029bea1e0e6fb0
+EBUILD libnsl-1.1.0-r1.ebuild 736 SHA256 e1b7fdf9602adf1b615b24ec279fe49f973eb1add9e45aa1b6ed411d1bb5d900 SHA512 a3896d15411f106cad1e17252c43a7e36c1922be50af348a8cbb5e8ac435d883a56969d36da3880c5a9ec1dafaeebca8c29ff4cfbee6785029bb3c7c981f3136 WHIRLPOOL be3b7a23937bc2eb6f4f064183f9c70c864ad67e55fad101844e98f352cf2297850408bcea4f3b7c6f3aa941b88b976da4b8699c3883ab8c511507b307a53716
 MISC metadata.xml 379 SHA256 ebf32af5bc074fc17a37c93745bc34847424be60d6d5d23a69d88baabc554bcf SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753 WHIRLPOOL eab5963365c94d28e5e60cc0b4eaee3d576bf8cc3372eb739f0fcbdbf4f3c37fc1af7c90b39866e476fdcd2d529b7e78f2bbcc1d3b938c047702d09db3141fa6
diff --git a/net-libs/libnsl/libnsl-0.ebuild b/net-libs/libnsl/libnsl-0.ebuild
new file mode 100644
index 000000000000..f5c68293a69b
--- /dev/null
+++ b/net-libs/libnsl/libnsl-0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready version"
+HOMEPAGE="https://github.com/thkukuk/libnsl"
+
+# Fake version to help portage upgrading.
+
+SLOT="0/1"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+DEPEND="<sys-libs/glibc-2.26"
+RDEPEND="${DEPEND}"
diff --git a/net-libs/libnsl/libnsl-1.1.0.ebuild b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
index 3abda843bf65..407fc963fdaa 100644
--- a/net-libs/libnsl/libnsl-1.1.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
@@ -9,16 +9,20 @@ DESCRIPTION="Public client interface for NIS(YP) and NIS+ in a IPv6 ready versio
 HOMEPAGE="https://github.com/thkukuk/libnsl"
 SRC_URI="https://github.com/thkukuk/${PN}/archive/${P}.tar.gz"
 
-SLOT="0"
+SLOT="0/2"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+
+# Restore keywords and stabilize together with glibc-2.26!
+KEYWORDS=""
+
 IUSE=""
 
 DEPEND="
-	!<sys-libs/glibc-2.26
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
 "
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+	!<sys-libs/glibc-2.26
+"
 
 S=${WORKDIR}/${PN}-${P}