| 1 |
commit: 582813bc85632cd46b874ca1f9fba48e22fc73a0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 29 21:25:48 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 21:26:44 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582813bc |
| 7 |
|
| 8 |
www-client/elinks: add 0.16.0 |
| 9 |
|
| 10 |
Note that this adds USE=javascript masked because it can't work yet (because |
| 11 |
of pending libxmlpp bump) but added to ensure we don't forget about it. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/797427 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
profiles/base/package.use.mask | 4 ++++ |
| 17 |
www-client/elinks/Manifest | 1 + |
| 18 |
.../elinks/{elinks-9999.ebuild => elinks-0.16.0.ebuild} | 15 ++++++++++++--- |
| 19 |
www-client/elinks/elinks-9999.ebuild | 15 ++++++++++++--- |
| 20 |
4 files changed, 29 insertions(+), 6 deletions(-) |
| 21 |
|
| 22 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 23 |
index 0e241ff8be84..26983de4b5a7 100644 |
| 24 |
--- a/profiles/base/package.use.mask |
| 25 |
+++ b/profiles/base/package.use.mask |
| 26 |
@@ -6,6 +6,10 @@ |
| 27 |
# This file is only for generic masks. For arch-specific masks (i.e. |
| 28 |
# mask everywhere, unmask on arch/*) use arch/base. |
| 29 |
|
| 30 |
+# Sam James <sam@g.o> (2022-12-29) |
| 31 |
+# Needs yet-unpackaged libxmlpp-5.0, bug #888898 |
| 32 |
+www-client/elinks javascript |
| 33 |
+ |
| 34 |
# Ionen Wolkens <ionen@g.o> (2022-12-29) |
| 35 |
# Blocks eventual cleanup of <dev-util/glslang-1.3.231, and the same |
| 36 |
# functionality can be got through USE=shaderc without direct usage. |
| 37 |
|
| 38 |
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest |
| 39 |
index ccbe603223be..e78cffa828a7 100644 |
| 40 |
--- a/www-client/elinks/Manifest |
| 41 |
+++ b/www-client/elinks/Manifest |
| 42 |
@@ -1,2 +1,3 @@ |
| 43 |
DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b |
| 44 |
DIST elinks-0.15.1.tar.xz 1997208 BLAKE2B dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2 SHA512 677eeeeab3fc24dcfe4e7248a9c1a8e07083ebd13bd9923d89702a04dbe1c3e4d4038029c095881183d7f11ae2c5317ff7e5458320644fde0c176378b89068d8 |
| 45 |
+DIST elinks-0.16.0.tar.xz 2029708 BLAKE2B b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 SHA512 b1d6040b691610d596e0d1eae26bfe52d702272c71a2e5100ab7d6b05b24a0b88524d4fc7be3f6371e0bada1e6f0992da7505a72419ca642dec778424629a522 |
| 46 |
|
| 47 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-0.16.0.ebuild |
| 48 |
similarity index 91% |
| 49 |
copy from www-client/elinks/elinks-9999.ebuild |
| 50 |
copy to www-client/elinks/elinks-0.16.0.ebuild |
| 51 |
index 20caa1f92b40..3c1f97b7f5ff 100644 |
| 52 |
--- a/www-client/elinks/elinks-9999.ebuild |
| 53 |
+++ b/www-client/elinks/elinks-0.16.0.ebuild |
| 54 |
@@ -4,7 +4,7 @@ |
| 55 |
EAPI=8 |
| 56 |
|
| 57 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 58 |
-LUA_COMPAT=( lua5-{1,2} ) |
| 59 |
+LUA_COMPAT=( lua5-{1,2,3,4} luajit ) |
| 60 |
|
| 61 |
inherit meson lua-single python-any-r1 |
| 62 |
|
| 63 |
@@ -22,8 +22,10 @@ fi |
| 64 |
|
| 65 |
LICENSE="GPL-2" |
| 66 |
SLOT="0" |
| 67 |
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn |
| 68 |
- lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd" |
| 69 |
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn" |
| 70 |
+IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd" |
| 71 |
+# tests restricted for https://github.com/rkd77/elinks/issues/203 |
| 72 |
+RESTRICT="!test? ( test ) test" |
| 73 |
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" |
| 74 |
|
| 75 |
RDEPEND=" |
| 76 |
@@ -35,6 +37,10 @@ RDEPEND=" |
| 77 |
) |
| 78 |
guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) |
| 79 |
idn? ( net-dns/libidn:= ) |
| 80 |
+ javascript? ( |
| 81 |
+ dev-cpp/libxmlpp:5.0 |
| 82 |
+ dev-lang/mujs:= |
| 83 |
+ ) |
| 84 |
lua? ( ${LUA_DEPS} ) |
| 85 |
lzma? ( app-arch/xz-utils ) |
| 86 |
perl? ( dev-lang/perl:= ) |
| 87 |
@@ -65,6 +71,7 @@ pkg_setup() { |
| 88 |
python-any-r1_pkg_setup |
| 89 |
} |
| 90 |
|
| 91 |
+ |
| 92 |
src_configure() { |
| 93 |
local emesonargs=( |
| 94 |
-D88-colors=true |
| 95 |
@@ -84,6 +91,7 @@ src_configure() { |
| 96 |
-Dgssapi=false |
| 97 |
-Dhtml-highlight=true |
| 98 |
$(meson_use idn) |
| 99 |
+ $(meson_use javascript mujs) |
| 100 |
-Dipv6=true |
| 101 |
-Dleds=true |
| 102 |
-Dlibev=false |
| 103 |
@@ -102,6 +110,7 @@ src_configure() { |
| 104 |
-Dsm-scripting=false |
| 105 |
-Dspidermonkey=false |
| 106 |
-Dterminfo=true |
| 107 |
+ $(meson_use test) |
| 108 |
$(meson_use tre) |
| 109 |
-Dtrue-color=true |
| 110 |
$(meson_use xml xbel) |
| 111 |
|
| 112 |
diff --git a/www-client/elinks/elinks-9999.ebuild b/www-client/elinks/elinks-9999.ebuild |
| 113 |
index 20caa1f92b40..3c1f97b7f5ff 100644 |
| 114 |
--- a/www-client/elinks/elinks-9999.ebuild |
| 115 |
+++ b/www-client/elinks/elinks-9999.ebuild |
| 116 |
@@ -4,7 +4,7 @@ |
| 117 |
EAPI=8 |
| 118 |
|
| 119 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 120 |
-LUA_COMPAT=( lua5-{1,2} ) |
| 121 |
+LUA_COMPAT=( lua5-{1,2,3,4} luajit ) |
| 122 |
|
| 123 |
inherit meson lua-single python-any-r1 |
| 124 |
|
| 125 |
@@ -22,8 +22,10 @@ fi |
| 126 |
|
| 127 |
LICENSE="GPL-2" |
| 128 |
SLOT="0" |
| 129 |
-IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn |
| 130 |
- lua lzma +mouse nls nntp perl samba ssl tre unicode X xml zlib zstd" |
| 131 |
+IUSE="bittorrent brotli bzip2 debug finger ftp gopher gpm gnutls guile idn" |
| 132 |
+IUSE+=" javascript lua lzma +mouse nls nntp perl samba ssl test tre unicode X xml zlib zstd" |
| 133 |
+# tests restricted for https://github.com/rkd77/elinks/issues/203 |
| 134 |
+RESTRICT="!test? ( test ) test" |
| 135 |
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" |
| 136 |
|
| 137 |
RDEPEND=" |
| 138 |
@@ -35,6 +37,10 @@ RDEPEND=" |
| 139 |
) |
| 140 |
guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated] ) |
| 141 |
idn? ( net-dns/libidn:= ) |
| 142 |
+ javascript? ( |
| 143 |
+ dev-cpp/libxmlpp:5.0 |
| 144 |
+ dev-lang/mujs:= |
| 145 |
+ ) |
| 146 |
lua? ( ${LUA_DEPS} ) |
| 147 |
lzma? ( app-arch/xz-utils ) |
| 148 |
perl? ( dev-lang/perl:= ) |
| 149 |
@@ -65,6 +71,7 @@ pkg_setup() { |
| 150 |
python-any-r1_pkg_setup |
| 151 |
} |
| 152 |
|
| 153 |
+ |
| 154 |
src_configure() { |
| 155 |
local emesonargs=( |
| 156 |
-D88-colors=true |
| 157 |
@@ -84,6 +91,7 @@ src_configure() { |
| 158 |
-Dgssapi=false |
| 159 |
-Dhtml-highlight=true |
| 160 |
$(meson_use idn) |
| 161 |
+ $(meson_use javascript mujs) |
| 162 |
-Dipv6=true |
| 163 |
-Dleds=true |
| 164 |
-Dlibev=false |
| 165 |
@@ -102,6 +110,7 @@ src_configure() { |
| 166 |
-Dsm-scripting=false |
| 167 |
-Dspidermonkey=false |
| 168 |
-Dterminfo=true |
| 169 |
+ $(meson_use test) |
| 170 |
$(meson_use tre) |
| 171 |
-Dtrue-color=true |
| 172 |
$(meson_use xml xbel) |
Archives