diff --git a/Manifest b/Manifest
index cc5cb246d116..d5e98224b108 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29292 BLAKE2B b5c71ca6a2df388c4c5f1e9290c81bc3ce220bc2eccba1c9d00f04f87d1db3ab85124e2c65c8589ec9795b1a705d683706102c344f59d97ebef32aa480ccc60f SHA512 5b59b4e9cd0fd3bb01bd720298ce4ecd5ed55eafcd270979cf9b08019fc1c37edb6b7c9ed19761c9cbbc772cd27bc381b4e6454212ef54b28cd448a15b5ccf56
-TIMESTAMP 2021-05-16T17:39:08Z
+MANIFEST Manifest.files.gz 29288 BLAKE2B eb4400c08048b5b98c135e202859d4085d2e20dfdf2ae120d1a905bbacc6bb7782cc0933941f937c2698c5180c1736db5a045cd1a96206fb5fa6ad985a74ccf5 SHA512 e50e277b33e1f780bf54488e0fe5fd2d9291461941b259fd0fb4e76781c81f382d531c03dea5349fa93fb4b22488ac83147d0f16e36f3b5ba4dc871e09d7d1f2
+TIMESTAMP 2021-05-17T05:09:20Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmChWLxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCh+oBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA2yw//ZD6/xzXAe+ALGgOguWp3ZTRdDdfuW2I6FH4Nr2DBjgiAc0z60GOywDpH
-mTY4cvHj91043rNYCLbZEIBcO5ZHq192ZUGri1CdNkde8E943EolKJTCHtexd71D
-kx6QJJFJb8vwpbAM5MBxT5wSKbhugTAbakRRMkYr+HRpS24s/CRj7bNzf5h3jeOQ
-76/P9l+7cf+cPHBO3Nd5+EYhWf8zbFXmQPW3K4VbXXewQW+YLumpMIdSoFuolZDl
-87qDf+gSjDeTj7BG9vkRaLrVb91pe84uH5mskgoY6kzPV1jdmGQ6vPF8pth/rlkI
-5SeUOJ+pj/X4wBpa83MCmd2j1EuhcyubRQk1NwwFIP8Z4V0ScTTG7wySLMCMYAz5
-yccOhcOhh2/P0Mxq0UXnKTtXAiH7FfMiTeHhpQ1meB+U6lBxHjn00RRl1kUMAv3o
-+36GQMKrJjZ47vnsDTci2iVA3o67g2uZEHXZM7aueo7s78Qm1Rflxuqhdb5g/iRP
-wJYq8H3QWa7AulUOuTqz6PikMI37ji7DlNPyzzy/rAbEhQaI9YgamNHttPrEYjnf
-XJFJG9P6ks9dJWlhu0vyn2iHUWSZZZDo/M9V/jP2CWNY9ydTYYQfA02yRM1dX1lA
-fvlMOQ5+7QpvLVhEJOV+/ImyrM1BigUHDwR2EFOmxxLp8vA+g0Q=
-=HhxC
+klCRsRAAjC+lPO73puJ5n+SeZdkoqKzR4y3miAtYmym6NxfpEKGgahR7K9HoJUvr
+xR4fiCN7TxNoNwHGiGT7IvkeJB9d6wDiFUnIUJtw1E3mZbNlSbxvBG0En0t29t8G
+NngQ9TXXXQDbCWqQFLcvLxMJztseVfOhFMYObtBId6KU8KkCY/ub0gLMWMhjtjKE
+K8TRDiiaNHP46lCJ3hLEr4KJGBQXhspPX9omQdHO5uLfZsrFSBgLbcpVauq5Sx23
+Yk3d5+8vWInPI33fNrvBzJs2Cn5r1J4qMoTE6cd0Wl+ebDdV/8zwVA/32miQcbm5
+W3Ns5t+hIRcQly2g8W1sOf8btVk5wv0w/I/brex6UZwaIuVaYye5540TUw+DySeF
+QoCfhQ1pr2ckRP+gP93FqGSjpITJG9YktoDNP0cBSU0INKsoFb34rYX9MXtnkC/k
+0pSlzyRnD5hsZUn5bUb5WNAUZoQfCvSGAC+tDhLwn1vvmEPahtoNpDND4+fHqmGM
+a25UrpSGBoMd8p87C6rJuWqfKrOR0TpQIDYEV3nGdBcbh2Bb+4jSoFkwq+fHK/Mm
+h+9JKKCCE4hXyPEJI0zI8riN+KUpg5RARQmldwEF4BDdjGMjd/tG0MtwATBP+EQv
+vPFrV+d7zzzEk/wS+vGQtjVh67aXTXvECHgyRI23/AgLOZaodts=
+=v7fk
-----END PGP SIGNATURE-----
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..03e24044e545
--- /dev/null
+++ b/acct-group/vnstat/Manifest
@@ -0,0 +1,2 @@
+EBUILD vnstat-0.ebuild 196 BLAKE2B 2869e1135890ecf974db45120a9d824f10bde0bf6c304af36b4fc39bcc3e1732b03cfe174d7293c09954beed787dc6f92d6c396bb7c46f6da0b4db68b8f57bfa SHA512 cd4d0e8f29f724206160cccbf44cb90149167fb07a593ed055d5faf7d76c36794d400a87338d725d33bc294bc6dadb1563e8d07438fab41eeca3d9ac545182db
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
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..eaa1cd2a8a85
--- /dev/null
+++ b/acct-user/vnstat/Manifest
@@ -0,0 +1,2 @@
+EBUILD vnstat-0.ebuild 241 BLAKE2B b013182dc58daf2fdeb3aedd4b61c35ee7ddde966cfb19fc758d1b21920531037634ce4d3e4d741d6e55c94f7db4d6b3f8a392974052afa071e0714ba065a9ee SHA512 700c81216a3aef03d30ed6d2d5097474380273cbe913f9638f63d4f87870cba417f3680b2207b8507558cc1c539a6a4dd5392d2df219375cee670fc0b44488db
+MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
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/Manifest b/app-accessibility/caribou/Manifest
index 92e9f1316423..302c0282c7cc 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -4,6 +4,5 @@ AUX caribou-fix-python-env.patch 2508 BLAKE2B b27a37c5f14affb2610b6a2caca9827a4b
AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f80954a730174f9509e2a3c846b790f8abe861fb65ddf683bee87b0cd99b8d18c4c6eab6413f978a295190cc5d9a355c51 SHA512 8ce9b33c09e19a24e2e8366674437afa03743637d0d1854e8c5b4f73cbd69148b8c4d59d65212c509146fd051015d7a20f9d8ff92e9c835b4d805ca6c564b5c2
AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999
DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21-r2.ebuild 2582 BLAKE2B 7fb7cfc2354bb9f945a23e93b0a4cdd85c1b8d653e4b4387940ea455224fb16794c273b4e1e5a82d01818363bb355f2e6f601122f3342583b2adaa2e44e4d5c6 SHA512 5abec28e094a414a73552a7c36fdfb415f47b7160c41749b484a0bd4ad81aebc66c124945d52798971f37721fc9c1c60874caa0249ca0f7603baa71fd971ea9d
-EBUILD caribou-0.4.21-r3.ebuild 2123 BLAKE2B 043ee1379ac474069cb26e4b48f215f38222dad46567e5141be4147e60efdc53723480af230ab798b560ab49745ac8d4d8427ccfa9fe5a500c077d43b689c605 SHA512 7b6ef74e4b7afb5770d14e2ef335eff06f71bbf043f3aac9de1e8a2fe92fd423b57f1645f7cd2b9edb00d663835df8dc0f085871a46dddc52d76f7ae42e23232
+EBUILD caribou-0.4.21-r3.ebuild 2122 BLAKE2B 3400a998a87dff0b8d318ba4daa4715273d5e69b740c3e740575b23444ab6d9fd46877e3d72f563910db897bd802a647f4a31f0c63b5889ff79946d878fc328e SHA512 a4e6f710ac87528e1edf1c8753be95a1bebff459fd0ed6e1f9fe40122dff92a4da05e0199bf1bc75a54f36a15049bd1eacc67abb62ef4eeb5d8cf6e5a9e6cc9e
MISC metadata.xml 839 BLAKE2B 139993feb8299a6fe4d363ec5a11e07128656c7d3f17c2888c76181e54c2ac1f30b3d3159cdab42653a1d04d452e71d41b10eb9380cb92281ba73f6f66d34ccd SHA512 66a2ed68edb2fd15f71a6a4afa566e5fa5b9dff7bdb53f626e6efad4474fb1bde6f9427fe0826b077d2bb48653f915b87afef5fe3ad9c3ebb037178528e2f6bf
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/Manifest b/app-admin/xstow/Manifest
index 7a8856dcbb87..d854f5b29a48 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -3,5 +3,5 @@ AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e
DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
EBUILD xstow-1.0.1.ebuild 1227 BLAKE2B 28a7252478623b3d12ae239972643643423f4c44e0a466262f06a0c3b011004959f96c8f0a2f1c54ae7811d44a15dcd139e08016e02b3213ddcefd5802ba403e SHA512 5109811f174a1e69716bb63e71ebc1c72b983de8e0a5eb9c8df4ddfd097d478b63edff3bb9dcfb30dc4f5b0502b547330acb53ddc723d149c0f874d8c9671669
-EBUILD xstow-1.0.2.ebuild 1235 BLAKE2B b50a9841c9c3485d4ab076c93c35602be2a84f6ea6042e11d39fb6dada8cd8761b44918b0700e98d04ca18893f31b99dfa04795e65fe98a9585aaaf5ed54cadd SHA512 d893d068cee08a3be9d1004a613d1f9ee0e131b1bd0836404e5292eecf650cb894927f77df858d3328cf26cc0161b49fb7e7f669e6573b917474ef7c9d42fc54
+EBUILD xstow-1.0.2.ebuild 1233 BLAKE2B 4a45ac5464981c51093ae99c62098b55fe730643262075d5e614e68f15c4e8c6c593e2f80fa3cd577eb21feb86aa4755ac65315639e413ed1f41c7a72b4b0799 SHA512 a6e4b1bd0a74340736e228f940949080d43b04dc203ea968f21fe19f29cc7e718418769fa39fa2a237a1c1ff504aab53c02a056081e5c34ec6bd178aee6b130b
MISC metadata.xml 242 BLAKE2B 7633663d830cf12f60d6d815b59e4eacf16e97efcbd7c29001a0e9251a016f13d46de474241f71ec8eb4421d5bdc5ed822437096654af920f1774f394ebec4a0 SHA512 5e943dac60c778c120973997f72f2b3ab35e49eb4e61d64b821a8370cffb1e0b628cc09f9855a569813074facb568a0821d1ed4108f9f24b0f23c14a64178d48
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/Manifest b/app-editors/emacs/Manifest
index 55defd9690f6..8d9942e1a384 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,5 +17,5 @@ EBUILD emacs-26.3-r4.ebuild 11815 BLAKE2B d47062336ca215fec5657dea95739751405f66
EBUILD emacs-27.1-r4.ebuild 14346 BLAKE2B 455210831d874ae10846d7872bafb5606275fb42c42074990f2b904c197b5e2948e98a5659537070b43df7935e357d226f89e75d4ed7bf2f01aab17f1282ec9e SHA512 b8389386ec5b510c044a138a256d44d6b4dc2de79aa490a86ee86039c6fb2b7d811e8d417e7f0b77d89693221721961555b27bb208ca00ce03d800c1c2e7455c
EBUILD emacs-27.2.9999.ebuild 14310 BLAKE2B 80f0e564e88e59debc29f728776d22ca86f4b26733c6806c918f653da3b114794a7cebdc8d136fc00dfc50d94ebb0c4ad4763af874d52c3ba2322ff531a3b70a SHA512 d3f4b7be206b7dc430f536c9e59681be77adcd70885ce7c914eb96a65209ab6dcf7e338206c1f75c7ac6fc45f74aacf2eac502912b22e0b2592c76ff8d6e897f
EBUILD emacs-27.2.ebuild 14311 BLAKE2B bb7104a2b5ecf0ed7a19d18d107607bf426f2d065b9895c45a2e20ea55243eb4e8fbfe06ce12848c4ba57a05bb8a30f37d8c7f6ed274980f447a6eb8c0d804c3 SHA512 3a0e3b915b413cd0c4b83bfb6d7a73e3dfebfbf87eae343607d956abaf42658947fe41263fc29ba13471ff60f160dfdace0ac75b5d218957365c501a29275d46
-EBUILD emacs-28.0.9999.ebuild 13893 BLAKE2B be43f8161664d9f00e5dab72abe4553f9e896f8941e352b7783ce2a3c872b45d6d53f90e2bfaad2b8ab0970414012c8a46aff7677b959beaf0cfcba3fb7425d6 SHA512 cd8261cda23976142c6030a6cc715844e0960f4ace34e28af9a6d6c1e8e0edb26cc9836f9d83d65ddee8bb262ecd8a40c786c9195a663b2ff8b12c2b12115858
-MISC metadata.xml 3037 BLAKE2B fea30de2fe3c754253119e21c0f2c1023d4ac9c78ff0586fd5c427a8b44104ca620a16a8560de310afe342fd38e69be58781656ae45d59223d3e48d6510bb980 SHA512 07a5bf84aecac3fde3d6b0a698e875683f8479becc66037ba4d21f0bfef3e7d533331ab072ad1d5911cc36d9b5efdec979a3daafe812a5055139f8171d4ae6ea
+EBUILD emacs-28.0.9999.ebuild 14196 BLAKE2B a45dd87886e1df006c1cc3e4301f03f3df30debe414fbe5c47fde4ecadb59ec5e4720e8eafee2053527dfca015dd73c526540f12cf666300c44644b2905058c4 SHA512 05ffce7d2b738d300ff9b393e52115b8327f7616bd946e87ed9d132b7fdfa965f8d231df5819a2f11eca6b46b1dea0ea09df6429eff872966568242fa39a30ef
+MISC metadata.xml 3129 BLAKE2B d0bfee8c1d5de0496d4b7bb5fff30f8b5c19911ccdf40d8bf34c990c57a61f6a6b68528e2a393174b190c59ffa1ff657c0d5dd6b9ff1d15e59641ae2b7da749c SHA512 1e37638584eefe022ffb08951adce160d6342aa90e92cfb0481689b662ff6a04a9327bb8c03fbc302315a17c4918d082ee076caadea34a2c461957f079da2279
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/Manifest b/app-editors/nano/Manifest
index eb77bc090eb4..00552a7de936 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -2,7 +2,7 @@ DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe8
DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf
DIST nano-5.7.tar.gz 2989413 BLAKE2B 604f3140bd963661bb7d13933b5bac867bcfd90635287dc8f160e4bda094641c20f2fe2157fe1b5eda28842f78c4e651a354ed6edcafe67b4f2bf6c9eda0051c SHA512 f6d580918c488b15a5f8f77b4b52ea3e86535c251fe32dd978bae014bcadd543a5696f7741018ffd05b6271c1defe6a67687577f3cfe059ed2b4d3e422b2a694
EBUILD nano-5.3-r1.ebuild 2430 BLAKE2B 33487afb23e1b01280d6f6fe3f4ffc1008ca820a3e100919fa3c89cc874d80287befc979d3d3848b00cdcdad3954a43eb6fa2d8625320a6e1c9d83b49ad01312 SHA512 98ac275e4a54bee9500d5bd5d71a84e37ac1ce941a4ae5e827d1ae19209fa9d4bd3840e640d6017776f6fcd32df5ae08425f1ba5d2bce0b8e8a5e3ea2fd958d7
-EBUILD nano-5.6.1.ebuild 2285 BLAKE2B d92189e9d0925f670490113ffc4a5bfa0bcf3de3e587448cfea31c25eae1f374e4d2d4e0d4c5e2485accd9c65d99b260531286a09df796909a991291fe38c26f SHA512 4c0f9e451b55387aea2fc5ab52b3d2d8d98b84a51437b50bf4052fe9315746f91676a49248842af39a8234418d91a7195b4ce9e2c49f47bf157c1220cd4504c4
+EBUILD nano-5.6.1.ebuild 2281 BLAKE2B 66004fd9d399d494ed8e5479bcd128ac09b0c812688670d5df47674e915ad670d2284828f929dc5bb1828d83ab792dcb714ec3ac3348b7d78dd82c0633c108e4 SHA512 dfff336508b7e82993aa6a07acec467b2422354847595699af9b55464e630bb46495c71c5e297b1b8d59e492122836175814313598d39ecaa30eff1c8452c84a
EBUILD nano-5.7.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
EBUILD nano-9999.ebuild 2289 BLAKE2B 0447364b3dbc38a83e671e44d49c9f1082deccbecb81b9f97a9c36ad6273b5a0cee6ecdeff1d6759b4bd86c3e167b34607c7426b9344a1a1c4839883ccc63584 SHA512 63c7ebcfbf66c0fc875a263f26abb5d002d8d12a78f53b4e3192819ee747db6b1e259696b84a1af3b7b27d8050af63fd02da5b61c51185fd8162dd9defc44ede
MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
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/Manifest b/app-editors/vis/Manifest
index f0a3c714dcfa..7f062d42cb32 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348a
DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.7.ebuild 2083 BLAKE2B a825d0603a0c085c68dfb49cdeaae78ba014011f0c468756755499ec1d55677c1456a5e8d98e541689128f35ef5c820d5c61b5e7ef7dd8a4a59194d5e5b3311d SHA512 ffa446b16d633b89dd371a677fdc0d6b0d82c6f5b22dbdb70c46e147b7a11aa3e0361a769f91335f7facd2f5a2e4093171cb4d63bd212e8c80103d2c6ddcd2b7
+EBUILD vis-0.7.ebuild 2082 BLAKE2B 04130f5c29e2f30eebd308a6656e37444c876c2c4c64680c1ed743ff4dd399bdcfd908f5819708e22c30ee6b8cbe82808e9a3b2b08ae21d8d77d3fb4fddb35cc SHA512 59de24a57fbf4f99330a9fd1c927f3bdf4205eb580d4340060241d6b58d7edea45eeff63574574e6ef62dad92cde5fa82e6c8976ca1f1041ceda2b3b45f5a449
EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f
MISC metadata.xml 623 BLAKE2B b15ac2bb4f7ca0007660f46e07c0c994476f538af10d50298de77d0dd251fd0eee4a545bce9d1ba10c545fc929056b5b3a3a65de5df99bc4811e723df8930faa SHA512 742298dcc4b328f46b3c60726169b11bbc7c4a3546e2983c96b90aed07ff8ee027030a20e7fca9469e2ac1d1fdda7069806f9fb35e442a36d2435669d6235bab
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/Manifest b/app-emulation/docker-credential-helpers/Manifest
index 991c575bb877..37e4a6e2df5e 100644
--- a/app-emulation/docker-credential-helpers/Manifest
+++ b/app-emulation/docker-credential-helpers/Manifest
@@ -1,3 +1,3 @@
DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10
-EBUILD docker-credential-helpers-0.6.3.ebuild 1244 BLAKE2B 25fbe23b6fdb260ee8623f91e3df3f0a75e75cdc42f3ddf12ccb179f7e792142956fdc192701fa31c357e9d76fddd6840418d566cccc5110817ab2804ef61b9a SHA512 e5f93230354e429c0f5e84add71971c417e7399ba743eb67b52e7a0969e138034dcac1a17c453ae2b3f369ec0ae63e2f9686868ae1ed5ea3d62a843f4671314d
+EBUILD docker-credential-helpers-0.6.3.ebuild 1243 BLAKE2B 4c9e817cf31635dda11e8964b2a1881122fe59dfc5fa8d275e464222c5e6e7d38a91aeeb4defd3a5a2a63cfc31e74a67e1b81e6b1e11cf88e02b03d77abcbb0d SHA512 8504d5f522c9cce5bb2818455c55954e5f7d6e8948becb37969477fafba639ea866cd88176e92e91a8ce567374f4ce77d30e8078e4247fbe6be9d955a7a4e55a
MISC metadata.xml 877 BLAKE2B 5411cc175644103cddc23decc424aa517f71296362ea3859cc969fc50ffec41b4fd325e98f681e9798e196f6da3f30dc86a4af0ca797d2d83684920b58550cc0 SHA512 e7f7a33a2fb1bbf308606d713691153304b2989de19a8a6f618471b252889d12af8d0737f53379a90da628dea2f7ea6fa61222e4d57c91297731b4b7f52cb793
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 da1047a1281b..142ed1466798 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -17,8 +17,11 @@ 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
EBUILD libvirt-7.0.0-r2.ebuild 8728 BLAKE2B 69047ed88abf8ec34d90c77ab7ebb92513985477d816da1ad9ddcd42c33b1a47d70c574a7605a685919e42d33d1af835327ae63761f36bb325bf8a7195e8b6f2 SHA512 1a5216a9b524f77e5099bff5e791866a1432cfedf193afb45dc1a1b1d8720ebb102acf70b148dd0a071ad3d65412768838ea8d3a40765aa9238c77e158133bcf
EBUILD libvirt-7.1.0-r1.ebuild 8479 BLAKE2B 2b16121f4b0930eae86e7866ca7ad5859cc5009cca4d3b2d3e08566a40dbe94f54e324435fdaa8ac8c6b8eff269fc02421c503b52ffd7e5ab31577bc40b03873 SHA512 75a840582349c8c9373e6f15645818a0f5ba6c8aa4510ab62a16499c9dc7d06f23d1caf488ada35d6d51b24fb62cb96d9c362c0cef592b75adaee8516739c4c9
EBUILD libvirt-7.2.0-r1.ebuild 8285 BLAKE2B 7d5c0c746e44714177a6192250992e190d57deb8ee342e7fe5f457b2bb6a905bff860544f7fd6267624d46b95b0e75caf905dc6c29ea273f8c72cb5edbaadd45 SHA512 a578a69498e3bbe5b5d9df0509c9cfc6294d49f351bdf4ab20df8392152d655777897c8d15e58c2ff344251c444b981f3f7e58c49b09d952816733dd73f0ab9d
-EBUILD libvirt-9999.ebuild 8121 BLAKE2B afe23c5c267f86131782b7fe043368d2e26a67ca7b20d7f0014078ab1f69a3e7734ca8823beadadf29ad09d5617c5432a832895c0b441a024256425ee8a2e2e6 SHA512 24ca3d948f69ff72513ec5baf14da7905c35a0fcb90fb49b3fae3e43b19a83bc18cba353dd9bba52b94f80b8c7a710e74eb5f7623518d2b6e1b4c10985740a13
+EBUILD libvirt-7.3.0.ebuild 8183 BLAKE2B f5883eb9d0f5e8413fee7c1a413734957e99445fb60cbe56fea042c486430eb66a9daee811cd73befa1424aba25cda75898a6dc94e65ff000b275d89a0de6956 SHA512 c606015a23412fbb5878e939987ae98851690bbae777eec59e80945097751b60f960a4d1488943c55d0f9c3bc9b926e78574009fce707b53ffa4e26377fa67c4
+EBUILD libvirt-9999.ebuild 8183 BLAKE2B f5883eb9d0f5e8413fee7c1a413734957e99445fb60cbe56fea042c486430eb66a9daee811cd73befa1424aba25cda75898a6dc94e65ff000b275d89a0de6956 SHA512 c606015a23412fbb5878e939987ae98851690bbae777eec59e80945097751b60f960a4d1488943c55d0f9c3bc9b926e78574009fce707b53ffa4e26377fa67c4
MISC metadata.xml 3326 BLAKE2B 70997d3eee5387a0735faad11a891927ad7c96b5fed632c3774611a7c35159eacfd6b0e9561c09dd08d64112c6bd66ff011fd58ed23520bc4f4f531c0d5f4693 SHA512 651bf4d8eec1af7b08c8b1050f2a4d57fa8e205205c59f231d3f84be643a71633b1426e9df1c83c838636245503bfefeef66696ddb9dc9e8da6b1aadee741856
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 d229aec7ca8e..ff1a2aadb4b0 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -7,6 +7,8 @@ AUX qemu-guest-agent-4.2.0-fix-shutdown.patch 515 BLAKE2B b70f9f67464b91042ced22
AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd37218f8e61d5a2e245ba3908f054891420c7626a8df7ecd0329edf1d11246d38e5591cb4530d63969134a34a5065c5ef041004b4 SHA512 41cb67cb02cf5a8eb5a5b929e2a6adcb6dfe376d6ea512d404edf18d0ca85fbec93140f83ee5d8f4980095fc46040cfd27b22f378cc61dcd6e147badd8b1a045
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
EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1775 BLAKE2B 36cde83af7db9939d3a588056b8ca450a8ed3e7e85f229acee3a444c95bb0142c5df8f1b36cfa4c01781bf86f53a1fb4e79a5772ae506a1555cd53287bda402f SHA512 2fff0bb4118da1a168bc5ae4810f37b226be6a83d376fb6a91acb2c45b652a20705d2fab8678f18fce4c53717ac700bd03dfdfaec6a6893fac995fc61203eb63
-EBUILD qemu-guest-agent-5.0.0.ebuild 1777 BLAKE2B 9796d27b88bf67eb7fefb402411bdce1f09c14bc0d75500217a8ed9ab16eba4d10e67d7cf83cc4245ab04d1c426060638fc91a49b0911cb709376b1a2d417371 SHA512 b3f2fa20422cf4e9c3bd9f65ae44950a8dcdd91cdcf03aa76f8e9995cc38e294143b3eb927007586aa811f3779822e524f34166850b502b3b8764ac167210961
+EBUILD qemu-guest-agent-5.0.0.ebuild 1776 BLAKE2B 2544988ac347b9e50043408aa4adfb2ce6e546da7293df34aa28700e2812dd223264a263ca48522ff748089e41429747fe0b91349bdfb39ea061ae84b53bf089 SHA512 63dc41dde9119b384db45e5d4bd73737dfa55538a2b950595019a8733fdc71773a56d111eb53d774fd3b29dd9bdaa097b8bb4b145b875e5410c31049d2e5c02a
+EBUILD qemu-guest-agent-6.0.0.ebuild 1630 BLAKE2B 0b94559db4bca99f38efcad6c7ec7e7036853ab919cc2aa7935fd58892ef28ab361f2f1211b19426ff6edcdee5583588e00736eedbd9948adbf8ba932962d140 SHA512 f9291e2d76644a4a93409faf4e9bf78cc0d9ddfdd738039293e52ff89fbcd03afd78ced4efc244cd043ade6b486bbcf177ef4054143e68cd236f8f60dc965e81
MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
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/Manifest b/app-emulation/qemu/Manifest
index 0f1cf8f54e9c..f86ee1adb5fc 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -15,7 +15,7 @@ DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a7
DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
EBUILD qemu-5.2.0-r2.ebuild 25479 BLAKE2B c53c242253d3571ba7d5484ff30773e16aa51c4c14be99c7c50326657220c3ddfe5e84074b0e99268582d8c735b6ce71a179ab5ce5d88cdda33dcd0f0cc3aef4 SHA512 88f55bba87bec4393f3e4e1706ad5352a7b2f1f531b2f4c74370beeab7e4318428113040861b0dd37ed6ce3524caadfb957ab15a329fc52cf13ea1cbbd70c86e
EBUILD qemu-5.2.0-r3.ebuild 25639 BLAKE2B d23bdb53da967696bd56afd27ef58b4653b7954d170c6957a9956aca3f6b0d23c72a3e3f786826110652838bcebd4b765fcdd679b50754fe35d04e160bf44dd4 SHA512 4860b1b80237fa6c15fd798bd94327b3b573738365a768bb1c18ecb055bd30c8a762bbfa6df3b83c8293407e2029af05de4766c9310a64eb5382076865dfd70a
-EBUILD qemu-5.2.0-r50.ebuild 25750 BLAKE2B f004138c531d17e09fc08a62d358e8b5c8e601b35ec125de63a321b7116c386f5ffe79e3f5b271e207e1007e1083c47db29efeac5f16c211b6bd971bea9df5c8 SHA512 2a3666126199496df486d5f0001d0de2b5e05191e3cf408f0eecfcbc39b71b3588c6e5280ad3b29e05fa7ccc929152a1d054a87fe9c5cfbbdec11231cefba4de
+EBUILD qemu-5.2.0-r50.ebuild 25749 BLAKE2B 887ceeeb867e737ed6dcc558c370cd79428428404c1598ce8afcc36a8b2e1e3a54399df716c7450800e854794ee6a3daabc7ee665f5e02ea346475c9f8562a8b SHA512 d11cf46d551f8b904dfab0775d8d25e1901c115fa7d1313f1006b16e4efc4169e8f1065bfa8435bbef7a78c2eba44e8f1ab16414c685dee6c490759ff69f4bf6
EBUILD qemu-6.0.0.ebuild 25612 BLAKE2B 690f0c8c291ecfe08ddbaaa4bf8edf97f75466ddcc8a6ed7d981d0b4e919b07d18a51a6776f316153e36bb037ce66a618989d29bb17e0ecdc2baab870eb512a5 SHA512 485802867e888e54a7ded12c5a700bb4502d322ad683ab7645b179aa7d375b9c1ee919480a1c7ff988dfbff49c788f08beb5b6e59271412ecb208d310f44e42f
EBUILD qemu-9999.ebuild 25570 BLAKE2B 11df2d2670ed91c92b86d58e7db91bcd10b946875d6091aa83a31c90cdd28d3fa9bd749a591cc86e428ee085f914ab2b0fc4a42896ca3e3fb662c8bfdf0004a2 SHA512 b13919ebf371043cd1de8bac1e7acd6f157c94ce80f3d99beff68f4a5466ecfe42d1532508a3b87b7fd0dbc6618b17539c019546db4fef2b6fd9756d56367603
MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
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/Manifest b/app-misc/task/Manifest
index d6df0d9233d9..e14d6220dff2 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -4,5 +4,5 @@ DIST task-2.5.1.tar.gz 903428 BLAKE2B afa17364984237ea589921afb4379297b128ea1bb6
DIST task-2.5.3.tar.gz 788760 BLAKE2B 3e8a4f2ebf6c39d3d51dc9b044cf1c8fbce23ab8178b6645405f26522bbb6f29e9f78247fe52601f6c8f87f966a3b7aad130417d0f416b9d969e9e396c10eafc SHA512 e906c8f42ad4b9a7e20a82defe31b89194d72957f18dd5129ecc41a2a60a9d8b0d01abb9b44ecce79b65cd9064af4a4a4c9dd695f98152e77908f130dc3f9677
DIST tests-2.5.3.tar.gz 223579 BLAKE2B 89a7fda3726d9923388675f34fe40a6a597901b2ab6c90a345b89d4ba00660e6a7533c4752fc4fe6f77344594a322c17eb43866028c26d005ce44cf12c11c355 SHA512 f6a58407f172385e9955b21b7fffeb510f852bd055ada4869547e396856c7df01b8414a51de6bc8530b29d8ca0fa7e74a8e35aa7bc88fe1e15bda7035a5fadd1
EBUILD task-2.5.1-r2.ebuild 1166 BLAKE2B 726572a3998040ea2b48f50aeabcfce2c7ce4538c99c9b1fe4d960fb1f0d76e6804a8625a618d54c9c1df643fcc878d56563202524cdda4c70c2de32c37a2840 SHA512 a7785cb3b81097e69ac3fafbd7586069f35c305b6ae6e29ac75b57d9e896d66e6c7099948df7985560bd0f509425351f6240862716f54413b4846057bc703015
-EBUILD task-2.5.3.ebuild 1371 BLAKE2B b22ef6dcef1c571d1d7f750cadf40a2ece291b5856540f57ca4e85b5ac99ca065638d01e4dcfa94c1d191404dc4c34b5001b884751a8e5805141909716df197d SHA512 803c3e8e17e4b82bb91adbabc2be903ab360799fc7aee563e56924a060000e8bba862cefc5aaa071cbdbde14f7bf6bf97706dd307edbb0460d3b389a851e61e4
+EBUILD task-2.5.3.ebuild 1370 BLAKE2B 7d7fa17a1f737ee694204dd747b2a56e1591c73d01eea993fedfd776f6dbeda57bcb614a77ae948352729c32f869dd41a0fd35c3de016eb402e76a4d206a44e1 SHA512 8784c08b9607493e10f04bb2698fa1041f9e256d1fc726e022f8858931ea8cdad31cfa45d9a9dff2e690225dfcca0b4299fde84d18af58fc681c37b25d4911e7
MISC metadata.xml 465 BLAKE2B c3932c8c436b15c3222e07e7102364c30008fb2b36354f3da1d0ec5c8a9cb29a992a39ae9e329404166c1f7220ef29d5ffed1e10401a84782b79773072add441 SHA512 16416c5221952dbcc52b47312b9277d6e6230e1686816fb3c56db6dfd576459f39ded1e2eec7d43a14956373a090b7fcbb045fe285c49a65a0e0339ff6e789cc
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/Manifest b/app-text/asciidoc/Manifest
index 02029ab66cb2..2b3eec7a7a84 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -2,6 +2,6 @@ DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c3
DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089
DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
EBUILD asciidoc-9.0.2-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
-EBUILD asciidoc-9.0.4-r1.ebuild 2328 BLAKE2B d588dbbc01d45a302006b51840ae5c9d1a741e8121a594cb9911af8e4b24933fddf091e6d50fd63ea9e66654d868dc1a7745a6a629c76a036dfbd0f7917c4810 SHA512 ba4fe05a83d22dad37d7bbf875a76150798fe7da9bf48229bb0279ad182b986008c52fb753fedbc6d97c49fd570fc1dabd31a8890d3b7d2ee470c4911f82d52d
+EBUILD asciidoc-9.0.4-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
EBUILD asciidoc-9.0.5-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
MISC metadata.xml 465 BLAKE2B 7add2c9dc126e1538251b0ba0001a624d7ddb9406adc5151d8388d7a8549e2968fc5a02219f79e63ac1577c4ee55cda9b4ebdfa138eb9d6142375943d8da0e39 SHA512 986aa9ed2b95d5d5a61bfea9aecd3c4371ba76a1a6e9cfe8833b7cdef449527dcde14879565f0302d55533501e082c2f1d4734004218299061bcd87b7adbc8a7
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/Manifest b/app-text/barcode/Manifest
index 73448d25d6d9..4e81086eb3d6 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,4 +1,5 @@
AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735bba98a7445160ba5f7ff368f0befa2332e423f31732ea27a104b3f5f7db0fa8a954d465116a38fd445cd1ebc1209242 SHA512 1cacd446234f9b0d841803f3627a7b0775da22cc74fcf09ee45ee95317ed6816bc545e61555707f7c7a5cee743b33b241088182b01d6cdcd49e047f050d29c68
+AUX barcode-0.99-install-static-lib.patch 331 BLAKE2B 72b6a5a31ce3c450587ae7603f802bdd9e8c467f9095538fb819f2742703be1abe749af7faf340f908ee8e5979277f7fc65cc8230685f060253c08e31a5641f8 SHA512 2033f6edcdf98efcb17296845be76d1c2cfc3504fcee965d68536e209f949d26d6ef2326858fe673492e36a5c3aebd14eb3e0ef96355ca43d25a23f19b612d01
DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
-EBUILD barcode-0.99.ebuild 629 BLAKE2B a3795836c93717f841a18ffb16e362b3a7d9b97f312476c70684c525e7f482b580fb357a76ed9291341730a36ffac9687abbed2fbc67406c0e27f51a4fc6355e SHA512 9833f89fa9197e0f4031979000a9c9993e41e322c8e8642d6452ee3b8858050b48db02d3b64f7d5cdcb944046a42133e27fe54ebc78cfd997bf330cfc213d87c
+EBUILD barcode-0.99-r1.ebuild 720 BLAKE2B 448c0d1acba6731d26bb8734937a491604b6befcb16c3c26f9443aff1e51ff83126de45a2386d4654f601409faa3a5bb6ed09db8f9f7d0717d563765184c16e4 SHA512 544c3edbf21c639e980961814d71ae9167e452e320d0d081b4b359ae9b8c3868c9d13495dbcb9aee36d8bcb57a9fa41480e5505af3e418fe882c4f2779ea9510
MISC metadata.xml 243 BLAKE2B c7e8ffa98061b37b0107cea12e59f7779ed014b1b83b008c1f8baa888fca120d4ba508078f2182c27c1bff0e8c2dea07bf3b33a3b086fdfbd7421cbf57b2494c SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f
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/Manifest b/app-text/jabref/Manifest
index efda90d75bcd..181258215af9 100644
--- a/app-text/jabref/Manifest
+++ b/app-text/jabref/Manifest
@@ -1,3 +1,3 @@
DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r4.ebuild 1839 BLAKE2B 14f139884a63130ffdf59ee41f8640117ab925a39058c6ec80d515d7e8deb8379da387baa50023a08e218888811f1fb89ee9bb840cfdba2a0021b8a09da83f4e SHA512 53df22685ae2fe8a572f87ddb0bb1b953438bb05d2a8fe6ad1a64a97037348819309d55e3d532eea61fbba5c58470e732a68005fc5eaba435d90b55f89b0898f
+EBUILD jabref-2.10-r5.ebuild 1844 BLAKE2B 0e76e8392a4ceea776949ea002f8ba818ba038c4978c8e7e0c66b0a460e515c14a5972be28f92ed86634ea404701a2ce76faee015032fae85a83ba95b20861cb SHA512 c9454d62e0c8549eeded61ff5185c08ccbcb003833a146954580e78817e147c36729ebc96abb2291ea6f21798ae19a67543e6ff5a9967ea739372c5816601389
MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
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/Manifest b/dev-cpp/eigen/Manifest
index 42654ad4c431..9ddb505acd3e 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -4,5 +4,5 @@ AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f
DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0f3e7c853e0ab38cf904608ddd4485cc4e15eb0cd5e3c401276f270f3c86f538f205cc91b8c83e131d1bc916d SHA512 16244cc89f2e1879543232b965cbf653b3ccf10e967c8c437a41e27d8320392bdf584d8c24b8a97406ab7d1481d5154da74e0702ec1334ae6a46de83f4573a46
EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B 8ac30181d5c64ecb1a5ba47d386b00962e772319dfaeb393deb1c0d742a8c4721b4ea57de43ee79c754634872b455e0ae6a086617b46b4ca9bf19b9ff038a20e SHA512 02b5f22b042d817b9d4729bc13bea27b54683508db23d22ae0215003f49a7b9f70069e92911f9e4e40d5f71ac847035cc89843f426b7dcfca214e1e4cd3034eb
-EBUILD eigen-3.3.9.ebuild 2499 BLAKE2B 3b9577b804ab4059a94f5fd2fdf0f55fa094d570bc998ea41feb3e0ab3ec3014492b78466e0602d4b9be448b3c82c243b41bfd635f62fe2b0f53bf16fa055e8e SHA512 68b000a435dc937d09d21c6ef3528b561548f7f4903cf902bf32c9c116fdec53ae12bd504b552e39244b06cf1d08d419d4ba07b767a40e4abcbcebd808676585
+EBUILD eigen-3.3.9.ebuild 2497 BLAKE2B 983f9090b61665b9bc93dd0f9ffcfe9328383900232364bfbb664ed07941da961a47d4e0dd37135f37f2507f509b1c7f3aee68bd0377bb876869ee1a9374e1a6 SHA512 2cbd455d306813dd0e35ccab44ea4ecbb035a1f666e0a489be5a23cc852d4f1d7bc2f08ab4d11e0c2231d307991e7e8cb4e64f065de1948a806a013469cf6648
MISC metadata.xml 886 BLAKE2B 650db5b70b6440feb58275f3c949a9b191121798f47baba77e10e53f176470084136fc880914a7cce29d7424472f1f0116a81e33ab7eb25541e1fa549a9aa362 SHA512 32adfdc1a0501b1926b027d729c2c204d8b84c00623ff250bd8b66877371f812a966aed20efc71b5bf47c3fcfe5249f68a4ef0fb3ab2422eec9c8e7f6af341ca
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/Manifest b/dev-go/godep/Manifest
index 7ac2f1a9adbc..dd040cac8b23 100644
--- a/dev-go/godep/Manifest
+++ b/dev-go/godep/Manifest
@@ -1,4 +1,4 @@
DIST godep-74.tar.gz 71366 BLAKE2B ce16803fd0bbc7a28de2957b47faf1b88461387a240628d87346f8a64ef19ba2cb4d61fd3a37a990a4c99fb42a2583379ff015163da307ff08f1e3d4ce3f85dd SHA512 c131fd72cd6d6f3d3603c8698a9c4213c6402956488bcf169a846a87607f46c6e94184a6c5c3d4fc04110231a0954e0024c3008577d3ede7aa0825460f430add
EBUILD godep-74.ebuild 641 BLAKE2B 8b7f18f6e76b4aa7f3574c1051b15ac91f642fb59c4ead889edbd3f73e06a9a8504e225872a81f404bee6f67a50cb8d921fb6b4b4dc92c5061643169ae5eef31 SHA512 ad962744146b79afdf530b05a79d33ee32f5c8ed66872030a2e32b1de964fedf4f18a45fbb8edf0d79e1fd73ec0a8c5373e59cafdb8b1f1124350e57586beb19
EBUILD godep-9999.ebuild 641 BLAKE2B 8b7f18f6e76b4aa7f3574c1051b15ac91f642fb59c4ead889edbd3f73e06a9a8504e225872a81f404bee6f67a50cb8d921fb6b4b4dc92c5061643169ae5eef31 SHA512 ad962744146b79afdf530b05a79d33ee32f5c8ed66872030a2e32b1de964fedf4f18a45fbb8edf0d79e1fd73ec0a8c5373e59cafdb8b1f1124350e57586beb19
-MISC metadata.xml 302 BLAKE2B cb6ef837f068d07c8192621f112078a1956b78500949ab03f5e925ae874845f34a737bf25ac8a5ecb95ef7bb9455a698fd6943e1b4d21e65c1b5764e2ca35349 SHA512 e30920abb10249687e6eaf2327e3a32d70f351558d0d8d7f0844b74c32601f90312ef56d1c471653f43132884ac1ef5092838b41cd09a2137912220ba75b930d
+MISC metadata.xml 248 BLAKE2B f9efa1c45294d6c14c0e896cd0b75ddcba4ad9f7d1bd6f16a8d543a2cd6c9f21273e08e249623310948f716b7329be3e2fa57363edf3b64bbb41e188ab478987 SHA512 60b85cc1ee2d70e66e24f11ba8958ff490ccee543572cbf35f5799841e05abcab37ae64a35e5a9efe3f1501a586284e19a4451fbf58d5f0d55d88ac5f0e0362a
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/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 47dfc2729ce9..95139d30f00d 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -10,7 +10,7 @@ DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6
DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
EBUILD ant-eclipse-ecj-4.13.ebuild 1252 BLAKE2B 697a4bfae3f28eda5f91137c1f31198c64f530374218f1b69f2ec3dadc04fd085583f950ef852c410abd0688355c31c5cf715a359ceaf8b2f2422d03c00535dc SHA512 3f6897bc51f8c1b641dee6c7735a38b4d00903d8920c2112f863b185f62fcb67a79a1feedcd09bd103cf9f3d58bfd818f10d3043f862f775df9643b9d01757e8
-EBUILD ant-eclipse-ecj-4.15.ebuild 1252 BLAKE2B de96e1f93f2992a3c9052413e0f87d708ccaeddf1a92f5fa1e9bc8113fe4af43f182e258e92e17fff1b8950dd16f7353896a25c3a46118d686ff26c7fe184971 SHA512 723278db7ebc5c3b812923cfd71e1db9526ad3f05dcfa840d9dba27696b271771f63496e9d67206ee644267853ffa7f9f77980053bbd0a46b00e99de55d3b491
+EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 08dc9cfa8f20c917346ce4bc50492bfde4391107c3748184aae7f91aeb364b0fa3623ff41d69582694c7818562e791566e85c9a6387322f007a659c19592b29c SHA512 718a7717a2cc2762c9220db8da478cb3b96194936ee4dc8b359f843fff768813aec83a482cb651cb7245fc0cb9175ef34ec753811bf83a2f1bfec6b99972e34f
EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
MISC metadata.xml 546 BLAKE2B 1d3e6201cf0f0e87bf1ede2db78c4c706d9a59df9321a0820a9d180c7da9736c4af6a3442c1abf175e45969447ef9c8e0a0f8d73ce50985405c445f14c694903 SHA512 999312c6cfed7b52584e3e80ac1a9f5b372a05b1f6523f859b367080e7989c988e2773fd2b0f5ec5fb11da42386e37dffedf761324a41b43c309b3ab5a57fd36
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/Manifest b/dev-java/antlr/Manifest
index 04140315f67e..271f24335c11 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,5 +1,5 @@
AUX 3.2-java-8.patch 1318 BLAKE2B f7cf19e6da346c50ed066782905fffeac9b9f42c9988bc3ba0d18bc434fecfaa6d4ad3e74d2c84c87854716435be4a596c47b919ce42b310e48dc70d184bc7f5 SHA512 70c9dc23ec64ba75bfcfc0597544b13c2c35c523c6f2c9d82dbc54a44c30a5432a56b6193db74ca9c3d92235bdadc5427857c364abc4df79ffdc1d2b55221d32
-AUX 3.2-test-fixes.patch 10278 BLAKE2B 868e9dc24f26b9933fe169f93b9156b3965473da7e636058ac630455b4f9347f465f86151681ee9734bcf1e435345abb033fbfb7cfbd845d6d41b423ae6478e0 SHA512 b593da8fb05d8ac51b0fd72172b740aeae060bd18c58413c67ff0c5242609b419d4a1b0a4f5ae66d5a3b2103007d4511ece41da6b09dab5f12ffd5f905d45d31
+AUX 3.2-test-fixes.patch 10294 BLAKE2B e2bed0bc4acd8c7de9eacfa6755f81db2cab78fb20518a51051d5a38fb33e25442e5e39ced3a94b525f3dcb5d0bad4c640c3df9da5b431efdf6d76764b11c5bd SHA512 0af15f7e315182f54c65ebcd298ebc02d6715f2233996d0effe7f44eb433e73ed7a33ee12e96d29f72b4437cead864c99150fee60c3c1740b6451619396be72b
AUX 3.5.2-test-fixes.patch 2093 BLAKE2B 4016d770a226f1fb86f7f6e630df38c0d2ed0b4a025991f6b88e88506d2a44838c17097fc4ad5f63e506a839ebce0fcfa8e57f22415f777b0bd4c37afc93a0b1 SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533
DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
DIST antlr-3.2.jar 1928009 BLAKE2B 9c56b0142abdb7d0caabebbae12618a665f91001e2f472519549a65b8601b81fcca485898c7420087a7b631351eb26e4b98589d7284960efcc3c65155919fd2a SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6
@@ -11,8 +11,8 @@ DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55
DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
-EBUILD antlr-2.7.7-r8.ebuild 1087 BLAKE2B c6bdc1f7d552392aa67ef176906a1166015198d5fd2ae67c1c323d664f3313d7333e8669a2b5f354953b7618045a1bd6d9a5dc733c393dcba00732b5745c6852 SHA512 01d07904b06d66fe88467846734466ff8510c0e3c6bec84d03f52ce9db38bbc2e761157ccb5480a59647da4605b6093673c0d71ce0d9290fc545a2251db37b5f
-EBUILD antlr-3.2.ebuild 3258 BLAKE2B d5421808caca91f7b1d15a304c0f37fa6a4216920cf0aef7c66df36a5b622144f23db838cdd7b248037bd45864847368d2b921157fe340b571237df4805b0011 SHA512 63234889e423852a17067dcf253ba63f70443de7e0df4be6dddc423f5035aa582796ecd32906ef4e9421bebfa6c0b419bcfcbe125643715eaf3004f25066f7d0
+EBUILD antlr-2.7.7-r9.ebuild 1126 BLAKE2B d39a0e5d9d46d345dd23ce49cf44c1f40bb1a8c2929dfe98acb0265fb24c06466ead638cfc004999bd60b4a163439846a589062dcc2d1a829b8b7b14ac82c09e SHA512 6af7b69db4a2eab58bdc2ec16872b67e76027c40bfb8d13426c2036d4a788ebc3ce0599dd2bc84f12535325a9c0c68f4ab606dc8a5b2c0412ec3f5f8f78d1f24
+EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
EBUILD antlr-4.5.3.ebuild 2511 BLAKE2B d1e36cee6e8d101a265a337071c19020528f42a70976b554f2eecf8ec7200ab020e2d971fcc2f0bdcba0be0b4d96f738face2492df498ddf6012aec56a2f4c69 SHA512 ce63e0a89420501f9a7580c409fd30d5714d49ab18cc5f04ecbdba569f9b73307878f3617151146b0c099584eb142166c485dfb4ba24980c78a6ed453a6e4d19
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/Manifest b/dev-java/avalon-framework/Manifest
index 33658be88b83..57a9c51602a3 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,4 +1,4 @@
AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.2.0-r2.ebuild 980 BLAKE2B f370e2378c75139af859c0095ec886fa35053651b2425e684a788b69fdf4befb38d55bbf52c3e211fb526cc0b7bda87a5335e43a27baf04d17ab307f0e816c20 SHA512 00d74942a47021077d7bbc7a6175e68d0dc2e9e7e5f16f1f219edc7fdecb650c96367ac8081ed9ee24cd50e39c0dd5b4a6bd20362b3e7d5964f7ed4c162781c6
+EBUILD avalon-framework-4.2.0-r2.ebuild 979 BLAKE2B 0167018c458b2611ac2ae2b8fb3aab70791126fa5a7dbfc0bc6e485e119aeb1bd50c52d14d457eb34375b0f711fdbe7588fa81dc57b0fef29e7f5d4b9774be24 SHA512 a95563add2e7484edf89c8b2a82ed477dddb35a746ece4e14f26d2dc9a23ae60c146ac1abcd145192139500c22206223286866ca73b39c32bb354d961a79a3d4
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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/Manifest b/dev-java/avalon-logkit/Manifest
index 51c09a157b30..cc400b441ebe 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,4 +1,4 @@
AUX avalon-logkit-2.1-java7.patch 1155 BLAKE2B 8e5a7756fed565d23cb7d9265171ad7c42c7c1a1f1f81284461aaad1d85718d77a7767f51d8e5cc7a3724c2a0b15dabc541d1c6c8fbfad670fe56765ac3beda4 SHA512 155bd7d65a2eb59528067605f1c40b1f176228af2fbc11f6560ad929cf5344d74ba79bbd58c7cb35b6065c74ec4e579cea590c0cc23082979d79cd70ce8414e7
DIST avalon-logkit-2.1-src.tar.gz 60218 BLAKE2B 1c35b38a22d95cffabb19e099d42697adf7aa6ad471f6cb62e02a30b6612c8405b9f7473ca61ea4f7f9c1f3b1ece6ee68f7ec711b79672330db3ac9e57642e0d SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a
-EBUILD avalon-logkit-2.1-r9.ebuild 1441 BLAKE2B 3bed0691e2f5c4129665612733dde3d231fbfb0f4a09b3ba858cfc80a75e9a35d4b134f1b3c41240ce0205811febbc36ae75648c1af8dae7bed83714315eccbe SHA512 bca49c8f24d197aa35f90636967572d9b398f6dedabe42f99882240de3cb7583b4c3f21cb17677211b8cad6589be7027bd096f1f5de132a230e28c031ed73ae1
+EBUILD avalon-logkit-2.1-r9.ebuild 1440 BLAKE2B 0e757ab22e27ef536cc65e00326d6ff11f070e56fe9805d2d0315945c0c86aa2e27453fd461cf18fa36053b4e552eca4934658b07862f15a883c13a1a6b9a65d SHA512 6af94ed631c817a3db09535925542a4049fafbf4a2cf7dad13fe7473c1e7777c2ab3197fc3cfbeb4b760e52e3f43759dc23fca47fa7fb50b9dd521a2000c0052
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
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/Manifest b/dev-java/commons-codec/Manifest
index 966c1a4e1537..fcb5a7ac27a4 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -1,5 +1,5 @@
DIST commons-codec-1.15.tar.gz 423639 BLAKE2B 5d9d3dd44fda7eee77048eaa1e28f54f9baff7ad276f7e718f4a4d6c5b26605914809db538e9832bf06b1468a65432645ef9de74aec9f9af9973668a82bd996f SHA512 dcf0b86f269a96362dca5b36b9e764a07e390634804b359d4dbd1a0c50bfcc9f778e3797f196e1f553d76dd25b3c6fd016f0ffbbca856fa6c88d3d55791889ce
DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
-EBUILD commons-codec-1.15.ebuild 1366 BLAKE2B 7f328f5350f34e72c335c80bf085075583ab9be7d4277843f2a6823222ec4a01bcf328ee0a69051eda798d9739b5bdeb08ff75fac3ad430eeb6dfddec7b3e0a0 SHA512 4cb0130a3208d1aacc77e7e5ba8ce15f63ae4261a55e42bc6a70fafae6f4ca82431bcb9d8be7fec1743efec935acaf045bb14859b33fea7b0c3d185e6fe52e8f
+EBUILD commons-codec-1.15.ebuild 1364 BLAKE2B c672f1bd6d6ef10613ce90e077d50956f1a253aaabebbcb51e8d9315f04459db6b8262ceee4c4cd8daadd0b3ebb2ee08f661ed0a88c1cfb9f4554fe694700273 SHA512 e12d1b08bb1aaa5d17d5ab3193f8453ad57f1a7439766fc7d9ac24e894f1ff310c3b93e6ce4918519d85804cad25f822dc984aa4535da84970aed9c1be37c6fe
EBUILD commons-codec-1.7.ebuild 908 BLAKE2B 54d95f6e45fb34815077188bd9ba7b0370d565ab9a2175715e8e90f2b0d3fffcdb4d0fbe547b68bea1e70e996716bf7187dd06dc6510e5873b0a1309aaa08ec5 SHA512 8f0fd884b856b8c1796fcb6c905b70869fee94d753f442f94531045fa39f4f32ff30dc9aadbdba24135139b59c9bc6e5b6d618b335563149e22e7ee05d6e6c8e
MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
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/Manifest b/dev-java/commons-collections/Manifest
index 752215c4e0b6..0f7922e30b0c 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -2,6 +2,6 @@ AUX commons-collections-3.2.2-fixes.patch 9913 BLAKE2B 0582b3c2e06275ddc75fdaf05
DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
EBUILD commons-collections-3.2.2.ebuild 1378 BLAKE2B ca87bc67d684eae78f9816803456c1ef52cc0d3571514dba7cf2d8017f9ce72bddd35a0de681b4c33b0db1bb9e37f3e5a85cc4620819c8bcd98a70f308fc38a0 SHA512 ba6ec8a82736e39dfd41681e87e6587edd163be81ea5f80b56a37e529b7d681292627a308373ac8d2330bfd69206dd54fe1c04c34b4e63cd6255bef712042d2b
-EBUILD commons-collections-4.1-r1.ebuild 1268 BLAKE2B f8a19d20e4ebd7bfe8737a232a94a7f82cb05582fac81ea1c70f96447c75b7e81a49f9a754afe0a93dcd2ded7a8a326f0dc557a76740f76be75b60f23e3df3bd SHA512 042273da5131d6a8ce76fbd70247a2e2767aae2a4384b902d9555928905b9e66bd5e88703f12e33ab01200ed39d82ffabaeda83d3938a25ed0e57741788e75b4
+EBUILD commons-collections-4.1-r1.ebuild 1267 BLAKE2B 9183580e99a30c85c61ad045bde305a5e43ede963c38aa0b33bb7ab052e240291845a3ebdbc9553228ff58d5432122879ebd7b6f4af2e9a2c05666061c85adcd SHA512 2218be50d5e2d00e1a2c1783d46b9ac159c7f72dabffa506d50df8f0ed4e669a908544fb7afaa4b0404867cf931cea14960ce7cc28a769afe6a2c736e71307bf
EBUILD commons-collections-4.1.ebuild 1261 BLAKE2B f307b979f9614cefe6d4f5eea916abb9591b277f16118b6cdc76a9425eda268845f8cc7860f990d0007449b9ca5d19fbeaf560569a814ace95f79297bfce5f40 SHA512 ef8287e70b9d9995365f24db5f98232207e21c05726eaf27cdd223dc1da52c154addbd0c2bd7bb1f79b2c79a5d90748fa7c2af3ff9e236dc0d1664f5e4039a99
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
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/Manifest b/dev-java/commons-io/Manifest
index a48999714011..8ae9da05992c 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
DIST commons-io-2.8.0-sources.tar.gz 445833 BLAKE2B 4fc6f9b66fa88adfc110742bd3eab55cbe165552f71d665f70fd54d4b0b79c4e76b45fccdb78c6ef64e476f54efc8b51adc9b2d7e880c71dbdb6bc5883d2fe55 SHA512 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d
-EBUILD commons-io-2.8.0.ebuild 1032 BLAKE2B db544b790131b095e00e2966a7633a949e71f32d75545e02491bd0bf59e9ee7a49854dc6d98422167b02fe62d45a84ceff51970c53f62ff40e5f08316d410777 SHA512 a4b5f9b49eb8729afee00b0b29eeb14b5bc15f0f0ffd28da7241fa44335070d0ce7a078159dfdd69553710e82ada47ed947ff71f616dd25913fe01fc9c34cdf6
+EBUILD commons-io-2.8.0.ebuild 1031 BLAKE2B eed3f1516b0a4b9382ee69b133363be093018abf28ef84c056f725e904ca78eeac9902aa51210e0ca8ed46dbd11cbe0638d2ef8c6be80dacc938eb4e2f5a8f21 SHA512 7dbaecd92f51898e047efe48fd47c013d6a96ace64f5921307eb0caaff1182c719c5f268a77da1bb09769535e0fbd03ec098bf10900fce1929893f5e46e82a01
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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/Manifest b/dev-java/commons-lang/Manifest
index f7eb90f4bfec..68de7893ecac 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -6,6 +6,6 @@ DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d88
EBUILD commons-lang-2.0-r3.ebuild 839 BLAKE2B 0d2d338ce391a152b73127792904096a744f18aa0ab5cf426bf8e48226a13924de745e43c91866db7e7b5a70cf558285654e2fb4efcac352b9faa323bcf65d9f SHA512 c8f1172157f4ecc2c2b44443a4c9fe14d824164869692b6e3d52684d17792f19c125b23bbebf5b5ab67d4a4e2718f629d9d5600ad98663e024040f0246acc41d
EBUILD commons-lang-2.6-r1.ebuild 869 BLAKE2B 014e28d08de2cd8bd5ca9dd2d5492566f14864a00ac86cf4e262953396a74aef22882704c2c136c23070758bc5d832a0986c478e1fc0f141b9e4f5727841ebc5 SHA512 6575b1287b05a662f34d80bba40fad7b75f357331f4723900c0e2a5c6294a308acccb2664d9ce0dec0bec87fc0c819efb31f667dc242c22cc18ce508bee5388f
EBUILD commons-lang-3.1.ebuild 825 BLAKE2B 828fefecb0daecd2c0dee1da07be43d676a55e152ff630e967626fa74e6a58abd6918a6e558e8bf6120435c62b64956aa6e9c05fdd0c44917dbe0241ad4a33a4 SHA512 7d2158fabad2919520b3fe56c78c6b6fe584711fbb0a2f21335f785bc82f842ab947078c0c93a7e641918f3c6d8c0152c41e2f2e09d43524aee44afb5900915b
-EBUILD commons-lang-3.11-r1.ebuild 996 BLAKE2B 4d54b5a13578969627f1171a6e64ed6dd573250ad03bbbbdc601b3abc833b8634efc2aba5d50ff2ce9aaf29f0e767ecd0b81fae4fa4d9cd46fb7170f27e15133 SHA512 a67800e8302e5a413cae003d3c3d1bdb1db3ab28b41b250b1e842c43d7f478caf37f158cb5454366cdc0fb51913351da94ef131c060706de417069c9ac0921a2
+EBUILD commons-lang-3.11-r1.ebuild 995 BLAKE2B e7d5a76550e12ae7244590548884a19fa561939ae043319967bc3ac9725b8f3fb57a9f97a39701875c6a09006d86b1eaf66762794d256b949c454072f95d8e4b SHA512 2c13a50652cb260d42890780e74f72d7c5b3341444997ee10978bbea25d9060612876a25120e65a70eb6dfc0459b6fb3da9184017e36a38e6ad46aecd1cf3152
EBUILD commons-lang-3.12.0.ebuild 1040 BLAKE2B 776631cfa442dfe17533e1d65ac9b816837fd3bb6a5f19b82a61aa27c9349d52b90184fde0aa7241dd170fd04a3be0abac4e7cdbdde8dc1533f842c199b85514 SHA512 f1f56b70a2aad5f6f17723ffd0d04c70bdd4bb5b07eb682689d54442162ccc72908b52a3dddf4f7fe0d18d4d470d795fdf4432dae9d702734a967a6636f24ecc
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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/Manifest b/dev-java/commons-logging/Manifest
index 8f407747db70..41fb3ebd911a 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,5 +1,5 @@
AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r3.ebuild 2352 BLAKE2B ad555871569da38ea2a881bb9320d8d8611292d20e7e93c6724d5fc37d25ebb163b5038d64919a98d6224ca29c235cc3ac7ec13d07588f682ca5f1f4bb964b1a SHA512 4f61d2a39de676f9498444ca339ab833f02b311e9d7058b35b68a62fc0e2f1e6a6428d25d9fbf3ca9110f51375cf2959996d1f29d1c02a042d02493d65623e8c
+EBUILD commons-logging-1.2-r3.ebuild 2351 BLAKE2B 304d8ff9c8d4db50002257fc9584f02b8308c81137b04f20500c17b4762773e1f64ff85ba69b6d2f65730023bc296ca756b8160a423a2f1625e94cf4171c3370 SHA512 80065144f0cda04d4850d12b5e36412cbc96ce43214ed3d448e7fdf02f01ef41e30f311cc7f34de08f5bd3e94ff3d74b4b7931e069192187ef9332e7a41b5c1b
MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
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/Manifest b/dev-java/commons-math/Manifest
index 75cfbcf7c271..4c86292df88e 100644
--- a/dev-java/commons-math/Manifest
+++ b/dev-java/commons-math/Manifest
@@ -1,3 +1,3 @@
DIST commons-math3-3.6.1.jar 2514690 BLAKE2B ce5dc1a5bdccf85aa780dd648b64c0ed78b4d5a36d15d9737f661135f4f1ec962c3c44a0c4d8fc7d12c667e62b19860cb2a47f507c8c3e6da6cce57e1b9caf54 SHA512 eab6003834c0f1b7e67eee242d33db43f85d388ac32e37caa6bd16d74340db5c189ff5c7fd112ef13b9009d2fbcf2bad6650b6e5d9124316b59493b2d07d065d
-EBUILD commons-math-3.6.1-r1.ebuild 737 BLAKE2B 7356804ac820438617cd44edf4c4b2fb71355973277471b36eef8eac9f65807513e252f8f22bd66886ba4d5048938f1e1a1c1a970dec27baf461d9156613784a SHA512 373c0ed90b28d739005641a564fe6c07f0d5694ae11cadd6caacd87aa86145a2425c35c532643a913c87ba88f474bbd57fcf0bcc74304897bc70b3a2bf713fc2
+EBUILD commons-math-3.6.1-r1.ebuild 736 BLAKE2B ee236d80c075b8472ae2770b2c21b8d9910854ee6a6de20409f5c031c6bbbea88693fd3cadaf305f2d8488220b4b8f2bb9149e1c4b4699e9020e66f86c644b25 SHA512 ede63024c1a18b9ccacd1de71182d17a60eeccdeeab86adc28777fea29a61ef3f8c43bd8eaa5f78c7f83f51f518e7b5b6d54dbba95727236d10171327ec24bea
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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/Manifest b/dev-java/easymock/Manifest
index 5649fcf47000..75215a18801e 100644
--- a/dev-java/easymock/Manifest
+++ b/dev-java/easymock/Manifest
@@ -1,4 +1,4 @@
AUX 3.3.1-r1-no-android.patch 590 BLAKE2B 1fd2493bc0208516421c31adead309adfaad4b30a137739a082588f38b8d85933258718aca277f8f863f468c2775ec1c4ce107948b7d10cc8a4fc8b07cb47383 SHA512 ba9fcb6c5922869511f421b9f1c005c7656840762fac0d9aecf87b5db615dd181bae24d9ce491191c2a7ee8a863ebf14aaf42f94e40d40d8f2192ad4296ece7f
DIST easymock-3.3.1.tar.gz 624460 BLAKE2B bb5a472aef6c162d3afe5b66edef4891cc48fe6698c1f1eccc7f45f1883ff7f940b0479af5c0dd61b3354b41225ca50f191ba54b92479362a0074ddf3dbb5b43 SHA512 93fefd458a42b6c13d85ab1df768bf906620f052eea88116e93578374a5086eb8b27d8731e82b689dc3d73699e45d03b718c7d8bf2a430ac4a6a717365e52a9a
-EBUILD easymock-3.3.1-r1.ebuild 1478 BLAKE2B 917b09c220baf610511dddae5f5ed0deedcc788cafdf2184399eba177b2b7f825e306bdb9db9f4423b4f58b055a1de084120761900f9a78cd1d9431dc8248adf SHA512 a15f005149d48806f34e1452f43f116a00da270d0542552e911f685de99fab16a734504a044d3b23f15f8b0de631f4a2d8ff1409596055421670a34494aecf3f
+EBUILD easymock-3.3.1-r1.ebuild 1477 BLAKE2B 3992332702132fbbd04e689d08f95d00452ff56c2a24aa46ec5e6902269901131e0c89423915b4f145d4a2ebf285c834b7bba015617e594d8160ddfdd80ba48e SHA512 69263f2d9cd8956129a870a31ab35ce6ec782df5e56d596c6659c52a875574baf31fecbb0718d914b2102b06bb522d98ed5da75f35adb598f724ef9d4b07d970
MISC metadata.xml 486 BLAKE2B 90b0a999f8cf928fb74f6b80f15137fcbb4d3bf881f080dee4b424281d95ce0a342f41bf041cfa9d3e72624ca85849bbca1bf2aeebe317a8768951c20d1ab0b2 SHA512 3fc28642c63761d234abf049fa6e33e6548a381e9b15e10a71d1263e1b80e93b4fa773831e0021751ce9736282f50480e93f07aa4f5fc6da5e19c7875f78b3c7
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/Manifest b/dev-java/jackcess/Manifest
index a5860a3e6a36..ab9c20a5d4c1 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,4 +1,4 @@
AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
-EBUILD jackcess-4.0.0.ebuild 1991 BLAKE2B 6f6da81f52839c541ff9d1ca86f68de5c9241d9f5eea85010dbb254d6d0d156e2fa56076f49c18581a455708865a79bf7332649449e5e835ef3cae85922ab839 SHA512 daa520ced96db1166e128cf0fa04a730c61d8ca3abca66dd7d06d4e1633b2ce177fcdd95caf39d1176dfc607da179ea67e191653cb67fd01101e6de0f407ffe0
+EBUILD jackcess-4.0.0.ebuild 1989 BLAKE2B d433e8ae866e9f13c4da2b3c1a5912d2fb24870f6d01a15560cb7dc8b4148bf6d23a8d21cc3196b9938de7e3e548a361ac03b8a8476951d53bd934b3435e014d SHA512 3c95487efccef386b673fba6dbeb1edf0da21442df7b92ae93aa3bb9a2ff2df0c05d8198199ff98bf777658224c283f4665d01211c97f442c74c5da0ed3a102e
MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
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 a6ff52d18e91..631ada4b1358 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,8 +1,5 @@
-AUX jaxen-1.1.4_maven1-build.xml 13148 BLAKE2B c5f6421878e732db00b2d5daede8d93cdf1d349c1dfdbb6f83a607d734dc05f0847ce5f8cc86ec1a2be5855d96dfc1a3128c0811846f4a5c7679dd60ad730c12 SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42
-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
-EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
EBUILD jaxen-1.1.6-r2.ebuild 861 BLAKE2B 97da05063fd187441941327f16b6091c87559bf4b569f5a89caffae5b4d19e439901705272d2614747e89bcef84f27788155c903f26566aa9ad15eab33ba2698 SHA512 e5ccdf47ac5886a9f58d520a7cf587292c47f5adffdb668fcbc47eba8d3b2d70d2875561aa69dc6b6fad2bcda4a9db530bd47dc87a0fe72da644adaf5890d874
EBUILD jaxen-1.2.0-r1.ebuild 1913 BLAKE2B b25661c32fe81cfbbedc1cec06a8473c107c8b4e7b854df1d725e97b6211b34bdba4663398d155ce2d5549cba144f4ceddcc4e11d10f0afed2a4ba076f2c046a SHA512 91b9f4fbd7a2f80b6125cceaedb67097f122613143314f81e0b291717241fec783c230067aab717cd7b6ec124cd4a07dc4adf45d9ffe50ac5acbb53e5a7829f9
MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
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/Manifest b/dev-java/jdom/Manifest
index 3e8f9cb7e4c3..c314dc5b3213 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,6 +2,5 @@ AUX build-xml-2.patch 1528 BLAKE2B f9ba4714bfe2ad46019c71655128512c639b8dfb54f53
DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-2.0.6-r4.ebuild 1394 BLAKE2B 15121dd00dbe1b5b35ed9848d22bbd97483644869a0662712679cb6addb9d6f27f7914e93d0fc2548ababc37b865561ec92dcc420584fcb16139d6f8b4c444b4 SHA512 e5419858ca9241520c7906818e353f309a8ed9687075ed1c41c597e7e1c2a58570c248f612db420b66d19dfafbf88bd02250cb63f371523d3ce2f4e09d99f2b6
EBUILD jdom-2.0.6-r5.ebuild 1374 BLAKE2B e317fd9ddda54ad8b1302b2cbdb77b32b8a0be05b0644634b1a00605f5a3b97332735ac6f978d618ef66baca93b684fb357fd97e3f03e7f0ac208467e9513e44 SHA512 64fd4bdb5771f313e2e4a9a8054e092c9f21041fc2c3438e6dff319138533362473f891bfba4f30c6c4dc64db6bc39f6ab42a445a8679bc3d6c25645b62daf16
MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
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/Manifest b/dev-java/jflex/Manifest
index 5f356dd5e603..88ff58647ff1 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,5 +1,5 @@
AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1-r1.ebuild 3545 BLAKE2B 219107bfae4e1bc96e05cc7829ab67e59c343610244e62d5a65232ad711932582213f310b04c4685385c71074ce47fd8a0bb4f6ae2963ffd5a42a2c6211870d7 SHA512 1f429d17f63ce37116fbd0f5a36dfb48434b4bfe5b0a2eab5bd8026634a010b9e03ed87dd08ae91d16cd5c46d37b7f74993b44e8af19c07a3ec19e142ed7b558
+EBUILD jflex-1.6.1-r1.ebuild 3544 BLAKE2B 07454e651d891b2da9e4785575c6c31f65af2dbd13d3cc0c9f00f238f3a73040218ef666dc0cea8c7ee089d0ba90c4e190ca3112fcc87d00e85d0f117ae2dc07 SHA512 373529d569d7e4ad8db0d0a96da1f9aa64c536ffe23d5f22c6e9912f665bb23b59f13c3c7ee5db13e1e3125eb0227dc45de220e1c7e05722832b01c994c6ca02
EBUILD jflex-1.6.1.ebuild 3550 BLAKE2B 68ff187aaa48cefb2018bd12098d7f334859166d7dd03694613c9ec3cdc4050d93daffda51f2cf8f4d55546314c3f4a11cf3e5927e4df455a58a77d59b0263cd SHA512 92cba8225532e333f950dbf078c6c1b71404b044f058e4be1d0a66c10cc29c3b2cc4dd8d7875db5ad8636854cac4f0800b5b8c41694076a22bda334ab6dfe469
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
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 0f678f4c7cbd..8c1ec02c2a34 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,6 +1,3 @@
-AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
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
EBUILD joda-time-2.10.10-r1.ebuild 1955 BLAKE2B b122e651f5473fc5facd6ea265cbe6bf56363d26a2ad3c8b17890172e8a38d690f4b13ccb6a88e23457a0a0e4bf24985c42464758370fb705acb6dbcf4395bc2 SHA512 97600dbda51c1593abcd4a34faa18496ebbdd42db941a8f075506fc636d0caa8556081427f3ac6ca911884a69e9cea1529c737a5ef086851f3b4896b650069ee
-EBUILD joda-time-2.7-r1.ebuild 1907 BLAKE2B 3a7d17a4e108eee44161a1cfe148e799e3307fa18e86322626d8a825a7eea1f59c3c5cbaa9183e431a7619c487538507a68f98c22c67f4ea8ad6c178c5b5a58b SHA512 edbaa5dfbcafd27a1899d1759f4488dacb7b007e7f3061eb0ab4ff5eca0be8ba36df0b758d7fead35497e3cabaec91ba483ee656a6a59b4c92ba5cf5a50ac977
MISC metadata.xml 496 BLAKE2B 1305c141e2009564578f1028c915296d4a1d12c75b350bb2d37e3e5e4fba89631ed750c58944285a493b7b3590d76ba6b72cae1dd711e3a021226c5b1b6e6944 SHA512 b411a78e0160f6866682e6f5df59b9e06835250710182a66e5f4d1527f81820f88ac1a8d13e93021a05161b8b72587205404902db97afa2a239d1fe7bc8a84f6
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/Manifest b/dev-java/log4j/Manifest
index 974faf0e5574..39a962002db5 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,3 +1,3 @@
DIST log4j-1.2.17.tar.gz 2864448 BLAKE2B 233763dbe53f92b5408d3e278b291dff8a7d74657f367ec8b7c7ae1e685ddc0170783c8a5e4b48ec2590b6dda13f45e91bd66066f2c6b515e5d692caca31660b SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8
-EBUILD log4j-1.2.17-r3.ebuild 1444 BLAKE2B 4a054c942e2aeef1e869c8e1344485ebeeb0836db214dff9887c5f8027036cd6c733c4a4dbacc04b875d283b0bb8c7b08d78d792a7d8bab09c494ebcaae70721 SHA512 00fd7c4612b730b6ee5fe8561222985a39e6125f18aaf30ffe1f75b648816e53989036b62d59ab8c4ce85585608ea398162aec8eab6cbbcb9b74c4a93ef56a3d
+EBUILD log4j-1.2.17-r3.ebuild 1443 BLAKE2B 86775c41449ff2536ae73fd2c937654d2f08bc3cfab29d359bc91d3981e7e54037053a2a1c3cf6778c13e20da6d07029d58b82c59d196cf52426c077a30a26fc SHA512 818202c1ac5c3e8541a8df20089fb952ce85ab60b82b111025ccc15e34c16a8fecc74604fc3a65e566597accb5cba3432e75bac9a5c9325b5d4258440e0a4133
MISC metadata.xml 365 BLAKE2B c7d4eddda426c4ba6e5749a60c60c1ec3a169e545e119b4987703c13bbbea8fb59ea52055c1dad743b0374a13b32869fb39ee846e5fad2237cd11426b612f69e SHA512 0a4edf2fd6a980baad45c3282db2f991b7c806d8a36a06bed355a4491472b58e0e79f96c5dd2210d0ea51f5f4e83731165345c21b0b439bb2a36584b543b18a7
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/Manifest b/dev-java/objenesis-test/Manifest
index 8f1870667b22..69e465cc2656 100644
--- a/dev-java/objenesis-test/Manifest
+++ b/dev-java/objenesis-test/Manifest
@@ -1,3 +1,3 @@
DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-test-3.2.ebuild 871 BLAKE2B 07f8bf1132db0ea5c4a6029db31a09858e16b0b9d4b94caf4cb955b0337f8d79e101f50d2a9b6c7288210b4dca24307551afdb9c144ae30e062d56d1deb41357 SHA512 554f86111bdc3ca361e267b1028efb0672ad82045fc30b6b251a9c4445bcea8b7fb5875ebddbb6cca2a1ab8c594b4b99e981d03642ea409469c11087a47ddf40
+EBUILD objenesis-test-3.2.ebuild 870 BLAKE2B c54276ad677b993b8d0ffd7287a67f3aef784b19098ed396748a5ed4dec4bac0530b3cdc591c1bcd1f224e2e0b9574014ce0d1e3ff878dd7e3f542da5aad3ad9 SHA512 e19f19b8b82bbc40a271630f93ca39ac26aa6df1362684ae1ac7698ae45dcebba32e3aca7d595bcb7c9e37219a78d34de999106ff99bcc69775b8f581fcb357b
MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
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/Manifest b/dev-java/objenesis/Manifest
index 2f66dbc0fa3a..401136d07386 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,3 @@
DIST objenesis-3.2.tar.gz 123629 BLAKE2B d875224d7a9fcf6173787edaca35f58f72d6c85ee443831be8050170ba826e8a155c7983c62ef5d01a1bb8331943dd6da5cb50eefb87cc0c7d3db540b01fcac3 SHA512 8f0bf9449191bce1823be0cbae85438edf595bde0483bb2fb4415a880b6715ae60826473bd5ee15789a7d0638932878dbdaaf7b42a6d582aa7bbf09124e97e3b
-EBUILD objenesis-3.2.ebuild 1214 BLAKE2B fa8ce944f4e5af256cc4a66791a5d1863184f3c794e698ebf3554e438156df12cac745de878c52510d729babeb7f062194a5fe559979a8f2da1e6a9918233159 SHA512 f5b19271aed8002d501b467f4234b5eb69cfb627f08c9ef818197a9532141bac8032d0eccdea1fa966f0e2672b7a2f0c636e0b33f503427c3b696ce70189cf34
+EBUILD objenesis-3.2.ebuild 1213 BLAKE2B 027f06e2a9302ee45c21d10ea59841587f6c54af015e21873339bf8dc6bf982da87be0f3da92f1b90ccc09ef5c959c05bc2ab4af5a0443c419aa529b762c7a15 SHA512 acad4c6c0b79bfd9020ce7fe3540c93c4516999691907724c54ac59c1b1508d56f95030fa8fa832e2299410dcdac463ebb880871826946e865cf6e8f943bce70
MISC metadata.xml 385 BLAKE2B 21b4ff5cdc9b66726d00f32aec998bd89bff2a75929eb15bed2aa688bfe1a04ac5a5df209ad2e732c0b168f0af0124fa7e74512721222a94fe5d155bd8a48d4c SHA512 51de98336149b818cfd1ba47b9a7ee5d09cba8669273f673db5491aa1d9e9b675cbcabae43a4bb4061ca2654f03ff998d01480b71e741ebe7cdaead2f786710a
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/Manifest b/dev-java/oracle-javamail/Manifest
index 312ca54c2d19..ae048af98e69 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,3 +1,3 @@
DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.6-r1.ebuild 1316 BLAKE2B a7165622d773eac307a5ca900b53c68473c6ffee19c3bfd13b6de77fa79986ac87fd162dcb802b624eb571c8f1ebdc338086db53901b6dc9062fa5ded2f20748 SHA512 673ea0ccecdbae8e2bb424f0b59f7d64af22f6cb5f624d2cd78e10f1c732e3971e0621cc9189ff98a565f9634a292ed612186c35bfcb05d14daf49a15ba3ef3c
+EBUILD oracle-javamail-1.5.6-r1.ebuild 1315 BLAKE2B 25b78259ed0a8c7c65ee5dbdeb36b1965b18cc301d40c34bafda6a5f8c62fb96647fec6a367ccae1e7c1eeea2c679c15c73428b68544ad2e101afaf8852f2993 SHA512 f774febcdc5cea9ecb01af6ead62830aceaa99f38637276f52b39715ae36e08400910e96c6d24f69770c11f0829b2f387e6bef2d9ce2db9f22b88610433a6fa6
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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/Manifest b/dev-java/poi/Manifest
index b7bce3541a3a..6c3bf2896024 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,3 +1,3 @@
DIST poi-5.0.0.tar.gz 111429369 BLAKE2B b29e754fb709d01ff4d68e9227f4c4739384bd02934b6860e8a0e96552d9e9ff1c5c665bc0b701f79226505fd98373fe6ad160c72735903eae388f0cd6618337 SHA512 e79d15b42d8ec389fd15b7714faf7b49b9fb4d57014cb341fff0f061393f4ea7dfcbd3810a6ec19539eabddbb1d0690aa56de4a1a412d05a527e11797047023a
-EBUILD poi-5.0.0.ebuild 1949 BLAKE2B b790be051164b89b6c3ecb5f9e18d990a13eb486411eb93a5b144d96193fb1f60d5c67edc262de6ee5ef5040599290ca1b62782a098257b420ad466044b54439 SHA512 9963fa265073c4179c1937e7073a8994693a10005d987c38d0d2ccb7c84186baba5ccad10c0a16cf9ce32fca4fb694b994f19b44f6dfaae33b29bf679e36df46
+EBUILD poi-5.0.0.ebuild 1947 BLAKE2B 92f6d749ce72b3d139d296c728dc3e39a9578a37a3baa957d7badabdfaf6691a204582e78499277a4b2329304775fe0688cdefe92b8386304baea5429e19d870 SHA512 3095e7a2b1793a33908e8f2d3cf0ed7ca29fd7b9dc109953ad41da34c1145b2ae6351e7c74c6142c23c3421944f646dda344344e6341cfceeef3a146aa3cbb29
MISC metadata.xml 428 BLAKE2B 3c635a18242ab2a097c37707bc6ce85d05144fe8142b6b2fed764f785ca9885171d84bc2c8422160eaa0b8d868180295f49de953ada22c26d85a72b39e11e3ff SHA512 f43292d507ae9a54941544ac52d678907440c5c663a50131cd170b97159f2d8045f38a5f9dda418a518c6ab711a77c600062416438fcf802ee03cd69801252bc
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/Manifest b/dev-java/slf4j-api/Manifest
index 386872b99478..a11a4e6582cf 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,3 +1,3 @@
DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da599140d7d37fe55da6dfa2c2aff1825ee57c9d6b7bf0015e4b41b3c15ac0971559b3dd4bb5244e5393cd209ee26fac5e93d SHA512 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f
-EBUILD slf4j-api-1.7.30-r1.ebuild 1366 BLAKE2B c64200dd8cf2359c7b1af7dcb7a0d9fb15e2ef6e06657c6412b2f3516b2abe27717945467f567583300807bc0fddd1f90df4fa60aa2c1b757dd69b1174adf617 SHA512 613c39180fd45c9df7862946d0d1fbfb9591a55e7385dbfa7d6337c1efb0ed718f8c2fa0307d2bc579283efaadad83df1a2d06271fcc3dd6e6bcf6e3e40f4470
+EBUILD slf4j-api-1.7.30-r1.ebuild 1365 BLAKE2B 3bea2f16ae8b2180146426855f896e65764db90c822988045dd2d706704487cadd86d22223e4b76f8d8cc67f6cffab32c9781996e0db7318b90822f6dec77ebb SHA512 b193257213af552180060750e3be79ff83d2bc67addc46134c8c83080b15ceb0b6431a089b88229104f959c632b1a76626b7d056f0ab72e97e30dd12b76fc139
MISC metadata.xml 366 BLAKE2B fcc9f77c9b83f1d612815cd6e9e8814ba364c8407422ec822f0c60ccc2176dc724e826ce9fdbdd7fb1290f669fd332b93a74650628840d30d1dd2d68184d9893 SHA512 628c4e1ed007e31d4b8a3769fb2f4bd5c4f8041d99ef656508927302345a16573713abe0da228546f8a976d8e3e5de4538f838437623149c7f5b14bfee12abd1
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 c56b11c76745..4347153a4202 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,6 +1,4 @@
AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
-DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
-EBUILD snakeyaml-1.16.ebuild 1330 BLAKE2B bc4ec2b97f5e12b611340669485f71e44fe56905c554761dd9628f14bfb8d501e57d2f322b8d0ef8bc8159720e05d643f7cc5626358ec71e029bd4fb73497608 SHA512 65553fab3d53a9feba2dbf1a5754a68710d796b8d5f182696869aa2c6224291b81156753c8cce6807c9c622b214bf9ab4dba70cdffdfdf36ecc6a0ffe7bf32a5
EBUILD snakeyaml-1.28-r1.ebuild 2947 BLAKE2B 69b449227dd2df1c5aa3b00a69a62f582eae7e30bb9b277c56b66ff815473f3a47c84cc081b83af33e98648d3afc1f62e835fedfd721dc2aef0d5b4f277291df SHA512 f8ea7dd4a7942ba7f7f1d34271d583ca457776a895b61634e2dc4717412d542c5347068c4537ad690bbc95c94958474cf8b9326cc12d4d229ee73cdd159eea0f
MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
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/Manifest b/dev-java/sparsebitset/Manifest
index 604bf3b371c2..6b2c89bf88b5 100644
--- a/dev-java/sparsebitset/Manifest
+++ b/dev-java/sparsebitset/Manifest
@@ -1,3 +1,3 @@
DIST sparsebitset-1.2.tar.gz 1669439 BLAKE2B abfd88fb21f72d22bbb1f7bff11bd2a9b4e2af84689cbe8013f27f1f138512ecf843a60b8c5c196b622d024614e7f197b349a6cd510eb1c17bd757f7c1a0d90d SHA512 0c7c182556240886e0732626561401aa8695fd46ba90e5e95c5b28c90abaf5f6fd4c3b791171cdde71f61111c6b08ae8f56de105779f71d0448635cbe3b0b247
-EBUILD sparsebitset-1.2.ebuild 1046 BLAKE2B c46a863e954d31e5923f7a0b7083dc6ccef198696e15b601fdd8d5487c780c1ed81c14444e1404568cd90ccf5cfcf63059a43b3129a2e75c6559274a423a6423 SHA512 1e952b63e38142d90a2e1657750102f5555bbfe7d663bac5790e499d258d315248e965dfbe74adb1965b8d758910633e9fb5732f1c759e066e94f26bd166cb40
+EBUILD sparsebitset-1.2.ebuild 1044 BLAKE2B 46ad495b50c6c4f329abbf8cb412ec9cbdf017353607116aba94e02cca68a48b100dae571ef894c1c118c536f25f6c97e347be86bd69de7256fedd978e0cc796 SHA512 f813d0513c686880ba350de498bd88b1aab21b2848666849f0c7b4b79dcf984b6dc869e3ffa1e13035caa53269a82714b1f84539d316eb928798a3c6d42c6a45
MISC metadata.xml 385 BLAKE2B 7c290911ac6a6ab2657efba2c525b9b5f72cdb730f3612f452ac97d635a51784421e43c64a601fd7c5a73a25642c7c7c2cd550553de34d6bf6d2888571a4c395 SHA512 74d05d5f3c3595a9a686e5d807910ed1d73ff29c4bcf875dc08ec2e05c7e0495b48208d81e075f8fe7d0ca9de6420acb506684ac5e673e33086e0f7276d1d940
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/Manifest b/dev-java/sun-jms/Manifest
index bfc2bb275f58..4d0d7a9b804b 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1,3 +1,3 @@
DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r2.ebuild 1330 BLAKE2B d39c97ba5613b160a380eeee4104027897bea4990788a6a064d2f4ac561b306051aa1cc1f4f50fc79ecc39b5de9f7386b3ca06f643969aeb9e8829f66efefe4c SHA512 9e3865734c6eb046f36532be3c273f9e7d64c0e6f6f931255a0a0af13af38fa9b0dfa81f2ef2049bdbfbec89c1d3631fc554ffe4f9ea619f9e7bac29be7ec1f8
+EBUILD sun-jms-1.1-r2.ebuild 1336 BLAKE2B 5a897d391ca3586f57257226132331fd87e7336f173091512312a6494862f289cbc010e330355c444c30f9bfd9ce28798dd0cc601e25928769a9219faabd0677 SHA512 375f2efa9f19c00f908926c036138e24b6a064e0985584383fee09c80448fd5448a28fd1a61712fbf7af689c17944987956863ef225ff8e2941192fc0cfaf70f
MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
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/Manifest b/dev-java/swt/Manifest
index 7025c6b6912c..478eccdd018e 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -18,5 +18,5 @@ DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
-EBUILD swt-4.10.ebuild 4613 BLAKE2B b666b2a3bc964012c12b568c24f3a9239b9de956df76c804a76029ad30a0279f240d2b967ac86e51500a8f524dca31c4982b77be3268fcfaada4dc8212de7416 SHA512 b4b1c33f0cb51603730ae2b950c652b27bd1e669ad2e6b62e08c4d640ae98393d442b41a2eb88f42a136c2952582f9240154f7ffc06ebca9a943b71248bffab8
+EBUILD swt-4.10-r1.ebuild 4629 BLAKE2B 6ec4fff913b3f0fb72615009644556e2ebfa1247619000c16a41025099f21948dc0c5a78f9f93ca0f380501ff6a00e834a050a9fc58b0938917d6eff678d64db SHA512 4a944f03e1ba887c5cc2fa638369e72638395558268c57b8a0a7d542eb2e34cf17b6b9a6fa79e10f99152186c88719ff730f1741f6989a80039c2501affec961
MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
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/Manifest b/dev-java/tomcat-servlet-api/Manifest
index d10a49715fb8..dbafb0f597db 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -19,10 +19,10 @@ EBUILD tomcat-servlet-api-10.0.6.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a8
EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b
EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2
EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a
-EBUILD tomcat-servlet-api-7.0.108.ebuild 2987 BLAKE2B 58215b6b83dd299746d8a57bb9dd09b0ca04868f8de442b894d2a06ee68d901041a12594390bf87bc291f96f78cc6e5c207d01766948e9eaa0fbd29d1f194e6a SHA512 c93c1e035d0fce24fcb6a2fa28cb6713d8f38114a6ba76081d6eb1b5e42b2087fa9920c7a443c8b36fdf5d2d157886d70e2ddefbf901c33c53236c5e8901cb11
+EBUILD tomcat-servlet-api-7.0.108.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
EBUILD tomcat-servlet-api-7.0.109.ebuild 2990 BLAKE2B 08f62ce9a014e01926a2d2eaac5daf393e8df8f2dff737d1215b5304b9ab8bc92f794bd00a3bb6f2fd17b00b921b3445d86c44743a5e915a8e4fb33c762ac81f SHA512 c4db6d1df1fedf89adbbb90e8197dde37c5f656034e3629420096ad40af1e50644de527b0eab432e20463d811192ff889a06a72fe949084168bcbcc3e5ea5b79
-EBUILD tomcat-servlet-api-8.5.65.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5
+EBUILD tomcat-servlet-api-8.5.65.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c
EBUILD tomcat-servlet-api-8.5.66.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac
-EBUILD tomcat-servlet-api-9.0.45.ebuild 3175 BLAKE2B 996c4285297fa2560227d87381d06be9c7120cce6d802ee9ada2387e7589726be83c76d57c5a6cbfbcf42dd5670194ced0de72268ff237861ce900959eef9b40 SHA512 dca2fac51ed5a98f4004c9536a9623dab69e38f5b7e02edc98dd1365a98321caeb78ea03a9e68a0db517cdc559a253a394e812b2e03306944d9c73718d30d53b
+EBUILD tomcat-servlet-api-9.0.45.ebuild 3174 BLAKE2B 8142c3911554979940a3ef71fd28d834cd10dd7cbe6c2ecaa46198a8873b5a1b787c499f59e1f4ae42ad1b2a9f8fded31f93e9af8fbec6e486b214ae526e6ef7 SHA512 cc57dd3eb335d5fc4d650ddf85bda93472330b86b7f91513efcdfa006df4f3e360e85a7984ad44a53fdf5df06616e157b83a17c46920982170921bcf9251ea16
EBUILD tomcat-servlet-api-9.0.46.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 4bd9ced26941..79e5aa3b361f 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,11 +1,4 @@
-AUX xom-1.2.6.patch 2096 BLAKE2B 041c55199398e37fcb4a481d7deb1c8c3fb8d980fa6ebc207236cf1e85e91c7b28f2c5e551153ac52b17272b8f02324dce7ae2b9948f9c0880a900eed84d9f62 SHA512 7d864f9178a5fd846572a17eb345a74510e7a3880c203054d7156849c10c678421ed688965d821daafcff91888be9a485c5409937055a56139066aaa6d32aca0
AUX xom-1.3.7-disable-invalid-test.patch 672 BLAKE2B a58012a6152e0b9d8b064c32b5dfa0de3c5c008c44001963c6d4f81a7230c9d4b0aacedf99936ccb8ceb84ef5926eaee228e488846c15b47ee1caeaa47ce6279 SHA512 bd6bc466b36f5095b8b74109ea5b5e740317b81d1a844571c7dd6212536d8abaaf576e4c57b66eb997efa2b24fffcbf8c79a2c28361785e710ba6736c9b8491d
-AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e02000aa29b3d1ddc6b40bd16ceb7ae60983ce703715f01e550fa2b643bcb1febb032387ab5431367d9dbc54079ed5f551 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830
-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
-EBUILD xom-1.2.10.ebuild 2166 BLAKE2B 65380004dc447dd45c034599259b11e28ebc3988be9528782de0568b73b6e31632101d024b941b2acec78a8736dff7ad2b4a01d1303b9ba96c7c1b5c6c0e02ac SHA512 0858697d6ff1fc61930e42162d4e67b67e662b29e166d2e15da0fa51cf8563e06599359e6b04bd470902363988d6d61730a78a94244ff7b0ffca778afdeebeab
-EBUILD xom-1.3.2.ebuild 819 BLAKE2B 95c1a0236273676e598936b570f6304ed86b51b03b7368c6e1d112c6234bb92f3c0d1e5d36bb271e264fcf869d8d990124ffedaee7dcf0067a959a66d6374326 SHA512 92cfc4188b4b1d59d169481ec95c63bf6534f42df3f98c680beb8a69b3ecb7dd26b9ffaf0386e8536191008dd8789bc4312a750decbc867eab5c3e0639c959a3
EBUILD xom-1.3.7.ebuild 1670 BLAKE2B 7be5543510ceaf1a9a97110417493b51c2481fdff6f985392456063fdd035175cc5dd58bcf475eb6b9345573f14d2d7bdd20dd2d93ea5fc910fc5bc6ef1e18ec SHA512 3b25b044d20351d9eb5d51e1b497cdb731c70e6b25e313e7a0d5bbd2248fe00d09ba0d6013db98811965186b8ac5610d9d1a0387b9ad2a1f93fa49b641c3b889
MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
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/Manifest b/dev-lang/moarvm/Manifest
index dbf4dcb3c9a9..6d6487167a02 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -5,4 +5,4 @@ EBUILD moarvm-2020.11.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa8
EBUILD moarvm-2020.12.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
EBUILD moarvm-2021.02.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
EBUILD moarvm-9999.ebuild 1736 BLAKE2B 9f434f8561c55716165952dce8e35bd3659fbd0f3a42f688049e023faa0f10c4aa245ca810279ae80527c4ec5fe5c514bc5ae534aa30e839693657ce68fc7f9c SHA512 5867e2ee90401a86cd0341d8ab5ae75fecb7d366d88e1269439248686942b5c1855e45857b4388491631b26361aac3b0495d7214158931e955655a34d557fada
-MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
+MISC metadata.xml 802 BLAKE2B a2fc329ff27764a800785617bf71bdb99f764c3709130a094ac398d99aeef1414c1188d55088ada2f41eb4892709ef681d47b9f64e27a0426d5ec0cd8c90640e SHA512 2afbbc8899857a4bd3583f2bad121fd68208dfbdd4d0852bfbf28860e45e49a4b600ee74c254f7ffa782e8c1e939d56744acf82771a49fe0caed7e31492b8c60
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
-