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 CAB50139085 for ; Tue, 3 Jan 2017 15:06:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 152B0E0E5E; Tue, 3 Jan 2017 15:06:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2F4AE0E5E for ; Tue, 3 Jan 2017 15:06:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3262534112A for ; Tue, 3 Jan 2017 15:06:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0BDB24E8 for ; Tue, 3 Jan 2017 15:06:00 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1483455956.071b6bc3a32cf9557fa153b0097e5fd0cf887a0c.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cyrus-sasl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild X-VCS-Directories: dev-libs/cyrus-sasl/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 071b6bc3a32cf9557fa153b0097e5fd0cf887a0c X-VCS-Branch: master Date: Tue, 3 Jan 2017 15:06:00 +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: fc9c3118-c90b-4bbf-ac1f-7c5fb11f9321 X-Archives-Hash: d7914bc334a7a1bfab98ec36ea239ecd commit: 071b6bc3a32cf9557fa153b0097e5fd0cf887a0c Author: Fabian Groffen gentoo org> AuthorDate: Tue Jan 3 15:05:41 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jan 3 15:05:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071b6bc3 dev-libs/cyrus-sasl: add fixes for Prefix platforms at runtime Package-Manager: portage-2.2.28-prefix dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild index a13cf79..703bfa1 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -165,7 +165,7 @@ multilib_src_configure() { $(use_enable kerberos gssapi) \ $(multilib_native_use_enable java) \ $(multilib_native_use_with java javahome ${JAVA_HOME}) \ - $(multilib_native_use_with mysql mysql /usr) \ + $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) \ $(multilib_native_use_with postgres pgsql) \ $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) \ $(use_enable srp) \ @@ -197,7 +197,7 @@ multilib_src_install() { # Default location for java classes breaks OpenOffice (bug #60769). if use java; then java-pkg_dojar ${PN}.jar - java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl.so" + java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)" # hackish, don't wanna dig through makefile rm -rf "${ED}/usr/$(get_libdir)/java" || die docinto "java" @@ -231,7 +231,11 @@ multilib_src_install_all() { systemd_dounit "${FILESDIR}/saslauthd.service" systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" - prune_libtool_files --modules + # The get_modname bit is important: do not remove the .la files on + # platforms where the lib isn't called .so for cyrus searches the .la to + # figure out what the name is supposed to be instead + use static-libs || [[ $(get_modname) != .so ]] || \ + prune_libtool_files --modules } pkg_postinst () {