Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: eclass/
Date: Wed, 23 Sep 2015 02:52:01
Message-Id: 1442976706.bc5a6b4582e762b4999356033e7f68749b7a215f.grknight@gentoo
1 commit: bc5a6b4582e762b4999356033e7f68749b7a215f
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 23 02:51:46 2015 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 23 02:51:46 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=bc5a6b45
7
8 Test a more standard way to display the ABI message
9
10 Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
11
12 eclass/mysql-multilib.eclass | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
16 index 17206cf..5f84d88 100644
17 --- a/eclass/mysql-multilib.eclass
18 +++ b/eclass/mysql-multilib.eclass
19 @@ -795,7 +795,7 @@ mysql-multilib_pkg_preinst() {
20 if [[ -z ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] ; then
21 SHOW_ABI_MESSAGE=1
22 elif [[ ${REPLACING_VERSIONS} && -e "${EROOT}usr/$(get_libdir)/libmysqlclient.so" ]] && \
23 - in_iuse client-libs && ! built_with_use --missing true ${CATEGORY}/${PN} client-libs ; then
24 + in_iuse client-libs && has_version "${CATEGORY}/${PN}[-client-libs(+)]" ; then
25 SHOW_ABI_MESSAGE=1
26 fi