[gentoo-commits] repo/gentoo:master commit in: net-libs/libnsl/

[Andreas Hüttel]

commit:     59670267e6dd415f3aff10567a0f04ce406735c7
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 18:54:07 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 18:54:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59670267

net-libs/libnsl: Make a fake libnsl version that "uses" old glibc

This helps the portage resolver do the upgrade later on.
Drop keywords on libnsl-1.1.0; we'll have to restore them at the
same time as glibc-2.26 gets keywords.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../{libnsl-1.1.0-r1.ebuild => libnsl-0.ebuild}    | 27 ++++------------------
 net-libs/libnsl/libnsl-1.1.0-r1.ebuild             |  7 ++++--
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/net-libs/libnsl/libnsl-1.1.0-r1.ebuild b/net-libs/libnsl/libnsl-0.ebuild
similarity index 51%
copy from net-libs/libnsl/libnsl-1.1.0-r1.ebuild
copy to net-libs/libnsl/libnsl-0.ebuild
index e56e5624f34..f5c68293a69 100644
--- a/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-0.ebuild
@@ -3,32 +3,15 @@
 
 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"
+# 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="
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!<sys-libs/glibc-2.26
-"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Fool multilib-minimal to run ./configure in out-of-tree build
-	ECONF_SOURCE=${S} econf
-}
+DEPEND="<sys-libs/glibc-2.26"
+RDEPEND="${DEPEND}"

diff --git a/net-libs/libnsl/libnsl-1.1.0-r1.ebuild b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
index e56e5624f34..407fc963fda 100644
--- a/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-1.1.0-r1.ebuild
@@ -9,9 +9,12 @@ 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="