gentoo resync : 25.09.2021

2 files changed, 16 insertions, 7 deletions

diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index edbf28b33726..fafc00fbdc3a 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -3,5 +3,5 @@ DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620d
 DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784
 EBUILD libnsl-0-r1.ebuild 565 BLAKE2B f1227ef218ff7edb1c5f299fd31d12d4b91467991a5c3036227284accf455bc7524a58f352b13f591396a0535877e5b49d6cf301aaec4da3a8f5124b23b99a74 SHA512 ea2b7ced6307d96991b3a05ba7152b6817c10f21712e14d4e7b389bd0728d3482894e4f0de604ebb381edc091870fd05369d4046df786b64661ec75da8e7dc56
 EBUILD libnsl-1.3.0-r2.ebuild 947 BLAKE2B 490faf6aec16d8c70d880da369b9251590013081f0ea66d97f35205b624c72ec3b33616cb83bc68eb710150c51e42f230183dd85582d75f747756f23f0f72a57 SHA512 3b0846f669028294648d603bf32aca1d2916b9a16ee7e8965f86ebd712a8f29b3731af2242a61aaafa5b0592063b7f3fad85484be546f467ea075fa7bb34ba9a
-EBUILD libnsl-2.0.0.ebuild 856 BLAKE2B 5aff478cf6e6137b53404ff5ca864b2ee2904ec9a80f6b305dfabdb48b2f0f2df3728211b893a9c9727b5876adce8c1d95cfb84e8cba01c26ded1511f91c0f9b SHA512 ea5da6373ab831d5da0c63fb154b5c4c75ef64009dd0e21c93daba30758c551fd47e39e7e9b1a67331dc1dfd037a4192d62f1a8dd3a50353bab557d2d203f43f
+EBUILD libnsl-2.0.0-r1.ebuild 1236 BLAKE2B 09309690ea79e036bab821024c006f889dfc5c0d56b2748b4103b17329e7854419029499c12e0fa6c7fe4e3a1d116a2304069310e27b975e5131f730108492ac SHA512 51aca5f6c9f0734544e18a61c3490f5f3af83bbb8dfa62ca96575cec737a41afd800a44598ef4ba9a51e0fc81a65e32c427aacc0d86c5d6b47c9d912a842a14f
 MISC metadata.xml 380 BLAKE2B fa4dc82ad37eb111b813c74a2f06e2afc3205abf41fc2287490a5542ea82e49096f6c4fba6ca284b318679d1962e4b32cb1e9c0e29027b04b56019ed4ed0d98e SHA512 f8e686cb3c4d25abe584f58ccb47b9265eaea8ae35ed5beabdb40158f35ffcec8263045d113e782a41791840530c8dd53dfab03ec916a38edfd573a5fb94e2af
diff --git a/net-libs/libnsl/libnsl-2.0.0.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
index eb30d9918952..99b3fb7a8a12 100644
--- a/net-libs/libnsl/libnsl-2.0.0.ebuild
+++ b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-inherit multilib-minimal
+inherit multilib-minimal preserve-libs
 
 DESCRIPTION="Public client interface for NIS(YP) in a IPv6 ready version"
 HOMEPAGE="https://github.com/thkukuk/libnsl"
 SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
+# This is a core package which is depended on by e.g. PAM in some cases.
+# Please use preserve-libs.eclass in pkg_{pre,post}inst to cover users
+# with FEATURES="-preserved-libs" or another package manager if SONAME
+# changes.
 SLOT="0/3"
 LICENSE="LGPL-2.1+"
-
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="static-libs"
 
-DEPEND="
-	>=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]
-"
+DEPEND=">=net-libs/libtirpc-1.2.0:=[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
 	!<sys-libs/glibc-2.26
 "
@@ -28,6 +28,7 @@ multilib_src_configure() {
 		--enable-shared
 		$(use_enable static-libs static)
 	)
+
 	ECONF_SOURCE=${S} econf "${myconf[@]}"
 }
 
@@ -35,3 +36,11 @@ multilib_src_install_all() {
 	einstalldocs
 	find "${ED}" -type f -name '*.la' -delete || die
 }
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libnsl.so.2
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libnsl.so.2
+}