Browse Source

Sync with portage [Tue May 18 08:42:42 MSK 2021].

tags/1967
Calculate Linux 4 months ago
parent
commit
770532170a
100 changed files with 850 additions and 1951 deletions
  1. BIN
      Manifest.files.gz
  2. BIN
      app-admin/Manifest.gz
  3. +0
    -4
      app-admin/kpcli/metadata.xml
  4. +0
    -2
      app-admin/lastpass-cli/Manifest
  5. +0
    -82
      app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch
  6. +0
    -69
      app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
  7. +0
    -20
      app-admin/lastpass-cli/metadata.xml
  8. +2
    -1
      app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
  9. BIN
      app-crypt/Manifest.gz
  10. +2
    -0
      app-crypt/openpgp-keys-libidn/Manifest
  11. +12
    -0
      app-crypt/openpgp-keys-libidn/metadata.xml
  12. +23
    -0
      app-crypt/openpgp-keys-libidn/openpgp-keys-libidn-20210517.ebuild
  13. BIN
      app-editors/Manifest.gz
  14. +1
    -0
      app-editors/vile/Manifest
  15. +48
    -0
      app-editors/vile/vile-9.8u.ebuild
  16. BIN
      dev-java/Manifest.gz
  17. +0
    -2
      dev-java/classmate/Manifest
  18. +0
    -47
      dev-java/classmate/classmate-0.9.0-r1.ebuild
  19. +0
    -45
      dev-java/classmate/classmate-1.2.0.ebuild
  20. +0
    -11
      dev-java/classmate/metadata.xml
  21. +0
    -1
      dev-java/commons-configuration/Manifest
  22. +0
    -67
      dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
  23. +0
    -19
      dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
  24. +0
    -13
      dev-java/commons-configuration/metadata.xml
  25. +0
    -1
      dev-java/commons-jelly/Manifest
  26. +0
    -63
      dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
  27. +0
    -59
      dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch
  28. +0
    -8
      dev-java/commons-jelly/metadata.xml
  29. +0
    -1
      dev-java/ezmorph/Manifest
  30. +0
    -44
      dev-java/ezmorph/ezmorph-1.0.6.ebuild
  31. +0
    -22
      dev-java/ezmorph/metadata.xml
  32. +0
    -1
      dev-java/ical4j/Manifest
  33. +0
    -80
      dev-java/ical4j/files/1.0.5-build.xml.patch
  34. +0
    -57
      dev-java/ical4j/ical4j-1.0.5.ebuild
  35. +0
    -24
      dev-java/ical4j/metadata.xml
  36. +0
    -1
      dev-java/tapestry/Manifest
  37. +0
    -5
      dev-java/tapestry/files/Version.properties
  38. +0
    -32
      dev-java/tapestry/files/build.properties
  39. +0
    -94
      dev-java/tapestry/files/common.properties
  40. +0
    -15
      dev-java/tapestry/metadata.xml
  41. +0
    -70
      dev-java/tapestry/tapestry-3.0.4-r3.ebuild
  42. BIN
      dev-libs/Manifest.gz
  43. +1
    -0
      dev-libs/cdk/Manifest
  44. +2
    -2
      dev-libs/cdk/cdk-5.0.20160131.ebuild
  45. +53
    -0
      dev-libs/cdk/cdk-5.0.20210324.ebuild
  46. +2
    -1
      dev-libs/libzip/libzip-1.7.3-r1.ebuild
  47. +2
    -2
      dev-libs/nanomsg/nanomsg-1.1.5.ebuild
  48. BIN
      dev-python/Manifest.gz
  49. +0
    -1
      dev-python/pep8/Manifest
  50. +0
    -13
      dev-python/pep8/metadata.xml
  51. +0
    -28
      dev-python/pep8/pep8-1.7.1.ebuild
  52. +5
    -3
      dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild
  53. +5
    -3
      dev-python/pyFFTW/pyFFTW-9999.ebuild
  54. +0
    -1
      dev-python/pytest-pep8/Manifest
  55. +0
    -9
      dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch
  56. +0
    -11
      dev-python/pytest-pep8/metadata.xml
  57. +0
    -32
      dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
  58. +1
    -1
      dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
  59. BIN
      dev-qt/Manifest.gz
  60. +0
    -1
      dev-qt/qtwebengine/Manifest
  61. +372
    -0
      dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210421-qtbug-91773.patch
  62. +0
    -190
      dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
  63. +1
    -0
      dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
  64. BIN
      dev-util/Manifest.gz
  65. +0
    -1
      dev-util/cbindgen/Manifest
  66. +0
    -68
      dev-util/cbindgen/cbindgen-0.18.0.ebuild
  67. +1
    -1
      dev-util/cbindgen/cbindgen-0.19.0.ebuild
  68. +1
    -0
      dev-util/dialog/Manifest
  69. +5
    -0
      dev-util/dialog/dialog-1.3.20210324.ebuild
  70. +53
    -0
      dev-util/dialog/dialog-1.3.20210509.ebuild
  71. +0
    -1
      dev-util/findbugs/Manifest
  72. +0
    -47
      dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
  73. +0
    -24
      dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
  74. +0
    -29
      dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
  75. +0
    -24
      dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
  76. +0
    -24
      dev-util/findbugs/files/0005-Don-t-require-git-to-build.patch
  77. +0
    -75
      dev-util/findbugs/files/launchers/fb
  78. +0
    -3
      dev-util/findbugs/files/launchers/fbwrap
  79. +0
    -83
      dev-util/findbugs/files/launchers/findbugs
  80. +0
    -89
      dev-util/findbugs/files/launchers/findbugs2
  81. +0
    -108
      dev-util/findbugs/findbugs-3.0.1.ebuild
  82. +0
    -12
      dev-util/findbugs/metadata.xml
  83. BIN
      dev-vcs/Manifest.gz
  84. +1
    -1
      dev-vcs/repo/Manifest
  85. +0
    -32
      dev-vcs/repo/repo-2.11.ebuild
  86. +1
    -1
      dev-vcs/repo/repo-2.14.ebuild
  87. +11
    -3
      dev-vcs/repo/repo-2.15.ebuild
  88. BIN
      eclass/Manifest.gz
  89. +10
    -0
      eclass/perl-functions.eclass
  90. BIN
      games-puzzle/Manifest.gz
  91. +1
    -0
      games-puzzle/quadrapassel/Manifest
  92. +49
    -0
      games-puzzle/quadrapassel/quadrapassel-40.1.ebuild
  93. BIN
      gnome-extra/Manifest.gz
  94. +1
    -0
      gnome-extra/nm-applet/Manifest
  95. +52
    -0
      gnome-extra/nm-applet/nm-applet-1.22.0.ebuild
  96. BIN
      mail-client/Manifest.gz
  97. +1
    -1
      mail-client/roundcube/roundcube-9999.ebuild
  98. +66
    -66
      mail-client/thunderbird-bin/Manifest
  99. +0
    -0
      mail-client/thunderbird-bin/thunderbird-bin-78.10.2.ebuild
  100. +65
    -0
      mail-client/thunderbird/Manifest

BIN
Manifest.files.gz View File


BIN
app-admin/Manifest.gz View File


+ 0
- 4
app-admin/kpcli/metadata.xml View File

@@ -5,10 +5,6 @@
<email>juippis@gentoo.org</email>
<name>Joonas Niilola</name>
</maintainer>
<maintainer type="project">
<email>perl@gentoo.org</email>
<name>Gentoo Perl Project</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="sourceforge">kpcli</remote-id>


+ 0
- 2
app-admin/lastpass-cli/Manifest View File

