From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1106552-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BF7B0138334
for <garchives@archives.gentoo.org>; Sun, 18 Aug 2019 23:09:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D70A3E08ED;
Sun, 18 Aug 2019 23:09:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B880BE08ED
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Aug 2019 23:09:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B9877349DC4
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Aug 2019 23:09:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F65562A
for <gentoo-commits@lists.gentoo.org>; Sun, 18 Aug 2019 23:09:35 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1566169771.f83add3a865a9cd4b074d98becb907000acce4d1.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-libs/readline/readline-8.0_p1.ebuild
X-VCS-Directories: sys-libs/readline/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: f83add3a865a9cd4b074d98becb907000acce4d1
X-VCS-Branch: master
Date: Sun, 18 Aug 2019 23:09:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e9140901-10bd-4df9-a2d5-02a8817327ed
X-Archives-Hash: e853431b55f7203b2c5db6ba702a371a
commit: f83add3a865a9cd4b074d98becb907000acce4d1
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 23:05:19 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 23:09:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f83add3a
sys-libs/readline: Readded preserve_old_libs call.
Arfrever told me that pkgcore still has no such functionality.
Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-libs/readline/readline-8.0_p1.ebuild | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/sys-libs/readline/readline-8.0_p1.ebuild b/sys-libs/readline/readline-8.0_p1.ebuild
index cb270f8f0e2..b000aa3b553 100644
--- a/sys-libs/readline/readline-8.0_p1.ebuild
+++ b/sys-libs/readline/readline-8.0_p1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
# Official patches
# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
@@ -164,3 +164,12 @@ multilib_src_install_all() {
docinto ps
dodoc doc/*.ps
}
+pkg_preinst() {
+ # bug #29865
+ # Reappeared in #595324 with paludis so keeping this for now...
+ preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}
+
+pkg_postinst() {
+ preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}