diff --git a/Manifest.files.gz b/Manifest.files.gz
index 00c6482230c6..9e36e6656c11 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index fdeafe0b1df0..e6e27122d5b1 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/vnstat/Manifest b/acct-group/vnstat/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/vnstat/metadata.xml b/acct-group/vnstat/metadata.xml
new file mode 100644
index 000000000000..979bcc7aec93
--- /dev/null
+++ b/acct-group/vnstat/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sam@gentoo.org
+ Sam James
+
+
diff --git a/acct-group/vnstat/vnstat-0.ebuild b/acct-group/vnstat/vnstat-0.ebuild
new file mode 100644
index 000000000000..bf1125671eb6
--- /dev/null
+++ b/acct-group/vnstat/vnstat-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for vnstat network monitoring"
+ACCT_GROUP_ID=229
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 6706da668fae..9b32cdae133d 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/vnstat/Manifest b/acct-user/vnstat/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/vnstat/metadata.xml b/acct-user/vnstat/metadata.xml
new file mode 100644
index 000000000000..979bcc7aec93
--- /dev/null
+++ b/acct-user/vnstat/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sam@gentoo.org
+ Sam James
+
+
diff --git a/acct-user/vnstat/vnstat-0.ebuild b/acct-user/vnstat/vnstat-0.ebuild
new file mode 100644
index 000000000000..f3c15bcd12e5
--- /dev/null
+++ b/acct-user/vnstat/vnstat-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for vnstat network monitoring"
+ACCT_USER_ID=229
+ACCT_USER_GROUPS=( vnstat )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 9f5a0ed0ee12..877473b5e2ba 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
deleted file mode 100644
index 158e4af5f781..000000000000
--- a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1 vala
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- app-accessibility/at-spi2-core
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3:3[introspection]
- x11-libs/gtk+:2
- >=dev-libs/gobject-introspection-0.10.7:=
- dev-libs/libgee:0.8
- dev-libs/libxml2
- >=media-libs/clutter-1.5.11:1.0[introspection]
- x11-libs/libX11
- x11-libs/libxklavier
- x11-libs/libXtst
- ${PYTHON_DEPS}
- $(vala_depend)
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
- dev-libs/glib[dbus]
- >=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
- >=gnome-base/gsettings-desktop-schemas-3
- gnome-base/librsvg:2
- sys-apps/dbus
- !=dev-util/intltool-0.35.5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-fix-compilation-error.patch"
- "${FILESDIR}/${PN}-fix-subkey-popmenu.patch"
- "${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch"
- "${FILESDIR}/${PN}-fix-antler-style-css.patch"
-)
-
-src_prepare() {
- # FIXME: Now this supports python3 too...
- # delete custom PYTHONPATH, useless on Gentoo and potential bug source
- # + caribou is python2 only so fix the shell scripts
-# sed -e '/export PYTHONPATH=.*python/ d' \
-# -e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-# -i bin/{antler-keyboard,caribou-preferences}.in ||
-# die "sed failed"
-
- vala_src_prepare
- gnome2_src_prepare
-
- prepare_caribou() {
- mkdir -p "${BUILD_DIR}" || die
- }
- python_foreach_impl prepare_caribou
-}
-
-src_configure() {
- ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
- gnome2_src_configure \
- --disable-docs \
- --disable-static \
- --enable-gtk3-module \
- --enable-gtk2-module
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=769323
- dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}
diff --git a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
index 0481327a4841..69622f67cffb 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
${PYTHON_DEPS}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7a42ea5b030c..b869577b8c3b 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/xstow/xstow-1.0.2.ebuild b/app-admin/xstow/xstow-1.0.2.ebuild
index 30abbbbc0dd2..f416bcdeb236 100644
--- a/app-admin/xstow/xstow-1.0.2.ebuild
+++ b/app-admin/xstow/xstow-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE="ncurses"
DEPEND="ncurses? ( sys-libs/ncurses:0= )"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 2b087e54c4cf..190862464394 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index d1f8dc79560f..e37d8033beab 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
RESTRICT="test"
RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
@@ -52,6 +52,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?]
gmp? ( dev-libs/gmp:0= )
gpm? ( sys-libs/gpm )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+ jit? ( sys-devel/gcc:=[jit(-)] )
json? ( dev-libs/jansson )
kerberos? ( virtual/krb5 )
lcms? ( media-libs/lcms:2 )
@@ -140,6 +141,10 @@ src_prepare() {
|| die "Upstream version number changed to ${FULL_VERSION}"
fi
+ # These files ignore LDFLAGS. We assign the variable here, because
+ # for live ebuilds FULL_VERSION doesn't exist in global scope
+ use jit && QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*"
+
eapply_user
# Fix filename reference in redirected man page
@@ -261,6 +266,7 @@ src_configure() {
$(use_with games gameuser ":gamestat") \
$(use_with gmp libgmp) \
$(use_with gpm) \
+ $(use_with jit native-compilation) \
$(use_with json) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with lcms lcms2) \
@@ -310,7 +316,7 @@ src_install() {
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die
rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die
- rm -rf "${ED}/usr/$(get_libdir)" || die
+ rm -rf "${ED}/usr/$(get_libdir)/systemd" || die
rm -rf "${ED}"/var || die
# remove unused /site-lisp dir
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 626977035455..48f1ffacb83d 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -38,6 +38,8 @@
engine
Use media-gfx/imagemagick for image
processing
+ Compile with Emacs Lisp native compiler support via
+ libgccjit
Compile with native JSON support using
dev-libs/jansson
Use dev-libs/libxml2 to parse XML instead
diff --git a/app-editors/nano/nano-5.6.1.ebuild b/app-editors/nano/nano-5.6.1.ebuild
index 5a5e970391ae..e1d933b0f49f 100644
--- a/app-editors/nano/nano-5.6.1.ebuild
+++ b/app-editors/nano/nano-5.6.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.7.ebuild
index cb3bb901689a..ae3e241b5b45 100644
--- a/app-editors/vis/vis-0.7.ebuild
+++ b/app-editors/vis/vis-0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
IUSE="+ncurses +lua selinux test tre"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 012da98625a0..6604a41ff456 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
index ea5a5b0037df..456a74724b57 100644
--- a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
+++ b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
if [[ ${PV} = *9999* ]]; then
inherit golang-vcs
else
- KEYWORDS="amd64 ~arm64"
+ KEYWORDS="amd64 arm64"
EGIT_COMMIT="v${PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
inherit golang-vcs-snapshot
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 1b170960177a..cd23471daa1d 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -4,3 +4,5 @@ DIST libvirt-7.1.0.tar.xz 8645944 BLAKE2B 97a76091616b427fc64a6a3caf5d9b04d7b9ae
DIST libvirt-7.1.0.tar.xz.asc 833 BLAKE2B 2610cff98967260a5005840e1b03cff16790da82d9a51f14d6b34453db3ba89aa34915bba69d57b333f50d17e2492c77e85ee4e6282b8fe5f4cd0f7ace638334 SHA512 6c92c91bc7f23b32deee3442008b44d6469a9cabf2ed39459afcbfce9b3f2b1b655514a068c4bcdc8909ba02a0a4762e8f845ae4dba8da18719acf45614ca6da
DIST libvirt-7.2.0.tar.xz 8661052 BLAKE2B eae6b4e7422690dd780e1647e2a39dfdff0562f3e63bce9ca5ee34540dec3755269efaad459d1b516b56fdeb1503cc966ffa60378aaa18210b972b739716fe34 SHA512 f6bb26ca7cb5a8d342f1f39afd051ed76b71414e1b934557cf50784da17e4f2fb3301c2ace3b593fcdeb6a18ad559a007ad594111c2c348b9157d3a59d475928
DIST libvirt-7.2.0.tar.xz.asc 833 BLAKE2B c389d80ef4f7627230b88446ef77daab1bf34e49e20cfb5c5418500fdf388af23aeb2458551548cb732c868f87f35a5c28acff8c01faebe985a6953953a69149 SHA512 526955a9f9d294635e63a4ed20c3e478fb4b5f3a63150a59ff30d84ad16a286ddb4c6508d0317c56df63a0d22a099085697df344fe2b15bce07acf9f05cda331
+DIST libvirt-7.3.0.tar.xz 8680468 BLAKE2B 88ad3dbac627203419eb80b28649613480a287014688b5b75b9a18d60b3d2b2c6628c803384ce0eed81bf84cdc0dd8539b072f32ccf0319f09bebaaeb0e089bf SHA512 e039d5cc000c0f29ead4faddf154852ee8d8b5943e940b717eabb33cc9990d3f257a942b05a661bf6c36df5b5763c31df3f8b5a0fc21e8111a81c57da42d903e
+DIST libvirt-7.3.0.tar.xz.asc 833 BLAKE2B 812a7cf4bcaef88a4229008579a18da19d78b0a988890359907e4067b5eb6d74176907875a3a27775ffabaf29fb4d0e92c7f2ec13042ef8657c09ad6b287984d SHA512 f5349bb6c7919b54518a2ffc058592fb588045d37d18dfce5efb7e2f512c2a19b0f956d6ee34a16982cdaec4c23954300f7e130656afeb3cf535c65a0d62c04e
diff --git a/app-emulation/libvirt/libvirt-7.3.0.ebuild b/app-emulation/libvirt/libvirt-7.3.0.ebuild
new file mode 100644
index 000000000000..2de18dcd6e20
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-7.3.0.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+ SRC_URI=""
+ SLOT="0"
+else
+ SRC_URI="https://libvirt.org/sources/${P}.tar.xz
+ verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
+LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="
+ apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+ iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+ parted pcap policykit +qemu rbd sasl selinux +udev
+ virtualbox +virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ qemu? ( libvirtd )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+BDEPEND="
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ dev-python/docutils
+ virtual/pkgconfig
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ verify-sig? ( app-crypt/openpgp-keys-libvirt )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ acct-user/qemu
+ app-misc/scrub
+ >=dev-libs/glib-2.48.0
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/openbsd-netcat-1.105-r1
+ >=net-libs/gnutls-1.0.25:0=
+ net-libs/libssh2
+ net-libs/libtirpc
+ net-libs/rpcsvc-proto
+ >=net-misc/curl-7.18.0
+ sys-apps/dbus
+ sys-apps/dmidecode
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ virtual/acl
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ caps? ( sys-libs/libcap-ng )
+ dtrace? ( dev-util/systemtap )
+ firewalld? ( >=net-firewall/firewalld-0.6.3 )
+ fuse? ( sys-fs/fuse:0= )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+ libssh? ( net-libs/libssh )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+ lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2[-device-mapper-only(-)]
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? (
+ acct-group/libvirt
+ >=sys-auth/polkit-0.9
+ )
+ qemu? (
+ >=app-emulation/qemu-2.11
+ dev-libs/yajl
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ virt-network? (
+ net-dns/dnsmasq[dhcp,ipv6,script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ >=app-emulation/xen-4.6.0
+ app-emulation/xen-tools:=
+ )
+ udev? (
+ virtual/libudev
+ >=x11-libs/libpciaccess-0.10.9
+ )
+ zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+ ${RDEPEND}
+ ${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+ "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+ "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+ ~DEVPTS_MULTIPLE_INSTANCES"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM
+ ~IP_NF_FILTER
+ ~IP_NF_MANGLE
+ ~IP_NF_NAT
+ ~IP_NF_TARGET_MASQUERADE
+ ~IP6_NF_FILTER
+ ~IP6_NF_MANGLE
+ ~IP6_NF_NAT"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~IP_NF_TARGET_REJECT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ touch "${S}/.mailmap" || die
+
+ default
+ python_fix_shebang .
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature apparmor)
+ $(meson_use apparmor apparmor_profiles)
+ $(meson_feature audit)
+ $(meson_feature caps capng)
+ $(meson_feature dtrace)
+ $(meson_feature firewalld)
+ $(meson_feature fuse)
+ $(meson_feature glusterfs)
+ $(meson_feature glusterfs storage_gluster)
+ $(meson_feature iscsi storage_iscsi)
+ $(meson_feature iscsi-direct storage_iscsi_direct)
+ $(meson_feature libvirtd driver_libvirtd)
+ $(meson_feature libssh)
+ $(meson_feature lvm storage_lvm)
+ $(meson_feature lvm storage_mpath)
+ $(meson_feature lxc driver_lxc)
+ $(meson_feature nls)
+ $(meson_feature numa numactl)
+ $(meson_feature numa numad)
+ $(meson_feature openvz driver_openvz)
+ $(meson_feature parted storage_disk)
+ $(meson_feature pcap libpcap)
+ $(meson_feature policykit polkit)
+ $(meson_feature qemu driver_qemu)
+ $(meson_feature qemu yajl)
+ $(meson_feature rbd storage_rbd)
+ $(meson_feature sasl)
+ $(meson_feature selinux)
+ $(meson_feature udev)
+ $(meson_feature virt-network driver_network)
+ $(meson_feature virtualbox driver_vbox)
+ $(meson_feature wireshark-plugins wireshark_dissector)
+ $(meson_feature xen driver_libxl)
+ $(meson_feature zfs storage_zfs)
+
+ -Dnetcf=disabled
+ -Dsanlock=disabled
+
+ -Ddriver_esx=enabled
+ -Dinit_script=systemd
+ -Dqemu_user=$(usex caps qemu root)
+ -Dqemu_group=$(usex caps qemu root)
+ -Ddriver_remote=enabled
+ -Dstorage_fs=enabled
+ -Ddriver_vmware=enabled
+
+ --localstatedir="${EPREFIX}/var"
+ -Drunstatedir="${EPREFIX}/run"
+ -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ meson_src_configure
+}
+
+src_test() {
+ export VIR_TEST_DEBUG=1
+ meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ # Depending on configuration option, libvirt will create some bogus
+ # directoreis. They are either not used, or libvirtd is able to create
+ # them on demand, so let's remove them.
+ #
+ # Note, we are using -f here so that rm does not fail or warn if the
+ # directory is nonexistent.
+ rm -rf "${D}"/etc/sysconfig
+ rm -rf "${D}"/var
+ rm -rf "${D}"/run
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 769f02106434..2de18dcd6e20 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles
+inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -22,9 +22,10 @@ fi
DESCRIPTION="C toolkit to manipulate virtual machines"
HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
LICENSE="LGPL-2.1"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
IUSE="
- apparmor audit +caps dtrace firewalld fuse glusterfs iscsi
- iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
+ apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
+ iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
parted pcap policykit +qemu rbd sasl selinux +udev
virtualbox +virt-network wireshark-plugins xen zfs
"
@@ -45,7 +46,9 @@ BDEPEND="
dev-libs/libxslt
dev-perl/XML-XPath
dev-python/docutils
- virtual/pkgconfig"
+ virtual/pkgconfig
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ verify-sig? ( app-crypt/openpgp-keys-libvirt )"
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
@@ -98,7 +101,7 @@ RDEPEND="
>=sys-auth/polkit-0.9
)
qemu? (
- >=app-emulation/qemu-1.5.0
+ >=app-emulation/qemu-2.11
dev-libs/yajl
)
rbd? ( sys-cluster/ceph )
@@ -293,9 +296,6 @@ src_install() {
rm -rf "${D}"/var
rm -rf "${D}"/run
- newbashcomp "${BUILD_DIR}/tools/bash-completion/virsh" virsh
- newbashcomp "${BUILD_DIR}/tools/bash-completion/virt-admin" virt-admin
-
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 54512aa781b6..79b21e4711ad 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -1,2 +1,3 @@
DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
+DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
index b01086e4fcac..07064fdef42f 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
@@ -11,7 +11,7 @@ MY_PN="qemu"
MY_P="${MY_PN}-${PV}"
SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
new file mode 100644
index 000000000000..ade6439209c3
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit systemd toolchain-funcs udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/glib"
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ tc-export AR LD OBJCOPY RANLIB
+
+ local myconf=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --libdir="/usr/$(get_libdir)"
+ --localstatedir=/
+ --disable-bsd-user
+ --disable-linux-user
+ --disable-system
+ --disable-strip
+ --enable-tools
+ --disable-werror
+ --enable-guest-agent
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ )
+ echo "./configure ${myconf[*]}"
+ ./configure "${myconf[@]}" || die
+}
+
+src_install() {
+ dobin build/qga/qemu-ga
+
+ # Normal init stuff
+ newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+ newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+ # systemd stuff
+ udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+ systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+ qemu-guest-agent.service
+}
+
+pkg_postinst() {
+ elog "You should add 'qemu-guest-agent' to the default runlevel."
+ elog "e.g. rc-update add qemu-guest-agent default"
+}
diff --git a/app-emulation/qemu/qemu-5.2.0-r50.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
index df951b18e2c4..24ee84b828e3 100644
--- a/app-emulation/qemu/qemu-5.2.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
- KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm64 ~ppc ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index b9f112f67cfc..66a851e7edb2 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/task/task-2.5.3.ebuild b/app-misc/task/task-2.5.3.ebuild
index 1116f0710464..a4cf45b94910 100644
--- a/app-misc/task/task-2.5.3.ebuild
+++ b/app-misc/task/task-2.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~x86 ~x64-macos"
IUSE="+sync"
DEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a00c98514e79..a775d9864484 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
index e9c29e8b5279..952821000c67 100644
--- a/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99-r1.ebuild
similarity index 75%
rename from app-text/barcode/barcode-0.99.ebuild
rename to app-text/barcode/barcode-0.99-r1.ebuild
index bd58bc146e16..9defd1531f06 100644
--- a/app-text/barcode/barcode-0.99.ebuild
+++ b/app-text/barcode/barcode-0.99-r1.ebuild
@@ -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
@@ -14,7 +14,10 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="app-text/libpaper"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-install-static-lib.patch
+)
src_prepare() {
sed -i -e '/^LDFLAGS =/s:=:+=:' \
@@ -25,3 +28,7 @@ src_prepare() {
default
}
+
+src_configure() {
+ econf --disable-shared
+}
diff --git a/app-text/barcode/files/barcode-0.99-install-static-lib.patch b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
new file mode 100644
index 000000000000..44d32d059ce9
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-install-static-lib.patch
@@ -0,0 +1,13 @@
+--- barcode-0.99_orig/Makefile.am 2020-12-06 15:39:43.270943391 +0100
++++ barcode-0.99/Makefile.am 2020-12-06 15:40:26.723942515 +0100
+@@ -25,7 +25,9 @@
+
+ bin_PROGRAMS = barcode sample
+
+-noinst_LTLIBRARIES = libbarcode.la
++lib_LTLIBRARIES = libbarcode.la
++
++include_HEADERS = barcode.h lib/gettext.h
+
+ ACLOCAL_AMFLAGS = -I m4
+
diff --git a/app-text/jabref/jabref-2.10-r4.ebuild b/app-text/jabref/jabref-2.10-r5.ebuild
similarity index 92%
rename from app-text/jabref/jabref-2.10-r4.ebuild
rename to app-text/jabref/jabref-2.10-r5.ebuild
index 8ed45fb5a629..094dfeeb4b5f 100644
--- a/app-text/jabref/jabref-2.10-r4.ebuild
+++ b/app-text/jabref/jabref-2.10-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
JAVA_ANT_REWRITE_CLASSPATH="true"
-inherit eutils java-pkg-2 java-ant-2 java-utils-2
+inherit desktop java-pkg-2 java-ant-2 java-utils-2
MY_PV="${PV/_beta/b}"
@@ -30,11 +30,11 @@ COMMON_DEP="
"
DEPEND="
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.8:*
${COMMON_DEP}"
RDEPEND="
- >=virtual/jre-1.6
+ >=virtual/jre-1.8:*
${COMMON_DEP}"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 20caa8be6d0f..012e79f6eaf8 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
index 143998b0ad11..622a094a858d 100644
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
RESTRICT="!test? ( test )"
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 7fff87f023a1..cb328c9f04e6 100644
Binary files a/dev-go/Manifest.gz and b/dev-go/Manifest.gz differ
diff --git a/dev-go/godep/metadata.xml b/dev-go/godep/metadata.xml
index 315037efd033..5c1204f8fe42 100644
--- a/dev-go/godep/metadata.xml
+++ b/dev-go/godep/metadata.xml
@@ -1,9 +1,7 @@
-
- zmedico@gentoo.org
-
+
tools/godep
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0ac96194ca03..6c1a335eef3e 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
similarity index 91%
rename from dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
rename to dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 27aab2586f93..478fe1efa829 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -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
@@ -21,10 +21,10 @@ IUSE=""
CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
dev-java/ant-core:0"
RDEPEND="${CDEPEND}
- >=virtual/jre-11"
+ >=virtual/jre-11:*"
DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-11"
+ >=virtual/jdk-11:*"
+BDEPEND="app-arch/unzip"
JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
diff --git a/dev-java/antlr/antlr-2.7.7-r8.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
similarity index 91%
rename from dev-java/antlr/antlr-2.7.7-r8.ebuild
rename to dev-java/antlr/antlr-2.7.7-r9.ebuild
index 3ca31ab70cf0..f7a428518635 100644
--- a/dev-java/antlr/antlr-2.7.7-r8.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -10,13 +10,14 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr2.org/"
SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
+
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
S="${WORKDIR}/${P}"
@@ -43,5 +44,6 @@ src_install() {
use examples && java-pkg_doexamples examples/java
use source && java-pkg_dosrc antlr
+ # https://bugs.gentoo.org/789582
einstalldocs
}
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2-r1.ebuild
similarity index 90%
rename from dev-java/antlr/antlr-3.2.ebuild
rename to dev-java/antlr/antlr-3.2-r1.ebuild
index 3efa97660287..fba666dc5ad6 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2-r1.ebuild
@@ -1,30 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
-inherit epatch java-pkg-2 java-pkg-simple
+JAVA_PKG_IUSE="doc test"
+
+inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr3.org/"
SRC_URI="https://www.antlr3.org/download/${P}.tar.gz
https://www.antlr3.org/download/${P}.jar" # Prebuilt version needed.
+
LICENSE="BSD"
SLOT="3"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
RESTRICT="!test? ( test )"
CDEPEND=">=dev-java/antlr-2.7.7-r7:0
dev-java/stringtemplate:0"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.8:*
test? ( dev-java/junit:4 )"
+PATCHES=(
+ # These fixes have been applied in 3.5.
+ "${FILESDIR}/${PV}-test-fixes.patch"
+ "${FILESDIR}/${PV}-java-8.patch"
+)
+
S="${WORKDIR}/${P}"
JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar"
JAVA_GENTOO_CLASSPATH="antlr,stringtemplate"
@@ -33,13 +41,10 @@ src_unpack() {
unpack ${P}.tar.gz
}
-java_prepare() {
+src_prepare() {
+ default
java-pkg_clean
- # These fixes have been applied in 3.5.
- epatch "${FILESDIR}/${PV}-test-fixes.patch"
- epatch "${FILESDIR}/${PV}-java-8.patch"
-
# Some tests fail under Java 8 in ways that probably aren't limited
# to the tests. This is bad but upstream is never going to update
# 3.2 even though other projects still rely on it. If any issues
@@ -54,7 +59,7 @@ java_prepare() {
src_compile() {
cd "${S}/runtime/Java/src/main" || die
- JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+ JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" java-pkg-simple_src_compile
cd "${S}/tool/src/main" || die
diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch
index 0544b7006170..28068edb76ba 100644
--- a/dev-java/antlr/files/3.2-test-fixes.patch
+++ b/dev-java/antlr/files/3.2-test-fixes.patch
@@ -1,5 +1,5 @@
---- tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000
-+++ tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100
+--- a/tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000
++++ b/tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100
@@ -130,8 +130,8 @@
try {
Process process =
@@ -43,8 +43,8 @@
buf.append(line);
buf.append('\n');
line = in.readLine();
---- tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100
-+++ tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000
+--- a/tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100
++++ b/tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000
@@ -49,7 +49,7 @@
g.addEdge("F", "H");
g.addEdge("E", "F");
@@ -72,8 +72,8 @@
List nodes = g.sort();
String result = nodes.toString();
assertEquals(expecting, result);
---- tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100
-+++ tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000
+--- a/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100
++++ b/tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000
@@ -731,19 +731,23 @@
"c : a\n" +
" | b\n" +
@@ -111,8 +111,8 @@
}
@Test
---- tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000
-+++ tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000
+--- a/tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000
++++ b/tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000
@@ -439,20 +439,15 @@
ErrorManager.setErrorListener(equeue);
Grammar g = new Grammar(
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index 71b22b19ab46..b04d776db7a1 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
index f66302f731e8..efbc19a52df0 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r9.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit"
HOMEPAGE="https://avalon.apache.org/closed.html"
SRC_URI="https://archive.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-${PV}-src.tar.gz"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
LICENSE="Apache-2.0"
SLOT="2.0"
IUSE=""
diff --git a/dev-java/commons-codec/commons-codec-1.15.ebuild b/dev-java/commons-codec/commons-codec-1.15.ebuild
index de13bb85fb75..92af3cd6ce23 100644
--- a/dev-java/commons-codec/commons-codec-1.15.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.15.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
# Compile dependencies
# POM: ${P}-src/pom.xml
diff --git a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
index 3cbb9daf5282..228b947a439d 100644
--- a/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Extends the JCF classes with new interfaces, implementations and ut
HOMEPAGE="https://commons.apache.org/collections/"
SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/commons-io/commons-io-2.8.0.ebuild b/dev-java/commons-io/commons-io-2.8.0.ebuild
index 6b1a3a17f7b6..730f099a18c1 100644
--- a/dev-java/commons-io/commons-io-2.8.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-io/"
SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/commons-lang/commons-lang-3.11-r1.ebuild b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
index bb2399c94a7a..fe748bed2f36 100644
--- a/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://commons.apache.org/lang"
SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
CDEPEND="
dev-java/easymock:3.2
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index adffeb36c057..1be76e85241d 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
index fd1f6c61c92c..3ef7e38716d8 100644
--- a/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
+++ b/dev-java/commons-math/commons-math-3.6.1-r1.ebuild
@@ -21,4 +21,4 @@ RDEPEND=">=virtual/jre-1.8:*"
LICENSE="Apache-2.0"
SLOT="3"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/easymock/easymock-3.3.1-r1.ebuild b/dev-java/easymock/easymock-3.3.1-r1.ebuild
index 3b4e321ccffe..bef9d66247ab 100644
--- a/dev-java/easymock/easymock-3.3.1-r1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
CDEPEND="
dev-java/cglib:3
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index 503f94c45ff4..7d2a8161da68 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index b1138e4df534..e9646ad9808e 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,3 +1,2 @@
-DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690 SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031
DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
diff --git a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
deleted file mode 100644
index efbdd2074bb2..000000000000
--- a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ================================= WARNING ================================
- Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.
- ==========================================================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Proxy used :
- Proxy host [${proxy.host}]
- Proxy port [${proxy.port}]
- Proxy user [${proxy.username}]
-
-
-
- Proxy not used.
-
-
-
-
-
-
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
deleted file mode 100644
index 8968d7a7d6f0..000000000000
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
- dev-java/xom:0
- dev-java/jdom:0
- dev-java/dom4j:1"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.4"
-
-DEPEND="
- ${CDEPEND}
- test? ( dev-java/ant-junit:0 )
- >=virtual/jdk-1.4"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom"
-EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
-
-java_prepare() {
- cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "target/${P}.jar"
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use examples && java-pkg_doexamples src/java/samples
- use source && java-pkg_dosrc src/java/main/*
-}
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
deleted file mode 100644
index 8549f9e42e10..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-java/xalan:0
- dev-java/jaxen:1.1
- dev-java/iso-relax:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/build-xml-2.patch"
-)
-
-java_prepare() {
- java-pkg_clean
-
- epatch "${PATCHES[@]}"
-
- # Remove Android stuff to avoid junit RDEPEND.
- rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
- dodoc {CHANGES,COMMITTERS,README,TODO}.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
- java-pkg-2_src_test
-}
diff --git a/dev-java/jflex/jflex-1.6.1-r1.ebuild b/dev-java/jflex/jflex-1.6.1-r1.ebuild
index 7df78eee922a..80b924fcbda7 100644
--- a/dev-java/jflex/jflex-1.6.1-r1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.de/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~ppc-macos ~x64-macos"
IUSE="examples test vim-syntax"
RESTRICT="!test? ( test )"
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index e095d554d3be..a0252fc34687 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,2 +1 @@
DIST joda-time-2.10.10.tar.gz 1052384 BLAKE2B 656efddf6b98f10ce6729c6fa4c76ddfeb86dd94971c2637af3ddcb8a3a47f83948dbd58b04a6249445ef2857c5c5edb994a6d56349ed4ff4130ce9aaebd57e9 SHA512 e7917fd28cd10d7fbee02016b1f13a15a80af099b952cc0e8978bfc7fa389109553804670492c206f2b49bcf910ea093fc1838cb45ce4b7a3a885aac2aaf5943
-DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
diff --git a/dev-java/joda-time/files/joda-time-2.7-build.xml b/dev-java/joda-time/files/joda-time-2.7-build.xml
deleted file mode 100644
index fa1fd5e25a39..000000000000
--- a/dev-java/joda-time/files/joda-time-2.7-build.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- =================================== WARNING ===================================
- JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.
- ===============================================================================
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/joda-time/joda-time-2.7-r1.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild
deleted file mode 100644
index f492d319c95b..000000000000
--- a/dev-java/joda-time/joda-time-2.7-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc examples source test"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
-SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-
-RESTRICT="test"
-
-DEPEND=">=virtual/jdk-1.8
- dev-java/joda-convert:0
- test? (
- dev-java/junit:0
- dev-java/ant-junit:0
- )"
-RDEPEND=">=virtual/jre-1.8"
-
-src_prepare() {
- default
-
- rm -v *.jar || die "Failed to remove bundled jars."
- cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."
-
- mkdir -p "${S}"/target/classes || die "Failed to create target classes directory."
- cp -Rv "${S}"/src/tz-data/* "${S}"/target/classes/ || die "Failed to copy timezone data."
-
- mkdir -p "${S}"/target/classes/org/joda/time/format || die "Failed to create target classes subdirectory."
- cp -Rv "${S}"/src/main/java/org/joda/time/format/*properties "${S}"/target/classes/org/joda/time/format/ || die "Failed to copy message bundles."
-}
-
-src_compile() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar)"
-
- java-pkg-2_src_compile
-}
-
-src_test() {
- EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjar --build-only joda-convert joda-convert.jar):$(java-pkg_getjar --build-only junit junit.jar)"
-
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar
-
- dodoc NOTICE.txt RELEASE-NOTES.txt
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use examples && java-pkg_doexamples src/example
- use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
index 0fa931af9d40..ee8247958b42 100644
--- a/dev-java/log4j/log4j-1.2.17-r3.ebuild
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
HOMEPAGE="http://logging.apache.org/log4j/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux"
IUSE="javamail jms"
CDEPEND="
diff --git a/dev-java/objenesis-test/objenesis-test-3.2.ebuild b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
index d3ef97a3bf1a..a4285de9bf73 100644
--- a/dev-java/objenesis-test/objenesis-test-3.2.ebuild
+++ b/dev-java/objenesis-test/objenesis-test-3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/easymock/objenesis/archive/refs/tags/${PV}.tar.gz ->
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/objenesis/objenesis-3.2.ebuild b/dev-java/objenesis/objenesis-3.2.ebuild
index 87362be1d570..893f78715071 100644
--- a/dev-java/objenesis/objenesis-3.2.ebuild
+++ b/dev-java/objenesis/objenesis-3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/easymock/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Compile dependencies
# POM: ${P}/main/pom.xml
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
index 8e469d1a6cc7..f56700c34bec 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://java.net/projects/javamail/downloads/download/source/javamail-$
# either of these
LICENSE="CDDL GPL-2 BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-java/poi/poi-5.0.0.ebuild b/dev-java/poi/poi-5.0.0.ebuild
index 32cac97d164d..17710fa6007b 100644
--- a/dev-java/poi/poi-5.0.0.ebuild
+++ b/dev-java/poi/poi-5.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://poi.apache.org/"
SRC_URI="https://archive.apache.org/dist/${PN}/release/src/${PN}-src-${PV}-20210120.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Common dependencies
# POM: ${P}/sonar/main/pom.xml
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
index b1522d481d56..ef4a91e9b8c8 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.30-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/qos-ch/slf4j/archive/refs/tags/v_${PV}.tar.gz -> slf
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 585b73ed3681..6fb3ce63e073 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,2 +1 @@
DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
deleted file mode 100644
index 84d47f987398..000000000000
--- a/dev-java/snakeyaml/snakeyaml-1.16.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple vcs-snapshot
-
-DESCRIPTION="A YAML 1.1 parser and emitter for Java 5"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/joda-time:0
- dev-java/junit:4 )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- # Remove some tests with tricky dependencies.
- rm -rv src/test/java/{examples/SpringTest.java,org/yaml/snakeyaml/{emitter/template/VelocityTest.java,issues/issue9}} || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.md src/etc/announcement.msg
-}
-
-src_test() {
- local DIR="src/test/java"
- local CP="${DIR}/../resources:${DIR}:${PN}.jar:$(java-pkg_getjars joda-time,junit-4)"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name AbstractTest.java ! -name PyImportTest.java)
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/sparsebitset/sparsebitset-1.2.ebuild b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
index bfada3fb296e..05457982154c 100644
--- a/dev-java/sparsebitset/sparsebitset-1.2.ebuild
+++ b/dev-java/sparsebitset/sparsebitset-1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/brettwooldridge/SparseBitSet/archive/refs/tags/Spars
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index fc11510e058b..610e73d56983 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${At}"
LICENSE="sun-bcla-jms"
SLOT=0
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="doc"
RDEPEND=">=virtual/jre-1.3"
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10-r1.ebuild
similarity index 98%
rename from dev-java/swt/swt-4.10.ebuild
rename to dev-java/swt/swt-4.10-r1.ebuild
index 13b1abd63b38..527f20631194 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
@@ -34,16 +34,18 @@ COMMON_DEP="
net-libs/webkit-gtk:4
)"
DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.8
- app-arch/unzip
- virtual/pkgconfig
+ >=virtual/jdk-1.8:*
x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
x11-libs/libXt
>=x11-libs/libXtst-1.1.0"
RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.8"
+ >=virtual/jre-1.8:*"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig
+"
S="${WORKDIR}"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
index c750d5ea6f6f..0a4f99352d99 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.108.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
index d5d3aa1096eb..8846bfbc900c 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.65.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
index 12c59541c7f8..6a6fd33a63f6 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.45.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 2a4c459fafe7..8c6360068295 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,4 +1 @@
-DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
-DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
-DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch
deleted file mode 100644
index 3187e437306b..000000000000
--- a/dev-java/xom/files/xom-1.2.6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur XOM/build.xml XOM_patched/build.xml
---- XOM/build.xml 2010-06-21 06:03:14.000000000 +0300
-+++ XOM_patched/build.xml 2011-03-13 07:05:01.000000000 +0200
-@@ -21,7 +21,6 @@
- subject line. The XOM home page is http://www.xom.nu/
- -->
-
--
-
- Build XOM
-
-@@ -71,7 +70,7 @@
-
-
-
--
-+
-
-
-
-@@ -226,7 +225,7 @@
- encoding="UTF-8"
- fork="true"
- includeAntRuntime="false"
-- excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
-+excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/">
-
-
-
-@@ -323,7 +322,7 @@
-
-
-
-+ classpath="${lib.dir}/jarjar.jar"/>
-
-
-
--
--
-+
-
-Don't build and install fallback parser relying on internel classes of
-SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119
-
---- /tmp/build.xml
-+++ /tmp/build.xml
-@@ -235,10 +235,6 @@
- ${version}
-
-
--
--
--
-
-
-
diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild
deleted file mode 100644
index 434b57752e5d..000000000000
--- a/dev-java/xom/xom-1.2.10.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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
-
-JAXEN_V="1.1.6"
-JAXEN_P="jaxen-${JAXEN_V}"
-
-DESCRIPTION="A new XML object model"
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-# Bundled jaxen as its moved under XOM's namespace
-SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz
- http://dist.codehaus.org/jaxen/distributions/${JAXEN_P}-src.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="dev-java/xerces:2
- dev-java/xml-commons-external:1.3
- examples? ( java-virtuals/servlet-api:2.4 )"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
- dev-java/jarjar:1
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/XOM"
-
-# Test require network access to pass.
-# They need a redirected http document on public web.
-RESTRICT="test"
-
-java_prepare() {
- epatch "${FILESDIR}/${PN}-1.2.6.patch"
- epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119
-
- # Delete test files as they aren't installed
- rm -vr src/nu/xom/tests || die
-
- # Delete bundled jars
- rm -v *.jar lib/*.jar || die
-
- # Delete bundled classes
- find . -name "*.class" -delete -print || die
-
- # Move bundled jaxen to where the build.xml expects it
- mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die
-
- java-pkg_jar-from --into lib/ xml-commons-external-1.3
- java-pkg_jar-from --into lib/ xerces-2
- java-pkg_jar-from --build-only --into lib/ jarjar-1
-
- # Tagsoup is only needed to run betterdoc but we use the pregenerated ones.
-}
-
-src_compile() {
- local ant_flags="-Ddebug=off"
- use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servlet-api-2.4 servlet-api.jar)"
-
- ANT_TASKS="jarjar-1" eant jar ${ant_flags}\
- $(use examples && echo samples)
-}
-
-src_install() {
- java-pkg_newjar build/${P}.jar ${PN}.jar
- use examples && java-pkg_dojar build/xom-samples.jar
- dodoc Todo.txt
-
- use doc && java-pkg_dojavadoc apidocs/
- use source && java-pkg_dosrc src/*
- use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples
-}
diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild
deleted file mode 100644
index b7321e970a26..000000000000
--- a/dev-java/xom/xom-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 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-pkg-simple
-
-DESCRIPTION="XML Object Model"
-HOMEPAGE="http://cafeconleche.org/XOM/index.html"
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-CDEPEND="
- dev-java/xerces:2
- dev-java/jaxen:1.1
- dev-java/xml-commons-external:1.3"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
- xerces-2
- jaxen-1.1
- xml-commons-external-1.3"
-
-JAVA_SRC_DIR="nu"
-
-src_prepare() {
- default
-
- rm -r nu/xom/integrationtests/ || die
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index cfc3be9f2fde..9c383a7f6916 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/moarvm/metadata.xml b/dev-lang/moarvm/metadata.xml
index 544cc2f4ef43..cc052b528dda 100644
--- a/dev-lang/moarvm/metadata.xml
+++ b/dev-lang/moarvm/metadata.xml
@@ -5,10 +5,6 @@
patrick@gentoo.org
Patrick Lauer
-
- perl@gentoo.org
- Gentoo Perl Project
-