@@ -1,2 +0,0 @@
DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e

+ 0
- 82
app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch View File

@@ -1,82 +0,0 @@
From 6b69a534863741734b550daf43b5d06c8d899b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Thu, 23 Jan 2020 00:25:50 +0100
Subject: [PATCH] Mark global variable as extern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GCC now defaults to -fno-common. As a result, global variable accesses
are more efficient on various targets. In C, global variables with
multiple tentative definitions now result in linker errors.

Fix #532

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
globals.c | 40 ++++++++++++++++++++++++++++++++++++++++
process.h | 4 ++--
2 files changed, 42 insertions(+), 2 deletions(-)
create mode 100644 globals.c

diff --git a/globals.c b/globals.c
new file mode 100644
index 0000000..59e9c30
--- /dev/null
+++ b/globals.c
@@ -0,0 +1,40 @@
+/*
+ *
+ * Copyright (C) 2014-2018 LastPass.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ *
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL. If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so. If you
+ * do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ *
+ * See LICENSE.OpenSSL for more details regarding this exception.
+ */
+
+#include "process.h"
+
+/* Globals */
+int ARGC;
+char **ARGV;
diff --git a/process.h b/process.h
index 58c2480..4cc2cf4 100644
--- a/process.h
+++ b/process.h
@@ -4,8 +4,8 @@
#include <stdbool.h>
#include <sys/types.h>
-int ARGC;
-char **ARGV;
+extern int ARGC;
+extern char **ARGV;
void process_set_name(const char *name);
void process_disable_ptrace(void);

+ 0
- 69
app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild View File

@@ -1,69 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6

CMAKE_WARN_UNUSED_CLI=no
inherit cmake-utils bash-completion-r1

DESCRIPTION="Interfaces with LastPass.com from the command line."
HOMEPAGE="https://github.com/lastpass/lastpass-cli"
SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/${PN}-man-1.3.1.tar.xz"

SLOT="0"
LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
KEYWORDS="amd64 x86"
IUSE="X +pinentry test"
RESTRICT="!test? ( test )"

RDEPEND="
X? ( || ( x11-misc/xclip x11-misc/xsel ) )
dev-libs/openssl:0=
net-misc/curl
dev-libs/libxml2
pinentry? ( app-crypt/pinentry )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"

PATCHES=(
"${FILESDIR}"/"${PN}"-1.3.3-gcc10-fix.patch
)

src_configure() {
local mycmakeargs=(
-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
)

cmake-utils_src_configure
}

src_compile() {
cmake-utils_src_compile all $(usex test lpass-test '')
}

src_install() {
cmake-utils_src_install install

doman "${WORKDIR}"/man/lpass.1

# Version 1.3.2 uses automagic detection for bashcomp
# To preserve backwards compatibility, we unconditionally
# install the completion file
newbashcomp contrib/lpass_bash_completion lpass
}

src_test() {
local myctestargs=(
-j1 # Parallel tests fail
)

# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
# which is incorrect for our out-of-source build
sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-i "${S}"/test/include.sh || die

cmake-utils_src_test
}

+ 0
- 20
app-admin/lastpass-cli/metadata.xml View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gokturk@gentoo.org</email>
<name>Göktürk Yüksek</name>
</maintainer>
<use>
<flag name="X">
Use <pkg>x11-misc/xclip</pkg> or <pkg>x11-misc/xsel</pkg> to copy passwords to the clipboard.
</flag>
<flag name="pinentry">
Use <pkg>app-crypt/pinentry</pkg> to prompt for passwords.
</flag>
</use>
<upstream>
<remote-id type="github">lastpass/lastpass-cli</remote-id>
<bugs-to>https://github.com/lastpass/lastpass-cli/issues</bugs-to>
</upstream>
</pkgmetadata>

+ 2
- 1
app-admin/syslog-ng/syslog-ng-3.31.2.ebuild View File

@@ -15,7 +15,8 @@ LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
test? ( python )"
RESTRICT="!test? ( test )"

RDEPEND="


BIN
app-crypt/Manifest.gz View File


+ 2
- 0
app-crypt/openpgp-keys-libidn/Manifest View File

@@ -0,0 +1,2 @@
DIST openpgp-keys-libidn-20210517-simonjosefsson-0424D4EE81A0E3D119C6F835EDA21E94B565716F.asc 5925 BLAKE2B 50df50ba10a69f0be231356f319036083c7f7198e8caa757b1766538b5e34114291cdb47ba3a8d880e2143d3e93e98ad99e4c3f7221a5f51c755db7456b00439 SHA512 35f629f471220c9179bfd2919277495c4de3264bf1270ef0a1839e6d3e864fb09479ab82a5f5f612c5955697ce78c411244a8f8b48c0c4f5f53e2bfb2ade78b5
DIST openpgp-keys-libidn-20210517-timruehsen-99415CE1905D0E55A9F88026860B7FBB32F8119D.asc 5986 BLAKE2B d6bab47834e2ba470d3c8a0c1b72cdbb6d12423cdb66b6fa6db5f5dc52270315171a04989b838017418f7a6bd90417f3fc5249c0c4b1c6151e811bc46a180c97 SHA512 5980ae33d6158d34ad31f49eb8c4dac87a92ce37ee07f45e54388912fdf794c181e88118c5efa81d4e030795baa82140aa8f1123910746d978f02a9c04089436

+ 12
- 0
app-crypt/openpgp-keys-libidn/metadata.xml View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
<maintainer type="person">
<email>sam@gentoo.org</email>
<name>Sam James</name>
</maintainer>
</pkgmetadata>

+ 23
- 0
app-crypt/openpgp-keys-libidn/openpgp-keys-libidn-20210517.ebuild View File

@@ -0,0 +1,23 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

DESCRIPTION="OpenPGP keys used to sign libidn releases"
HOMEPAGE="https://www.gnu.org/software/libidn/"
# Simon Josefsson
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-simonjosefsson-0424D4EE81A0E3D119C6F835EDA21E94B565716F.asc"
# Tim Rühsen
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-timruehsen-99415CE1905D0E55A9F88026860B7FBB32F8119D.asc"
S="${WORKDIR}"

LICENSE="public-domain"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"

src_install() {
local files=( ${A} )

insinto /usr/share/openpgp-keys
newins - libidn.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
}

BIN
app-editors/Manifest.gz View File


+ 1
- 0
app-editors/vile/Manifest View File

@@ -1 +1,2 @@
DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229
DIST vile-9.8u.tgz 2375989 BLAKE2B 86e2bb01fab7c429233484493aa33c0b807f7babedf6e69f4c526a6677471ff8e43287114073d22ebb229a801ef003779ab587c9a17474519148e1f64d58460e SHA512 fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d

+ 48
- 0
app-editors/vile/vile-9.8u.ebuild View File

@@ -0,0 +1,48 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone"
HOMEPAGE="https://invisible-island.net/vile/"
SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl iconv"

RDEPEND="app-eselect/eselect-vi
>=sys-libs/ncurses-5.2:0=
iconv? ( virtual/libiconv )
perl? ( dev-lang/perl )"
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/flex
virtual/pkgconfig"

src_configure() {
econf \
--disable-stripping \
--with-ncurses \
--with-pkg-config \
$(use_with iconv) \
$(use_with perl)
}

