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 F04111382C5 for ; Sat, 3 Feb 2018 14:01:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28997E0B0E; Sat, 3 Feb 2018 14:01:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E63FAE0B0E for ; Sat, 3 Feb 2018 14:01:25 +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 95982335C63 for ; Sat, 3 Feb 2018 14:01:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E76AB1C5 for ; Sat, 3 Feb 2018 14:01:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1517666457.7fa1fb1c758eaac7ea8975cd0fda0cc49b4d74ef.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/qxmpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild net-libs/qxmpp/qxmpp-9999.ebuild X-VCS-Directories: net-libs/qxmpp/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7fa1fb1c758eaac7ea8975cd0fda0cc49b4d74ef X-VCS-Branch: master Date: Sat, 3 Feb 2018 14:01:22 +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: b966b632-af54-4643-a088-a5418d282565 X-Archives-Hash: 9097be59d56ab000eb32eb1a58e00836 commit: 7fa1fb1c758eaac7ea8975cd0fda0cc49b4d74ef Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 3 13:34:55 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 3 14:00:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa1fb1c net-libs/qxmpp: Simplify src_configure Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild | 21 +++++++++------------ net-libs/qxmpp/qxmpp-9999.ebuild | 21 +++++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild index 688a4490a70..c8b090dafc1 100644 --- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild +++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -44,17 +44,14 @@ src_prepare(){ default_src_prepare } -src_configure(){ - local conf_speex - local conf_theora - local conf_vpx - - use opus && conf_opus="QXMPP_USE_OPUS=1" - use speex && conf_speex="QXMPP_USE_SPEEX=1" - use theora && conf_theora="QXMPP_USE_THEORA=1" - use vpx && conf_vpx="QXMPP_USE_VPX=1" - - eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}" +src_configure() { + eqmake5 "${S}"/qxmpp.pro \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="$(get_libdir)" \ + QXMPP_USE_OPUS=$(usex opus 1 0) \ + QXMPP_USE_SPEEX=$(usex speex 1 0) \ + QXMPP_USE_THEORA=$(usex theora 1 0) \ + QXMPP_USE_VPX=$(usex vpx 1 0) } src_install() { diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild index 21806f48a18..d9226e906b6 100644 --- a/net-libs/qxmpp/qxmpp-9999.ebuild +++ b/net-libs/qxmpp/qxmpp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,17 +45,14 @@ src_prepare(){ default_src_prepare } -src_configure(){ - local conf_speex - local conf_theora - local conf_vpx - - use opus && conf_opus="QXMPP_USE_OPUS=1" - use speex && conf_speex="QXMPP_USE_SPEEX=1" - use theora && conf_theora="QXMPP_USE_THEORA=1" - use vpx && conf_vpx="QXMPP_USE_VPX=1" - - eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}" +src_configure() { + eqmake5 "${S}"/qxmpp.pro \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="$(get_libdir)" \ + QXMPP_USE_OPUS=$(usex opus 1 0) \ + QXMPP_USE_SPEEX=$(usex speex 1 0) \ + QXMPP_USE_THEORA=$(usex theora 1 0) \ + QXMPP_USE_VPX=$(usex vpx 1 0) } src_install() {