1 |
commit: e76d4407d049879afd737694c7c276b1ce3d86c1 |
2 |
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net> |
3 |
AuthorDate: Thu May 26 07:21:23 2022 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 26 13:12:22 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76d4407 |
7 |
|
8 |
net-im/signal-cli-bin: version bump to 0.10.6 |
9 |
|
10 |
new EAPI8, now depends on virtual/jre:17 |
11 |
|
12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
13 |
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/25637 |
15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
16 |
|
17 |
net-im/signal-cli-bin/Manifest | 3 ++ |
18 |
...l-cli-bin-0.10.6-use-working-java-version.patch | 33 +++++++++++++ |
19 |
net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild | 54 ++++++++++++++++++++++ |
20 |
3 files changed, 90 insertions(+) |
21 |
|
22 |
diff --git a/net-im/signal-cli-bin/Manifest b/net-im/signal-cli-bin/Manifest |
23 |
index 5080764d631c..570dbe52032d 100644 |
24 |
--- a/net-im/signal-cli-bin/Manifest |
25 |
+++ b/net-im/signal-cli-bin/Manifest |
26 |
@@ -1,3 +1,6 @@ |
27 |
+DIST signal-cli-bin-0.10.6.README.md 5916 BLAKE2B e7fc8646b1bcafe5145fec9d14450dcc235380d8f1e776f30432b3235a2ed87043a55ba4da48c058f83b04750e0e1dcd97ee5e50ce079e7bb906f04f9e77fb38 SHA512 a7347ea5134982fa76442702b9d7892b1bbdbf5f36b1823461e14c320cf38cdf3f2379178c7864ef21285f8f3a0c26d4e2fb9ea9546b2fb4d1271d552bf7c37e |
28 |
+DIST signal-cli-bin-0.10.6.signal-cli.1.adoc 19971 BLAKE2B 1642c6e463d0c536abfba4fa2e5c91f5fbb7c9d9817684924be82a43c7fbca7b92f07718507582721c63c32d1844c5c016f02dfb7b03b8ae7494f090ffdb7d00 SHA512 361098a70d3ee7f114a8f0f95794c24380363f782b4778d70a1cb2cc8bfee107e9b0f88c4cdd236f51960a14bcf18d60cb9920d4abac09fe58c0df9f5d4a5551 |
29 |
+DIST signal-cli-bin-0.10.6.tar.gz 34191841 BLAKE2B 3a0d4ae9c938aaadb59803550d56d4ae17cb8c0d3ea1f2874654207423679ca42ab42d1aa7894b897794298f94b2f57eac84120b7fbf7a0e4d6e0153a9565681 SHA512 4a7d5381bbcdde516d25e6a580854213ba5b144aa942d3cdea48b3e587d9db9e448c1bcf8c91a7632157747d00c5da4a4dbf1c366ae5a332f922c6d9a6ad33d1 |
30 |
DIST signal-cli-bin-0.8.5.README.md 5626 BLAKE2B e8a70135622a7eeaa9b4c965f75f001e641745c60a10d61ab96a014194034a1daf2ec077cb7798bf32c5f9218af6103dc9de7bbb2811b9a4aa162f55697f2232 SHA512 feed6673b56c4ac812d5038157f08bef36b48725211ad06a146a0f349c20213527eec814a5e940aacc0de0fdf7d74931fcd12a0d764df82340025a71a7f22a35 |
31 |
DIST signal-cli-bin-0.8.5.signal-cli.1.adoc 15222 BLAKE2B d5075011c82bb79f2de7f7b2f2cbf060428281b0f1d054e1cba09632e6e2b7dd472e8dfa3f0d7863acd9d8e93cfa51af1e241153baeb4d5f2e0e8698a158e6a1 SHA512 cd076fde6cdeca70734bb385d7dbf574fa859da9b2ba01c5dfbd8fde0f3457c400be41d790cd7cdc05932731693f4114e4708b7d42e405bf8dd6f982309c0ca2 |
32 |
DIST signal-cli-bin-0.8.5.tar.gz 17563403 BLAKE2B d400285d513c893475c74cbbfa7cb01391545d88e5e1504d9a5175428b31e7308cfc1c9526dc8cef4aab9a75e916a1b596f7939eeeaf5544ffb351c7dfcb3b59 SHA512 1d1931a568d9f95e020ee21dbf2d594b0d43d59e4621a7ef1ff21ab2e3cd4ea00da363bd5d86e12745015c643e4ebde4f58bec4a51be807e401ebb127430fa70 |
33 |
|
34 |
diff --git a/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch |
35 |
new file mode 100644 |
36 |
index 000000000000..02b77bc54dd4 |
37 |
--- /dev/null |
38 |
+++ b/net-im/signal-cli-bin/files/signal-cli-bin-0.10.6-use-working-java-version.patch |
39 |
@@ -0,0 +1,33 @@ |
40 |
+This patch searches the jre 17 binary in the gentoo specific directories. |
41 |
+ |
42 |
+Signed-off-by: Martin Dummer <martin.dummer@×××.net> |
43 |
+ |
44 |
+--- a/bin/signal-cli |
45 |
++++ b/bin/signal-cli |
46 |
+@@ -118,13 +118,19 @@ |
47 |
+ |
48 |
+ |
49 |
+ # Determine the Java command to use to start the JVM. |
50 |
+-if [ -n "$JAVA_HOME" ] ; then |
51 |
+- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then |
52 |
+- # IBM's JDK on AIX uses strange locations for the executables |
53 |
+- JAVACMD=$JAVA_HOME/jre/sh/java |
54 |
+- else |
55 |
+- JAVACMD=$JAVA_HOME/bin/java |
56 |
+- fi |
57 |
++# This package needs Java 17, |
58 |
++# so we must search for matching java binaries |
59 |
++for I in /usr/lib*/openjdk-17 /opt/openjdk-bin-17 /opt/openjdk-jre-bin-17; do |
60 |
++ J_TRY="$I/bin/java" |
61 |
++ if [ -x "$J_TRY" ] ; then |
62 |
++ "$J_TRY" -version 2>&1 | grep --fixed-strings --quiet "17." |
63 |
++ if [ $? -eq 0 ] ; then |
64 |
++ JAVACMD="$J_TRY" |
65 |
++ break |
66 |
++ fi |
67 |
++ fi |
68 |
++done |
69 |
++if [ -n "$JAVACMD" ] ; then |
70 |
+ if [ ! -x "$JAVACMD" ] ; then |
71 |
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME |
72 |
+ |
73 |
|
74 |
diff --git a/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild |
75 |
new file mode 100644 |
76 |
index 000000000000..29710caad87a |
77 |
--- /dev/null |
78 |
+++ b/net-im/signal-cli-bin/signal-cli-bin-0.10.6.ebuild |
79 |
@@ -0,0 +1,54 @@ |
80 |
+# Copyright 2021-2022 Gentoo Authors |
81 |
+# Distributed under the terms of the GNU General Public License v2 |
82 |
+ |
83 |
+EAPI=8 |
84 |
+ |
85 |
+MY_P="signal-cli-${PV}" |
86 |
+DESCRIPTION="Send and receive messages of Signal Messenger over a command line interface" |
87 |
+HOMEPAGE="https://github.com/AsamK/signal-cli/wiki" |
88 |
+SRC_URI=" |
89 |
+ https://github.com/AsamK/signal-cli/releases/download/v${PV}/${MY_P}-Linux.tar.gz -> ${P}.tar.gz |
90 |
+ https://github.com/AsamK/signal-cli/raw/v${PV}/README.md -> ${P}.README.md |
91 |
+ https://github.com/AsamK/signal-cli/raw/v${PV}/man/signal-cli.1.adoc -> ${P}.signal-cli.1.adoc |
92 |
+" |
93 |
+S="${WORKDIR}/${MY_P}" |
94 |
+ |
95 |
+LICENSE="GPL-3" |
96 |
+SLOT="0" |
97 |
+KEYWORDS="~amd64" |
98 |
+ |
99 |
+DEPEND=" |
100 |
+ || ( virtual/jdk:17 virtual/jre:17 ) |
101 |
+" |
102 |
+RDEPEND="${DEPEND}" |
103 |
+BDEPEND=" |
104 |
+ app-text/asciidoc |
105 |
+" |
106 |
+ |
107 |
+PATCHES=( |
108 |
+ "${FILESDIR}/${P}-use-working-java-version.patch" |
109 |
+) |
110 |
+ |
111 |
+src_unpack() { |
112 |
+ default |
113 |
+ cp "${DISTDIR}/${P}.signal-cli.1.adoc" signal-cli.1.adoc || die |
114 |
+} |
115 |
+ |
116 |
+src_compile() { |
117 |
+ default |
118 |
+ a2x --no-xmllint --doctype manpage --format manpage "${WORKDIR}/signal-cli.1.adoc" || die |
119 |
+} |
120 |
+ |
121 |
+src_install() { |
122 |
+ insinto /usr |
123 |
+ doins -r lib |
124 |
+ dobin bin/signal-cli |
125 |
+ newdoc "${DISTDIR}/${P}.README.md" README.md |
126 |
+ doman "${WORKDIR}/signal-cli.1" |
127 |
+} |
128 |
+ |
129 |
+pkg_postinst() { |
130 |
+ elog "Please read /usr/share/doc/${PF}/README.md.bz2" |
131 |
+ elog "how to register signal-cli with the signal service and how to send" |
132 |
+ elog "and receive messages" |
133 |
+} |