src_install() {
emake DESTDIR="${D}" install

dodoc CHANGES* README doc/*.doc
docinto html
dodoc doc/*.html
}

pkg_postinst() {
einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
eselect vi update --if-unset
}

pkg_postrm() {
einfo "Updating ${EPREFIX}/usr/bin/vi symlink"
eselect vi update --if-unset
}

BIN
dev-java/Manifest.gz View File


+ 0
- 2
dev-java/classmate/Manifest View File

@@ -1,2 +0,0 @@
DIST classmate-0.9.0.tar.gz 57752 BLAKE2B 31247d159be4898b9ae71024da41c8602fe4d82f4ee10edab3146355cac06b23991fe926397737c43341085f35b392fc3f8a6b8278b9e47706f6fd06012f4c59 SHA512 7fb331c462458c8aab143f23c0d128a0e4e976f9d12bd181eb5658961b217bd1fe0871d056fc38bff794522c8b3118a2a017eab265afffc1d60b5580df1237a2
DIST classmate-1.2.0.tar.gz 62150 BLAKE2B fac7cb24e527f69863cfb4c59e634ac77165aa5a1ecae9d887511818a87ae9cd2652eb47e72844f3e38bed3c4856185020db6ece90553d14ce84cf6ce859cae7 SHA512 82f38229cbe57531354300b967589afcf064970a2b41ac56ad3520582719416ca878d9a4adc46d46a4470077e5f14ddcf2906b0af03156863301dca0b20d4151

+ 0
- 47
dev-java/classmate/classmate-0.9.0-r1.ebuild View File

@@ -1,47 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI="5"

JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-pkg-simple vcs-snapshot

DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"

IUSE=""

RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
test? ( dev-java/junit:4 )"

S="${WORKDIR}/${P}"

JAVA_SRC_DIR="src/main/java"

# This one test is buggy.
JAVA_RM_FILES=(
src/test/java/com/fasterxml/classmate/AnnotationsTest.java
)

java_prepare() {
rm pom.xml || die
}

src_test() {
testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"

mkdir target/tests || die
ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")

tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
| grep -vP '\$');
ejunit4 -cp "${testcp}" ${tests}
}

+ 0
- 45
dev-java/classmate/classmate-1.2.0.ebuild View File

@@ -1,45 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=6

JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-pkg-simple

DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"

RDEPEND="
>=virtual/jre-1.6"

DEPEND="
>=virtual/jdk-1.6
test? ( dev-java/junit:4 )"

S="${WORKDIR}/java-${PN}-${P}"

JAVA_SRC_DIR="src/main/java"

src_prepare() {
default
rm -v pom.xml \
src/test/java/com/fasterxml/classmate/AnnotationsTest.java || die
}

src_test() {
testcp="${S}/${PN}.jar:$(java-pkg_getjars junit-4):target/tests"

mkdir target/tests || die
ejavac -cp "${testcp}" -d target/tests $(find src/test/java -name "*.java")

tests=$(find target/tests -name "*Test.class" -not -name "BaseTest.class" \
| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
| grep -vP '\$');
ejunit4 -cp "${testcp}" ${tests}
}

+ 0
- 11
dev-java/classmate/metadata.xml View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<upstream>
<remote-id type="github">cowtowncoder/java-classmate</remote-id>
</upstream>
</pkgmetadata>

+ 0
- 1
dev-java/commons-configuration/Manifest View File

@@ -1 +0,0 @@
DIST commons-configuration-1.6-src.tar.gz 559621 BLAKE2B ce6ca821c03b4948796c46fe796684dbcc8eafbc6004e2abace573f8fa316f638056c03684d10d29c0f3126554bc8cf2c9195228044a2db7203f847d2b71b22e SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01

+ 0
- 67
dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild View File

@@ -1,67 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=5

JAVA_PKG_IUSE="doc source"

inherit epatch java-pkg-2 java-ant-2

DESCRIPTION="Generic interface for reading configuration data from a variety of sources"
HOMEPAGE="http://commons.apache.org/configuration/"
SRC_URI="mirror://apache/commons/configuration/source/${P}-src.tar.gz"

# it needs functionality from ant-core, although not providing an ant task
# the functionality is apparently needed only for 1.4 jdk
# but I don't feel like adding virtual for this
CDEPEND="
>=dev-java/commons-beanutils-1.7.0:1.7
>=dev-java/commons-codec-1.3:0
>=dev-java/commons-collections-3.1:0
>=dev-java/commons-digester-1.8:0
>=dev-java/commons-jxpath-1.2:0
>=dev-java/commons-lang-2.4:2.1
>=dev-java/commons-logging-1.1.1:0
java-virtuals/servlet-api:3.0
dev-java/ant-core:0"

DEPEND=">=virtual/jdk-1.6
${CDEPEND}"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
LICENSE="Apache-2.0"
SLOT="0"

KEYWORDS="amd64 ppc64 x86"
IUSE=""

S="${WORKDIR}/${P}-src"

JAVA_ANT_REWRITE_CLASSPATH="yes"

java_prepare() {
# Tweak build classpath and don't automatically run tests
epatch "${FILESDIR}/${P}-gentoo.patch"
}

EANT_GENTOO_CLASSPATH="
commons-beanutils-1.7
commons-codec
commons-collections
commons-digester
commons-jxpath
commons-lang-2.1
commons-logging
servlet-api-3.0
ant-core"

# Would need mockobjects with j2ee support which we don't have
# Check overlay for ebuild with test support
RESTRICT="test"

src_install() {
java-pkg_newjar target/${P}.jar
dodoc RELEASE-NOTES.txt
use doc && java-pkg_dohtml -r dist/docs/api
use source && java-pkg_dosrc src/java/*
}

+ 0
- 19
dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch View File

@@ -1,19 +0,0 @@
--- build.xml.orig 2006-10-13 00:00:17.000000000 +0200
+++ build.xml 2006-10-13 00:02:37.000000000 +0200
@@ -97,13 +97,13 @@
</copy>
</target>
- <target name="jar" description="o Create the jar" depends="compile,test">
+ <target name="jar" description="o Create the jar" depends="compile">
<mkdir dir="${classesdir}/META-INF"/>
<copy file="LICENSE.txt" todir="${metadir}"/>
<copy file="NOTICE.txt" todir="${metadir}"/>
- <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>
+ <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>
<jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"
- manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
+ manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
</jar>
</target>
<target name="clean" description="o Clean up the generated directories">

+ 0
- 13
dev-java/commons-configuration/metadata.xml View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<longdescription>
Commons Configuration provides a generic configuration interface
which enables an application to read configuration data from
a variety of sources.
</longdescription>
</pkgmetadata>

+ 0
- 1
dev-java/commons-jelly/Manifest View File

@@ -1 +0,0 @@
DIST commons-jelly-1.0-src.tar.gz 174769 BLAKE2B 2dc43eef28c76252976616f0509aacbfed31ec0b99916730d86d084ec54bacc4f49000d04a953002717670d17a4ae2ae7249d57b327258414c3515dbb8abde7f SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35

+ 0
- 63
dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild View File

@@ -1,63 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=5

JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-ant-2

MY_P="${P}-src"
DESCRIPTION="A Java and XML based scripting and processing engine"
HOMEPAGE="http://commons.apache.org/jelly/"
SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"

LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~amd64 ~x86"
IUSE=""

CDEPEND="
dev-java/dom4j:1
dev-java/junit:0
dev-java/jaxen:1.1
dev-java/commons-cli:1
dev-java/commons-lang:0
dev-java/commons-jexl:1.0
dev-java/commons-logging:0
dev-java/commons-discovery:0
dev-java/commons-collections:0
dev-java/commons-beanutils:1.7
dev-java/tomcat-jstl-spec:0
java-virtuals/servlet-api:3.0"
RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
DEPEND="${CDEPEND}
>=virtual/jdk-1.6
test? ( dev-java/ant-junit:0 )"

S=${WORKDIR}/${MY_P}

java_prepare() {
# disables dependency fetching, and remove tests as a dependency of jar
epatch "${FILESDIR}/${P}-gentoo.patch"
}

JAVA_ANT_REWRITE_CLASSPATH="yes"

EANT_EXTRA_ARGS="-Dlibdir=."
EANT_GENTOO_CLASSPATH="
commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec
jaxen-1.1,junit,servlet-api-3.0"

src_test() {
java-pkg-2_src_test
}

src_install() {
java-pkg_newjar target/${P}.jar ${PN}.jar
dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/*
}

+ 0
- 59
dev-java/commons-jelly/files/commons-jelly-1.0-gentoo.patch View File

@@ -1,59 +0,0 @@
diff -ru commons-jelly-1.0-src/build.xml commons-jelly-1.0-src-patched/build.xml
--- commons-jelly-1.0-src/build.xml 2005-06-16 10:39:44.000000000 -0400
+++ commons-jelly-1.0-src-patched/build.xml 2005-09-04 19:39:19.000000000 -0400
@@ -37,6 +37,8 @@
<property name="proxy.password" value="">
</property>
<path id="build.classpath">
+ <fileset dir="${libdir}" includes="**/*.jar"/>
+ <!--
<pathelement location="${libdir}/servletapi/jars/servletapi-2.3.jar">
</pathelement>
<pathelement location="${libdir}/commons-cli/jars/commons-cli-1.0.jar">
@@ -67,6 +69,7 @@
</pathelement>
<pathelement location="${libdir}/xerces/jars/xerces-2.2.1.jar">
</pathelement>
+ -->
</path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
@@ -92,7 +95,7 @@
</and>
</condition>
</target>
- <target name="compile" description="o Compile the code" depends="get-deps">
+ <target name="compile" description="o Compile the code" depends="">
<mkdir dir="${classesdir}">
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
@@ -120,10 +123,12 @@
<copy todir="${classesdir}/META-INF" file="${basedir}/LICENSE.txt">
</copy>
</target>
- <target name="jar" description="o Create the jar" depends="compile,test">
+
+ <target name="jar" description="o Create the jar" depends="compile">
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
</jar>
</target>
+
<target name="clean" description="o Clean up the generated directories">
<delete dir="${defaulttargetdir}">
</delete>
@@ -213,7 +218,7 @@
</fileset>
</copy>
</target>
- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <target name="javadoc" description="o Generate javadoc" depends="">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -432,4 +437,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
-</project>
\ No newline at end of file
+</project>

+ 0
- 8
dev-java/commons-jelly/metadata.xml View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
</pkgmetadata>

+ 0
- 1
dev-java/ezmorph/Manifest View File

@@ -1 +0,0 @@
DIST ezmorph-1.0.6-sources.jar 68198 BLAKE2B c8df2da6282361932041de5cb7200119dd70279b1b4a0aa0ecdb8b87d5582fddd8716c593850af6d3da972b51dcee9f62eb5bfee83e698a1ce1c3b6f23f359df SHA512 a8f88ff38e2d2815ee64436af87c4dc5a9858edec729c8db3ebda6d64d2fe2644b5e56deafedcf242caffa523643ccb978cd775c85793df6e2e5487c6d878cea

+ 0
- 44
dev-java/ezmorph/ezmorph-1.0.6.ebuild View File

@@ -1,44 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI=5
JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-pkg-simple

DESCRIPTION="A simple Java library for transforming an Object to another Object"
HOMEPAGE="http://ezmorph.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"

COMMON_DEP="dev-java/commons-lang:2.1
dev-java/commons-beanutils:1.7
dev-java/commons-logging:0"
RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
app-arch/unzip
${COMMON_DEP}"

JAVA_GENTOO_CLASSPATH="
commons-lang-2.1
commons-beanutils-1.7
commons-logging"

RESTRICT=test #564158

java_prepare() {
# Don't build tests all the time
if ! use test ; then
rm -r net/sf/ezmorph/test || die
fi
}

src_install() {
java-pkg_dojar ${PN}.jar
use doc && java-pkg_dojavadoc target/api
use source && java-pkg_dosrc net
}

+ 0
- 22
dev-java/ezmorph/metadata.xml View File

@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<longdescription lang="en">
EZMorph is simple java library for transforming an Object to another Object.

EZMorph's key strengths are:

Supports transformations for primitives and Objects
Supports transformations for multidimensional arrays
Supports transformations with DynaBeans
JDK 1.3.1 compatible
Small memory footprint (~76K)
</longdescription>
<upstream>
<remote-id type="sourceforge">ezmorph</remote-id>
</upstream>
</pkgmetadata>

+ 0
- 1
dev-java/ical4j/Manifest View File

@@ -1 +0,0 @@
DIST ical4j-1.0.5-src.tar.bz2 9307268 BLAKE2B f72cb77a73e1b1740f52accf5296630ba4e2ef9d4610a384a400ea50e84f245c2d320e05b2702e963ef3d7097e073687343fe2e924eca5e64b80a8f2dc1adcdf SHA512 1c2c1eb6207094fd12036d4eb93afaef820c19c7bce99611ddb9115cd62ece76972b7280364b49643147e4456ef4afca4df23ce4413e0288804183f33c2cc286

+ 0
- 80
dev-java/ical4j/files/1.0.5-build.xml.patch View File

@@ -1,80 +0,0 @@
diff --git a/ical4j-1.0.5/build.xml b/ical4j-1.0.5/build.xml
index 512738c..be5aac9 100644
--- a/ical4j-1.0.5/build.xml
+++ b/ical4j-1.0.5/build.xml
@@ -14,7 +14,7 @@
<property file="build.properties" />
<!-- Project paths -->
- <property name="source.dir" location="source" />
+ <property name="source.dir" location="src" />
<property name="test.source.dir" location="test" />
<property name="output.dir" location="bin" />
<property name="package.dir" location="build" />
@@ -99,7 +99,7 @@
<echo message="Compiling source from classpath: ${project.classpath}" />
<mkdir dir="${output.dir}" />
- <copy file="${source.dir}/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
+ <copy file="src/main/resources/net/fortuna/ical4j/model/tz.alias" todir="${output.dir}/net/fortuna/ical4j/model" />
<javac source="1.4" target="1.4" srcdir="${source.dir}" destdir="${output.dir}" debug="true" debuglevel="lines,source,vars" deprecation="true" classpathref="project.classpath" />
</target>
@@ -123,7 +123,7 @@
<attribute name="Class-Path" value="commons-logging.jar,commons-codec.jar,commons-lang.jar" />
</manifest>
<jar basedir="${output.dir}" compress="true" jarfile="${package.dir}/${package.file}" manifest="etc/manifest.mf">
- <zipfileset dir="etc/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
+ <zipfileset dir="/usr/share/zoneinfo" prefix="zoneinfo" excludes="zones.h,zones.tab" />
</jar>
</target>
@@ -187,10 +187,8 @@
<instr instrpathref="coverage.classpath" destdir="${out.instr.dir}" metadatafile="${coverage.dir}/metadata.emma" merge="true" />
</emma>
- <junit printsummary="withOutAndErr" showoutput="yes" fork="yes">
- <!--
- <classpath path="${project.classpath}"/>
- -->
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+
<classpath>
<pathelement location="${out.instr.dir}" />
<path refid="coverage.classpath" />
@@ -198,22 +196,19 @@
</classpath>
<jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=false" />
- <test name="net.fortuna.ical4j.AllTests" />
- <!--
- <batchtest>
- <fileset dir="${test.source.dir}">
- <include name="**/*Test.java"/>
- </fileset>
- </batchtest>
- -->
-
- <!--
- <test name="net.fortuna.ical4j.data.CalendarOutputterTest"/>
- <test name="net.fortuna.ical4j.model.component.VTimeZoneTest"/>
- <test name="net.fortuna.ical4j.model.component.VEventTest"/>
- <test name="net.fortuna.ical4j.data.CalendarBuilderTest"/>
- -->
- </junit>
+
+
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+
+ <batchtest>
+ <fileset dir="${test.source.dir}">
+ <include name="**/*Test.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
<emma enabled="${emma.enabled}">
<report sourcepath="${src.dir}">

+ 0
- 57
dev-java/ical4j/ical4j-1.0.5.ebuild View File

@@ -1,57 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

EAPI="5"

JAVA_PKG_IUSE="doc examples source"

inherit java-pkg-2 java-ant-2

DESCRIPTION="a Java library for handling iCalendar data streams"
HOMEPAGE="http://ical4j.sourceforge.net/"
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"

LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"

COMMON_DEP="
dev-java/commons-logging:0
dev-java/commons-codec:0
dev-java/commons-lang:2.1
dev-java/backport-util-concurrent:0"

RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
dev-java/emma:0
${COMMON_DEP}"

S=${WORKDIR}/${MY_P}

java_prepare() {
epatch "${FILESDIR}"/${PV}-build.xml.patch
rm -v lib/*.jar || die "rm jar failed"
#mkdir bin || die "mkdir bin failed"
java-pkg_filter-compiler jikes
}

EANT_ANT_TASKS="emma"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_BUILD_TARGET="package"
EANT_GENTOO_CLASSPATH="commons-logging,commons-codec,commons-lang-2.1,backport-util-concurrent"
EANT_EXTRA_ARGS="-Demma.dir=/usr/share/emma/lib/ -Dsource.dir=src/main/java"

RESTRICT="test"
# two tests fail with maven, they work in HEAD

src_install() {
java-pkg_dojar build/*.jar
dodoc README AUTHORS CHANGELOG etc/FAQ \
etc/TODO etc/standard_deviations.txt
use doc && java-pkg_dojavadoc docs/api
use source && java-pkg_dosrc src/main/java/net
use examples && java-pkg_doexamples etc/samples
}

+ 0
- 24
dev-java/ical4j/metadata.xml View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<longdescription lang="en">
iCal4j is a Java library used to read and write iCalendar data streams
as defined in RFC2445. The iCalendar standard provides a common data
format used to store information about calendar-specific data such as
events, appointments, to-do lists, etc. All of the popular calendaring
tools, such as Lotus Notes, Outlook and Apple's iCal also support the
iCalendar standard.

Providing both a parser and an object model, iCal4j allows you to either
modify existing iCalendar data or create new data models. Validation is
also provided to ensure the data maintains a state consistent with the
specification.
</longdescription>
<upstream>
<remote-id type="sourceforge">ical4j</remote-id>
</upstream>
</pkgmetadata>

+ 0
- 1
dev-java/tapestry/Manifest View File

@@ -1 +0,0 @@
DIST Tapestry-3.0.4-src.zip 1174780 BLAKE2B 2f2ad5e3860ed6852962b282431df15ae4f6f17f0d08e4246dcef69bcdd033acafe881ea3ba33bd38c2dcf8843caf37fb0b46da84c5b107c2d1c4a0d77aaf89a SHA512 ab94cee9745fceeecbc98a27ace90567b3bc8ab880408da0a32526ba3a68b24f90daeca5d2ea0180b5693ae4fd12f01f0db98e78f176cdc0a0370b5554aa9d10

+ 0
- 5
dev-java/tapestry/files/Version.properties View File

@@ -1,5 +0,0 @@
# $Id: Version.properties 390452 2006-03-31 11:34:17 -0500 (Fri, 31 Mar 2006) jkuhnert $
#
# Stores the version number of the framework.

framework.version=3.0.4

+ 0
- 32
dev-java/tapestry/files/build.properties View File

@@ -1,32 +0,0 @@
# $Id: build.properties.sample 243768 2004-02-04 13:04:22Z mindbridge $
# This file is used to configure the Tapestry build.
# Copy it as "build.properties" and fill in the necessary data.

# The absolute path to the directory where external distributions
# used in the building process will be downloaded and installed
base.path=/usr/share/java

# The absolute path to the directory containing the JBoss installation.
# Required to execute the configure and run-jboss targets.
jboss.dir=

# The absolute path to the directory containing the Tomcat installation.
# Required to execute the deploy-tomcat target.
#
tomcat.dir=

# The absolute path to the directory containing the Jetty installation.
# Required to execute the run-workbench target.
jetty.dir=

# The absolute path to the directory containing the Jython installation.
# Required to execute the junit target.
jython.dir=

# Home for xml-forrest, used to build documentation.
# Available from :pserver:anoncvs@cvs.apache.org:/home/cvspublic as module xml-forrest
# Build forrest, then set to the shbat directory, i.e.
# C:/workspace/xml-forrest/build/dist/shbat

forrest.home=


+ 0
- 94
dev-java/tapestry/files/common.properties View File

@@ -1,94 +0,0 @@
# $Id: common.properties 385802 2006-03-14 13:47:10Z jkuhnert $
#
# Specifies some general properties used throughout.
# Each build.xml must specify root.dir (as a relative path).

lib.dir=lib

root.lib.dir=${root.dir}/${lib.dir}

ext.dist.dir=${root.dir}/ext-dist

root.config.dir=${root.dir}/config

framework.jar=tapestry-${framework.version}.jar
contrib.jar=tapestry-contrib-${framework.version}.jar

examples.dir=${root.lib.dir}/examples

vlib.war=vlib.war
vlib.ear=vlib.ear
vlibbeans.jar=vlibbeans.jar
workbench.war=workbench.war
wap.war=wap.war

ext.download.dir=${ext.dist.dir}/downloads

# Names of directories under lib

ext.dir=ext
j2ee.dir=j2ee
runtime.dir=runtime

jboss.lib.dir=${jboss.dir}/lib
jboss.client.dir=${jboss.dir}/client
jboss.server.all.lib.dir=${jboss.dir}/server/all/lib

# Directory containing source code and package resources
src.dir=src

# Directory containing compiled Java code
classes.dir=classes

# Used as part of copyrights

copyright.years=2000-2004

# ----- JUnit Unit Test Suite, version 3.8 or later -----
junit.home=${ext.download.dir}/junit3.8.1
junit.lib=${junit.home}
junit.jar=${junit.lib}/junit.jar
junit.ext.jar=${ext.dist.dir}/junit.jar
junit.loc=http://telia.dl.sourceforge.net/sourceforge/junit/junit3.8.1.zip

# ----- JDOM Library, version 1.0 -----
jdom.home=${ext.download.dir}/jdom-1.0
jdom.lib=${jdom.home}
jdom.jar=${jdom.lib}/build/jdom.jar
jdom.ext.jar=${ext.dist.dir}/jdom-1.0.jar
jdom.loc=http://www.jdom.org/dist/binary/jdom-1.0.tar.gz

# ----- McKoi Pure Java Database, version 1.0.2 -----
mckoi.home=${ext.download.dir}/mckoi1.0.2
mckoi.lib=${mckoi.home}
mckoi.jar=${mckoi.lib}/mckoidb.jar
mckoi.ext.jar=${ext.dist.dir}/mckoidb.jar
mckoi.loc=http://www.mckoi.com/database/ver/mckoi1.0.2.zip

# ----- DocBook XML, version 4.1.2 -----
docbookxml.file=${ext.dist.dir}/docbkx412.zip
docbookxml.loc=http://www.docbook.org/xml/4.1.2/docbkx412.zip

# ----- DocBook XSL, version 1.64.1 -----
docbookxsl.file=${ext.dist.dir}/docbook-xsl-1.64.1.zip
docbookxsl.loc=http://telia.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.64.1.zip

# ----- Apache Forrest, version 0.5.1 -----
forrestdl.home=${ext.download.dir}/apache-forrest-0.5.1-bin
forrestdl.ant.xml=${forrestdl.home}/forrest.antproxy.xml
forrestdl.loc=http://archive.apache.org/dist/forrest/pre-0.6/apache-forrest-0.5.1-bin.zip

# ---- OGNL ----
ognl.version=2.6.7
ognl.loc=http://ognl.org/${ognl.version}/ognl-${ognl.version}.jar
ognl.dest=${root.lib.dir}/${ext.dir}/ognl-${ognl.version}.jar

# ---- Javassist ----

javassist.version=2.5.1
javassist.loc=http://umn.dl.sourceforge.net/sourceforge/jboss/javassist-${javassist.version}.zip
javassist.dest=${ext.download.dir}/javassist-${javassist.version}
javassist.ext.jar=${root.lib.dir}/${ext.dir}/javassist-${javassist.version}.jar
javassist.jar=${javassist.dest}/javassist.jar



+ 0
- 15
dev-java/tapestry/metadata.xml View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
<longdescription lang="en">
Tapestry is a powerful, open-source, all-Java framework for creating leading edge web applications in Java.

Tapestry reconceptualizes web application development in terms of objects, methods and properties instead of URLs and query parameters.

Tapestry is an alternative to scripting environments such as JavaServer Pages or Velocity. Tapestry goes far further, providing a complete framework for creating extremely dynamic applications with minimal amounts of coding.
</longdescription>
</pkgmetadata>

+ 0
- 70
dev-java/tapestry/tapestry-3.0.4-r3.ebuild View File

@@ -1,70 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
JAVA_PKG_IUSE="doc source"

inherit java-pkg-2 java-ant-2

DESCRIPTION="Dynamic, robust, highly scalable web framework in Java"
HOMEPAGE="https://tapestry.apache.org/"
SRC_URI="mirror://apache/${PN}/Tapestry-${PV}-src.zip"

IUSE="${JAVA_PKG_IUSE}"

LICENSE="Apache-2.0"
SLOT="3.0"
KEYWORDS="amd64 x86"

CDEPEND="
dev-java/bsf:2.3
dev-java/commons-beanutils:1.7
dev-java/commons-codec:0
dev-java/commons-digester:0
dev-java/commons-fileupload:0
dev-java/commons-lang:2.1
dev-java/commons-logging:0
dev-java/jakarta-oro:2.0
dev-java/javassist:2
dev-java/ognl:3.0
dev-java/tomcat-servlet-api:2.4
"
RDEPEND="
${CDEPEND}
>=virtual/jre-1.4
"
DEPEND="
${CDEPEND}
app-arch/unzip
>=virtual/jdk-1.4
"

S="${WORKDIR}/Tapestry-${PV}"

EANT_GENTOO_CLASSPATH="commons-logging,commons-fileupload,commons-lang-2.1"
EANT_GENTOO_CLASSPATH+=",commons-codec,commons-beanutils-1.7,commons-digester"
EANT_GENTOO_CLASSPATH+=",tomcat-servlet-api-2.4,ognl-3.0,bsf-2.3,jakarta-oro-2.0"
EANT_GENTOO_CLASSPATH+=",javassist-2"

JAVA_ANT_REWRITE_CLASSPATH="true"

src_prepare() {
default

mkdir config lib || die
cp "${FILESDIR}/Version.properties" config/ || die
cp "${FILESDIR}/build.properties" config/ || die
cp "${FILESDIR}/common.properties" config/ || die
}

src_compile() {
cd "${S}/framework" || die
eant -Dgentoo.classpath="$(java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
use doc && javadoc -sourcepath src/ org.apache.tapestry -d ../javadoc
}

src_install() {
java-pkg_newjar "lib/${P}.jar"
use source && java-pkg_dosrc framework/src/org
use doc && java-pkg_dojavadoc javadoc
}

BIN
dev-libs/Manifest.gz View File


+ 1
- 0
dev-libs/cdk/Manifest View File

@@ -1 +1,2 @@
DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59

+ 2
- 2
dev-libs/cdk/cdk-5.0.20160131.ebuild View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
@@ -8,7 +8,7 @@ inherit versionator
MY_P="${PN}-$(replace_version_separator 2 -)"
DESCRIPTION="A library of curses widgets"
HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"

LICENSE="BSD"
SLOT="0/6" # subslot = soname version


+ 53
- 0
dev-libs/cdk/cdk-5.0.20210324.ebuild View File

@@ -0,0 +1,53 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

MY_P="${PN}-$(ver_rs 2 -)"

DESCRIPTION="A library of curses widgets"
HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
S="${WORKDIR}"/${MY_P}

LICENSE="BSD"
SLOT="0/6" # subslot = soname version
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples unicode"

DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
RDEPEND="${DEPEND}"
BDEPEND="sys-devel/libtool
virtual/pkgconfig"

PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )

src_configure() {
if [[ ${CHOST} == *-*-darwin* ]] ; then
export ac_cv_prog_LIBTOOL=glibtool
fi

econf \
--disable-rpath-hack \
--with-libtool \
--with-shared \
--with-pkg-config \
--with-ncurses$(usex unicode "w" "")
}

src_install() {
# parallel make installs duplicate libs
emake -j1 \
DESTDIR="${D}" \
DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install

if use examples ; then
local x
for x in include c++ demos examples cli cli/utils cli/samples ; do
docinto ${x}
find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
done
fi

find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
}

dev-libs/libzip/libzip-1.7.3.ebuild → dev-libs/libzip/libzip-1.7.3-r1.ebuild View File

@@ -3,7 +3,7 @@

EAPI=7

inherit cmake multibuild
inherit cmake multibuild flag-o-matic

DESCRIPTION="Library for manipulating zip archives"
HOMEPAGE="https://nih.at/libzip/"
@@ -43,6 +43,7 @@ pkg_setup() {
}

src_configure() {
append-lfs-flags
myconfigure() {
local mycmakeargs=(
-DBUILD_EXAMPLES=OFF # nothing is installed

+ 2
- 2
dev-libs/nanomsg/nanomsg-1.1.5.ebuild View File

@@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"

LICENSE="MIT"
SLOT="0/5.0.0"
KEYWORDS="amd64 ~arm ~arm64 ~x86"
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
IUSE="doc static-libs"

DEPEND="doc? ( dev-ruby/asciidoctor )"


BIN
dev-python/Manifest.gz View File


+ 0
- 1
dev-python/pep8/Manifest View File

@@ -1 +0,0 @@
DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da

+ 0
- 13
dev-python/pep8/metadata.xml View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<stabilize-allarches/>
<upstream>
<remote-id type="pypi">pep8</remote-id>
<remote-id type="github">PyCQA/pycodestyle</remote-id>
</upstream>
</pkgmetadata>

+ 0
- 28
dev-python/pep8/pep8-1.7.1.ebuild View File

@@ -1,28 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python3_{7,8} pypy3 )

inherit distutils-r1

DESCRIPTION="Python style guide checker"
HOMEPAGE="https://github.com/PyCQA/pycodestyle/ https://pypi.org/project/pep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
distutils_enable_tests pytest

python_prepare_all() {
# AssertionError: 7 is not false : 7 failure(s)
sed -i -e 's:test_checkers_testsuite:_&:' \
testsuite/test_all.py || die

distutils-r1_python_prepare_all
}

dev-python/pyFFTW/pyFFTW-0.12.0.ebuild → dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild View File

@@ -22,6 +22,8 @@ fi
IUSE=""

DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
>=sci-libs/fftw-3.3:3.0="
RDEPEND="${DEPEND}"
>=sci-libs/fftw-3.3:3.0=[threads]"
RDEPEND="${PYTHON_DEPS}
${DEPEND}"
BDEPEND="${PYTHON_DEPS}
dev-python/cython[${PYTHON_USEDEP}]"

+ 5
- 3
dev-python/pyFFTW/pyFFTW-9999.ebuild View File

@@ -22,6 +22,8 @@ fi
IUSE=""

DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
>=sci-libs/fftw-3.3:3.0="
RDEPEND="${DEPEND}"
>=sci-libs/fftw-3.3:3.0=[threads]"
RDEPEND="${DEPEND}
${PYTHON_DEPS}"
BDEPEND="${PYTHON_DEPS}
dev-python/cython[${PYTHON_USEDEP}]"

+ 0
- 1
dev-python/pytest-pep8/Manifest View File

@@ -1 +0,0 @@
DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758

+ 0
- 9
dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch View File

@@ -1,9 +0,0 @@
diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,5 +4,3 @@
include tox.ini
include LICENSE
include test_pep8.py
-graft doc
-graft test_pep8.py

+ 0
- 11
dev-python/pytest-pep8/metadata.xml View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
<upstream>
<remote-id type="pypi">pytest-pep8</remote-id>
</upstream>
</pkgmetadata>

+ 0
- 32
dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild View File

@@ -1,32 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

PYTHON_COMPAT=( python3_{7,8} pypy3 )

inherit distutils-r1

DESCRIPTION="pytest plugin to check PEP8 requirements"
HOMEPAGE="https://pypi.org/project/pytest-pep8/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

SLOT="0"
LICENSE="MIT"
KEYWORDS="amd64 ~arm64 x86"
IUSE=""

RDEPEND="
>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
dev-python/pytest-cache[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"

PATCHES=(
"${FILESDIR}"/1.0.6-MANIFEST.patch
)

python_test() {
${EPYTHON} test_pep8.py || die
}

dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild → dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild View File

@@ -18,10 +18,10 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
BDEPEND="
!!<dev-python/setuptools_scm-2
test? (
dev-python/toml[${PYTHON_USEDEP}]
dev-vcs/git
!sparc? ( dev-vcs/mercurial ) )"


BIN
dev-qt/Manifest.gz View File


+ 0
- 1
dev-qt/qtwebengine/Manifest View File

@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
DIST qtwebengine-5.15.2_p20210406.tar.xz 320144324 BLAKE2B 45aafc32f4642fee5525f0504d61ed47c3085d5eff566271701805942ce5fcb2233655111592059775991da5b89dc1702031373f6ff171722ed163265d894daa SHA512 c4a0d5fec3247c04acc447c1c819d1e5dcb1d3c0cbb57a87a5cfa5c0c2b765e82c9f75a7297ba57303df5e1004d75dc554ffd70e24ecb8655126136672f38fdb
DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa

+ 372
- 0
dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210421-qtbug-91773.patch View File

@@ -0,0 +1,372 @@
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 5597c69f9..2cd48907b 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
m_adapterClient->loadFinished(false, request.url(), false,
net::ERR_DISALLOWED_URL_SCHEME,
QCoreApplication::translate("WebContentsAdapter",
- "HTTP-POST data can only be sent over HTTP(S) protocol"),
- false);
+ "HTTP-POST data can only be sent over HTTP(S) protocol"));
return;
}
params.post_data = network::ResourceRequestBody::CreateFromBytes(
@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
GURL dataUrlToLoad(urlString);
if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
- m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
+ m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
return;
}
content::NavigationController::LoadURLParams params((dataUrlToLoad));
@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
if (m_webContents->IsLoading()) {
m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
QStringLiteral("Discarded"));
+ m_webContentsDelegate->DidStopLoading();
}
content::WebContents::CreateParams createParams(m_profileAdapter->profile());
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 267266d81..afc43806a 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -466,8 +466,7 @@ public:
virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
virtual void loadCommitted() = 0;
virtual void loadVisuallyCommitted() = 0;
- virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
- const QString &errorDescription, bool triggersErrorPage) = 0;
+ virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
virtual void focusContainer() = 0;
virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
virtual QSharedPointer<WebContentsAdapter>
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 1e92a46f8..f0e4130e8 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
void WebContentsDelegateQt::LoadProgressChanged(double progress)
{
- QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
- int p = qMin(qRound(progress * 100), 100);
-
- if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p == 100)
+ if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
return;
- if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
- m_loadProgressMap[current_url] = p;
+ int p = qMin(qRound(progress * 100), 100);
+ if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
+ m_loadingInfo.progress = p;
m_viewClient->loadProgressChanged(p);
}
}
@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
}
}
-void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
{
- m_isDocumentEmpty = true;
- m_viewClient->loadStarted(url, isErrorPage);
- m_viewClient->updateNavigationActions();
-
- if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
- && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
- && !m_isNavigationCommitted) {
- m_loadProgressMap.insert(url, 100);
- m_lastLoadedUrl = url;
- m_viewClient->loadProgressChanged(100);
+ // only report first ever load start or separate one for error page only
+ if (!isErrorPage && m_loadingInfo.isLoading()) // already running
return;
- }
- if (!m_loadProgressMap.isEmpty()) {
- QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
- while (it != m_loadProgressMap.end()) {
- if (it.value() == 100) {
- it = m_loadProgressMap.erase(it);
- continue;
- }
- ++it;
- }
+ m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
+ if (!isErrorPage) {
+ m_loadingInfo.progress = 0;
+ m_viewClient->loadStarted(m_loadingInfo.url, false);
+ m_viewClient->updateNavigationActions();
+ m_viewClient->loadProgressChanged(0);
+ } else {
+ m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
}
-
- m_lastLoadedUrl = url;
- m_loadProgressMap.insert(url, 0);
- m_viewClient->loadProgressChanged(0);
}
void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
navigation_handle->SetSilentlyIgnoreErrors();
- if (!navigation_handle->IsInMainFrame())
+ if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
return;
m_loadingErrorFrameList.clear();
m_faviconManager->resetCandidates();
- EmitLoadStarted(toQt(navigation_handle->GetURL()));
+
+ m_loadingInfo.url = toQt(navigation_handle->GetURL());
+ // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
+ bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
+ emitLoadStarted(isErrorPage);
}
-void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
{
- Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
- Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
-
- // When error page enabled we don't need to send the error page load finished signal
- if (m_loadProgressMap[url] == 100)
+ if (!m_loadingInfo.isLoading()) // not currently running
return;
- m_lastLoadedUrl = url;
- m_loadProgressMap[url] = 100;
- m_isNavigationCommitted = false;
- m_viewClient->loadProgressChanged(100);
+ Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
+ Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
+
+ if (!isErrorPage) {
+ if (m_loadingInfo.progress < 100) {
+ m_loadingInfo.progress = 100;
+ m_viewClient->loadProgressChanged(100);
+ }
- m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
- m_viewClient->updateNavigationActions();
+ m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
+ m_viewClient->updateNavigationActions();
+ } else {
+ m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
+ }
}
-void WebContentsDelegateQt::EmitLoadCommitted()
+void WebContentsDelegateQt::emitLoadCommitted()
{
m_findTextHelper->handleLoadCommitted();
m_viewClient->loadCommitted();
@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
profileAdapter->visitedLinksManager()->addUrl(url);
}
- m_isNavigationCommitted = true;
- EmitLoadCommitted();
+ emitLoadCommitted();
}
// Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
// Now report we are starting to load an error-page.
m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
m_faviconManager->resetCandidates();
- EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
+ emitLoadStarted(true);
// If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
if (navigation_handle->HasCommitted())
- EmitLoadCommitted();
+ emitLoadCommitted();
}
}
@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
if (m_loadingState == LoadingState::Loading)
setLoadingState(LoadingState::Loaded);
+
+ emitLoadFinished();
+ m_loadingInfo.clear();
}
void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
// Delay notifying failure until the error-page is done loading.
// Error-pages are not loaded on failures due to abort.
bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
- EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
+ m_loadingInfo.success = false;
+ m_loadingInfo.url = url;
+ m_loadingInfo.errorCode = errorCode;
+ m_loadingInfo.errorDescription = errorDescription;
+ m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
}
void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
m_viewClient->iconChanged(QUrl());
-
- EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
+ emitLoadFinished(/* isErrorPage = */true);
return;
}
// Qt6: Consider getting rid of the error_description (Chromium already has)
@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
// Trigger LoadFinished signal for main frame's error page only.
if (!render_frame_host->GetParent()) {
m_viewClient->iconChanged(QUrl());
- EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
+ emitLoadFinished(/* isErrorPage = */true);
}
return;
@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
- EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
+
+ m_loadingInfo.success = http_statuscode < 400;
+ m_loadingInfo.url = toQt(validated_url);
+ m_loadingInfo.errorCode = http_statuscode;
+ m_loadingInfo.triggersErrorPage = triggersErrorPage;
}
void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 5a3dff6e9..7149f6bff 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -216,9 +216,9 @@ private:
WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
const QUrl &url,
bool user_gesture);
- void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
- void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
- void EmitLoadCommitted();
+ void emitLoadStarted(bool isErrorPage = false);
+ void emitLoadFinished(bool isErrorPage = false);
+ void emitLoadCommitted();
LoadingState determineLoadingState(content::WebContents *contents);
void setLoadingState(LoadingState state);
@@ -242,9 +242,17 @@ private:
int m_desktopStreamCount = 0;
mutable bool m_pendingUrlUpdate = false;
- QMap<QUrl, int> m_loadProgressMap;
- QUrl m_lastLoadedUrl;
- bool m_isNavigationCommitted = false;
+ struct LoadingInfo {
+ bool success = false;
+ int progress = -1;
+ bool isLoading() const { return progress >= 0; }
+ QUrl url;
+ int errorCode = 0;
+ QString errorDescription;
+ bool triggersErrorPage = false;
+ void clear() { *this = LoadingInfo(); }
+ } m_loadingInfo;
+
bool m_isDocumentEmpty = true;
base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
};
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 6ab1c97cb..1de7f1c7f 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
-void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
- const QString &errorDescription, bool triggersErrorPage)
+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
{
Q_Q(QQuickWebEngineView);
- Q_UNUSED(triggersErrorPage);
if (isErrorPage) {
#if QT_CONFIG(webengine_testsupport)
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index ebe55c345..ec535298b 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -116,8 +116,7 @@ public:
void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
void loadCommitted() override;
void loadVisuallyCommitted() override;
- void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
- const QString &errorDescription, bool triggersErrorPage) override;
+ void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
void focusContainer() override;
void unhandledKeyEvent(QKeyEvent *event) override;
QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index e08afed44..b32c15039 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
}
-void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
- const QString &errorDescription, bool triggersErrorPage)
+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
{
Q_Q(QWebEnginePage);
Q_UNUSED(url);
Q_UNUSED(errorCode);
Q_UNUSED(errorDescription);
- if (isErrorPage) {
- QTimer::singleShot(0, q, [q](){
- emit q->loadFinished(false);
- });
+ if (isErrorPage)
return;
- }
isLoading = false;
- Q_ASSERT((success && !triggersErrorPage) || !success);
- if (!triggersErrorPage) {
- QTimer::singleShot(0, q, [q, success](){
- emit q->loadFinished(success);
- });
- }
+ QTimer::singleShot(0, q, [q, success](){
+ emit q->loadFinished(success);
+ });
}
void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index 82ce99503..ae3ab5d25 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -107,8 +107,7 @@ public:
void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
void loadCommitted() override { }
void loadVisuallyCommitted() override { }
- void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
- const QString &errorDescription, bool triggersErrorPage) override;
+ void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
void focusContainer() override;
void unhandledKeyEvent(QKeyEvent *event) override;
QSharedPointer<QtWebEngineCore::WebContentsAdapter>

