| 1 |
commit: bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba |
| 2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 28 21:30:19 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 28 21:30:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf71556d |
| 7 |
|
| 8 |
app-misc/mosquitto: do not call get_libdir in global scope. |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/593422 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
app-misc/mosquitto/mosquitto-1.4.10.ebuild | 21 ++++++++++----------- |
| 15 |
1 file changed, 10 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-misc/mosquitto/mosquitto-1.4.10.ebuild b/app-misc/mosquitto/mosquitto-1.4.10.ebuild |
| 18 |
index 15d5dd8..b723fe3 100644 |
| 19 |
--- a/app-misc/mosquitto/mosquitto-1.4.10.ebuild |
| 20 |
+++ b/app-misc/mosquitto/mosquitto-1.4.10.ebuild |
| 21 |
@@ -2,7 +2,7 @@ |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
-EAPI=5 |
| 26 |
+EAPI="5" |
| 27 |
PYTHON_COMPAT=( python2_7 ) |
| 28 |
|
| 29 |
inherit eutils systemd user python-any-r1 |
| 30 |
@@ -21,21 +21,13 @@ DEPEND="${RDEPEND} |
| 31 |
${PYTHON_DEPS} |
| 32 |
srv? ( net-dns/c-ares )" |
| 33 |
|
| 34 |
-LIBDIR=$(get_libdir) |
| 35 |
-QA_PRESTRIPPED="/usr/sbin/mosquitto |
| 36 |
- /usr/bin/mosquitto_passwd |
| 37 |
- /usr/bin/mosquitto_sub |
| 38 |
- /usr/bin/mosquitto_pub |
| 39 |
- /usr/${LIBDIR}/libmosquittopp.so.1 |
| 40 |
- /usr/${LIBDIR}/libmosquitto.so.1" |
| 41 |
- |
| 42 |
pkg_setup() { |
| 43 |
enewgroup mosquitto |
| 44 |
enewuser mosquitto -1 -1 -1 mosquitto |
| 45 |
} |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
- epatch "${FILESDIR}/${PN}-1.4.9-conditional-tests.patch" |
| 49 |
+ epatch "${FILESDIR}/${P}-conditional-tests.patch" |
| 50 |
if use persistence; then |
| 51 |
sed -i -e "s:^#autosave_interval:autosave_interval:" \ |
| 52 |
-e "s:^#persistence false$:persistence true:" \ |
| 53 |
@@ -48,6 +40,14 @@ src_prepare() { |
| 54 |
} |
| 55 |
|
| 56 |
src_configure() { |
| 57 |
+ LIBDIR=$(get_libdir) |
| 58 |
+ QA_PRESTRIPPED="/usr/sbin/mosquitto |
| 59 |
+ /usr/bin/mosquitto_passwd |
| 60 |
+ /usr/bin/mosquitto_sub |
| 61 |
+ /usr/bin/mosquitto_pub |
| 62 |
+ /usr/${LIBDIR}/libmosquittopp.so.1 |
| 63 |
+ /usr/${LIBDIR}/libmosquitto.so.1" |
| 64 |
+ |
| 65 |
makeopts=( |
| 66 |
"LIB_SUFFIX=${LIBDIR:3}" |
| 67 |
"WITH_BRIDGE=$(usex bridge)" |
| 68 |
@@ -56,7 +56,6 @@ src_configure() { |
| 69 |
"WITH_TLS=$(usex ssl)" |
| 70 |
"WITH_WRAP=$(usex tcpd)" |
| 71 |
) |
| 72 |
- einfo "${makeopts[@]}" |
| 73 |
} |
| 74 |
|
| 75 |
src_compile() { |
Archives