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 50993138330 for ; Wed, 28 Sep 2016 21:30:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6DE0E07FB; Wed, 28 Sep 2016 21:30:43 +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 C9AD0E07FB for ; Wed, 28 Sep 2016 21:30:43 +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 03AFE34072E for ; Wed, 28 Sep 2016 21:30:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E1B7A7E1 for ; Wed, 28 Sep 2016 21:30:39 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1475098219.bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/mosquitto/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/mosquitto/mosquitto-1.4.10.ebuild X-VCS-Directories: app-misc/mosquitto/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba X-VCS-Branch: master Date: Wed, 28 Sep 2016 21:30:39 +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: 589861f3-2f67-48fc-a339-feec6f6fd227 X-Archives-Hash: 09d120a2c9b9d04ad905adad60346851 commit: bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba Author: Patrice Clement gentoo org> AuthorDate: Wed Sep 28 21:30:19 2016 +0000 Commit: Patrice Clement gentoo org> CommitDate: Wed Sep 28 21:30:19 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf71556d app-misc/mosquitto: do not call get_libdir in global scope. Gentoo-Bug: https://bugs.gentoo.org/593422 Package-Manager: portage-2.2.28 app-misc/mosquitto/mosquitto-1.4.10.ebuild | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app-misc/mosquitto/mosquitto-1.4.10.ebuild b/app-misc/mosquitto/mosquitto-1.4.10.ebuild index 15d5dd8..b723fe3 100644 --- a/app-misc/mosquitto/mosquitto-1.4.10.ebuild +++ b/app-misc/mosquitto/mosquitto-1.4.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="5" PYTHON_COMPAT=( python2_7 ) inherit eutils systemd user python-any-r1 @@ -21,21 +21,13 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} srv? ( net-dns/c-ares )" -LIBDIR=$(get_libdir) -QA_PRESTRIPPED="/usr/sbin/mosquitto - /usr/bin/mosquitto_passwd - /usr/bin/mosquitto_sub - /usr/bin/mosquitto_pub - /usr/${LIBDIR}/libmosquittopp.so.1 - /usr/${LIBDIR}/libmosquitto.so.1" - pkg_setup() { enewgroup mosquitto enewuser mosquitto -1 -1 -1 mosquitto } src_prepare() { - epatch "${FILESDIR}/${PN}-1.4.9-conditional-tests.patch" + epatch "${FILESDIR}/${P}-conditional-tests.patch" if use persistence; then sed -i -e "s:^#autosave_interval:autosave_interval:" \ -e "s:^#persistence false$:persistence true:" \ @@ -48,6 +40,14 @@ src_prepare() { } src_configure() { + LIBDIR=$(get_libdir) + QA_PRESTRIPPED="/usr/sbin/mosquitto + /usr/bin/mosquitto_passwd + /usr/bin/mosquitto_sub + /usr/bin/mosquitto_pub + /usr/${LIBDIR}/libmosquittopp.so.1 + /usr/${LIBDIR}/libmosquitto.so.1" + makeopts=( "LIB_SUFFIX=${LIBDIR:3}" "WITH_BRIDGE=$(usex bridge)" @@ -56,7 +56,6 @@ src_configure() { "WITH_TLS=$(usex ssl)" "WITH_WRAP=$(usex tcpd)" ) - einfo "${makeopts[@]}" } src_compile() {