+ 0
- 190
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild View File

@@ -1,190 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

PYTHON_COMPAT=( python2_7 )
QTVER=$(ver_cut 1-3)
inherit multiprocessing python-any-r1 qt5-build

DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"

if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
QT5_BUILD_DIR="${S}_build"
fi
fi

# patchset based on https://github.com/chromium-ppc64le releases
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"

IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"

RDEPEND="
app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
dev-libs/expat
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/re2:=
~dev-qt/qtcore-${QTVER}
~dev-qt/qtdeclarative-${QTVER}
~dev-qt/qtgui-${QTVER}
~dev-qt/qtnetwork-${QTVER}
~dev-qt/qtprintsupport-${QTVER}
~dev-qt/qtwebchannel-${QTVER}[qml]
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
sys-libs/zlib[minizip]
virtual/libudev
x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${QTVER} )
geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-68.2:= )
widgets? (
~dev-qt/qtdeclarative-${QTVER}[widgets]
~dev-qt/qtwidgets-${QTVER}
)
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
dev-util/gperf
dev-util/ninja
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
"

PATCHES=(
"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
"${FILESDIR}/${P}-glibc-2.33.patch" # by Fedora, bug 769989
"${FILESDIR}/${P}-gcc11.patch" # by Fedora, bug 768261
"${FILESDIR}/${P}-icu69.patch" # bug 781236
)

