commit: 7fa1fb1c758eaac7ea8975cd0fda0cc49b4d74ef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 13:34:55 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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() {
