| 1 |
commit: 7fa1fb1c758eaac7ea8975cd0fda0cc49b4d74ef |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 3 13:34:55 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 3 14:00:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa1fb1c |
| 7 |
|
| 8 |
net-libs/qxmpp: Simplify src_configure |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild | 21 +++++++++------------ |
| 13 |
net-libs/qxmpp/qxmpp-9999.ebuild | 21 +++++++++------------ |
| 14 |
2 files changed, 18 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild |
| 17 |
index 688a4490a70..c8b090dafc1 100644 |
| 18 |
--- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild |
| 19 |
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -44,17 +44,14 @@ src_prepare(){ |
| 27 |
default_src_prepare |
| 28 |
} |
| 29 |
|
| 30 |
-src_configure(){ |
| 31 |
- local conf_speex |
| 32 |
- local conf_theora |
| 33 |
- local conf_vpx |
| 34 |
- |
| 35 |
- use opus && conf_opus="QXMPP_USE_OPUS=1" |
| 36 |
- use speex && conf_speex="QXMPP_USE_SPEEX=1" |
| 37 |
- use theora && conf_theora="QXMPP_USE_THEORA=1" |
| 38 |
- use vpx && conf_vpx="QXMPP_USE_VPX=1" |
| 39 |
- |
| 40 |
- eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}" |
| 41 |
+src_configure() { |
| 42 |
+ eqmake5 "${S}"/qxmpp.pro \ |
| 43 |
+ PREFIX="${EPREFIX}/usr" \ |
| 44 |
+ LIBDIR="$(get_libdir)" \ |
| 45 |
+ QXMPP_USE_OPUS=$(usex opus 1 0) \ |
| 46 |
+ QXMPP_USE_SPEEX=$(usex speex 1 0) \ |
| 47 |
+ QXMPP_USE_THEORA=$(usex theora 1 0) \ |
| 48 |
+ QXMPP_USE_VPX=$(usex vpx 1 0) |
| 49 |
} |
| 50 |
|
| 51 |
src_install() { |
| 52 |
|
| 53 |
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild |
| 54 |
index 21806f48a18..d9226e906b6 100644 |
| 55 |
--- a/net-libs/qxmpp/qxmpp-9999.ebuild |
| 56 |
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2017 Gentoo Foundation |
| 59 |
+# Copyright 1999-2018 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=6 |
| 63 |
@@ -45,17 +45,14 @@ src_prepare(){ |
| 64 |
default_src_prepare |
| 65 |
} |
| 66 |
|
| 67 |
-src_configure(){ |
| 68 |
- local conf_speex |
| 69 |
- local conf_theora |
| 70 |
- local conf_vpx |
| 71 |
- |
| 72 |
- use opus && conf_opus="QXMPP_USE_OPUS=1" |
| 73 |
- use speex && conf_speex="QXMPP_USE_SPEEX=1" |
| 74 |
- use theora && conf_theora="QXMPP_USE_THEORA=1" |
| 75 |
- use vpx && conf_vpx="QXMPP_USE_VPX=1" |
| 76 |
- |
| 77 |
- eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}" |
| 78 |
+src_configure() { |
| 79 |
+ eqmake5 "${S}"/qxmpp.pro \ |
| 80 |
+ PREFIX="${EPREFIX}/usr" \ |
| 81 |
+ LIBDIR="$(get_libdir)" \ |
| 82 |
+ QXMPP_USE_OPUS=$(usex opus 1 0) \ |
| 83 |
+ QXMPP_USE_SPEEX=$(usex speex 1 0) \ |
| 84 |
+ QXMPP_USE_THEORA=$(usex theora 1 0) \ |
| 85 |
+ QXMPP_USE_VPX=$(usex vpx 1 0) |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
Archives