From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 07F6E1382C5 for ; Thu, 1 Mar 2018 02:06:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 154EEE08DB; Thu, 1 Mar 2018 02:06: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 E8B8CE08DB for ; Thu, 1 Mar 2018 02:06:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3AC10335C2C for ; Thu, 1 Mar 2018 02:06:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95D7E1EF for ; Thu, 1 Mar 2018 02:06:33 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1519869772.be9140b74fdeb63a8451b3ffcc4037f0f45b1655.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.3.5_rc.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: be9140b74fdeb63a8451b3ffcc4037f0f45b1655 X-VCS-Branch: master Date: Thu, 1 Mar 2018 02:06:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1b5e8814-7287-4f78-8ce9-871c39d0c2b2 X-Archives-Hash: 71908a5a6699e06f1640154b609a37b8 commit: be9140b74fdeb63a8451b3ffcc4037f0f45b1655 Author: Brian Evans gentoo org> AuthorDate: Thu Mar 1 02:02:52 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Mar 1 02:02:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be9140b7 dev-db/mariadb: Fix file collision from previous commit Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-db/mariadb/mariadb-10.3.5_rc.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild index 1d5e58bace4..fd3d65af594 100644 --- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild +++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild @@ -542,10 +542,12 @@ multilib_src_install() { doins "${S}"/sql/*.h fi + if use client-libs ; then # Install compatible symlinks to libmysqlclient # use static-libs && dosym libmariadbclient.a "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.a" # dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so" dosym libmariadb.so.3 "${EPREFIX}/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}" + fi # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die