src_prepare() {
if [[ ${PV} == ${QTVER}_p* ]]; then
# This is made from git, and for some reason will fail w/o .git directories.
mkdir -p .git src/3rdparty/chromium/.git || die

# We need to make sure this integrates well into Qt 5.15.2 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
fi

# QTBUG-88657 - jumbo-build could still make trouble
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
fi

# bug 630834 - pass appropriate options to ninja when building GN
sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die

# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | \
xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die

if use system-icu; then
# Sanity check to ensure that bundled copy of ICU is not used.
# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
local file
while read file; do
echo "#error This file should not be used!" > "${file}" || die
done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
fi

qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri

qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro

qt_use_disable_mod widgets widgets src/src.pro

qt5-build_src_prepare

# we need to generate ppc64 stuff because upstream does not ship it yet
if use ppc64; then
einfo "Patching for ppc64le and generating build files"
eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
pushd src/3rdparty/chromium > /dev/null || die
eapply -p0 "${WORKDIR}/${PN}-ppc64le"
popd > /dev/null || die
pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
mkdir -vp source/config/linux/ppc64 || die
mkdir -p source/libvpx/test || die
touch source/libvpx/test/test.mk || die
./generate_gni.sh || die
popd >/dev/null || die
fi
}

src_configure() {
export NINJA_PATH=/usr/bin/ninja
export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"