1 |
commit: a6598a9bfa5866d1e6bb2fbb7c2df3e828fdadb6 |
2 |
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 24 17:45:56 2020 +0000 |
4 |
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 25 10:44:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6598a9b |
7 |
|
8 |
net-im/coturn: versionbump, remove old, solves 724918,716096,710286 |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.23 |
11 |
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org> |
12 |
|
13 |
net-im/coturn/Manifest | 2 +- |
14 |
net-im/coturn/{coturn-4.5.1.1.ebuild => coturn-4.5.1.2.ebuild} | 8 +++++++- |
15 |
net-im/coturn/coturn-9999.ebuild | 8 +++++++- |
16 |
3 files changed, 15 insertions(+), 3 deletions(-) |
17 |
|
18 |
diff --git a/net-im/coturn/Manifest b/net-im/coturn/Manifest |
19 |
index 0f48d31a5c5..c40ac5708b1 100644 |
20 |
--- a/net-im/coturn/Manifest |
21 |
+++ b/net-im/coturn/Manifest |
22 |
@@ -1 +1 @@ |
23 |
-DIST coturn-4.5.1.1.tar.gz 420069 BLAKE2B fe0e0334658d2a69132d7a83667ee52927e888f8978bd03eb099e61f17a4516d10a36d2abb1c93e2b25bc4192c342fba581b85892e99b139016e09c77a365cc2 SHA512 a5e1aecdab5a7060ffbc73cc8dd294cafa701f2e0d2a827e40901cb6001af5a2c5ecbafdf14662410713818aad0ad259133f0dc9b34730bf7911863e1e255f70 |
24 |
+DIST coturn-4.5.1.2.tar.gz 436487 BLAKE2B c59a3ba0554111c6f70db04438e08b4d78bacc312bc5e5c2435e92f697222c8a3ab1c4f3e25de15174c3c359acda4760f855d88e37e68d333568c0882f4139a5 SHA512 6dd223fee866d97a3e55d87250fcb5d6ecc56f14b30029685406237aedd3d3cd6c09b685ef13ed2d1ebed3a4a3a80a88151c6498f312e53e3f5848d4af489478 |
25 |
|
26 |
diff --git a/net-im/coturn/coturn-4.5.1.1.ebuild b/net-im/coturn/coturn-4.5.1.2.ebuild |
27 |
similarity index 82% |
28 |
rename from net-im/coturn/coturn-4.5.1.1.ebuild |
29 |
rename to net-im/coturn/coturn-4.5.1.2.ebuild |
30 |
index 4a1fd749973..f3a72b58154 100644 |
31 |
--- a/net-im/coturn/coturn-4.5.1.1.ebuild |
32 |
+++ b/net-im/coturn/coturn-4.5.1.2.ebuild |
33 |
@@ -32,10 +32,16 @@ RDEPEND="acct-group/turnserver |
34 |
DEPEND="${RDEPEND}" |
35 |
|
36 |
src_configure() { |
37 |
+ if [ -n "${AR}" ]; then |
38 |
+ sed 's:ARCHIVERCMD="ar -r":ARCHIVERCMD="${AR} -r":g' -i "${S}/configure" |
39 |
+ fi |
40 |
+ sed 's:MANPREFIX}/man/:MANPREFIX}/:g' -i "${S}/Makefile.in" || die "sed for mandir failed" |
41 |
sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \ |
42 |
-i "${S}/examples/etc/turnserver.conf" || die "sed for logdir failed" |
43 |
sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \ |
44 |
|| die "sed for simple-log failed" |
45 |
+ sed '/INSTALL_DIR} examples\/script/a \ \${INSTALL_DIR} examples\/ca \${DESTDIR}${EXAMPLESDIR}' \ |
46 |
+ -i "${S}/Makefile.in" || die "sed for example ca failed" |
47 |
if ! use mongodb; then |
48 |
export TURN_NO_MONGO=yes |
49 |
fi |
50 |
@@ -51,7 +57,7 @@ src_configure() { |
51 |
if ! use sqlite; then |
52 |
export TURN_NO_SQLITE=yes |
53 |
fi |
54 |
- |
55 |
+ export DOCSDIR="/usr/share/doc/${PN}-${PV}" |
56 |
econf $(use_with sqlite) |
57 |
} |
58 |
|
59 |
|
60 |
diff --git a/net-im/coturn/coturn-9999.ebuild b/net-im/coturn/coturn-9999.ebuild |
61 |
index 4a1fd749973..f3a72b58154 100644 |
62 |
--- a/net-im/coturn/coturn-9999.ebuild |
63 |
+++ b/net-im/coturn/coturn-9999.ebuild |
64 |
@@ -32,10 +32,16 @@ RDEPEND="acct-group/turnserver |
65 |
DEPEND="${RDEPEND}" |
66 |
|
67 |
src_configure() { |
68 |
+ if [ -n "${AR}" ]; then |
69 |
+ sed 's:ARCHIVERCMD="ar -r":ARCHIVERCMD="${AR} -r":g' -i "${S}/configure" |
70 |
+ fi |
71 |
+ sed 's:MANPREFIX}/man/:MANPREFIX}/:g' -i "${S}/Makefile.in" || die "sed for mandir failed" |
72 |
sed 's:#log-file=/var/tmp/turn.log:log-file=/var/log/turnserver.log:' \ |
73 |
-i "${S}/examples/etc/turnserver.conf" || die "sed for logdir failed" |
74 |
sed 's:#simple-log:simple-log:' -i "${S}/examples/etc/turnserver.conf" \ |
75 |
|| die "sed for simple-log failed" |
76 |
+ sed '/INSTALL_DIR} examples\/script/a \ \${INSTALL_DIR} examples\/ca \${DESTDIR}${EXAMPLESDIR}' \ |
77 |
+ -i "${S}/Makefile.in" || die "sed for example ca failed" |
78 |
if ! use mongodb; then |
79 |
export TURN_NO_MONGO=yes |
80 |
fi |
81 |
@@ -51,7 +57,7 @@ src_configure() { |
82 |
if ! use sqlite; then |
83 |
export TURN_NO_SQLITE=yes |
84 |
fi |
85 |
- |
86 |
+ export DOCSDIR="/usr/share/doc/${PN}-${PV}" |
87 |
econf $(use_with sqlite) |
88 |
} |