summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Manifest30
-rw-r--r--Manifest.files.gzbin29810 -> 29838 bytes
-rw-r--r--app-admin/Manifest.gzbin32548 -> 32550 bytes
-rw-r--r--app-admin/clustershell/Manifest6
-rw-r--r--app-admin/clustershell/clustershell-1.8.4.ebuild2
-rw-r--r--app-admin/clustershell/clustershell-1.9.ebuild59
-rw-r--r--app-admin/clustershell/metadata.xml8
-rw-r--r--app-admin/logsurfer+/Manifest2
-rw-r--r--app-admin/logsurfer+/files/logsurfer+-1.8-fix-declaration-of-check_context_linelimit.patch30
-rw-r--r--app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild48
-rw-r--r--app-alternatives/Manifest.gzbin1676 -> 1680 bytes
-rw-r--r--app-alternatives/awk/Manifest2
-rw-r--r--app-alternatives/awk/awk-3.ebuild (renamed from app-alternatives/awk/awk-2.ebuild)21
-rw-r--r--app-dicts/Manifest.gzbin95523 -> 95537 bytes
-rw-r--r--app-dicts/aspell-ast/Manifest2
-rw-r--r--app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild2
-rw-r--r--app-dicts/aspell-be/Manifest2
-rw-r--r--app-dicts/aspell-be/aspell-be-0.01-r2.ebuild2
-rw-r--r--app-dicts/aspell-ca/Manifest2
-rw-r--r--app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-de/Manifest2
-rw-r--r--app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-eo/Manifest2
-rw-r--r--app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild2
-rw-r--r--app-dicts/aspell-ga/Manifest2
-rw-r--r--app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-gl/Manifest2
-rw-r--r--app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild2
-rw-r--r--app-dicts/aspell-it/Manifest2
-rw-r--r--app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-lt/Manifest2
-rw-r--r--app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild2
-rw-r--r--app-dicts/aspell-ml/Manifest2
-rw-r--r--app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild2
-rw-r--r--app-dicts/aspell-pt/Manifest2
-rw-r--r--app-dicts/aspell-pt/aspell-pt-20220621.ebuild4
-rw-r--r--app-dicts/aspell-ro/Manifest2
-rw-r--r--app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild2
-rw-r--r--app-dicts/aspell-ru/Manifest2
-rw-r--r--app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild2
-rw-r--r--app-dicts/aspell-sc/Manifest2
-rw-r--r--app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-sk/Manifest2
-rw-r--r--app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild2
-rw-r--r--app-dicts/aspell-sr/Manifest2
-rw-r--r--app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild2
-rw-r--r--app-dicts/aspell-tet/Manifest2
-rw-r--r--app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild2
-rw-r--r--app-dicts/aspell-tl/Manifest2
-rw-r--r--app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild2
-rw-r--r--app-doc/Manifest.gzbin6986 -> 6984 bytes
-rw-r--r--app-doc/gnucash-docs/Manifest8
-rw-r--r--app-doc/gnucash-docs/gnucash-docs-4.12.ebuild (renamed from app-doc/gnucash-docs/gnucash-docs-4.4.ebuild)42
-rw-r--r--app-doc/gnucash-docs/gnucash-docs-4.5.ebuild65
-rw-r--r--app-doc/gnucash-docs/metadata.xml1
-rw-r--r--app-editors/Manifest.gzbin14245 -> 14240 bytes
-rw-r--r--app-editors/jupp/Manifest2
-rw-r--r--app-editors/jupp/jupp-3.1_p41.ebuild2
-rw-r--r--app-office/Manifest.gzbin7894 -> 7893 bytes
-rw-r--r--app-office/gnucash/Manifest11
-rw-r--r--app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch26
-rw-r--r--app-office/gnucash/files/gnucash-4.12-fix-test.patch20
-rw-r--r--app-office/gnucash/gnucash-4.12.ebuild (renamed from app-office/gnucash/gnucash-4.5.ebuild)67
-rw-r--r--app-office/gnucash/gnucash-4.4.ebuild220
-rw-r--r--app-office/gnucash/metadata.xml25
-rw-r--r--app-portage/Manifest.gzbin9574 -> 9580 bytes
-rw-r--r--app-portage/portage-utils/Manifest2
-rw-r--r--app-portage/portage-utils/portage-utils-0.94.4.ebuild75
-rw-r--r--app-text/Manifest.gzbin48925 -> 48922 bytes
-rw-r--r--app-text/linuxdoc-tools/Manifest3
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch246
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild95
-rw-r--r--dev-ada/Manifest.gzbin3740 -> 3742 bytes
-rw-r--r--dev-ada/gtkada/Manifest3
-rw-r--r--dev-ada/gtkada/files/gtkada-23.0.0-gentoo.patch63
-rw-r--r--dev-ada/gtkada/gtkada-23.0.0.ebuild54
-rw-r--r--dev-java/Manifest.gzbin55977 -> 55974 bytes
-rw-r--r--dev-java/jakartaee-migration/Manifest4
-rw-r--r--dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild (renamed from dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild)2
-rw-r--r--dev-java/tomcat-el-api/Manifest3
-rw-r--r--dev-java/tomcat-el-api/tomcat-el-api-9.0.70.ebuild40
-rw-r--r--dev-java/tomcat-jsp-api/Manifest3
-rw-r--r--dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.70.ebuild47
-rw-r--r--dev-java/tomcat-servlet-api/Manifest3
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.70.ebuild47
-rw-r--r--dev-lang/Manifest.gzbin19494 -> 19494 bytes
-rw-r--r--dev-lang/luajit/Manifest4
-rw-r--r--dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild2
-rw-r--r--dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild2
-rw-r--r--dev-libs/Manifest.gzbin95823 -> 95825 bytes
-rw-r--r--dev-libs/gmp/Manifest2
-rw-r--r--dev-libs/gmp/gmp-6.2.1-r5.ebuild (renamed from dev-libs/gmp/gmp-6.2.1-r4.ebuild)32
-rw-r--r--dev-ml/Manifest.gzbin36305 -> 36297 bytes
-rw-r--r--dev-ml/lablgtk/Manifest2
-rw-r--r--dev-ml/lablgtk/metadata.xml12
-rw-r--r--dev-python/Manifest.gzbin261168 -> 261169 bytes
-rw-r--r--dev-python/canonicaljson/Manifest2
-rw-r--r--dev-python/canonicaljson/canonicaljson-1.6.4.ebuild2
-rw-r--r--dev-util/Manifest.gzbin69100 -> 69100 bytes
-rw-r--r--dev-util/gperf/Manifest3
-rw-r--r--dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch21
-rw-r--r--dev-util/gperf/gperf-3.1-r1.ebuild1
-rw-r--r--games-util/Manifest.gzbin8025 -> 8026 bytes
-rw-r--r--games-util/game-device-udev-rules/Manifest2
-rw-r--r--games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild2
-rw-r--r--media-libs/Manifest.gzbin67052 -> 67050 bytes
-rw-r--r--media-libs/exempi/Manifest2
-rw-r--r--media-libs/exempi/exempi-2.6.2.ebuild2
-rw-r--r--media-libs/openimageio/Manifest2
-rw-r--r--media-libs/openimageio/openimageio-2.3.21.0.ebuild2
-rw-r--r--media-video/Manifest.gzbin25848 -> 25846 bytes
-rw-r--r--media-video/vlc/Manifest2
-rw-r--r--media-video/vlc/vlc-3.0.18.ebuild2
-rw-r--r--metadata/Manifest.gzbin4036 -> 4033 bytes
-rw-r--r--metadata/dtd/timestamp.chk2
-rw-r--r--metadata/glsa/Manifest28
-rw-r--r--metadata/glsa/timestamp.chk2
-rw-r--r--metadata/md5-cache/Manifest.gzbin28353 -> 28335 bytes
-rw-r--r--metadata/md5-cache/app-admin/Manifest.gzbin56157 -> 56464 bytes
-rw-r--r--metadata/md5-cache/app-admin/clustershell-1.8.44
-rw-r--r--metadata/md5-cache/app-admin/clustershell-1.916
-rw-r--r--metadata/md5-cache/app-admin/logsurfer+-1.8-r513
-rw-r--r--metadata/md5-cache/app-alternatives/Manifest.gzbin1824 -> 1823 bytes
-rw-r--r--metadata/md5-cache/app-alternatives/awk-3 (renamed from metadata/md5-cache/app-alternatives/awk-2)4
-rw-r--r--metadata/md5-cache/app-dicts/Manifest.gzbin98306 -> 98271 bytes
-rw-r--r--metadata/md5-cache/app-dicts/aspell-ast-0.01-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-be-0.01-r22
-rw-r--r--metadata/md5-cache/app-dicts/aspell-ca-2.5.0-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-de-20161207.7.0-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-ga-5.1.0-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-gl-0.5.2-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-lt-1.3.2-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-ml-0.04.1-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-pt-202206212
-rw-r--r--metadata/md5-cache/app-dicts/aspell-ro-3.3.10-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r22
-rw-r--r--metadata/md5-cache/app-dicts/aspell-sc-1.0-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-sk-2.02.0-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-sr-0.02-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-tet-0.1.1-r12
-rw-r--r--metadata/md5-cache/app-dicts/aspell-tl-0.4.0-r12
-rw-r--r--metadata/md5-cache/app-doc/Manifest.gzbin22681 -> 22517 bytes
-rw-r--r--metadata/md5-cache/app-doc/gnucash-docs-4.1213
-rw-r--r--metadata/md5-cache/app-doc/gnucash-docs-4.414
-rw-r--r--metadata/md5-cache/app-doc/gnucash-docs-4.514
-rw-r--r--metadata/md5-cache/app-editors/Manifest.gzbin24615 -> 24612 bytes
-rw-r--r--metadata/md5-cache/app-editors/jupp-3.1_p412
-rw-r--r--metadata/md5-cache/app-office/Manifest.gzbin10163 -> 10002 bytes
-rw-r--r--metadata/md5-cache/app-office/gnucash-4.1218
-rw-r--r--metadata/md5-cache/app-office/gnucash-4.418
-rw-r--r--metadata/md5-cache/app-office/gnucash-4.518
-rw-r--r--metadata/md5-cache/app-portage/Manifest.gzbin17813 -> 17984 bytes
-rw-r--r--metadata/md5-cache/app-portage/portage-utils-0.94.415
-rw-r--r--metadata/md5-cache/app-text/Manifest.gzbin71677 -> 71831 bytes
-rw-r--r--metadata/md5-cache/app-text/linuxdoc-tools-0.9.8215
-rw-r--r--metadata/md5-cache/dev-ada/Manifest.gzbin7109 -> 7270 bytes
-rw-r--r--metadata/md5-cache/dev-ada/gtkada-23.0.016
-rw-r--r--metadata/md5-cache/dev-java/Manifest.gzbin74921 -> 75396 bytes
-rw-r--r--metadata/md5-cache/dev-java/jakartaee-migration-1.0.6 (renamed from metadata/md5-cache/dev-java/jakartaee-migration-1.0.5)4
-rw-r--r--metadata/md5-cache/dev-java/tomcat-el-api-9.0.7015
-rw-r--r--metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.7015
-rw-r--r--metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.7015
-rw-r--r--metadata/md5-cache/dev-lang/Manifest.gzbin38653 -> 38660 bytes
-rw-r--r--metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220127-r22
-rw-r--r--metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p202206132
-rw-r--r--metadata/md5-cache/dev-libs/Manifest.gzbin159553 -> 159561 bytes
-rw-r--r--metadata/md5-cache/dev-libs/gmp-6.2.1-r5 (renamed from metadata/md5-cache/dev-libs/gmp-6.2.1-r4)10
-rw-r--r--metadata/md5-cache/dev-python/Manifest.gzbin349296 -> 349295 bytes
-rw-r--r--metadata/md5-cache/dev-python/canonicaljson-1.6.44
-rw-r--r--metadata/md5-cache/dev-util/Manifest.gzbin133899 -> 133897 bytes
-rw-r--r--metadata/md5-cache/dev-util/gperf-3.1-r12
-rw-r--r--metadata/md5-cache/games-util/Manifest.gzbin10001 -> 10002 bytes
-rw-r--r--metadata/md5-cache/games-util/game-device-udev-rules-202203112
-rw-r--r--metadata/md5-cache/media-libs/Manifest.gzbin104208 -> 104218 bytes
-rw-r--r--metadata/md5-cache/media-libs/exempi-2.6.24
-rw-r--r--metadata/md5-cache/media-libs/openimageio-2.3.21.04
-rw-r--r--metadata/md5-cache/media-video/Manifest.gzbin36848 -> 36847 bytes
-rw-r--r--metadata/md5-cache/media-video/vlc-3.0.184
-rw-r--r--metadata/md5-cache/net-analyzer/Manifest.gzbin67383 -> 67708 bytes
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-5.0.294
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.0.104
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.0.1217
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.2.44
-rw-r--r--metadata/md5-cache/net-analyzer/zabbix-6.2.617
-rw-r--r--metadata/md5-cache/net-ftp/Manifest.gzbin4523 -> 4524 bytes
-rw-r--r--metadata/md5-cache/net-ftp/atftp-0.8.02
-rw-r--r--metadata/md5-cache/net-irc/Manifest.gzbin13125 -> 13287 bytes
-rw-r--r--metadata/md5-cache/net-irc/dccserver-0.5-r213
-rw-r--r--metadata/md5-cache/net-libs/Manifest.gzbin58099 -> 58100 bytes
-rw-r--r--metadata/md5-cache/net-libs/webkit-gtk-2.38.24
-rw-r--r--metadata/md5-cache/net-misc/Manifest.gzbin92410 -> 92405 bytes
-rw-r--r--metadata/md5-cache/net-misc/freerdp-2.9.04
-rw-r--r--metadata/md5-cache/net-proxy/Manifest.gzbin9829 -> 8689 bytes
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.2.1716
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.2.2116
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.2.2416
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.2.99992
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.4.1416
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.4.1716
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.4.192
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.4.99992
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.5.102
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.5.416
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.5.916
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.5.99992
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.6.62
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.6.72
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.6.99992
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.7.02
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-2.7.99992
-rw-r--r--metadata/md5-cache/net-proxy/haproxy-99992
-rw-r--r--metadata/md5-cache/net-vpn/Manifest.gzbin14167 -> 14171 bytes
-rw-r--r--metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.02
-rw-r--r--metadata/md5-cache/sec-keys/Manifest.gzbin19190 -> 19352 bytes
-rw-r--r--metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.709
-rw-r--r--metadata/md5-cache/www-client/Manifest.gzbin12116 -> 12109 bytes
-rw-r--r--metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2867.29 (renamed from metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2865.3)2
-rw-r--r--metadata/md5-cache/www-servers/Manifest.gzbin7874 -> 8029 bytes
-rw-r--r--metadata/md5-cache/www-servers/tomcat-9.0.7016
-rw-r--r--metadata/md5-cache/x11-libs/Manifest.gzbin27469 -> 27307 bytes
-rw-r--r--metadata/md5-cache/x11-libs/libICE-1.1.015
-rw-r--r--metadata/md5-cache/x11-misc/Manifest.gzbin64307 -> 64465 bytes
-rw-r--r--metadata/md5-cache/x11-misc/notify-osd-0.9.34-r216
-rw-r--r--metadata/news/Manifest28
-rw-r--r--metadata/news/timestamp.chk2
-rw-r--r--metadata/timestamp2
-rw-r--r--metadata/timestamp.chk2
-rw-r--r--metadata/timestamp.commit2
-rw-r--r--metadata/timestamp.x2
-rw-r--r--metadata/xml-schema/timestamp.chk2
-rw-r--r--net-analyzer/Manifest.gzbin44901 -> 44898 bytes
-rw-r--r--net-analyzer/zabbix/Manifest12
-rw-r--r--net-analyzer/zabbix/zabbix-5.0.29.ebuild2
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.10.ebuild2
-rw-r--r--net-analyzer/zabbix/zabbix-6.0.12.ebuild411
-rw-r--r--net-analyzer/zabbix/zabbix-6.2.4.ebuild2
-rw-r--r--net-analyzer/zabbix/zabbix-6.2.6.ebuild411
-rw-r--r--net-ftp/Manifest.gzbin3331 -> 3331 bytes
-rw-r--r--net-ftp/atftp/Manifest2
-rw-r--r--net-ftp/atftp/atftp-0.8.0.ebuild2
-rw-r--r--net-irc/Manifest.gzbin8065 -> 8069 bytes
-rw-r--r--net-irc/dccserver/Manifest2
-rw-r--r--net-irc/dccserver/dccserver-0.5-r2.ebuild30
-rw-r--r--net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch19
-rw-r--r--net-libs/Manifest.gzbin32772 -> 32770 bytes
-rw-r--r--net-libs/webkit-gtk/Manifest2
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild2
-rw-r--r--net-misc/Manifest.gzbin55256 -> 55249 bytes
-rw-r--r--net-misc/asterisk/Manifest2
-rw-r--r--net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.16
-rw-r--r--net-misc/freerdp/Manifest2
-rw-r--r--net-misc/freerdp/freerdp-2.9.0.ebuild2
-rw-r--r--net-proxy/Manifest.gzbin5363 -> 5366 bytes
-rw-r--r--net-proxy/haproxy/Manifest36
-rw-r--r--net-proxy/haproxy/haproxy-2.2.17.ebuild183
-rw-r--r--net-proxy/haproxy/haproxy-2.2.21.ebuild183
-rw-r--r--net-proxy/haproxy/haproxy-2.2.24.ebuild181
-rw-r--r--net-proxy/haproxy/haproxy-2.2.9999.ebuild6
-rw-r--r--net-proxy/haproxy/haproxy-2.4.14.ebuild179
-rw-r--r--net-proxy/haproxy/haproxy-2.4.17.ebuild181
-rw-r--r--net-proxy/haproxy/haproxy-2.4.19.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.4.9999.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.5.10.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.5.4.ebuild179
-rw-r--r--net-proxy/haproxy/haproxy-2.5.9.ebuild176
-rw-r--r--net-proxy/haproxy/haproxy-2.5.9999.ebuild25
-rw-r--r--net-proxy/haproxy/haproxy-2.6.6.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.6.7.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.6.9999.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.7.0.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-2.7.9999.ebuild23
-rw-r--r--net-proxy/haproxy/haproxy-9999.ebuild23
-rw-r--r--net-vpn/Manifest.gzbin7060 -> 7066 bytes
-rw-r--r--net-vpn/networkmanager-strongswan/Manifest2
-rw-r--r--net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild2
-rw-r--r--profiles/Manifest.gzbin152241 -> 152222 bytes
-rw-r--r--profiles/arch/loong/package.use.mask1
-rw-r--r--profiles/package.mask4
-rw-r--r--profiles/prefix/darwin/macos/arch/arm64/package.use.mask4
-rw-r--r--profiles/thirdpartymirrors2
-rw-r--r--profiles/use.local.desc6
-rw-r--r--sec-keys/Manifest.gzbin17007 -> 17006 bytes
-rw-r--r--sec-keys/openpgp-keys-apache-tomcat/Manifest2
-rw-r--r--sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.70.ebuild20
-rw-r--r--www-client/Manifest.gzbin6202 -> 6204 bytes
-rw-r--r--www-client/vivaldi-snapshot/Manifest8
-rw-r--r--www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2867.29.ebuild (renamed from www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2865.3.ebuild)0
-rw-r--r--www-servers/Manifest.gzbin4703 -> 4704 bytes
-rw-r--r--www-servers/tomcat/Manifest3
-rw-r--r--www-servers/tomcat/tomcat-9.0.70.ebuild202
-rw-r--r--x11-libs/Manifest.gzbin18840 -> 18837 bytes
-rw-r--r--x11-libs/libICE/Manifest1
-rw-r--r--x11-libs/libICE/libICE-1.1.0.ebuild26
-rw-r--r--x11-misc/Manifest.gzbin47359 -> 47356 bytes
-rw-r--r--x11-misc/notify-osd/Manifest2
-rw-r--r--x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch24
-rw-r--r--x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild72
299 files changed, 2888 insertions, 2136 deletions
diff --git a/Manifest b/Manifest
index 467b7bd93fab..a2351b2f7217 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29810 BLAKE2B e535a84970a4a9ae6b45a023b7cf380e8fd46360006d806d348fe6167cc1469e9c23221322fdb7a93b13881162899d71a9d69582461bdf358d3d03471bad70c8 SHA512 7b981f08403f389795e1db656eb160632fee96671b5750cf52a08b1dfe1256c6614c14ba967ff811accfc0cae8dff6d135626729aed3a5fd90808f63d9bd0900
-TIMESTAMP 2022-12-06T08:09:52Z
+MANIFEST Manifest.files.gz 29838 BLAKE2B d8b2fb0962f6aa75761793e434e6ab7eefccfaf152e92624b90b04b974c58189acee5578f05800cc110fad7f50236c406036a7743c8b1099cc4291e5681f89c3 SHA512 d5344bebd238098b60152df0c042a033f9c6f67ac906a46c9a87461cc48a18788050310eda154f1a965ded83a56cfb47a66be004963f40095a72b61d9cdc5f4a
+TIMESTAMP 2022-12-06T14:09:43Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOO+NBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOPTSdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAVqw/+KOgFEq4U9vtEtnSMG9zZX/eb6LihPMMw+IiO5/tb/yEFmMpBKMEDxbCt
-KFmUKk8+O3ibEZydYRN54J1NrUIH/w4oGYWnDvTA0VI+YBq5Rk84YSR3WV+N7gBE
-F5PSeyLrKfVUU1M2uP2/Mv7hqWAjsPHpQK/FMJ/JfEmGuBLIJIbVTQJHEEPQulXr
-T9DhS7P7OrPgmShEzori1sTQLPrQrC5wbmA/3tA9mG3iubbQYKbczYTWCB79WOwr
-Raii08iwmTFu4D3k9ukwm+tOkGeSfQoQ1m6GknD/Ymr3sqDvIOkvG3x/MVYhZqYr
-zDPm8B+6HuRNWguVqwSvlijGUm5YBz2fPLfXeET5xbQQeWK4k4L1n0T/LLsI78W1
-fREa8J/MFd1qyFRjRvYvS4Is+bLaglemRRSTvfZS/X+Vn/B1KvdyulBqTteKC85I
-VhgQdxU5gE+VmAIY1RcYvgYEar8fPsKPICxIwIbjhwvMWJhDqUiGUH8hd6Ryk+74
-gZtwzOrlEluhUyE87YaFOcbLHdgetCVdDKMHVqMK7KnIyXwF+aL01tj9jDBInkFv
-0ZePivnoldxuN17vWFu71ASQL13DH2i1hk+56Xy9O+vcXH5OyipafAe6GtWsCvPy
-nHusOuvbLgV3IOZjPl8Ym6KfKuKHCtwRLN4+JsGWC3IVcHZxCfo=
-=7E62
+klAErQ//Xzc/IwFyy212lGJ10VYyBGBdRqroWF7Pq2OC7daA8TYgr7QRCJrLGrqh
+9yRCT8AcNxrOT1Xf4oVUKWulF9w/BX1SMi4v/dkcqIxS/7iJRK0T9Izo05Hm14zs
+nIyRVawX1Zk7II/ZxCYvbms1vVUqXmHSb/V92VJqaFJGw2PETPQomUgvqFTtVeQG
+A2xCpA1fCON+E4P06/mgZRGxjnfGVSEaWhr7gJWWENO/Dyvve6X8/bdopemjcWG9
+IEgHNJc3q6OvmwQ+XqWmGp5XgHVDKE8HZaUSPWmE+ME5c+8I4i2uzoVn7zCXR2HI
+P2h11PAIuo9rBM+9x89GclxjtRiBrcuI0FwvoIjWzUvP8xXMOYyXYUOYHjm4218/
+hAiazY6wRHvMs0+J9QfwvCTaHI/NYqkNrfsIKpujFkuXq+wCIPXSl4CabAi5rOTo
+2PFt8dBqyX1LtI6ZpnYjzZse1nlvaiuX4LZ8w206Choii3BG/p7/Exbq8s1x+zLu
+GFjls7vxw2/Lx5I8Jb/FZQ16LYOntFuOGjixyy9oeqQhhTAfP0CIkY9WQGeKjIZ5
+K/0stdnDzDnxQ91lWKeak1kFjTh35jv5PM2YzVft5Ee3vG0YXKNMN5qpq9GJ5FrB
+JV2/iX2z+QZBIigo6GWm2tcEjyONtNQ5+ET3RS/ucORDzIM1X4A=
+=xMmr
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1374c98fbb8d..4f14d75e24ed 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
Binary files differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 64e11bd3f2a2..414d8a6e1c85 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
index 61e53ee96441..c5b1af1e7415 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -2,5 +2,7 @@ AUX clustershell-1.8.4-current-thread.patch 3427 BLAKE2B 4adcc9c27f29b99e3bdd20d
AUX clustershell-1.8.4-setrlimit-division.patch 763 BLAKE2B 7a527b9d7a6f37e49c1f33ec916f443f77c87a89c502edcae404d169543ca5304c4ce3165e938420ee712ada984e3128f8b34b4c20ffceb9dc623a3535014d7b SHA512 2dafe233a53ac9b83b068c865b0e1368bdfbc4f5a346fecc173460af5c6304f6b2f66fa190e14372d79414aad520336280f039b68b4754ddf3730b1959005f8a
AUX clustershell-1.8.4-skip-tests.patch 2577 BLAKE2B e79cfdf3def54ac620b3cd10955e0dd35426524fb5cab61fd9c32d47e557a481ee4b2ccedb9baeb768c20cbd909ce186962ebb966041f0e5acce3775ea616eaf SHA512 accfb107369d7d838a33023dbe94a749323b91cdd807779e44e6b8b6b9357e162bfc852aa99bad769674842d4ff2344385b3ef45504ba105d31727b5d4e02b8e
DIST clustershell-1.8.4.gh.tar.gz 367622 BLAKE2B 1487697a49d37902f9763094da1a156f5e7cc2ab0487814207bb9da03b1109f1ce55034fc92e72262d4b9920d5c52b9f6de84ce1ff04b06d042b0a6d005f1049 SHA512 582393e56d94e62e126d91f8af074a7b57d0e781a5c929cfc374e61324c412c32fcf9a8e063a78cb805c2ff34641887a1adfc7ef9f377b881077f719dbc2adc3
-EBUILD clustershell-1.8.4.ebuild 1353 BLAKE2B 90edec254bbd6fbc53c865af57e7ad035d32b4bc8ef8f9994bd41ae5d2f134959625c0e7b04ea3dcd0ef021f66effd45fb40a9537f2cbbb265022aa788219e4a SHA512 d6debb69259a9c020cf2557ab84b2809debca86f78ee2d17ccb99587eb420270cf3d1a59d732f34ac8e4c6c01b1ba0a5ce953a907c0b694380eeba5680d59d4c
-MISC metadata.xml 347 BLAKE2B 259f356be3bd36db0e537e9295748b546fb38fdafc00f314ba16695eee00e2d8530901ba5192bb70d094346f80d6fbd50f52101edc29edd3d1f1dbaab41cab4f SHA512 1824f7ffd8d00a87ca1af3d10f9536d878392e3b058da128e8df884bf4ffeceee4927fc5e87cb9bc58802507268eeec1651cf50a70a549b2a1b386e5f7066031
+DIST clustershell-1.9.gh.tar.gz 382574 BLAKE2B 031eb9683db330f3b90ac06fa9a0409ea72c1be3d83c8d0519e0080ead715386043c925a6dbaeafdb38351c54f1508c050279603cd81bc2de60ba2df5733f636 SHA512 9eb4e9663a6381fa27311d1d70002ba64066ee6e2e08aaf772974d8097c6ca2d020563fc8478064e76bc6e56d37ed7eefc2919db99a2f5b26bd878fa7b764a15
+EBUILD clustershell-1.8.4.ebuild 1352 BLAKE2B 3a497ef9904a8d55b6994c05cbe3356172291bb89c6d4a7ca400e9a621f625437fe8e7cbc6017c4f173eda8f79bf2e6f6c452bcb2d0d532832517c433a1293dc SHA512 a41bdbde556ac2e54d7a9b813b4981c076b2838779e1bdd4d7cdfc63ff8cc784ca185229c1c2df5d4695cf3c93b614f2c9e5cb23ca9f5fc57496cd7e9901ee1c
+EBUILD clustershell-1.9.ebuild 1157 BLAKE2B 0d13c78319e37ef7f2b17761e7840e6afceeda12eb52377eca2e6d68e3a8c96a53ca6607f773fa339d8c314f49df251325c290bd93fdd52d69e8417c1f3e89be SHA512 ebe671efb81147c2c2a1511b55299fc5cf2d86185e261bda6bb0da514e2bd15994d642a70d4f89bf5f747b259dc71239fd9d2c0663a31e6942afd03d4b4a5529
+MISC metadata.xml 610 BLAKE2B 1baa68f298ccc1117524968f3ddef220f068e876cfe8d6e5243a5f3144bfa8db21aa93bdb92efd3e7082c0e32b2747d2b544687114b09b78f823636d9b9be5b7 SHA512 0e4a89c4ea24577e065ed6b1a5714cfabea0a3452d546a16824608d2fdbc97ac39fb43d49c7adb279342a774b6719d52707b54091fc30326cbef14755fc04e0f
diff --git a/app-admin/clustershell/clustershell-1.8.4.ebuild b/app-admin/clustershell/clustershell-1.8.4.ebuild
index 9ad14aaab935..6aad25d532a6 100644
--- a/app-admin/clustershell/clustershell-1.8.4.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
BDEPEND="
test? (
diff --git a/app-admin/clustershell/clustershell-1.9.ebuild b/app-admin/clustershell/clustershell-1.9.ebuild
new file mode 100644
index 000000000000..4524a4f95ed9
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://github.com/cea-hpc/clustershell/"
+SRC_URI="
+ https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ test? (
+ app-shells/pdsh
+ net-misc/openssh
+ sys-devel/bc
+ )
+"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ default
+
+ # remove test sets that require working ssh connection
+ rm tests/{CLIClush,TaskDistant*}Test.py || die
+}
+
+python_test() {
+ cd tests || die
+ # Automatic discovery does not work
+ "${EPYTHON}" -m unittest_or_fail -v *.py || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ doman doc/man/man*/*
+
+ mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+ einfo "Some default system-wide config files have been installed into"
+ einfo "/etc/${PN}"
+}
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
index 596520c245e8..e2b4026b0bf5 100644
--- a/app-admin/clustershell/metadata.xml
+++ b/app-admin/clustershell/metadata.xml
@@ -5,6 +5,14 @@
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>arkamar@atlas.cz</email>
+ <name>Petr Vaněk</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">cea-hpc/clustershell</remote-id>
</upstream>
diff --git a/app-admin/logsurfer+/Manifest b/app-admin/logsurfer+/Manifest
index c2abbe0ebc78..e6eb098ed3a1 100644
--- a/app-admin/logsurfer+/Manifest
+++ b/app-admin/logsurfer+/Manifest
@@ -1,5 +1,7 @@
+AUX logsurfer+-1.8-fix-declaration-of-check_context_linelimit.patch 857 BLAKE2B e9840db3760acd7602dd77f187c2d13627f6083bf2a2cb37fbe9224115ec6a37c38dfce490ef4c1b1560645d92c8feeb6234a5b79b545bf9f5f9bfca3ca66853 SHA512 122b2932a4d48077b51271c012d43977d344e26c2c607c70df7c720edee2a186e4c5480e6b0d258e5874d9a797991c04bbe2186a622076e09958f87b81b8c704
AUX logsurfer-1.8.initd-r1 785 BLAKE2B c221acc6d565c6bef69e2b0e107d1d7e5b2fd03d7a645cbcf72b04ec903d3dd4fd031f3ba1f310b8cb0b6f1f8c936a1d3c605602a65682d09a3c4b86ced98f22 SHA512 dc02f6f317437adfe216992a0095912e73f9ad5abcbd2912bb4cdf0d71c4e0653eaeb14f3ff7164d20f1dee168c7b5352a3db96b9520a711e5f7ef04eca9e800
AUX logsurfer.confd 106 BLAKE2B 3b43cc5e0782c3b34dca3ae607cf38db2128d09a11770efc013501368483134a4e6741c14533dfd59b05cce06e5498ba3a1321c330fe43915f588c5fef4bd3d1 SHA512 872004ae1aedc3adb550da30ebc544ccbf11af5ad399bb9788a4db336138c3f5ec03c3704eaaa2cecb0559de6a2bcab9e96da062e6af9a6daa22afdec709a43a
DIST logsurfer-1.8.tar.gz 197507 BLAKE2B caa824ef486d8f48f39e6e1309d2dbccace4e91910b94267d50ab9dc022371bade87c251d87c4818d900ce2a72141f2ac4d0b4cccf4b2850e594951c77df2c0e SHA512 975b1353d067cee3a47fb555013ad86cf404863bcd044a46a7b8314670613b89720e4c21ac9c1389f930be964e4694ee6863ce72e289054ffacf9c62565ffa30
EBUILD logsurfer+-1.8-r4.ebuild 815 BLAKE2B 90a95aacad1bb0bf32a91bd3f480e5f82efb810918c631350580d51b0107f3ec022b2c1bf0fa279ba5936da7777cc6eecfc3fe410fdadc5f68a9c55f9ea1cf53 SHA512 f9dfd7c817452a3f71541cc9a1ac7699a1c6cd15d0556f46f74c9da9becdb6ae1f221489084905237198450e2eb9d4e390eecdb3de7385cdfae73fbe576047b6
+EBUILD logsurfer+-1.8-r5.ebuild 898 BLAKE2B d2c49827ce7774d7542b96c397a4ebce2559be7f75894d4e4953ab0b5d8005fa6a2586d3170cb673b77ad06353c6e55948881917c02278a1273f6b8547a43d53 SHA512 912a47c6dd231eff91d3ad7657c208ff835a20080e15a94dd4ff6483738d11011d8ad0d58dae2ac0b0f7ba3345c6ad56394cde2bcfc11b315d7bb12f79872120
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-admin/logsurfer+/files/logsurfer+-1.8-fix-declaration-of-check_context_linelimit.patch b/app-admin/logsurfer+/files/logsurfer+-1.8-fix-declaration-of-check_context_linelimit.patch
new file mode 100644
index 000000000000..6890e8e1672b
--- /dev/null
+++ b/app-admin/logsurfer+/files/logsurfer+-1.8-fix-declaration-of-check_context_linelimit.patch
@@ -0,0 +1,30 @@
+From dfd993afd0587080e73079ae7f5ea9a087784d49 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pascal=20J=C3=A4ger?= <pascal.jaeger@leimstift.de>
+Date: Tue, 29 Nov 2022 22:01:30 +0100
+Subject: [PATCH] Fix declaration of check_context_linelimit
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Bug: https://bugs.gentoo.org/871135
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+---
+ src/context.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/context.h b/src/context.h
+index 0448cfb..addbbab 100644
+--- a/src/context.h
++++ b/src/context.h
+@@ -22,6 +22,7 @@ void add_to_context(struct context *, struct context_line *);
+ void do_context_action(struct context *);
+
+ void check_context_timeout();
++void check_context_linelimit();
+
+ void expand_context_action_macros(struct context *);
+
+--
+2.38.1
+
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild
new file mode 100644
index 000000000000..fe9835fe9c2d
--- /dev/null
+++ b/app-admin/logsurfer+/logsurfer+-1.8-r5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/+/}"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Real Time Log Monitoring and Alerting"
+HOMEPAGE="https://www.crypt.gen.nz/logsurfer/"
+SRC_URI="mirror://sourceforge/logsurfer/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="freedist GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist" #444330
+
+RDEPEND="
+ acct-group/logsurfer
+ acct-user/logsurfer
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-declaration-of-check_context_linelimit.patch" )
+
+src_configure() {
+ local myeconfargs=(
+ --with-etcdir=/etc
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ tc-export CC
+ default
+}
+
+src_install() {
+ dobin src/logsurfer
+ doman man/logsurfer.1 man/logsurfer.conf.4
+
+ newinitd "${FILESDIR}"/logsurfer-1.8.initd-r1 logsurfer
+ newconfd "${FILESDIR}"/logsurfer.confd logsurfer
+
+ einstalldocs
+}
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz
index ed0cde5ccc6f..8f987715b105 100644
--- a/app-alternatives/Manifest.gz
+++ b/app-alternatives/Manifest.gz
Binary files differ
diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest
index 5ecba01dea54..4af029902a19 100644
--- a/app-alternatives/awk/Manifest
+++ b/app-alternatives/awk/Manifest
@@ -1,3 +1,3 @@
EBUILD awk-1.ebuild 554 BLAKE2B 29fc3ad3018b3ce17a24c250e22789105c8a564fdda0c2185401fe999ccb2d33eae2afacef01042e3b58e968b906452e9fb623f0a804c0a0954042297146abf9 SHA512 53db324987a3b7dc3c49f4d5d2060b8d065aa5798be2084d75c5eea89344205118ca301ca21ecc438d45e28ea1eb60357d44c2fe0b52ae1602636bf85535d1d0
-EBUILD awk-2.ebuild 1373 BLAKE2B a65daeca559e47330535a17923c6b21e083d671292d99391365895c74e408aeb6d03e2135f3e5d9b6bf50dda171ee5535597b6724dd8699b126d58e79ce2e669 SHA512 1cc668225cb6bfee490ab8564d777a668899937726a892e86b484b38d46a10e2614cb1501128973640c41f04118ba48d09651efd43a9c66b11809abcc631621e
+EBUILD awk-3.ebuild 1895 BLAKE2B 03a4a58d22e8e59acebd7811d2e9e8dcd6fc9c2c2601cf85da39f8f863de333164af838868eadf5ed2cd6d30aefbc2450bf917e4737d21297231b01550ec47a5 SHA512 c5b81fe0863e6fadaaf7ba0687834fabd92e92ddb6f7bf33efe4118ed328ef8b694d3471ece7656dbedb97fc25091cd68c4456218093decacdcfc2f5646d81b3
MISC metadata.xml 829 BLAKE2B bf4375b33e702c61a3f8553e1b63110acab32b68d4ac2d905b6dd12a2204484bc5c2f3a34b2ec127a6c60aac8c105949dbc6eb5ade3a1c8c959afdabdd3658a1 SHA512 32252970d3b12c7a5b9fc7c7ffae821908b9bd4101372e699c70e64572fd7563121427ed5971462417d8c2e6155e47f567ac3bb057d457d58648c5b4d2458974
diff --git a/app-alternatives/awk/awk-2.ebuild b/app-alternatives/awk/awk-3.ebuild
index c20aa0953478..d722129ee333 100644
--- a/app-alternatives/awk/awk-2.ebuild
+++ b/app-alternatives/awk/awk-3.ebuild
@@ -44,6 +44,27 @@ src_install() {
fi
}
+pkg_preinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ # if we are upgrading from a new enough version, leftover manpage
+ # symlink cleanup was done already
+ if ver_test "${v}" -ge 3; then
+ return
+ fi
+ done
+
+ # otherwise, remove leftover files/symlinks created by eselect-awk (sic!)
+ shopt -s nullglob
+ local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
+ shopt -u nullglob
+
+ if [[ ${files[@]} ]]; then
+ einfo "Cleaning up leftover manpage symlinks from eselect-awk ..."
+ rm -v "${files[@]}" || die
+ fi
+}
+
pkg_postrm() {
# make sure we don't leave the user without the symlinks, since
# they've not been owned by any other package
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 8652562a6cda..1bc8812d64a7 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
Binary files differ
diff --git a/app-dicts/aspell-ast/Manifest b/app-dicts/aspell-ast/Manifest
index 2939793500e2..5b223a156475 100644
--- a/app-dicts/aspell-ast/Manifest
+++ b/app-dicts/aspell-ast/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-ast-0.01.tar.bz2 123351 BLAKE2B ed4005db252c6f4f281d8b1f56b2f1a0da53b746dd148b2cf1567c0354e8351121145cfe1a06643ab7d3448cc72f81e4dd2c243a94f9f57d0161fd4cbab303ee SHA512 700a45c230218e57549cf4b2caaa9e86c4b8da68a3ed937fa391814816c1e0d16265d77658e209af66550e647f418663eb76952efed973e6b1f88570b90d77bc
-EBUILD aspell-ast-0.01-r1.ebuild 438 BLAKE2B 8a30b91bab1e1f3bc5a9e3ae5044997f13f31d7c7ec056de83f9d886a42352054c41cfba3ffbbf10f776a74bb83ed01b9091cbb0dc808e680cb49c059495badf SHA512 26230041743bca22d12f24aff0eba35ac14db3ddfd2f9d31e6a6d5215b0f71a8cb9835baa04199f236b3a77cf6aeec0402bfb7c3bd703d1eedcdf682c48e71cf
+EBUILD aspell-ast-0.01-r1.ebuild 440 BLAKE2B 30b305a89cb9099a1c5c396f37b18c377f39d349610fc3bf0e4a83bc59586e2a4197e2493254c5bdad01c4b3f944d5a135d0bc4bfbfda86bdb0b6b08a3b656c7 SHA512 6108dfa6edc9de4966beff0fa974ef3ad4952a38ef60d6a873be1f1e4bd57f66a642e2556c2cf4dbaebef81d4d7e919613b94e49d929d4978fdbf277d6e2d552
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild b/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
index b28405cdf9bc..abbd1a71dfa3 100644
--- a/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
+++ b/app-dicts/aspell-ast/aspell-ast-0.01-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Asturian"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-be/Manifest b/app-dicts/aspell-be/Manifest
index 368f24269992..79f490f955cd 100644
--- a/app-dicts/aspell-be/Manifest
+++ b/app-dicts/aspell-be/Manifest
@@ -1,4 +1,4 @@
AUX aspell5-be-0.01-official.patch 296 BLAKE2B f8d182a49512fd5d1331bed4e5eb57ff6f2fd6bda87daeef11dea1acd4cbde636014a754cb82c5920f159ed11b508a58a84779c3e2bb674fe4753f177ad716fc SHA512 d96f5250409589c1463f4c361024abc290f818476f291f1a044969d47c71798158275b5d8070cd134d3b2cd20a3509a1e15ef3d08a4074971d1af417be348970
DIST aspell5-be-0.01.tar.bz2 653405 BLAKE2B 7a7acadf75a754fd389b1bda94c5a437ba04db01beaaeea8a2cb2a3eba276150f680983e8292d5b80f3d5134501bfefad8538d96d2a459eeb698f0cd5f2a77a0 SHA512 320334c9944c44c9a61d24798ecd7603c4dc9fee99035d48d19759ecf2c1ac8ae21a0afde050d6527566e2404c1df4f75e313cec598b7faa93506142ea3c1022
-EBUILD aspell-be-0.01-r2.ebuild 562 BLAKE2B 2067431801c7ba83be15b22b3df26919b787828741a94cade944c3608cdc216045811bc5f452173571313e70afbfb2d62a04f86611689386c5facf20a503d67d SHA512 93d5baa2058ceb631eddcb1cba6946437da28a11403e67bdab3cb7176fd12397c6be8f3ce4baa9e31281201c09bcaa745726c04023e846c8bbd1207d8b01da23
+EBUILD aspell-be-0.01-r2.ebuild 564 BLAKE2B 2e421588b91de58f9cbd145621c7b90790a5f4749660dee15013ff244dc65a44bd639dedeb9fd4d5d7d56da5f183f0c4f5ab46c668a24d92da461cb381ab0fa7 SHA512 bfd998d0ff609f582c24aed1fbac83d71de4e2abcc3c96ddf3813b1e041011a0965bae8406ae243100d91736b5b951a051a43584d06a3587f07515a4178f33c8
MISC metadata.xml 356 BLAKE2B c174ec68b5c9df36ea740ff7a5513757420e866fdf7e1de3eae321d99aa43f3f81ff589e67150c1541d478e7baad61303fd052aa9782860fa3f7f6a2b53166cc SHA512 de552847531eb4d7f318b2bcc84ec790289ff82ff3c8d1786804b71d91eb629306aefaccdce782ef0a01abaf695aeabd571ef193306198816a54f0e384dd2aeb
diff --git a/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild b/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
index eddcca64a570..c0ce4d1b7155 100644
--- a/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
+++ b/app-dicts/aspell-be/aspell-be-0.01-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Belarusian"
ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-ca/Manifest b/app-dicts/aspell-ca/Manifest
index 000b2baf44ac..cb0dedc736fe 100644
--- a/app-dicts/aspell-ca/Manifest
+++ b/app-dicts/aspell-ca/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-ca-2.5.0.tar.bz2 250769 BLAKE2B 9ce3d87090416e2af526ced665b535e30f692fec293082828cbb28ead92387c6d3e0b9e4193c94f623ddfdf29860310ffb4446c9d67518edce6b43aaf1b34bc3 SHA512 70eee12b026d6d0b5f710593f4d1759190596e7b7db651b804cc4d724d2c567911ef8d370873ac7ab4506f6555b8dde046f3277c3cd072e0d7b76047cdd5b1b2
-EBUILD aspell-ca-2.5.0-r1.ebuild 538 BLAKE2B 52675278d1326c18d82ad93fcca7e790f670c19e705c918e9d89f032951789bf089abe838de5cc0736b601de65e84e02a690db96bf948b4e4b5003f619dee225 SHA512 2e0225f37207bc789a8dc0a82a6e1097a9c588e4e48c3428f53d1e3b7b0f7344cf43fbed7ef05eecb1651c2e502ae7c4f48f96145c6984ef61c6756042106291
+EBUILD aspell-ca-2.5.0-r1.ebuild 540 BLAKE2B 7ee744f08e47f6fc781611d8f7e63406b18281ff0809b2d7c020ff238cb35466a7618a1e43a1d9c94d98b407742e47e98b9aa04250f594ed2b8862478c237555 SHA512 27f906fee22763bb86b2386940e67db4360b981bee5d0df01d21af06bef61eefd24fc2fe0f622f11844ccd7a2fbe9546df8642cddb7c8ca85a49cbf4297a51a8
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild b/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
index 27380d30535f..17358f8b0468 100644
--- a/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
+++ b/app-dicts/aspell-ca/aspell-ca-2.5.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Catalan"
ASPELL_VERSION=6
-MY_PN="${PN/aspell/aspell${ASPELL_VERSION}}"
+MY_PN="${PN/aspell/aspell"${ASPELL_VERSION}"}"
MY_P="${MY_PN}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-de/Manifest b/app-dicts/aspell-de/Manifest
index f69b62b00dd5..7a96918811d1 100644
--- a/app-dicts/aspell-de/Manifest
+++ b/app-dicts/aspell-de/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-de-20161207-7-0.tar.bz2 294974 BLAKE2B c468eb843d0585ca196fa983ffebf933eb3386c942e7a8f0798980409aa2635f2ca9f890db0f3da281d7f126369afc9d27ac972d058bbe0dc7c3e7df5d5518ce SHA512 ec29fa49d4e0303d6ceb78da3884ac54ddf34205895f30a95bce0db66f74472b423980200acf01efb1fa40380d6ea6351a58656400af35772266f8a54b1bbec8
-EBUILD aspell-de-20161207.7.0-r1.ebuild 470 BLAKE2B 5bc04690946e158c7d95d388f221a1f7b339fa03aed487b247945fb22d0dbbe4894e511789faf3cd482bf0c02a1de9a80430d5a46f50c62a6db9c0e56de48765 SHA512 757c42dc5e6d5fe2d5b483343d9d3796aef8d4025648e87bb8a66b84e775f2924d409b279100c7bf8b1d27175be2c07e49a43c2975eab2a41db562f8f489fa0a
+EBUILD aspell-de-20161207.7.0-r1.ebuild 472 BLAKE2B 2a46352017333b0a8ceda60bd782144d54b2f5eb46c6e04122f317952e2a0386d8b392654e101fa5da2f07e7e99cad635dacc8bfedfe6f422c424c3b6b11554b SHA512 ef75601188e587f81fa90de2498403d74e97b1463dfb5aee87bde4341364522142922c6eed0165b90590815b0b181a59c73807774ee674e09af3e4b400ca4fc4
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild b/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
index c726dd55fd8a..5243f41e9775 100644
--- a/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
+++ b/app-dicts/aspell-de/aspell-de-20161207.7.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="German, Austria-German and Swiss-German"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV//./-}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV//./-}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-eo/Manifest b/app-dicts/aspell-eo/Manifest
index 4f8e32106633..afb069b4768c 100644
--- a/app-dicts/aspell-eo/Manifest
+++ b/app-dicts/aspell-eo/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-eo-2.1.20000225a-2.tar.bz2 71591 BLAKE2B 3e8624857ae9c7a1256849dfe65a2b5a9de396516973b3e00075d5bdc507598b414ad745df41e2f8b746aeb43d0296186dd1b8163af84a0bb709ac5a2847cab9 SHA512 172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda
-EBUILD aspell-eo-2.1.20000225.2-r1.ebuild 475 BLAKE2B 7f3e24e012ae94a9aa147f310fbc8b542b9d23b4c2366926ed036b61aaabfae994290281bdfa67904d3d1e6b0c87d739f1ae4e73662478cea3e292d0cc75b422 SHA512 671b0c1acfaeb3470b37becc371599f5a22c1bb4bc70586db8840950585db1335e990871b98d5876f5ba900ba4fdfb61f4f66143e52d4daecbe60d90289c8fdc
+EBUILD aspell-eo-2.1.20000225.2-r1.ebuild 477 BLAKE2B 8b5e2fde2246e6893c920e25ac5f3831a168b4555de1607189c129c2d801d0ca4cf6457e833ca8b8a722ef65f76e006c1adda658a471d6beae5d765c04fa987e SHA512 a7d8e3cc96909c7a2f9d016f32747554bb7d32d21676be290cea584ff6f851f91f91000462507531d5a6c3d4b0f261628f58de028be6b3ef44bf9e6f8810e19a
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
index 3e2223358d12..f7bdc02252a4 100644
--- a/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
+++ b/app-dicts/aspell-eo/aspell-eo-2.1.20000225.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
ASPELL_LANG="Esperanto"
ASPELL_VERSION=6
MY_PV="$(ver_cut 1-3)a-$(ver_cut 4)"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${MY_PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-ga/Manifest b/app-dicts/aspell-ga/Manifest
index e9eea9a4c559..a12dfd864dc2 100644
--- a/app-dicts/aspell-ga/Manifest
+++ b/app-dicts/aspell-ga/Manifest
@@ -1,3 +1,3 @@
DIST aspell5-ga-5.1-0.tar.bz2 1461825 BLAKE2B e1591c20da9abea4da5b7388c5d9d9f2c0ff2c2cf8b96d4b3e83010b71bcf538126712c8ec249d53398929cef69fe52c5b73745888a176233201fe56b9a96575 SHA512 e13c66829b8d578c577539b9adea459ca85bca5fa535ca130aa76011cad0deb0e8bbf1d5a09c7c0317c9d419898755807b7a5af166c1ee52a34906825070214b
-EBUILD aspell-ga-5.1.0-r1.ebuild 526 BLAKE2B 465590da5b85aace00e3a65dac95965da145e85d55ae6f233bedefbc0e241d19902a387507efbe41a2054038d5ef326bbe88b96a3bacdcf1c38e4d9058172872 SHA512 4119909ad25c348c78a5505f5753b445a6874fe0eee36278f3978cf539ba3a4616c1fa537788d940b956a4eb0d074503a7266078655ed9b5d5042a19e1339ba5
+EBUILD aspell-ga-5.1.0-r1.ebuild 528 BLAKE2B efc544b4233acfbb09d435cda3d769df3b551de95c7e869467a458d9fad1185e29c3bb11d01db2118ac0431c1c1fc4b30ea950da16153219176196779786934c SHA512 3c65b26d4feafccfacbbdefeaf30aaaaf82934afded28344c9b4c4af823aae1dbbad5b0c580ef11e7512bdf913bdcf518bffb189c4b28d20fc87397dd881e49b
MISC metadata.xml 357 BLAKE2B 2994adfc10648e39a9b2bc00fd37713f41aa81268dfe4eb3651ff7be34589c9fa8b583bd99e3b7840558d6dc8818ea036eb0f2be0e298194318392c03e149b31 SHA512 09057e1f06ab10968577c93f48210dad266743a1dffd6b7f9610d0545852681aa6d2b2d9c3756ad305abdd63ed3835af5559566da9cb736782b7898a74c1ccce
diff --git a/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild b/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
index d02c50cedb9b..738ebd03c7a3 100644
--- a/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
+++ b/app-dicts/aspell-ga/aspell-ga-5.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Irish"
ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-gl/Manifest b/app-dicts/aspell-gl/Manifest
index 3b39939e16d1..69d0dfdd21a0 100644
--- a/app-dicts/aspell-gl/Manifest
+++ b/app-dicts/aspell-gl/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-gl-0.5a-2.tar.bz2 80043 BLAKE2B 9c2c4601695e5fa5b64d0047e942f797bd37e2c2245421cb3a236a52fd64ba3524e1131c6e0e1deca777cb793d03e786ad4ad8804eadafe3bc17adf779f4b074 SHA512 9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714
-EBUILD aspell-gl-0.5.2-r1.ebuild 474 BLAKE2B cb8c4606f267e979e97ef9d2f7bb59666eae838600f5dae408398b3cf85fd821e1918b0b247b12dbeedb5da40fcf1985cb4301d2c7c3f50f66b9e330f0b40fdc SHA512 8ece2406e44c21a3200cbf8cd78050a27bf57aaaee9510a2a5a9a56a88a726dca000fac356e89a80e39a340ece75b5b8a716cd641a2bc999e8ed208bcdebd557
+EBUILD aspell-gl-0.5.2-r1.ebuild 476 BLAKE2B 75b99856bd4551035af4625bf65025f0d4ef02213297f39af89f693e18e649fdcd45c7c2bc6e596833f7cb97dae74076ded086535f5e5a6f12d6643a9c9a974b SHA512 38bd5817c7688d6ee7ea84f77acf418851683387a0d8e7823274cff89d622951a73823d24dce851db4fcbedfad1648200d819239101f19d6f05e918e79daddf7
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild b/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
index 1e31ec0ee6d0..ba5c7ee1f17c 100644
--- a/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
+++ b/app-dicts/aspell-gl/aspell-gl-0.5.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
ASPELL_LANG="Galician"
ASPELL_VERSION=6
MY_PV="$(ver_cut 1-2)a-$(ver_cut 3)"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${MY_PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-it/Manifest b/app-dicts/aspell-it/Manifest
index d701782cf47f..2872232c26f8 100644
--- a/app-dicts/aspell-it/Manifest
+++ b/app-dicts/aspell-it/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-it-2.4-20070901-0.tar.bz2 261419 BLAKE2B d377690df133647c8345eed4178d91c03a2a6813f444833ae5c78a0960577fa2d8d259a5b04e053770e2df832260ae817c387ddd814593fe2e6ddf5f95eb50a1 SHA512 6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9
-EBUILD aspell-it-2.4.20070901.0-r1.ebuild 459 BLAKE2B 9a6cbc35d445a07391866f5295ea269c1067220cf7b9053967e311dea69dc51a9073cf76d71db2cae5f2d27ab23c01cad28a0712e131726e57a749866863c462 SHA512 ac8538a2db028dd7f4bd70a9171b860b264578572330477ece5947d45b103b48c46ec8a70fed7b88f0bf29e884e34629e68837865c9f06832cf9dd32a9bf2d1c
+EBUILD aspell-it-2.4.20070901.0-r1.ebuild 461 BLAKE2B 59c12be06c3d6e6ee18ccd2c33bccc40fe093d7775e31d4d2fb8baa10fcc3da9cdb58398f6aa7d70ea5d2bc6e4410dd60405de3b36482693559687558d26b960 SHA512 3aa35a480cb5cadd0988cc1e0d9007aa73e98cae5ba9aeb2436f75ae2126b8f0dad1debdc64a5e4ca0ab5dc4111543b5810fb44249c8f6e08b0e445057ba133a
MISC metadata.xml 356 BLAKE2B e74055daa36a23c4c20bc8e4dbf5ecd9280667955c09cf89c18cac4536f6a85bac568c096f6bc5fc7f6f98468424243b041375f55914e4e76f1932357a7ab5e3 SHA512 f4395c008e6a4bcc4d23b4b4a3c8db340b09dfa1bf11000698b72ac33f497b299593b657a9b66ec34853a14e9654fd3d0b8ba343bb468f73f440e7d952955137
diff --git a/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild b/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
index 5ca016b0ddc8..737d13283005 100644
--- a/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
+++ b/app-dicts/aspell-it/aspell-it-2.4.20070901.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
ASPELL_LANG="Italian"
ASPELL_VERSION=6
MY_PV="${PV#*.}"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%%.*}.${MY_PV//./-}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%%.*}.${MY_PV//./-}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-lt/Manifest b/app-dicts/aspell-lt/Manifest
index 71e1979cb783..69c829a25f62 100644
--- a/app-dicts/aspell-lt/Manifest
+++ b/app-dicts/aspell-lt/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-lt-1.3.2.tar.bz2 176371 BLAKE2B 6d2d225b04beb3e07a7ec337371f4d7fcafe5a690bf7908f3931bcadb35fd4c9193e50fadca8a748ed93f290c42820cb60a62b57df3538e6fe7f1811f0e33c80 SHA512 df64eb6f5ae9bb564d14f0cd84106da3f32908e79682ebece6e3ed1613216eeca94f48c9c3f689df724cfca4d80f9749e39772766a9ea20167a97ee39074e5a3
-EBUILD aspell-lt-1.3.2-r1.ebuild 509 BLAKE2B 6bc246579f338690dd40171580a0da4b0e75e4739f8958b5651ff836b78fdf8ad0ffadbdfad0cf0f8a9b51fe51f8662283f1fdbaaabc3597b254fa158b01dd85 SHA512 fb4bebb4e6ef5143d80946a0144d60a87bb4d485f8df27a32b56c015b59ce503bcb3b1c02b0db461118d2414454efcea7b41d3c093dcab3effaba1e366d14193
+EBUILD aspell-lt-1.3.2-r1.ebuild 511 BLAKE2B 2cd85008f297767f5f5bf5264866fa133c575b5dfca130c8818d8119fa17943698c2befe7c5f980862d858ac1a967e60732d68313d0ab0858081624275bab392 SHA512 253ae0955ab7a561366ce5f9630bfbbc91fff0a2eed4dabf4a29cebc98031c7930b38355adb4bc12f3f689a0b0cc5faee66100c3d8fb6d16652c108d8bd8f651
MISC metadata.xml 359 BLAKE2B 51492481faedde42c7a2c94c26334e452970e8e3f2f0282f6905e98235e48c3199cfda326b5ab8f028587a4f6faa02c4d9573bbec4eca058320e78ce65b1c746 SHA512 e83fd835c848955a2aef77350c93cf122f52d9c49b721ea37dac1c935496630b2649e20d290aa873bda57a19689453a0ad3dada6df31b5ff93b282b04f136cb2
diff --git a/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild b/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
index 6f3d9ed429ec..717b03ec818d 100644
--- a/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
+++ b/app-dicts/aspell-lt/aspell-lt-1.3.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Lithuanian"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-ml/Manifest b/app-dicts/aspell-ml/Manifest
index 020e8533a757..31ca468c4747 100644
--- a/app-dicts/aspell-ml/Manifest
+++ b/app-dicts/aspell-ml/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-ml-0.04-1.tar.bz2 438015 BLAKE2B 00defa28d347385d74737e680b4c104f2a6c9b19bbe19880069ed1ecc54cef2a7844bf099c03bf7ae301cc85836c371b31588a71c4e3d5f219c596ac1ce448f2 SHA512 a9b6e522f9a4b4d9034f9cd2e1546e0cdfc9bad9f9c7515c8144efb186fb164ab55d422e93da89f0cf7c2b7e6f7b5d439747cc8b7e211c5b09a3638573765563
-EBUILD aspell-ml-0.04.1-r1.ebuild 450 BLAKE2B d946e15da2e3f4034c01c84ef12ab3438e6c8f014f07bc522ee8b3a1d3fc1c6d76929e4729ff2f58313ecd123272f98320363c7c8056d01785f8cfccefe6d00b SHA512 4a099731294898da304b443640875e06ce819e494579b64ed927ff5ca77db07f0d1dcf074b1c5184efa945459705095e01a821d6d30004eb96d39dbc20da1c62
+EBUILD aspell-ml-0.04.1-r1.ebuild 452 BLAKE2B 120f925db53d03e1ad50aa054b46f79628ff296722ef4754f3c2e33cb3b7d910b6db6a72fb1e1b024ca3e7ca09b42f66eb7063ab62c212f089dd5d1f021e3a86 SHA512 3138d324f4c85549b7caed40c5e6ec816267f436eecb8d93f83a8af5017ef6002791445727b44e7b1f603f24d28739f6b42b95bd614b617dbefc7e8ece3b2498
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild b/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
index 87b2c9d3ff47..07f56c3b6b9f 100644
--- a/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
+++ b/app-dicts/aspell-ml/aspell-ml-0.04.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Malayalam"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-pt/Manifest b/app-dicts/aspell-pt/Manifest
index c232845beebb..7192846ddc71 100644
--- a/app-dicts/aspell-pt/Manifest
+++ b/app-dicts/aspell-pt/Manifest
@@ -1,3 +1,3 @@
DIST aspell6.pt-20220621.tar.bz2 170248 BLAKE2B 24263cc1fc19b0758c08637edbd8e2b7d75132ee2cde46cfb4fb60d820452d57117e73666dae542f43c15fcc85868c686a98909ec1b3469396871b6e1ad03bb6 SHA512 9e5d7bd10b858f7fac288212c5658786fe1ce27c895673177aca99a17996ba7629817e0882432bfcf4dc9bdee501393f9f25744d59b0ae5995e2c2c78e2c147f
-EBUILD aspell-pt-20220621.ebuild 631 BLAKE2B a5f93bd1096af2534ce83fa19858aa666ec07c66a11f0553d8df13807aed6c85b448a18cd1ea1816a108aee19eecbc8a27e4bb572d6a6ccb79ec3a42f0e25a2f SHA512 1e83fb678a77011783885db8e4526789619cb92182ac96746c874dbc757c0556d1a891c81c9ee4cc6c2fb50cbf288ab7e4a43f8078f3f6e6d0bec58aafd59238
+EBUILD aspell-pt-20220621.ebuild 635 BLAKE2B 8c1e887d093d274722c557929aa805836de70be10a377fd638ee497d5fb578c244a892c6f2447aecd14e58196ef597d1fc0e32e2a90c4077c1f078441efc0165 SHA512 95c73145c26a6cf8cf4ad96e12798c1ed270fed0e8ce4487c3937bf9ccf0ac3a6be075e38d7bb44ebf4a3e5acc5b8a95eef91db35ecf5f8232ec3c0a7dcd81f1
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-pt/aspell-pt-20220621.ebuild b/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
index 71972c1b634b..59b1833c30eb 100644
--- a/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
+++ b/app-dicts/aspell-pt/aspell-pt-20220621.ebuild
@@ -6,8 +6,8 @@ EAPI=8
ASPELL_LANG="Portuguese"
ASPELL_VERSION=6
MY_PN="${PN/-/.}"
-MY_P="${MY_PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
-MY_S="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${MY_PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
+MY_S="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-ro/Manifest b/app-dicts/aspell-ro/Manifest
index 13b3adf46d2c..ac325c39a65c 100644
--- a/app-dicts/aspell-ro/Manifest
+++ b/app-dicts/aspell-ro/Manifest
@@ -1,3 +1,3 @@
DIST aspell5-ro-3.3.10.tar.bz2 469446 BLAKE2B f3e12fbed93ec368f6a94b5fc3475f26230d91f2e911c808a99e36be4a446832aaceb7ae203d771810c4978fe19a2eff779e099a0cc8f289abdab5db45deb222 SHA512 c535894d11ee168311a2cc0f799005639b21f3284a2a51db25d513d3e0494cf6d2fb7517bc79bc76f2d9ae89bb43c8bcbac7f451195ee22a7cce361aa09914ba
-EBUILD aspell-ro-3.3.10-r1.ebuild 485 BLAKE2B d7b3d4109819a2ca95f2012119d30b51481e953fbbd68f30ec99eb086d7cd50a36727dc28950f5d9bcd434e8f96d59194d14d1ab4da98955b967e6b664ecff1c SHA512 8fe7ed3db47683a2edc01141dd02d3fdfac51d3fab8ff2acd64a7bf6ae7690180d09ddc6ddd5ae1ab7a55b7d7434224ede079e219fd59051c128fa1c32390454
+EBUILD aspell-ro-3.3.10-r1.ebuild 487 BLAKE2B 707c23c34d8be3b0ed03c3973b05283bfafd4e876ba67c4148d422f410eb00240c7b208d92564ddf0450e02f0b74bb674b5cfac3236ebff760c4a70684eb9708 SHA512 2cf531288df0f9ef090e53268dac0a034de0d8d0f6f47ee287224a99cfbba70a7b42f1cecf0b8afa77bbe7e7a08f77ec379df3077218d1e41b7bcb34dc76af37
MISC metadata.xml 352 BLAKE2B 5a5d907f7afb0e969dc2f563a64cc37dee8c779bcd1d9c13da7255d8f4d89a683f870b1c60f75072c1eea27b84eacdcc28791902bfda745ebe0a252945ab7403 SHA512 c11306dbf7039968bf819f8603e637046034c2ffae58561e9fa1982272993e0a5826c20973e2e96cfd9a5c13c70c0b7a0fe250654a82a4978e92f6db29634868
diff --git a/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild b/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
index fe0dad58877b..d92599c11f7c 100644
--- a/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
+++ b/app-dicts/aspell-ro/aspell-ro-3.3.10-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Romanian"
ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-ru/Manifest b/app-dicts/aspell-ru/Manifest
index 917f7d6532e1..18bd7d1a0709 100644
--- a/app-dicts/aspell-ru/Manifest
+++ b/app-dicts/aspell-ru/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-ru-0.99f7-1.tar.bz2 427312 BLAKE2B e039744dff54dbad3dacafd63f5e4874b119b01da57929f403d535958b80b33e90a5429fdcfcc3d2fff2beb0e97e67fa0bd8af03c6a1ca2980d7c7718843c0e6 SHA512 789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430
-EBUILD aspell-ru-0.99.1-r2.ebuild 581 BLAKE2B 4dc67d5305ccb3ef3d175e9fcd885e738df48a354835a0b53387aa6405382a35f7d85728016af5f224e71000ed536476ef0bd9ad9ae757b08b1c7460f88b2df3 SHA512 55663fd22e6fd069c4e108e7e520e5a7026cb36d0f279b955596b172a48e460149c6cb19c544b64d51d398c70eeb0a23f86a266c80c63aa8e3a0318c63007ff8
+EBUILD aspell-ru-0.99.1-r2.ebuild 583 BLAKE2B 23c64090b4320b7343dd9eee17e1e9d7311b5cdf6c26d25de3042af9528629a6c0eec785fdb77ee2a034b23f3d6fdbff6ff36372fa9024922f0ce5b1ce8e8b4d SHA512 78d0b364b43d2b45bf9b72a625ea26f5fde066b57cc53ab4ab993ad644c7a5e496f6630978ca1b3e5e6f398e3b98a8365b06a86948837b2fb51e2e7562a33c98
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild b/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
index c235b67bba95..663473a7a423 100644
--- a/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
+++ b/app-dicts/aspell-ru/aspell-ru-0.99.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
ASPELL_LANG="Russian"
ASPELL_VERSION=6
MY_PV="$(ver_cut 1-2)f7-$(ver_cut 3)"
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${MY_PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${MY_PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-sc/Manifest b/app-dicts/aspell-sc/Manifest
index e4f6f401594c..76444917eb2a 100644
--- a/app-dicts/aspell-sc/Manifest
+++ b/app-dicts/aspell-sc/Manifest
@@ -1,3 +1,3 @@
DIST aspell5-sc-1.0.tar.bz2 281538 BLAKE2B 95b9f5f8508b026a919acabc7f1a6234323ffd462bea0447666831726495a5d3f1b7d52e83887144e275a2d76d2f1cb860537827c2c5e89a83aff2bbef3e0e01 SHA512 3cad49510894645b9bc97bbae877641e64af0440a2abcb6f96197da95390d4dd59d1374008c0ade9dc17772a32c367b9b03e6be65e7f190268365f25069d2a23
-EBUILD aspell-sc-1.0-r1.ebuild 439 BLAKE2B 8122a08b61dc43c7eb280ae1c5a017b656afb8e5cce26966339b40e786b6c5b9d3016c446633e1d99e8198e442ee0c876a39dc7d3f40a771f254be3cde6640fd SHA512 8f00bd2e95074c09b642406c79a0122a91ac70c4479fddfa64a4be2176e6085ad9738d97feebbe7642e79e8d94776927b59343cf01edf4c3243aaf63d696df4b
+EBUILD aspell-sc-1.0-r1.ebuild 441 BLAKE2B a4d53bb91f49c669c8abe56195fa4d6ffc76c7f94b0eca61aa94ff217f87da88da983beba3a642bd887105c2ab3bae32a96d642b97673bc908687b7cb71541f3 SHA512 0eeb4a1c9481e36e3b8169e5896ddd801cf4979595fb48dc8c3aeb8b6d153457ce51e2601ff773a88d84dfd850aecea5f071d828d3cf674fc4ec397d15948ce9
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild b/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
index 1ee14685ec03..de48f0755f84 100644
--- a/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
+++ b/app-dicts/aspell-sc/aspell-sc-1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Sardinian"
ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-sk/Manifest b/app-dicts/aspell-sk/Manifest
index d681b2ac0706..28538767a5bf 100644
--- a/app-dicts/aspell-sk/Manifest
+++ b/app-dicts/aspell-sk/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-sk-2.02-0.tar.bz2 448396 BLAKE2B 6f6a47e8a1dad0550ac0105868f256229ca37e5686422c138643e16d91d6f62f13dc766db4c69001c88c7fb96e5348da61d95f84c27ff7fcc6b5d17e6b9307e7 SHA512 fcdf5c043168c887f93dfad5b9c6e07d9edd0c6194139e61bee2ba3928798792d8e8b446754bc55a67acc6d333034ebed9655cc3c15ad638f834b5a9efcc63cd
-EBUILD aspell-sk-2.02.0-r1.ebuild 509 BLAKE2B 3395444a040961eb7040a820a163331f8450bccc5624ae3c2602bbe21adc70da52c4c0871f27e3f85dbe26dc999858c39d63f5de3898ee46bc80a1693d4194ab SHA512 f2e1cab6170b7e697900512d5e4cb9c167457dcc3f8a13cd366e09d6e3c4d4cdae48f6eca6a79f3bf3afe67d7a79216210d63ac012c296f483f9730c7bb6158e
+EBUILD aspell-sk-2.02.0-r1.ebuild 511 BLAKE2B 92eac1089ac46a3dca715ac952cd2358e66803f43d65e5fd4d2d0b9836d5a41ed19587d16fce89562355c0188217d6c46b88f3f75f8152631758bd7863656e4b SHA512 69b73129b03382e8d36594c3fa86f22665e5929ab3082e9b4ef2c55a19f4148db57c4324c400f1354e7bf04ffc1f6c7cb4fbf102bebf1ea21cd6c1af21c9c167
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild b/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
index 311b782b8a7b..c52ffaf9f09a 100644
--- a/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
+++ b/app-dicts/aspell-sk/aspell-sk-2.02.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Slovak"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-sr/Manifest b/app-dicts/aspell-sr/Manifest
index 4788a0aa186c..6226328cc73c 100644
--- a/app-dicts/aspell-sr/Manifest
+++ b/app-dicts/aspell-sr/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-sr-0.02.tar.bz2 574923 BLAKE2B 3fa85bb2a24716a51c33447fa15fdc833059d49db62f36d7f11dc21baa926c2918c869d5e7052f6d729c038af1aa1e12f47c6476349b6f34989c6fbbbe3ce34c SHA512 3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395
-EBUILD aspell-sr-0.02-r1.ebuild 433 BLAKE2B f4cea6a7c766f1d9b4bc9be10970afa300f90b90f2ddfe7a9297b360c15ef86d23cef7fc973a1c5d95fd144747141e118613c0097105ec6ce3b0c8b87825e9a8 SHA512 1838672a0975cdfb16a71895fb309f1b31c5be3f564a2078aa2f2a762e44e7fb54b026c9fd8e89bc65d51d83d40e0983b9eec2f22f67b4f67d356027e88d64ca
+EBUILD aspell-sr-0.02-r1.ebuild 435 BLAKE2B 7dd23ffc641058ca9ab8bb3ad22a8902aa7246b991ad1e3f5c6ca66daf5f9a475f92c833f9beb9d892b2d448f87249f027a3209c2b0bd2f097982e5ea534d64d SHA512 96565db8ba24a2d8d2ae0f2bbef3b5fdd67c8070670b4a718223d59f8b6960eb66b4976e06c7059d2629dc1ff352519eec1376b973ef608b1813d70d01849572
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild b/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
index e730744bf8f7..5223b4b3f4fc 100644
--- a/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
+++ b/app-dicts/aspell-sr/aspell-sr-0.02-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Serbian"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-tet/Manifest b/app-dicts/aspell-tet/Manifest
index 32fdff4d958b..817e15d2e776 100644
--- a/app-dicts/aspell-tet/Manifest
+++ b/app-dicts/aspell-tet/Manifest
@@ -1,3 +1,3 @@
DIST aspell5-tet-0.1.1.tar.bz2 33044 BLAKE2B 934bf9adf4936bfb18990b3c35ec45bfb9884f2a6a7c9518905fce633b842e7141f7365f9f2d9140d71d17fc24540d32484b8c8e68cf49b2673f770ab171de93 SHA512 6dc691b40cedd054a677197219f97ae5afc21bcf4820bf452d23963ae04a716bf7e38d1cff0eb050e13fd24fd2e8f3b0d24f9b19e7de3868faeca8aa16881802
-EBUILD aspell-tet-0.1.1-r1.ebuild 435 BLAKE2B f70054643541c12fd444e5198f1ec71131d1ef25766042b32fc34466e8c1afb058ee0738f45bcf6cb5f17fa8c0a6520c8cd6318dc9635ca2fcc4a28d3860cc63 SHA512 c1e6686fcea058e94443eb41c2af3d1abf51eb0e9edde0a13df8f646e9b10342cb2d5dfc03f893f768fed95977a3f401de63a1b0dd4efe8ba8de859d36ab188d
+EBUILD aspell-tet-0.1.1-r1.ebuild 437 BLAKE2B f9916965b8635623b8af61f1f1bd36533a732ce1d32a461f8143d10b84064acb769043dadaaca11051d8e770de16c2b3e6f4d3cab51b1fcdb9ef4fcb83f22a54 SHA512 e800fb9d24add459749c255dd2196b788e292a0a29051c5ac0ddaaf90165757ffb947b42aa7d27a717d44b9ab4f608a33bd270960a8702b21d980138bcf03d34
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild b/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
index 1d3c81aa5749..019d8238a49b 100644
--- a/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
+++ b/app-dicts/aspell-tet/aspell-tet-0.1.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Tetum"
ASPELL_VERSION=5
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV}"
inherit aspell-dict-r1
diff --git a/app-dicts/aspell-tl/Manifest b/app-dicts/aspell-tl/Manifest
index bef671492838..4dee1252c5de 100644
--- a/app-dicts/aspell-tl/Manifest
+++ b/app-dicts/aspell-tl/Manifest
@@ -1,3 +1,3 @@
DIST aspell6-tl-0.4-0.tar.bz2 42335 BLAKE2B 381fe2094c2411e50ee151da895109a352b1f7e8d6dd2ede372d81bba07f9bf45b9f6156d27e957287c9e8ad55b2a29db1fb3e4c1ba4f6ae47e3c94a7c2e3a9a SHA512 e9ad3e7e619ed19ffde923a07553c4930c60292a0e5592a68cf0e09d6f6d3b3b7ff74adb8f53e9255528c319c12ef442eff4e3b2ce169156d1664b5d565a7f5a
-EBUILD aspell-tl-0.4.0-r1.ebuild 478 BLAKE2B 3a384e6eac2903bff4afd829124c1aba7656e9288c5c5379510f17125cda29b99ee585b7f7cc910d5abcc0ff6c953c58541013fc18c36bd49e9509baa6d0555c SHA512 d10801b5081d51fdca725753e07adf3220d3f8c8524d702bb25eac7e1759c2417a3be512630d9a60f7a00029169465bc48e9064030d800efb76a0c5d32d1fed9
+EBUILD aspell-tl-0.4.0-r1.ebuild 480 BLAKE2B cf41253990aed68b652ce316e1f411a6fe73e8b927df41094464eefaf0d432b415abf2ad0936fbffda9f61c0afd4034934efc6d538364545b9e5b0f3fe12fdbc SHA512 7f4dea70f1a27d4f2b058021ca9daa684eeb03e22c4ce95368fa5780574aeb87413d53265275ae418d2e010f3dfa5eb23335ea2d0582a39ffc4e8838f06b1a6c
MISC metadata.xml 275 BLAKE2B 5ea4d40b14cc5ef65beaed8b1e6fba240963d79a9295621e0ec49d8e2a5577dc44770ebdea263723703611df01545780051e8cba4f2c4b6394c44db2abce3cde SHA512 c3dba23dbeb92f784a10f132881fd91e83a7bdc6a313ad5dff7da6e91ad72975a1b6fb5a85f3adef4abb746dd7f0fe7af81b8176ebf9ca495259ec04a29cbd8a
diff --git a/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild b/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
index 1d4a4b365a73..b911a2ad86cb 100644
--- a/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
+++ b/app-dicts/aspell-tl/aspell-tl-0.4.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
ASPELL_LANG="Tagalog"
ASPELL_VERSION=6
-MY_P="${PN/aspell/aspell${ASPELL_VERSION}}-${PV%.*}-${PV##*.}"
+MY_P="${PN/aspell/aspell"${ASPELL_VERSION}"}-${PV%.*}-${PV##*.}"
inherit aspell-dict-r1
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index a5cabf03c266..0bdfede5727a 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
Binary files differ
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 36aa3ec4b312..3df66c3ea081 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1,9 +1,7 @@
DIST gnucash-docs-4.10.1.tar.gz 83109980 BLAKE2B 1c7c14fe604b934a3a76c90822b2d6abd13fa81248be93269e90a09619ea5e145053933df1e6d7cd0578de0d4641ba1a5c87955452fdee1eba026843539ceb74 SHA512 b015071ae9cfcc65dfaae194ca3d8508345cdaaa6c6d955ba263b7b47ea5d9b6912807b0e8ad8988241184a8c380ba5c680c084130f61d0c040446efa5797f8c
-DIST gnucash-docs-4.4.tar.gz 62534210 BLAKE2B 0c3cdc3ccdf1cfb7a54e44dcde9ea10672cb312e6d6e083ae9bb65bc52b044e8559647a8491f6fa762d9bb84c33f22dd9cacb3a862548994bdc7c56b3e634aa9 SHA512 60e34af3fdb144fefc835d6497fd442daad1417c4e40f8b4fd8f66a37cd0cfa1d789aa03de435d4654ee2368a4b85e9b0cfba8eeef61829e0ca190a453a9abdc
-DIST gnucash-docs-4.5.tar.gz 71420078 BLAKE2B cf4cf6f62e0ce1c5f868f91b6452a531e14a4fb85c801a941e5b19a9a3e61593a248cc79c753e23d9fb40809f27194117d6e73c7723f9454c2c2d0658fcd77e0 SHA512 27fcb649ad813d2aa148b8a910a6d35fcb47e79b0c36e6b2456d733f8f969686234e090d128ccb4a2227c71385dfa9d9236606a3e9354923e128644ee0be137f
+DIST gnucash-docs-4.12.tar.gz 76306600 BLAKE2B 78fb413099701da8c251681fa9724867f94cd731f396a80fd2be647790f32285a45eb857bfeae4ed6c36f5ec7664bc5aabfbdc2237d155a9f95aab78bf3227fa SHA512 29db1a402f7d417ad1a2f4db683974447add597e1b9e1b421789f3d2c8f987d1692202bb9052548b5ce544973c12bd538abab5ff33d3253330f0535ef920c8f7
DIST gnucash-docs-4.8.tar.gz 74862559 BLAKE2B da0496a5762bd3a7437272e1118f53e2dbb218bc8c8e960134ece3b10909c5673109e76dd195cdde320bd47849d43ad1068d21857ab288b57ff3d179fafe36ce SHA512 61be5ada80748350f5d72068a6c19cd5a5db6cd8b4500ed16febe5f53586d929b4843ac6b51ced78b381e26c8948beeb1cc48593d5263f906ba5b8f3fda47d2e
EBUILD gnucash-docs-4.10.1.ebuild 1320 BLAKE2B b59c53c7f6973567a6e1a64093bbaa63e68982f8e1424999177b66ff1441a894edfbf93493f32eec61c3782094526d59b54aef5dc266637b83d1f31567da1f9e SHA512 c7c8fd54a5e05443685786370ee306c36fa3b2e7aa787c2a3e45af05df1f7588e69e11f3fb04ee18bec1a9d79b3d5d98d4a001090e5ae3c62b650325514f0524
-EBUILD gnucash-docs-4.4.ebuild 1285 BLAKE2B ecb63537a38a0bd44cc87e34d238b1f173330799aad9fad0908e940957dddff0305edbda67b0b06fac239776e375aecd3261e3f2765dec0cf6a94e965050247d SHA512 df0ed95b0f06a82ff9fda6f39229d8693676ea57699c9f1ef17ce19bb5e2801f342577e72c4e3cbd56c206b4e008f959147c3188b625a57c92c0cb3fe996f8ff
-EBUILD gnucash-docs-4.5.ebuild 1287 BLAKE2B bdcff301ee1ec3e3927bc7209579451b3ac63d76839c855cdb570902a0d87940686d7c197bcc5d88e2edd0e34e481d21bf6f6c4683a8c3d1664a17fae7f62710 SHA512 f128c1a98619845b0371acce1817f8d4c381e277d707d1ac154fd54364c5073a4afb14478f163cffc35c43860cab9cffe0eb825c746af6020b954ba32c6c4b39
+EBUILD gnucash-docs-4.12.ebuild 1408 BLAKE2B eaa8550df0d39424d2aa0fbbc3dd00f1e418dea1ca6efe73e7181615c3ca8af2a4500497d0c2f896534f9c8e1dbc173127e7ec03c4c5a8b6975b159df1c00b18 SHA512 0354f688c57144b59257cab44b82d39aa9e8c9a5aca35b79bd4056247da363013ad93c2f44c7eb4fe2445d63c13732e4fd6992eeffa054310ca475c4d161916b
EBUILD gnucash-docs-4.8.ebuild 1278 BLAKE2B 8bd5708ce32c324d150d946b2e05eaab13ec7ef4866fa6d0dc66c01b4418c9a4d42ba81c2258f5ab01503fc113b519a9f577ab118d42dbdfa86373f41f4ed5e5 SHA512 2080f962dc989078c4e6f3b7e5a6f6d3b275a3500ebe9115c14a503d57caaadb34c9c6fbbbc77329b64e4be586151d7c2cadc51dddfa4e5a06fd455235b57604
-MISC metadata.xml 331 BLAKE2B 135ffc2e8c3d03d13b165c798ad9d3448742cb7688c19972129462ac85e204b3e010197e076b37c5f92b956d53f30f5709dc25ccb0e15bddbffd5ea4e50f6f43 SHA512 52feb0565aa146f33ffe1024d8becbae1d3db8ba938028bb2af946877c93f278174811107f219d3786433e2b551f93417cb448febe71793f672f9b9d526d1830
+MISC metadata.xml 386 BLAKE2B c95b7a099a8d78b544782ba18dbf5bdc094e22e4afad4e97427a16e2bb4f0706104271b88db6cfec7670d78d21d61b717772f195ce6217e993099a5b13e547cd SHA512 f95171ae4ab46811574dc77d943f1c5f575cad1c92b979daefcd36eebe00b71aa9fdd12d09e451cb60d50edbd38df335ad05dd0cbcefc35c93150ffbb39af3e8
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.12.ebuild
index 858e91034767..d1f8186577d7 100644
--- a/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-4.12.ebuild
@@ -1,58 +1,60 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit autotools optfeature
+# Please bump with app-office/gnucash
+
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake optfeature
DESCRIPTION="Documentation package for GnuCash"
HOMEPAGE="https://www.gnucash.org/"
SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
LOCALES=( de it ja pt )
IUSE="${LOCALES[*]/#/l10n_}"
-DEPEND="
+BDEPEND="
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
- app-text/rarian
dev-libs/libxml2
dev-libs/libxslt
"
-src_prepare() {
- default
- eautoreconf
-}
-
src_compile() {
- :
+ cmake_src_compile -j1
}
src_install() {
local doc_type my_lang
- for doc_type in help guide; do
+ for doc_type in manual guide; do
for my_lang in C ${L10N}; do
- case $my_lang in
+ [[ -z ${my_lang} ]] && continue
+
+ case "${my_lang}" in
# Both help and guides translated
C|de|it|pt) ;;
- ja) # Only guides translated
- if [[ ${doc_type} = "help" ]] ; then
- elog "Help documentation hasn't been translated for $my_lang"
+ ja|ru) # Only guides translated
+ if [[ "${doc_type}" == "manual" ]] ; then
+ elog "Help documentation hasn't been translated for ${my_lang}"
elog "Will do English instead."
continue
fi
;;
*)
- die "Invalid locale: $my_lang"
+ die "Invalid locale: ${my_lang}"
;;
esac
- emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+ emake \
+ -C "${BUILD_DIR}/${doc_type}/${my_lang}" \
+ DESTDIR="${D}" \
+ install
done
done
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.5.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.5.ebuild
deleted file mode 100644
index 1da9c9eb8b32..000000000000
--- a/app-doc/gnucash-docs/gnucash-docs-4.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools optfeature
-
-DESCRIPTION="Documentation package for GnuCash"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-LOCALES=( de it ja pt )
-IUSE="${LOCALES[*]/#/l10n_}"
-
-DEPEND="
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- app-text/rarian
- dev-libs/libxml2
- dev-libs/libxslt
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- local doc_type my_lang
-
- for doc_type in help guide; do
- for my_lang in C ${L10N}; do
- case $my_lang in
- # Both help and guides translated
- C|de|it|pt) ;;
- ja) # Only guides translated
- if [[ ${doc_type} = "help" ]] ; then
- elog "Help documentation hasn't been translated for $my_lang"
- elog "Will do English instead."
- continue
- fi
- ;;
- *)
- die "Invalid locale: $my_lang"
- ;;
- esac
-
- emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
- done
- done
-
- einstalldocs
-}
-
-pkg_postinst() {
- optfeature "generating PDF files" dev-java/fop
- optfeature "viewing the docs" gnome-extra/yelp
-}
diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index 6cd43c9efeac..0c83fc97a657 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">gnucash</remote-id>
+ <remote-id type="github">Gnucash/gnucash</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 51e0e4af04d6..089d2d2a754e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
Binary files differ
diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest
index 880c72716c88..7796f2c2b1a3 100644
--- a/app-editors/jupp/Manifest
+++ b/app-editors/jupp/Manifest
@@ -1,5 +1,5 @@
DIST joe-3.1jupp40.tgz 503318 BLAKE2B 34452784f145f81158dc6a9223a365cd04fce2f3a669f99bf5571e8f33ecf8ff34d7f8495f6c6803ab1e734890c95d9fe9f88be38738b2b2111a9512db2f7872 SHA512 d61b7b9c5cc5c17925ef27f8f7942bc4e4d283e49b02f4962a7e3c5d3122868aadffe108f884164ae61e86776584374a2b5220c313a323efb9d3820268402ead
DIST joe-3.1jupp41.tgz 505002 BLAKE2B 4b354bb2643896b68dc6f270ee7a030703e168b9e8b98ab537878a53b00faad6809ff48eb9c24fa68a0d6e436222f745eef69290e803c1fcace5e6ca0278a6c9 SHA512 9a07946984b64fff4ad8174f9fa437073543cd6af357caf9674571ed787709b3cc2b16fd571d7b8b50b8bb9c7e7bf49dff010d162b76324818be130ab37e06cf
EBUILD jupp-3.1_p40.ebuild 650 BLAKE2B bd62a9e485d8b17baf7ac7a91bb945d3fa791a4f21b2cfba23fbe3c1907a0c1d3b46126be869ef4d384c9ed2791d33bb8851c3ef8673797121f240d9a2cc02ee SHA512 9d7172bb82fcbea8700e2bdbe4076097f6a6d230b3d2fad4938b0f61e19b6f3f72cb070c24a873c2c13a6a088e4a406df7d3f9f1ba4e154be6358fabd610d46d
-EBUILD jupp-3.1_p41.ebuild 620 BLAKE2B b7fdd1ca838afc1ff7127860177f9e766ee61967b5e0bfe3619d1eceaf3e3f340d2cd1c7ad7e7efea24adf1a795f14ac1cfbb7ae44024ac93e9b7e31c11ff132 SHA512 4eaf84cc3eaf976b29fe9422be35dacd5f3d0958a8a9af3471338fa1a661b956c370b783d453635de2adbd7c18bf6c34eaaaf52b01a717fd2abce1ecbc1e59c7
+EBUILD jupp-3.1_p41.ebuild 622 BLAKE2B fac6a4c1634b4c89dea756caf9dc71ad4807d8bd3b0c903681bd16dbde09eeea0c45994f99520f79815668d008939fedef158a22a6e8709cb577c2a1d380a0d0 SHA512 271982e5a08628303fc6fc8fa740d6b6a2ec896b907061d48acc6fecd44bc5e264cc34022046866b669649646c7e9d7c1b7a3bb0379a157bc2debbbfa79bbd06
MISC metadata.xml 252 BLAKE2B 21a1d67ef5a4d07f5f6ae18274ef15ee1ed5503ec38a59df3d0e78c501210f5865b893bb15648fcbc7cf027685995eedd94e757d446e3dd192c21f9170b7caa8 SHA512 27750f0c61daeb5558917bf1281981fc68ee903f55a63dc5806b8bfb63b31dde20d2fb9b2b434d089a73ba5f14cbfbfa7adfc98c7ede5f2102ea9d397575420e
diff --git a/app-editors/jupp/jupp-3.1_p41.ebuild b/app-editors/jupp/jupp-3.1_p41.ebuild
index cfdbb37a9585..3e6e016b519c 100644
--- a/app-editors/jupp/jupp-3.1_p41.ebuild
+++ b/app-editors/jupp/jupp-3.1_p41.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DESCRIPTION="Portable version of Joe's Own Editor"
HOMEPAGE="http://www.mirbsd.org/jupp.htm"
-SRC_URI="http://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/${PN}}.tgz"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/"${PN}"}.tgz"
S="${WORKDIR}/${PN}"
LICENSE="GPL-1"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 71c120966cf5..d9df184e6431 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
Binary files differ
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index f9be409b19e9..4472138da1b6 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,13 +1,12 @@
AUX gnucash-3.2-no-gui.patch 440 BLAKE2B 223d9527e0f290e73774b39ee25dae2c1740d4ed8b340d5d8cdfde74734ae30ebc391ca4ef8df6b162dd53cfd1b5ae3c7d5cd64446978a86969bb5fcc9ea6440 SHA512 628d38969abd7475f88ed9013d99691768abd11a751205092e04b92183551e0dce2e32f1212f66fde47e83730e1d26addbc47d990478e8a8968f9c9f0bc041bd
AUX gnucash-3.8-examples-subdir.patch 316 BLAKE2B 77779cebb75896e8d51981f5fc0cbc09aa51e83ea0823b1055d5e6bf9b420492f039e7e39985e405304819a46bbd178d10c2a55188e956c9b71b2c20842f947e SHA512 d4fc9a3e062ff25f65b82253c563c0d291d461b44d47f30c33a8041908a59fa23ce3e127b885690b1ec55d17222cac2c3679d49d962bb5be998f9611467e88f8
AUX gnucash-3.8-exclude-license.patch 634 BLAKE2B d6b86102a4ced983684e75f4f4801b7da096923a65c7fca10f13e9da45adb70ac5c2c3c5af9151a14e6f1eb3a3711d6283840db232ee6113818e1f1b215be9dc SHA512 a9c43405226d2256c0b3c981e70a4fc79bd126c08089e68ac01edc86070a2936eaa3f77ac16bad94954addd2085ca0bf1c62bec3d31840559bbf213e1b530f2d
+AUX gnucash-4.12-drop-broken-test.patch 1214 BLAKE2B 6e977f65cecee6b9102881529799f04ddd03b170f0e9cbe8959b3e356d2dfbef14d9cb11d3e37f0225991fe7bd08ef50163db1d007836cb1024b0c1a6e79b0fd SHA512 8f18214982537514cb0640a4fa52fe9707c6f3ea0db0eef1108fb7b36fb89d0dadc87d12796c60b94d9ed8224655c35a9954bfb463f9f6b56cb02eca4d9d4cda
+AUX gnucash-4.12-fix-test.patch 751 BLAKE2B 650ee0592dbc21f36792f135bf3c13b5b4869cf343170917b5bf408d43d6bb2d105e7f987fba38073bd16e6cf65ad8615812851b05b4909800ec9784ae1b5279 SHA512 f1e2a7fdab9849167dbca2fb407416ba6e55a158b609a995a9bbde3ea1d06cff1de00cc9839f4623b3ac04300b7043a38d5cd6cc70d1fab131159fb3e4ffbfd3
DIST gnucash-4.10.tar.bz2 14768016 BLAKE2B 645caedc342508290bac1ed4c8745ddc84f9634887cacc49246b3b1470e1d4c34b55af5b79c23747c8e223096e2b57876635fd07bc1e9153331abd11e4e249c2 SHA512 6898edff50af360bc7112a6d8eab3cde808a127df603f2eb5dca166a8f2ea079c3d37859fcb4ea22fa3a137f71792402dbff2d3ef4d0d93b0f2c980f5b1c2a62
-DIST gnucash-4.4-Fix-build-with-glib-2.68.patch.xz 9120 BLAKE2B b04cc859ab2817b69e9a5b3b92d73dd16aa4b3264202d0d089c80251a9ead5f459c6918fc605fda50e98db01d81dc4691ae58d7ff2eb4dad8c805edb523e36eb SHA512 3aea6195f47ed4c3ca395f10b7575bcabf8f5dcb185b938ece19a518de0f0bd18e9bbe19b84eca8ec99e3a076745e441f3d47d894049f0cfb88168723338fbf0
-DIST gnucash-4.4.tar.bz2 14430959 BLAKE2B 7a9e04957919a99e083dd5c1ac04150f77ab64eef277c0cd63ef90ade4a82875447f291d4f14499a14e987a86a7b7615d4a3cbb79a980be7022cb4f511b71368 SHA512 5882e5a91081bb9279ac5dc8798352cb15ebb934d1d37c6d6639244602108e067ece5b7f51ba32c9c413c1469d08ca32a73369e6af34e41c3ef704033c71f336
-DIST gnucash-4.5.tar.bz2 14472274 BLAKE2B 2cf9726fc241506867a49f796d2526c6a7524667dcf706f812d225deac146020f49dcdc7ac64b1c0b90d6e61941197dd8aec0f5166e474bc2f601fc8674abdc1 SHA512 5e6dfebae8845ab7ad8fcb95f38eb1d0907e789637f722fccf31486b05ee9ebbfb60b8c70e1cef1fc5913b73bfdc2251babed09b6f894c266b969874f3dff30b
+DIST gnucash-4.12.tar.bz2 14552115 BLAKE2B 6d5faf2fa1d096315bd6c346e0291109669fd9df4bc0404f4dbc2fc56c8a361aeff57e3535fea862f21ff59391319010b7f28c9bd7df658a1b0c518894862585 SHA512 4c930dfc9a10dfd06d3c52874a61e533ddc39deb1c334162dc3a096d998dbdfcac61520ae94dedbc6742b7807e250ff92d26067a70c4ab156e46bed333bbfd37
DIST gnucash-4.8.tar.bz2 14679619 BLAKE2B ef0790dcf823631b3a9764d60a49a55f35614d31117b1921ad5621d8b5298928555725b4d376e4b782437f8874b438496c3fd5b610df480fcc17f5d049a07511 SHA512 5fbafabe7ddbafe5e275b058758637011712934aec875b97085b7d068ab556ae5041b2cfa83f9a735eec877fac5158b701c2255be129e8ce883acf668fadefb5
EBUILD gnucash-4.10.ebuild 5166 BLAKE2B 06394d0b361926d5b8310096d444f42871c4fce672fdb128309d30d6c6465ba18869b11ba085b0edf332c444fd8bfacfa022dbb225be7168cf8fdb5d5af98a2b SHA512 32be59d825a1b9c136a0e22be0cdce58fdae70344f6363c9dd425cd55b3a3635cb5a8d3c9034cbef74b4b4422722079d88e7e3ec1c8e1fa209f414e290215447
-EBUILD gnucash-4.4.ebuild 5324 BLAKE2B 0e12c57a0d2e63129f7d2537d217a57a4c4214a9d70a47ec573dfbcbcce7e1a3f2aba31fba39b407d72d7af80774ae202c0d3537536d9b543a435659d024bf55 SHA512 01070e2aadee118e292996f35f8fb350b12f11e6a143e966fbfcb46fd76f22f8f04a6a6ef4fdd88824a67d5283c7d897ef2c78e2ec452e5ab82d9fa95ce92a48
-EBUILD gnucash-4.5.ebuild 5207 BLAKE2B 8d6f3d67dd2f68a522c8a47f176a5b6571457de8a2beb7c144075f51e5e7d10fd0087a3e0bc52b138192a5954e22d581c940a786a6b3345b7edc8d74ac999c7c SHA512 27e9a1fde6dff188a040a93676f523e9856733ee5a10329c136b997289e776bb9b4d39eabc4774811ac60bc6129bff1468d750ee98f11a1610ecdedede1668dc
+EBUILD gnucash-4.12.ebuild 5470 BLAKE2B d5c7a475bf83bad29064251a50018f32419091ad8fe1107d70b5828f9624e8bccac0405171e3caf9a198b886cb95c8468832d1a7ec65532ed4b3e8365fbed45a SHA512 8ceac87f19133e5fc71bdedeb0475b4c7ef67be339eda825f9b7c9708a53050cca521db9c1efd0099ccd33ba2839737bfbc42539fd7468134c1888449f332851
EBUILD gnucash-4.8.ebuild 5099 BLAKE2B 1743c35f6d0afb4ea1aab9f902070774478507778eb760ddb2aff9146615095c603c6a3c821793b1153d0783c9eae87ec2549bc8ad6334ac0cb54462d43b5a9b SHA512 c659e49db5238a8598d9d4a697bd3cdc1419170f5d08219c93a04bde13b2aba6a4f8f18c77db5941f68ac5a6de4f58be80ab3e0d32aff8ca612021c4ee8bedae
-MISC metadata.xml 563 BLAKE2B c2c2032183dddfa3a0fc088083fa4fc9012594dcc9949efbcde4f631e03bbc571e7d1e1711133f368ff9639539386dd96fa9e5b89c4cac662b7653ca4c85adf7 SHA512 2df8f406a6d52acfd7bab9f42c509e7004b87aa1bb765f4df80d8e8df975406463b7bf3ab9cace438662d38163cd3dd998b7da9d9bde327444fa4d27b0cef2ed
+MISC metadata.xml 1804 BLAKE2B 15a3ca62726683e56bf8a85ee4738a078c7d832776b54ebb35a28b7525d1634b88507ecba3595e76ec3b06f02fd263605f02c595fd459aeb86dfd05fbe124910 SHA512 0ee5d563d4e787717b97c1993946f6fc6c69b3677791a6bd45bf1aafaac43271b47e11d876a48fdba42a304e75e5f6290ebb1173f56c9f9b5c9422663a5aa119
diff --git a/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch b/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
new file mode 100644
index 000000000000..970d423c7b31
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.12-drop-broken-test.patch
@@ -0,0 +1,26 @@
+https://github.com/Gnucash/gnucash/pull/1472
+
+From a52795b022e040d7a93bb4dc352780d832c55390 Mon Sep 17 00:00:00 2001
+From: Marco Scardovi <mscardovi@icloud.com>
+Date: Sat, 26 Nov 2022 22:38:02 +0100
+Subject: [PATCH] Fix test
+
+Signed-off-by: Marco Scardovi <mscardovi@icloud.com>
+--- a/libgnucash/core-utils/test/CMakeLists.txt
++++ b/libgnucash/core-utils/test/CMakeLists.txt
+@@ -19,9 +19,6 @@ endmacro()
+ add_core_utils_test(test-gnc-glib-utils test-gnc-glib-utils.c)
+ add_core_utils_test(test-resolve-file-path test-resolve-file-path.c)
+ add_core_utils_test(test-userdata-dir test-userdata-dir.c)
+-if (NOT MAC_INTEGRATION AND NOT WIN32)
+- add_core_utils_test(test-userdata-dir-invalid-home test-userdata-dir-invalid-home.c)
+-endif()
+ if (MAC_INTEGRATION)
+ target_compile_options(test-userdata-dir PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
+ target_compile_definitions(test-userdata-dir PRIVATE ${GTK_MAC_CFLAGS_OTHER})
+@@ -53,4 +50,4 @@ gnc_add_test(test-gnc-path-util "${test_gnc_path_util_SOURCES}"
+
+ set_dist_list(test_core_utils_DIST CMakeLists.txt
+ test-gnc-glib-utils.c test-resolve-file-path.c test-userdata-dir.c
+- test-userdata-dir-invalid-home.c gtest-path-utilities.cpp)
++ gtest-path-utilities.cpp)
diff --git a/app-office/gnucash/files/gnucash-4.12-fix-test.patch b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
new file mode 100644
index 000000000000..03b4bba29c24
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-4.12-fix-test.patch
@@ -0,0 +1,20 @@
+https://github.com/Gnucash/gnucash/pull/1472
+
+From 6fe2028bca49f455b7841d178a712baec8f72919 Mon Sep 17 00:00:00 2001
+From: Marco Scardovi <mscardovi@icloud.com>
+Date: Thu, 24 Nov 2022 23:20:07 +0100
+Subject: [PATCH] Fix test
+
+Signed-off-by: Marco Scardovi <mscardovi@icloud.com>
+--- a/libgnucash/engine/mocks/fake-qofquery.cpp
++++ b/libgnucash/engine/mocks/fake-qofquery.cpp
+@@ -59,8 +59,8 @@ static class QofFakeQueryPool
+ {
+ ASSERT_TRUE(query_used((QofQuery*)query));
+ auto it = std::find(m_queriesUsed.begin(), m_queriesUsed.end(), query);
+- m_queriesUsed.erase(it);
+ m_queriesConsumed.push_back(*it);
++ m_queriesUsed.erase(it);
+ }
+
+ /* Remove a formerly added QofFakeQueryObject from the pool */
diff --git a/app-office/gnucash/gnucash-4.5.ebuild b/app-office/gnucash/gnucash-4.12.ebuild
index 11cdf2fabdfe..702eadfdd4b6 100644
--- a/app-office/gnucash/gnucash-4.5.ebuild
+++ b/app-office/gnucash/gnucash-4.12.ebuild
@@ -1,33 +1,35 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9} )
+# Please bump with app-doc/gnucash-docs
-inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake gnome2-utils python-single-r1 xdg-utils
DESCRIPTION="A personal finance manager"
HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/Gnucash/gnucash/releases/download/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2+"
SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
- python quotes register2 smartcard sqlite test"
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test"
RESTRICT="!test? ( test )"
# Examples doesn't build unless GUI is also built
REQUIRED_USE="
examples? ( gui )
python? ( ${PYTHON_REQUIRED_USE} )
- smartcard? ( aqbanking )"
+ smartcard? ( aqbanking )
+"
# dev-libs/boost must always be built with nls enabled.
# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
+# dependency, we just rely on that.
RDEPEND="
>=dev-libs/glib-2.56.1:2
>=dev-scheme/guile-2.2.0:=[regex]
@@ -73,41 +75,49 @@ RDEPEND="
dev-db/libdbi-drivers[sqlite]
)
"
-
-DEPEND="${RDEPEND}
- >=dev-cpp/gtest-1.8.0
+DEPEND="
+ ${RDEPEND}
>=sys-devel/gettext-0.20
dev-lang/perl
dev-perl/XML-Parser
sys-devel/libtool
+ test? ( >=dev-cpp/gtest-1.8.0 )
"
-
BDEPEND="
dev-lang/swig
dev-util/cmake
virtual/pkgconfig
"
-
-PDEPEND="doc? (
- ~app-doc/gnucash-docs-${PV}
- gnome-extra/yelp
-)"
+PDEPEND="
+ doc? (
+ ~app-doc/gnucash-docs-${PV}
+ gnome-extra/yelp
+ )
+"
PATCHES=(
"${FILESDIR}"/${PN}-3.8-examples-subdir.patch
"${FILESDIR}"/${PN}-3.8-exclude-license.patch
+ "${FILESDIR}"/${P}-drop-broken-test.patch
+ # will be fixed on future version, see
+ # https://github.com/Gnucash/gnucash/pull/1472
+ "${FILESDIR}"/${P}-fix-test.patch
)
-S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+# guile generates ELF files without use of C or machine code
+# It's a portage false positive, bug #677600
+QA_PREBUILT='*[.]go'
pkg_setup() {
use python && python-single-r1_pkg_setup
- xdg_environment_reset
}
src_prepare() {
cmake_src_prepare
+ # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
+ find "${S}" -name "*.scm" -exec touch {} + || die
+
# Fix tests writing to /tmp
local fixtestfiles=(
gnucash/report/test/test-report-html.scm
@@ -151,11 +161,6 @@ src_configure() {
}
src_test() {
- if use python ; then
- cp common/test-core/unittest_support.py \
- "${BUILD_DIR}"/common/test-core/ || die
- fi
-
LOCALE_TESTS=
if type locale >/dev/null 2>&1; then
MY_LOCALES="$(locale -a)"
@@ -170,22 +175,20 @@ src_test() {
ewarn "'locale' not found."
fi
- if [[ ! ${LOCALE_TESTS} ]]; then
+ if [[ ! "${LOCALE_TESTS}" ]]; then
ewarn "Disabling test-qof and test-gnc-numeric."
echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
- > "${BUILD_DIR}"/CTestCustom.cmake || die
+ > "${BUILD_DIR}"/CTestCustom.cmake || die "Failed to disable test-qof and test-gnc-numeric!"
fi
- cd "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die "Failed to enter ${BUILD_DIR}"
XDG_DATA_HOME="${T}/$(whoami)" eninja check
+ cmake_src_test
}
src_install() {
cmake_src_install
- # strip is unable to recognise the format of the input files (*.go)
- dostrip -x /usr/$(get_libdir)/guile
-
if use examples ; then
docompress -x /usr/share/doc/${PF}/examples
else
diff --git a/app-office/gnucash/gnucash-4.4.ebuild b/app-office/gnucash/gnucash-4.4.ebuild
deleted file mode 100644
index 8f020d3cb3eb..000000000000
--- a/app-office/gnucash/gnucash-4.4.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="https://www.gnucash.org/"
-SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-Fix-build-with-glib-2.68.patch.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-
-IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
- python quotes register2 smartcard sqlite test"
-RESTRICT="!test? ( test )"
-
-# Examples doesn't build unless GUI is also built
-REQUIRED_USE="
- examples? ( gui )
- python? ( ${PYTHON_REQUIRED_USE} )
- smartcard? ( aqbanking )"
-
-# dev-libs/boost must always be built with nls enabled.
-# net-libs/aqbanking dropped gtk with v6. So, to simplify the
-# dependency, we just rely on that.
-RDEPEND="
- >=dev-libs/glib-2.56.1:2
- >=dev-scheme/guile-2.2.0:=[regex]
- >=sys-libs/zlib-1.1.4
- dev-libs/boost:=[icu,nls]
- dev-libs/icu:=
- dev-libs/libxml2:2
- dev-libs/libxslt
- aqbanking? (
- >=net-libs/aqbanking-6[ofx?]
- sys-libs/gwenhywfar:=
- smartcard? ( sys-libs/libchipcard )
- )
- gnome-keyring? ( >=app-crypt/libsecret-0.18 )
- gui? (
- >=x11-libs/gtk+-3.22.30:3
- gnome-base/dconf
- net-libs/webkit-gtk:4=
- aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
- )
- mysql? (
- dev-db/libdbi
- dev-db/libdbi-drivers[mysql]
- )
- ofx? ( >=dev-libs/libofx-0.9.1:= )
- postgres? (
- dev-db/libdbi
- dev-db/libdbi-drivers[postgres]
- )
- python? ( ${PYTHON_DEPS} )
- quotes? (
- >=dev-perl/Finance-Quote-1.11
- dev-perl/Date-Manip
- dev-perl/HTML-TableExtract
- )
- sqlite? (
- dev-db/libdbi
- dev-db/libdbi-drivers[sqlite]
- )
-"
-
-DEPEND="${RDEPEND}
- >=dev-cpp/gtest-1.8.0
- >=sys-devel/gettext-0.20
- dev-lang/perl
- dev-perl/XML-Parser
- sys-devel/libtool
-"
-
-BDEPEND="
- dev-lang/swig
- dev-util/cmake
- virtual/pkgconfig
-"
-
-PDEPEND="doc? (
- ~app-doc/gnucash-docs-${PV}
- gnome-extra/yelp
-)"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2-no-gui.patch
- "${FILESDIR}"/${PN}-3.8-examples-subdir.patch
- "${FILESDIR}"/${PN}-3.8-exclude-license.patch
- "${WORKDIR}"/${P}-Fix-build-with-glib-2.68.patch
-)
-
-S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
- xdg_environment_reset
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Fix tests writing to /tmp
- local fixtestfiles=(
- gnucash/report/test/test-report-html.scm
- gnucash/report/reports/standard/test/test-invoice.scm
- gnucash/report/reports/standard/test/test-new-owner-report.scm
- gnucash/report/reports/standard/test/test-owner-report.scm
- gnucash/report/reports/standard/test/test-transaction.scm
- gnucash/report/reports/standard/test/test-portfolios.scm
- gnucash/report/reports/standard/test/test-charts.scm
- gnucash/report/test/test-report.scm
- gnucash/report/test/test-commodity-utils.scm
- gnucash/report/test/test-report-extras.scm
- libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
- libgnucash/backend/xml/test/test-xml-pricedb.cpp
- )
- for x in "${fixtestfiles[@]}"; do
- sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
- done
-}
-
-src_configure() {
- export GUILE_AUTO_COMPILE=0
-
- local sql_on_off="OFF"
- if use mysql || use postgres || use sqlite ; then
- sql_on_off="ON"
- fi
-
- local mycmakeargs=(
- -DCOMPILE_GSCHEMAS=OFF
- -DDISABLE_NLS=$(usex !nls)
- -DENABLE_REGISTER2=$(usex register2)
- -DWITH_AQBANKING=$(usex aqbanking)
- -DWITH_OFX=$(usex ofx)
- -DWITH_PYTHON=$(usex python)
- -DWITH_SQL=${sql_on_off}
- -DWITH_GNUCASH=$(usex gui)
- )
-
- cmake_src_configure
-}
-
-src_test() {
- if use python ; then
- cp common/test-core/unittest_support.py \
- "${BUILD_DIR}"/common/test-core/ || die
- fi
-
- LOCALE_TESTS=
- if type locale >/dev/null 2>&1; then
- MY_LOCALES="$(locale -a)"
- if [[ "${MY_LOCALES}" != *en_US* ||
- "${MY_LOCALES}" != *en_GB* ||
- "${MY_LOCALES}" != *fr_FR* ]] ; then
- ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
- else
- LOCALE_TESTS=true
- fi
- else
- ewarn "'locale' not found."
- fi
-
- if [[ ! ${LOCALE_TESTS} ]]; then
- ewarn "Disabling test-qof and test-gnc-numeric."
- echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
- > "${BUILD_DIR}"/CTestCustom.cmake || die
- fi
-
- cd "${BUILD_DIR}" || die
- XDG_DATA_HOME="${T}/$(whoami)" eninja check
-}
-
-src_install() {
- cmake_src_install
-
- # strip is unable to recognise the format of the input files (*.go)
- dostrip -x /usr/$(get_libdir)/guile
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -r "${ED}"/usr/share/doc/${PF}/examples
- fi
-
- if use python ; then
- python_optimize
- python_optimize "${ED}"/usr/share/gnucash/python
- fi
-}
-
-pkg_postinst() {
- if use gui ; then
- xdg_icon_cache_update
- gnome2_schemas_update
- fi
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-
- ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
- ewarn
- ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
- ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
-}
-
-pkg_postrm() {
- if use gui ; then
- xdg_icon_cache_update
- gnome2_schemas_update
- fi
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index d5d2365d04db..f4fdd26932f1 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -5,14 +5,33 @@
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
+ <longdescription lang="en">
+ GnuCash is personal and small-business financial-accounting software,
+ freely licensed under the GNU GPL and available for GNU/Linux, BSD,
+ Solaris, Mac OS X and Microsoft Windows.
+ Designed to be easy to use, yet powerful and flexible, GnuCash allows
+ you to track bank accounts, stocks, income and expenses. As quick and
+ intuitive to use as a checkbook register, it is based on professional
+ accounting principles to ensure balanced books and accurate reports.
+ </longdescription>
+ <longdescription lang="it">
+ GnuCash è un programma finanziario e di contabilità adatto all'utilizzo
+ in ambito famigliare o in una piccola impresa, rilasciato gratuitamente
+ con licenza GNU GPL e disponibile per GNU/Linux, BSD, Solaris, Mac OS X
+ e Microsoft Windows.
+ Progettato per essere di semplice utilizzo, ma comunque potente e flessibile,
+ GnuCash permette di tenere traccia dei conti bancari, delle azioni,
+ delle entrate e delle uscite. Intuitivo nell'utilizzo come il registro del
+ libretto degli assegni, si basa sui principi fondamentali della contabilità
+ per garantire l'equilibrio dei saldi e l'accuratezza dei resoconti.
+ </longdescription>
<use>
- <flag name="aqbanking">
- Connect to some internet banks via AqBanking
- </flag>
+ <flag name="aqbanking">Connect to some internet banks via AqBanking</flag>
<flag name="quotes">Enable Online Stock Quote retrieval</flag>
<flag name="register2">Use the new register (Experimental)</flag>
</use>
<upstream>
<remote-id type="sourceforge">gnucash</remote-id>
+ <remote-id type="github">Gnucash/gnucash</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 353454f224eb..d7aa20426b8e 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
Binary files differ
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 313b5f12ab35..e456d557db98 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,6 +1,8 @@
DIST portage-utils-0.94.1.tar.xz 1871688 BLAKE2B bec5ddd514b397c157c3b1bff70d61730f15804a6751f56eb69c4030a35fc6a6b11fa1e2bde94332772660f02bf9428623210733ae9e2f1290f29aa3b31a1813 SHA512 29fdb4093997eb95703d407da6b00305c949f0a00ae3aa5cfb2c47b66bddc59e034fae114663b40b611f906332066b648018aa4e5bc1b935e61a64f4b4bf1088
DIST portage-utils-0.94.3.tar.xz 1804720 BLAKE2B b0239a26d878db6dd73c9ee54f586526f8812921775126ef74afbe089186fdc5ca7197847e204c6ecbf9d79b6e2a6173cb0c39d4a26653ed0db2d7f9b10e88c5 SHA512 bf8fcccc26bb985bf7664f6ab0227a5251c3f918199de0c4e4c95b7107eb72eee367d1d524b5d9608b3c7eea9b1fae789456390cbb0d375297b807bb98644e01
+DIST portage-utils-0.94.4.tar.xz 1804252 BLAKE2B 4bdb3dca331eeeaeca34b949aa0228d81df71888fa7cb07f878958939f7820f6887ebb43f0a89d8ed8d787c152a631a731bc53f30c8241ca2530ee9420fea1e2 SHA512 d59a09c9b2dd4de8ed320a5b1c943a1d5dcdef41a057fbfeb00ed136e2ba87375d4562861de5b0e44bad986916d0f58487f3d93deaeb44e96385535d85d74217
EBUILD portage-utils-0.94.1.ebuild 1525 BLAKE2B 31633b095b9fb0dbc0e9a4c5810be266484b0d353578969d587d725722c7f6870031453466b8e8ea70b094ff3129e94d71a81a7000b432f739f4b64a811df561 SHA512 c2f182e8b08adad0f5b22ff08bd1a41aec90a0fa03e40070ab3535947a5d3eee57d5fe4d6bec28b6d228ef9e8baddbe69203a4cc24833a7e02af5e2cfb615186
EBUILD portage-utils-0.94.3.ebuild 1647 BLAKE2B fb1433bc5dfa5a2b8cbf1bbfd5ec23ec9c68e82a2165e31ab485fe69ca32bc66b78c793f7454a91fad46c98c60dd6b8e517d383b05f6479f79d1d8fa121b1bc4 SHA512 e904d047568d686d91945a795f096e4e665a1d4f44f84d8d49ebc5bad02803c1c4d3f7dbce6438f541a8e4b07216f861a50f60904237a9d09220629db4a9f5e8
+EBUILD portage-utils-0.94.4.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
EBUILD portage-utils-9999.ebuild 1654 BLAKE2B 6582abc4a5666204d307764051662f1fc217a42c136ff10f8d94b74b019863a7041c1decdf81fa8a28f8896fcf3d66687d56d7001b2368fb070498b464cee530 SHA512 4e3a8de13028c6b9df3feb15812e9fb771f79f1b0cc5b59bb71043cf9210aecfeed4e1e68efbf20a46e92b4e98aee62bbff6a93e7453e5ebe6b3242f12dbefe1
MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.94.4.ebuild b/app-portage/portage-utils/portage-utils-0.94.4.ebuild
new file mode 100644
index 000000000000..b07e43f8a485
--- /dev/null
+++ b/app-portage/portage-utils/portage-utils-0.94.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Small and fast Portage helper tools written in C"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
+else
+ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="openmp +qmanifest +qtegrity static"
+
+RDEPEND="
+ qmanifest? (
+ !static? (
+ app-crypt/gpgme:=
+ app-crypt/libb2:=
+ dev-libs/openssl:=
+ sys-libs/zlib:=
+ )
+ )
+ qtegrity? (
+ !static? (
+ dev-libs/openssl:=
+ )
+ )"
+DEPEND="${RDEPEND}
+ qmanifest? (
+ static? (
+ app-crypt/gpgme[static-libs]
+ app-crypt/libb2[static-libs]
+ dev-libs/openssl[static-libs]
+ sys-libs/zlib[static-libs]
+ )
+ )
+ qtegrity? (
+ static? (
+ dev-libs/openssl[static-libs]
+ )
+ )"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ [[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+ use static && append-ldflags -static
+
+ econf \
+ --disable-maintainer-mode \
+ --with-eprefix="${EPREFIX}" \
+ $(use_enable qmanifest) \
+ $(use_enable qtegrity) \
+ $(use_enable openmp)
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 178de34673ba..ee22d23d3e2a 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
Binary files differ
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 51e46372d282..d18124d91e8c 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,3 +1,6 @@
+AUX linuxdoc-tools-0.9.82-configure-clang16.patch 4677 BLAKE2B 7160430998bd80ca237e537e54c3fd6f0a12f60fb856b70e8b92eebdf2f29b2dd0232c72e10dcd087ae83849365be968c9d48c2fa3990f9c43cf4513ca7fc10e SHA512 11e3c38bd9d5091dc709c3c552b722b917b0b20a92a8b0a8ddf389826410d8533c783db7904b6b8ed8d571f86169cd1620a51331e8702980ee06287f3346db2c
DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
+DIST linuxdoc-tools-0.9.82.tar.bz2 550046 BLAKE2B 3bf9b9680659a3a6873e31116975fca7372167a701e630d762d37fcacf7acb9f1df4031558c4db24769e598a17b206e1c09607e341fc90f91497c15ff0cb05a1 SHA512 82560d9dc4db231e0a2c1fa3732d062bfd6af2cd3c5ffa0960939b2888533882437ddeeb54219e31acc7eaa10fdeee84ba206d32516cc5ed4f3fba2eab1ec0e4
EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1956 BLAKE2B 6434070af0621f3da002e10a83bc38bc3907ef0ba69fcbc9438dbe2320aed950227bb15a5436ba7727aa89519c80ac73ac01610e95707b9c0194442fbbea521b SHA512 a7dc53a87a5f8b1e2ff4d55f1dbfacc84da78fc62e5b11a5bb1d0f2839e351c931204df88debb276587c9c0622f298a421da40f5c61bbfbec5d837a8dd949758
+EBUILD linuxdoc-tools-0.9.82.ebuild 2014 BLAKE2B 6ed6a20bec2f10007dd797553e09943c0f69eed800f0dcd5c03da506cdddd6c2fbc8cc97eefa97377c7bda74c1ebee4cea736f1a524b2d54d214d0d9ac9ca8b5 SHA512 816a38afd491e7ab111cb7903361c4fa904eaf59541e87d56bb62495868e5f71a34a07852874a20428304d52c5631fbfd84ec15a55c6135ce39e1617820843cc
MISC metadata.xml 713 BLAKE2B 5bb40701020a2a88bccfc3293098732f464066af3317724cdff560819de1db44e33a6ef20ef3b09edce61580a50184e8cc5112d60d415ee42cabe6409e94d384 SHA512 10311f69090d7dbe3ccdf8047daf15ad6b86ae3cc58028b11629c581708c5de543c7fa1ab1bdbd173dbf5037e1dd23d68267de8e11d1a9da9e56659034f1316d
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch
new file mode 100644
index 000000000000..941d7eac1dc6
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch
@@ -0,0 +1,246 @@
+Patch emailed to upstream.
+
+From 216e770ced47ad0017cd43033ef213c2634fe87a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Dec 2022 08:53:14 +0000
+Subject: [PATCH] sgmls-1.1: fix configure script with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result. In this case, it led to a build failure
+(see https://bugs.gentoo.org/883203).
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/883203
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sgmls-1.1/configure
++++ b/sgmls-1.1/configure
+@@ -110,13 +110,14 @@ cat >doit.c <<\EOF
+
+ #include <ctype.h>
+ #include <signal.h>
++#include <stdlib.h>
+
+-static int whoops()
++static void whoops(int signal)
+ {
+ _exit(1);
+ }
+
+-main()
++int main(void)
+ {
+ int c;
+ #ifdef isascii
+@@ -213,9 +214,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdio.h>
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ remove("foo");
+@@ -231,9 +232,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <unistd.h>
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ getopt(argc, argv, "v");
+@@ -249,9 +250,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <unistd.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ access("foo", 4);
+@@ -267,9 +268,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <unistd.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ vfork();
+@@ -285,9 +286,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <sys/wait.h>
++int main(int argc, char **argv)
+ {
+
+ if (argc == 0) {
+@@ -306,10 +307,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
++#include <stdlib.h>
+ #include <string.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ strerror(0);
+@@ -326,9 +326,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <strings.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ bcopy((char *)0, (char *)0, 0);
+@@ -340,10 +339,9 @@ if $CC $CFLAGS -o doit doit.c $LIBS >/dev/null 2>&1 && ./doit 2>/dev/null
+ then
+ # Only use BSD_STRINGS if ANSI string functions don't work.
+ cat >doit.c <<\EOF
++#include <stdlib.h>
+ #include <string.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ memcpy((char *)0, (char *)0, 0);
+@@ -363,9 +361,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <signal.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ raise(SIGINT);
+@@ -382,9 +379,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <stdio.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ fpos_t pos;
+@@ -404,12 +400,11 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ pid_t pid;
+@@ -436,14 +431,15 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+
+-static int whoops()
++static void whoops(int signal)
+ {
+ _exit(1);
+ }
+
+-main()
++int main(void)
+ {
+ char buf[30];
+ #ifdef SIGSEGV
+@@ -469,10 +465,9 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <nl_types.h>
++#include <stdlib.h>
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ nl_catd d = catopen("foo", 0);
+@@ -492,12 +487,11 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <limits.h>
++#include <stdlib.h>
+
+ char c = UCHAR_MAX;
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ #if CHAR_MIN < 0
+ exit(!(c < 0));
+@@ -512,7 +506,8 @@ then
+ char_signed=
+ else
+ cat >doit.c <<\EOF
+-main()
++#include <stdlib.h>
++int main(void)
+ {
+ int i;
+
+--
+2.38.1
+
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
new file mode 100644
index 000000000000..b4403ab283ff
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+ || ( app-text/openjade app-text/opensp )
+ app-text/sgml-common
+ dev-lang/perl:=
+ sys-apps/groff
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/awk
+ sys-devel/flex
+ doc? (
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.82-configure-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ # Pregenerated configure scripts fail.
+ eautoreconf
+}
+
+src_configure() {
+ perl_set_version
+ tc-export CC
+ local myeconfargs=(
+ --disable-docs
+ --with-texdir="${TEXMF}/tex/latex/${PN}"
+ --with-perllibdir="${VENDOR_ARCH}"
+ --with-installed-iso-entities
+ )
+ use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Prevent access violations from bitmap font files generation.
+ use doc && export VARTEXFONTS="${T}/fonts"
+
+ default
+}
+
+src_install() {
+ # Makefile ignores docdir configuration option.
+ emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+ dodoc ChangeLog README
+
+ insinto /etc/sgml
+ newins - linuxdoc.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work around sgml-catalog.eclass removing it
+ cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/linuxdoc.cat
+ local real=${EROOT}/etc/sgml/linuxdoc.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ latex-package_pkg_postinst
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ latex-package_pkg_postrm
+ sgml-catalog-r1_pkg_postrm
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index e1570dc39626..9fc57378a94e 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
Binary files differ
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 0ac60c55be91..17807052ae13 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,8 +1,11 @@
AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
AUX gtkada-2021-uninstall.patch 398 BLAKE2B 2f5becba847173f5e780ca712d3fa3a8180fade82d36d6cbe3e94acb3e3d64e5754ee41b221878dbcfbb5db056e976a16837ce22aeb8c35027c0df6622a64bae SHA512 53a325b4b51e9d5dafc583e6001064b3d5cca9b5e1d4ccccc5280726c10a25f1a2563d1fe62c9d9c48ee058e4d4cc7bc8b722c5a89f4d276ddfac2bfa4726461
+AUX gtkada-23.0.0-gentoo.patch 2408 BLAKE2B 658863cebee256a7dc59f66cb852a5ab322291393e4a7a97b194d4724e0ae8dc01e048c7cd5ee375ea812d4b144216d2ab0487e278b32935aa772aa45e43d3df SHA512 8e84c77b45b97db1b60b830afb151bcdb76bac32585a5ba2131beb9f9252fba3b41b7b2fb03eb6c7e7714c5307faa189cee6c16529470780e66117f4d95682e8
DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
DIST gtkada-22.0.0.tar.gz 6070022 BLAKE2B ff5d13831acf839290923871a80a5edfff7d39c689175d528e50bfcae4f120381d8cc74a58f2d843e0aba6fd7c23bb43a34db279b0af9d7c9cc4f4bc9615b179 SHA512 abcc6152b0dac66b29ef791527bf6e8f0e1359e5a374732824561ca47d9b1951c168b9b27dbc1f24e496ef5afe6c68020edc9d374faf0495118630ef08a5c448
+DIST gtkada-23.0.0.tar.gz 6045493 BLAKE2B 05efb40453aa6f3ebd3beaf3dd7915bc2cca8cfec211bc6ae2f0a7a15f16029b1142028422367dbd4f68e72e02b71c030eec39802b0f9202e411d611a1fe521b SHA512 ea5dffe4fe1b99cfbd952bace510aff9e0f79fe2fa075c299d12e68dfb43b6334df0d707631de30e6e2c3a80759d342b178e8ed29a82e90445e450cfd332767f
EBUILD gtkada-2021.ebuild 1399 BLAKE2B 0a9fed14342931879768a40b9a7dd8931f9adefa370c97908673604de4c54bdefe80408a8db84ee658be8eec7e2c314637cc45c5103c1750c73df69bad09f16e SHA512 4e29ca6670641cfaee20788828a520e34647b555d670aaf14fb67bdbe4fbd3e08a89cba957d22fb58673709e41213b2acf73663f473d8fe98be9af2dd90ffbe1
EBUILD gtkada-22.0.0.ebuild 1196 BLAKE2B 9b09c41dace2eba14e3267fc6c92bb96df777ba6f4a837a66a2915ab1c0572ea99f016fd00de6aeaaf7735e0069faf703fbdd164e8c56ee31e214f83cd097397 SHA512 eadaf17693ef8faa15c3237ce99f04fd45030b3e08a940bec8b61811b95c567d763f6320b8cbf7a6f8c2321a8e9ecee768454e66b723d833ba8e968ae11822f0
+EBUILD gtkada-23.0.0.ebuild 1059 BLAKE2B 936d41fa9eb9cd8a7cdb8c5901bc23763f9243242bcaa691ce8c514227d4932961f8960619757740ad13c3d3fc5fea7199c358dd3a13590ec03807cac0710661 SHA512 0c7d849be660517900ffca6c67fbe318501092ada35787f4027cb607afa4b145eda884152ec30709a798781cf2a5843ab1b232b08286d76920ccc74053b59df4
MISC metadata.xml 688 BLAKE2B d3ea42354ba10dd872affbaeb5a14833cc2254bed85f10e15871c8131a46d3f996948b2fffb9d9aa795c914e4e9dc5d3f34e86666a2526c566d4b03fa14bf121 SHA512 ce18831b728277d125cf4cd86522a238ec17f4cab007958212c95f3ee97fedbdb827749549e0ea4eff93dc74022d61515d116f3fe606db34496e9045b8c23778
diff --git a/dev-ada/gtkada/files/gtkada-23.0.0-gentoo.patch b/dev-ada/gtkada/files/gtkada-23.0.0-gentoo.patch
new file mode 100644
index 000000000000..5acbd3f2548f
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-23.0.0-gentoo.patch
@@ -0,0 +1,63 @@
+--- a/Makefile.in 2022-12-05 22:30:42.309525178 +0100
++++ b/Makefile.in 2022-12-05 22:35:01.794773265 +0100
+@@ -30,7 +30,7 @@
+
+ GPRBUILD_FULL = ${GPRBUILD} -j${PROCESSORS} -m -p ${GPRBUILD_SWITCHES}
+ GPRINSTALL_FULL = ${GPRINSTALL} -p -f --project-subdir=$(PRJDIR) \
+- --build-var=GTKADA_BUILD,LIBRARY_TYPE --install-name=gtkada \
++ --build-var=LIBRARY_TYPE --install-name=gtkada \
+ --prefix=${DESTDIR}$(prefix) -XGTK_PREFIX=${prefix}
+
+ GETTEXT_INTL=@GETTEXT_INTL@
+@@ -71,24 +71,27 @@
+ LIBRARY_TYPE_FOR_TOOLS=static
+ endif
+
+-all: tools tests
++all: tools
+ static: build_library_type/static
+ relocatable: build_library_type/relocatable
+
+ tools:
+ @echo "====== Building tools ====="
+- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
+
+ build_library_type/%: src/gtkada-intl.adb
+ @echo "====== Building $(@F) libraries ====="
+- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
++ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
+
+ src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
+ gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
+
+ tests:
+ @echo "====== Building tests ====="
+- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
++ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
+
+ install/%: force
+ ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
+@@ -97,19 +100,11 @@
+ -Psrc/gtkada.gpr
+
+ install-clean:
+-ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gtkada))
+- -$(GPRINSTALL) --uninstall -f --prefix=$(prefix) \
+- --project-subdir=lib/gnat gtkada
+-endif
+
+ install: install-clean
+ ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+ --mode=usage -Psrc/tools/tools.gpr
+- cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+- --mode=usage --exec-subdir=${DESTDIR}${exampledir} \
+- -Ptestgtk.gpr -aP ../src
+ ifneq ($(OS),Windows_NT)
+- ln -s ${libdir} ${DESTDIR}${datadir}/examples/gtkada --force
+ endif
+ @echo '-----------------------------------------------------------------------'
+ @echo '-- GtkAda has now been installed. --'
diff --git a/dev-ada/gtkada/gtkada-23.0.0.ebuild b/dev-ada/gtkada/gtkada-23.0.0.ebuild
new file mode 100644
index 000000000000..e436df3805da
--- /dev/null
+++ b/dev-ada/gtkada/gtkada-23.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+inherit ada autotools multiprocessing
+
+DESCRIPTION="A complete Ada graphical toolkit"
+HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="${ADA_DEPS}
+ dev-libs/atk
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable shared) \
+ $(use_enable static-pic)
+}
+
+src_compile() {
+ emake -j1 PROCESSORS=$(makeopts_jobs)
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 615ee6b6f5a8..7e76922b5d4a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 5bc55b2791c7..761aaadf4467 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,5 @@
DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
-DIST jakartaee-migration-1.0.5-sources.tar.gz 41061 BLAKE2B 51002b1859b0beaf78fca50b6ac76ae2e7ee0cc9a84cefcf9222028d54b5dd7910e9efed0f25d4842d073128c55085ce3ca25ac4fc2603fe19e83b6916779bff SHA512 c58d042047ccce396b273c5718996511b52014067e311c1ce69b4fc3d866ef6ad31b6c319b4becb60c3fddbb062f9c02abbf20587c8fabb6674f28d5162dbcd8
+DIST jakartaee-migration-1.0.6-sources.tar.gz 42167 BLAKE2B 9252078f3b31e07dab533ca9d1d32812f49571adf942a3f11bf074d2110b5fb0c2500dae244b10597f0d76c18bb153cd577528cb01ff01350abb46d32251293a SHA512 81ecfe561695e4e5cacaed0ef89e5759e357b332f2798ac6f3d89c43c9a5dfed1a684745b7fe3afe6d1e82ac9405fd2de68da599a53bfe5f67397b452753b572
EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d
-EBUILD jakartaee-migration-1.0.5.ebuild 2983 BLAKE2B 657de2ac8b5b2e4f888c05fce584ae61afd52bc3925eadf83b966fb7a33e0116a7fb91e2c21c5fc9633d2247d291c4df09bdbb31763f037fa37933b2557c804a SHA512 015c1dc8eb17c726ff1d9189fea18809ef04d5e4890ebbf1728cdf53716a1b0ce18e59c405e7b702873fa5d6fb817ebd91ec4797a9f3a2dd340eae059b9f4f7f
+EBUILD jakartaee-migration-1.0.6.ebuild 2983 BLAKE2B 26d39afc5ea17cd43b7a02d2ced809a6a12833e24eb52a38d5f00646ce866a59e2ac9ca8cb7c64f00c427145cdfdf5e2c9a43ff4504d6634971812fcd76778bc SHA512 f4c66332e5e88bc2b5744d933ef78add9b105adea7b7388fe55f0f0f1a037219c7de631eabad21ffcb953db8f82f75a07b6eb7260ab13d046a26e688d73143b6
MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
index cbce676a1509..1c9731c85b44 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.6.ebuild
@@ -7,7 +7,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.5"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.6"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index b1a8a254b11e..c05502fb59b6 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -8,6 +8,8 @@ DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
+DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
+DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5e14bc3ad1ecb654664fb497592fefec76348fdf2ff33be25b3dcb0053cc12a7eb7370be6df54e2a8e95d73fd7e73a4ec60db SHA512 4486b915b1fec57e9ae076377267c9232d20a47d835144173157fb2bb25682c93e846add000e7d9cc1b00c74d1c9526fdbcb10fe7e5ae7242f4d37945b78799d
EBUILD tomcat-el-api-10.1.1.ebuild 1078 BLAKE2B 102936dff87a81ba38b59eb82a4e6643021278e203d5a1f929d0d59affe5664b28c9be24b71e87a19c67547c33d20717a1bdd4d1d688336978cbb46ec7db1603 SHA512 d5b14c813a66af8ef01b30b515f524c1adfedace4b82fa6b8761cd9c7c8ffcee3522ad063d0a7432f9482501af532dff71123602e1cd43a0a4d8c3f429ec5a4d
EBUILD tomcat-el-api-10.1.2.ebuild 1378 BLAKE2B 8a81c24f9ef4ad38ccb2bbd79e0ac11c08c913a50f48c2e0d81a37e6bb894f3527b02606f4bd43ec63ecf3dfd865ba77e48b4ff4e49da1934959caf98e401bdd SHA512 da1ff8e697ee12f3a7325ad51c9cccd04f739d9c2af8627e8b6d0e15799b486f16f9aad58dbfddd6c0f0fcf1f9d33bd6ddb2a4de8cd236bf1284c1acadce5450
@@ -15,4 +17,5 @@ EBUILD tomcat-el-api-8.5.83-r1.ebuild 1074 BLAKE2B 0265263b3c8ffb18c4f298f378250
EBUILD tomcat-el-api-8.5.84.ebuild 1374 BLAKE2B 49636903311ea08eecc21383ba28668f85a0b81e9a2e7769ab851e512886a4365a7870d6c7e54a12bf18ad0b2f36130cf601c776aa7ff4963c23486752a71ca2 SHA512 ae9e51bab4ef27768e8a5a4b04a53ea9c8b000db7020bc939c19a363b638c905df7385c8d4f5dfaeb7c53b8592d022c80f5047e6fea5d2d9b6dbefdfd28302bb
EBUILD tomcat-el-api-9.0.68-r1.ebuild 1074 BLAKE2B 6c7857d992e45f72ea22e6aa1cbd149ab0e163418ebf49d576b0f2fcb0ab5c47f63993bb8ac892611205d33a1895128892d4e570c513b252120665b347b87d66 SHA512 988472477469d03e307ff4c36461ac024d76e8e7e05cb209dc5111f9d118aead88a41e930583b1a5bb56f45de7fd7dbcf6203d51fc271a1435870d62ca5d7a1a
EBUILD tomcat-el-api-9.0.69.ebuild 1374 BLAKE2B d31798630a337c614b052a07a6ab144f0678efab63f56b627be30e99c2be05b3175d296a72f1bd81807cbeb3fd305858d0c15205eaed2bd626ea03309b9da01b SHA512 56b991c2cdfb78a987dc93845c960ba4de8cbb09d2c27c3e1465320ce534810f9aa8bafad1c68b711f6cb3cb6a1bc84c7baf05be06e0efa1954708146bdbc259
+EBUILD tomcat-el-api-9.0.70.ebuild 1374 BLAKE2B 71e22d407a445273ff2bcb6b19d5c33fdb01863db702b0a9b98d51db3234d50e915a068391149272e173b2bdfc9a4b9b4aacef889a4f982a4fa09b5271012709 SHA512 395529457fb65eb99c25bb049fb6207d4079e6ea4532b7cf52c9af1343ada44902f544416c8ae894758d232bbb01b68beecfc56e65d924a3757a2fa83446abf0
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.70.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.70.ebuild
new file mode 100644
index 000000000000..272b49376dbe
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.70.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:9.0.70"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+ default
+ # remove anything related to "el" or "jsp"
+ find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+ -exec rm -rf {} + || die "removing jsp failed"
+
+ mkdir resources || "creating \"resources\" failed"
+ cp -r java/javax resources || "cannot copy to \"resources\" dir"
+ find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 5543af7430a8..15f0daff9978 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -8,6 +8,8 @@ DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
+DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
+DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617587872ec1ce3f89d4e1722f1969089b90d96cd49153cf9139437a4d08a8980243059a35c27be20345339ff99861bb77fee663 SHA512 e717a54ac7176b45f5a55eed7063a9cc6fa7457029a68f5a3eafd461cd1586d6fb2a36d02d9b98bd0b139232786670680bc2f4f3e8ac91ac82041e20d6e2dc79
EBUILD tomcat-jsp-api-10.1.1.ebuild 1121 BLAKE2B 28281e634eae4990fda6afdcc45b451eb2fa397ba8f0ef26c0403a67618c1062a77002c051729c9238bfde185be4878bfcca113ff55d36cee3aaa0b9a5082686 SHA512 b476387af9ceeea788ecf9e54243e60533aec90d0f6609b4c86d9bc9860f9bf07d6cf8460ea508be28c1190a9d18c5f4bfb3af1dd3a735150ae80e81b61054b4
EBUILD tomcat-jsp-api-10.1.2.ebuild 1421 BLAKE2B 386285f7b823c7babcf7626af895d4d403dd2a31c6b6a220188251da2227ec180d657a01f5f37ddd32806b5672c66f64e02809d0d0308d00695cb9aefbafd348 SHA512 995e9e4293fbb5e9c6503c0bb2b8e85ebfeaa0bb4155c04df91e49f8d61cb2c58fc0f43b6b05aa26e63e08a38ec1f4d484145cd28c582d1b45899c0b1d2b4777
@@ -15,4 +17,5 @@ EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1117 BLAKE2B 5d9eb8bd7e2e79e2f4e7e37d3e9a
EBUILD tomcat-jsp-api-8.5.84.ebuild 1417 BLAKE2B ba676748e8426dab6b0cecfeaf857c59d5b2e8c40882ec72028b8c67a39e377f82256254e5109805068a9eb0521c9183bb867d3d4c43376ef0d98044bde24839 SHA512 3e9b09aa9c3ff00ac6f52d7087c87fd745727ad595ce3083977aa7df6207bd068e5e51a7235f7ce230f5e45abf3b7d2d296bba70b4f3e37bc8fa5ff6b7223ef1
EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1117 BLAKE2B 80e7bc1fad34ae43c7d84a5caf0fee14d40d2b162398ede8b0eb1faf9f6e7ba5f48765186bb68922dcd163a5a2b4fa6a90b2bd044d530fd331785d7d783c49a2 SHA512 41af601effda53de446251bab678b846b6508fe5e92d2d03d7966f51095d4d907f302ac0c8dee6356b4af35dfd3802f326423515e559313b737d9b573c7f6336
EBUILD tomcat-jsp-api-9.0.69.ebuild 1417 BLAKE2B a1c84669f61683e0e9754be12ea28c06d522b52f19a249951685b23d57af2ff61ed87c1eceb1832549f3e6a1f1f75b81c77e34c5bc19bad41b64ea84d179ae6b SHA512 b2f9be6528fddfd656102edc0a6e2eadbb97404ff13fb6e86902eab56ed7395308bc85c7fa76f9e7ec157518d033d4908815857e095e88913b3ed61a6ed93128
+EBUILD tomcat-jsp-api-9.0.70.ebuild 1417 BLAKE2B e11354fe4234fc6c75a4243d5475b0635d5aa18281f52c694ff0dc96612a2a25ea8b10efd518d53e256263ec6d9b2b7cb2aeefd93e398cdf41880fe812061a64 SHA512 122aac311a2f54db5a8f95ad3a29615d82a4efdf720c60ff2800c7973a37ddddfb89d5895987118d4a4f806f55b3424d341b8edfacf82cf099b0bb6267413cf0
MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.70.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.70.ebuild
new file mode 100644
index 000000000000..a96dc5e2c7d9
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.70.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:9.0.70"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 2.3 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+ ~dev-java/tomcat-el-api-${PV}:3.0
+ ~dev-java/tomcat-servlet-api-${PV}:4.0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+ default
+ mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+ cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+ find resources \( -name '*.java' -o -name 'tagext' \) \
+ -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b60fec2f298d..b97f36ad7087 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -15,6 +15,8 @@ DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
+DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
+DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1171 BLAKE2B 2e49a8a90f7936385988b221b6a1dd540590bac31a0969f38727441d7f6448236c82b6345f713b285834fcb3a4407fcb661889fe0f95b8d54f35d33d961f33f9 SHA512 cefdd4b9433d4cc16a4c6ba38752911a278bd97a78161755b98b96eb0280826b46300dc0ef26591ae9f28a2df47fcac58bf64b96064008c2cd2e5a4997435655
EBUILD tomcat-servlet-api-10.1.1.ebuild 1168 BLAKE2B ec65a3778cbc678f576e564fbb99ca990f99bfc6f02eea04beb6525e54e1b7a64fdbbf621df0af3106dfd6f8f0e9508c49e0c31c2f04aecce75138b7cf410cfc SHA512 6b6c241894e17a37eecee863454e98d56a274bafe3ef913aeb139d7aec1f906488a4485604f5178ed404d35a3953c1dd62b51e97c9a8de66b477deb2d5f38695
EBUILD tomcat-servlet-api-10.1.2.ebuild 1468 BLAKE2B 67d55f97786e2e4f191b8d9b76ec902b1d362e43f178f2f9b5afd49d70dfd0fa06ecbe519e0fa48cf7592438ddef6119f4917de642bd2380bc9af64b152276a0 SHA512 f654acecda8b6bef951d896355762bb95b2c59a37ea1fece08d0ae611b7bca43c6f363fce7405a87c6cc3df8df3dba3ba9a4d8408e274bf40b035e4d0ec4ff4c
@@ -26,4 +28,5 @@ EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1324 BLAKE2B 079d3ad08580256a30a3d359
EBUILD tomcat-servlet-api-8.5.84.ebuild 1624 BLAKE2B 64e617c79ba7facfe16b6e80421035c2281425a796bfffc80f7d2b99ff422fb0082d096aec56f3a80c700a748bb9d375a4909f91870263c56e0dc44dc2a6a876 SHA512 1198f5406abad645cb90baafe36781d17efcc76901fc46b3cd38efdc4dd3037a7fb7411c62849f3b57a0c568785cb719dfd3edff98f11057ba20a1157cfab57e
EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1164 BLAKE2B 89ee54e02f25080b1faa6e2279dbda2394e7efd74465818afb9d6da5a21ff0b6d8dbc0e3e7ba6ebafb8e0979ef7e3950cc4de9e2242df10b67521f1cad1531b0 SHA512 c32dc63e1dfffcb4ddaa3869a9e5b7ead54005f2d316593a0b1ec6dd98014321e9c7f3144830a924ecf88ba9e2cfdc446a76ab47166ed78efd4e4c49e63dbf03
EBUILD tomcat-servlet-api-9.0.69.ebuild 1464 BLAKE2B bb7a34bb8c3103c7506e789957a200cec40a2b7677846bd0aa07c446e38dd29c6ae440b72728a5f82b7599c1411ddcd698cb6471a554b54fb74419f230d7760f SHA512 7f9e8ff1e074e40b1bae69a983d5ee22326b4c0251281d5142b0ff1f0ccc1dbcff2798594b7b4067b3d7288644a5453f049453621a8826e9595db0268977f2ee
+EBUILD tomcat-servlet-api-9.0.70.ebuild 1464 BLAKE2B 19849693c5fdd62fe9902181042378d185694978e0419099d4b75d019fead7d626400e6d95b0d363bf12bb665e924527ffff66bca5a997ebc0ebaf2ace679943 SHA512 b092f1512ca679821efac75a13468e8e3b495fd1815eb6eb0f2874dc4a9fadbabf9735abc9a76634555e313ca124e555b1b4482fc154ec464410f6f7ab7f7899
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.70.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.70.ebuild
new file mode 100644
index 000000000000..3c25118441d2
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.70.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:9.0.70"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet"
+
+src_prepare() {
+ default
+ # remove anything related to "el" or "jsp"
+ find java/javax \( -name 'el' -o -name 'jsp' \) \
+ -exec rm -rf {} + || die "removing jsp failed"
+
+ mkdir resources || "creating \"resources\" failed"
+ cp -r java/javax resources || "cannot copy to \"resources\" dir"
+ find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index b759d2f2084f..a95432a6f662 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index bb6b29204f68..059daea507c4 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,5 +1,5 @@
DIST luajit-2.1.0_beta3_p20220127.tar.gz 1072282 BLAKE2B e1d4834683b9ec16f0567f5de486262d84af145e3e27724d343c130288e90abff089fd5c7ff1275f9dde3cb5ae4f818f710020bd708c599972a14f1671381c2a SHA512 4c6ae7173bb91dc2d4d425da4afdab2520078e15ae4471c0cb99a255dd7544d6900b333efbbfc8f26ffbc4fcd8f1d2daf65671c59b5cafd6b0d53cb07b49d4ff
DIST luajit-2.1.0_beta3_p20220613.tar.gz 1074088 BLAKE2B dbcfd4efcffb9b659a85af753017da5ca9b95e89a03dfe4e594513f2ad09b08e19a862527d41bd5adf8473afd022a471176ff5412975af47bdd785b9b9cfd43b SHA512 e4fc6ebde9cd9efc5e9936416526a0f581186bf0661eca60a50bcf5048312e02f66dc905308d63abda03380c33aa2e64ceddd87527d59a4488ae7f4aeaf36dfe
-EBUILD luajit-2.1.0_beta3_p20220127-r2.ebuild 1600 BLAKE2B 2f4a03043d87f3baf302baeddfb26fed0c0b1ca74ebb1c612e886c61e912bbf5712ed6a8b3880627f89f7ed4e6cbfa78496d18579006ec0b1bd35d3995cb696b SHA512 8c4949a6abd8bb7fdeeb9df5e60144e1c021bd05186bb28bd0e805b2c43022eb643f8b5004e31ed3485c992550ec241b0ea262c8b0a9a138b7769f13e8c112ef
-EBUILD luajit-2.1.0_beta3_p20220613.ebuild 1605 BLAKE2B 948aba933fc5468193638e0b434dd7baca5351685bfcf00b5adf1959fd8a3b15c5e469971aa6dd6d6597a808864e6dbadd6ce5592adc0cf711692e776802bb36 SHA512 edb2e18b5da0f94c72e991c5dafebcf7c08e273d6d9c6d6a3adc72736ae6cf3399e13aeda9e46dd04618b8c5cbe9dd068c198e0a900042eae72c020939b499a8
+EBUILD luajit-2.1.0_beta3_p20220127-r2.ebuild 1601 BLAKE2B 56e7f09accee678dfdda98ac84d08f1335e1ab8875a2552732466d6f2f729766b5d8678710b408aace240e2551fe1b5eece1fbed312d2cd09556081356866887 SHA512 5fb4a2254f595b31d49697528179a78a3653cc3c0f62d255bd2e4bedf59d9e6b393a71cd53f50cfcf34d9839ef11e65392ab411d940658ca9630595aa1f45523
+EBUILD luajit-2.1.0_beta3_p20220613.ebuild 1606 BLAKE2B 215cb46a299d440461f6c721e071a6af35f9108c61566b6d9f8beaceba1fd7837f6eea79a8899323c74e3cd8287feda8788839388352e03b989feb24219392bf SHA512 33bf6c1f05ab9c337cce088fa8a79a838f646ef6d45cedda504c4aeaba6189fd2fed093a0e3925828acbe09274cccd194947e7eda5a491a5176eb308c1aa1839
MISC metadata.xml 503 BLAKE2B 022372116d4d149a11fc0f3b0760f0fad126f435e075f3b514ab03657b0ff9eeb5c56148f9d1d1d114d34dee35d2c62f2fdad664d050976125d3681757fec3b3 SHA512 a6ede683b1a983e1bd8d2a1972339c8650e3ac87083961bc2f4550314231fb630e12a1a9966178b1486f73734da759ea49970618f72b97bcb7a4fe8c41e77729
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
index 6735d5ae4d00..eb39eee7fe3a 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220127-r2.ebuild
@@ -53,7 +53,7 @@ src_compile() {
src_install() {
_emake install
-dosym luajit-2.1.0-beta3 /usr/bin/luajit
+ dosym luajit-2.1.0-beta3 /usr/bin/luajit
pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
HTML_DOCS="doc/." einstalldocs
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
index e5985feb3a90..b3acc0d0871b 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3_p20220613.ebuild
@@ -53,7 +53,7 @@ src_compile() {
src_install() {
_emake install
-dosym luajit-2.1.0-beta3 /usr/bin/luajit
+ dosym luajit-2.1.0-beta3 /usr/bin/luajit
pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
HTML_DOCS="doc/." einstalldocs
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3667910add1a..f4014ddb5f5b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
Binary files differ
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 5517d56f2b6a..14b7f9628e23 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -6,5 +6,5 @@ DIST gmp-6.2.1-arm64-darwin.patch.bz2 2520 BLAKE2B 3d4e9dbd29dc9aa81f0c9e0de4a59
DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb
EBUILD gmp-6.2.1-r2.ebuild 3149 BLAKE2B 934cd313c6cd94b3e4347f1a2b1b6e3c871a274617be729ff496e33be72095a8eb61690238285d4d597994ff3e7d88312130e32afa92a5b0e3d7eb34b02fc51d SHA512 213753bd26129c343f32306262d81fade3b9d67e53014c96656979a480e2a81c4d14776081b1aebf3617804a38be45cf49b1ec13aa1f49fa703819be232512a8
-EBUILD gmp-6.2.1-r4.ebuild 4679 BLAKE2B 2ab8598f855678f032681440a04aaeb2ae19fa136ffbfadfaa8c61a5b722247910982284dbbcb02153dbea988e982a46c2502bf899451cd555622cfc14e4e19a SHA512 d86960214180fb0c67565878a07d4230ea013e0ad173ff96803446f00047c5478cb13d1934457cfa11e6ab72f527b53bdda2ea5d8261b54223393fdd73beb24b
+EBUILD gmp-6.2.1-r5.ebuild 5462 BLAKE2B 5a18f8decd27eea8ce546840aedfeadcaaa7fc9c96c2277d3a0cb8a8dd08dd2726b6db2a0b91889f767cf468bf142d957ef5fa4f12e69549931e8abccdac35a6 SHA512 1bcfd15b5e91bc52a4c024c904daddddfd9a47f75a35bda46a6c444d65361326478c1f9a69bb241d643ab9f5fc8fc28b2ce04235877600e821cefbd855ef9aa3
MISC metadata.xml 1044 BLAKE2B b6c7a609f9b8756693ae49f80508e73483145a9f4a8e3e63f25bdeb53dec0bca9851415f097722b1d646d57ae444fe4fdb98aef83d8a7cb15068672322dd5279 SHA512 4e47e1b850637db4b9d62d3a355587679cda1f245fcd264c6399fd4c463b0efbb2ec29cb4845efdb0795ba1dfa0dbc4c2186e983c6648352c9b41d871f388580
diff --git a/dev-libs/gmp/gmp-6.2.1-r4.ebuild b/dev-libs/gmp/gmp-6.2.1-r5.ebuild
index 0a58fc8ba3b4..2e867d0047e9 100644
--- a/dev-libs/gmp/gmp-6.2.1-r4.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit libtool multilib-minimal toolchain-funcs
+inherit gnuconfig libtool multilib-minimal toolchain-funcs
MY_PV=${PV/_p*}
MY_PV=${MY_PV/_/-}
@@ -47,6 +47,14 @@ PATCHES=(
"${FILESDIR}"/${P}-CVE-2021-43618.patch
)
+pkg_pretend() {
+ if use cpudetection && ! use amd64 && ! use x86 ; then
+ elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection"
+ elog "--enable-fat is a no-op on alternative arches."
+ elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made."
+ fi
+}
+
src_prepare() {
default
@@ -68,6 +76,19 @@ src_prepare() {
# Patches to original configure might have lost the +x bit.
chmod a+rx configure{,.wrapped} || die
+
+ # Save the upstream files named config.{guess,sub} which are
+ # wrappers around the gnuconfig versions.
+ mkdir "${T}"/gmp-gnuconfig || die
+ mv config.guess "${T}"/gmp-gnuconfig/config.guess || die
+ mv config.sub "${T}"/gmp-gnuconfig/config.sub || die
+ # Grab fresh copies from gnuconfig.
+ touch config.guess config.sub || die
+ gnuconfig_update
+ # Rename the fresh copies to the filenames the wrappers from GMP
+ # expect.
+ mv config.guess configfsf.guess || die
+ mv config.sub configfsf.sub || die
}
multilib_src_configure() {
@@ -115,11 +136,9 @@ multilib_src_configure() {
$(use pic && echo --with-pic)
)
- if use cpudetection && ! use amd64 && ! use x86 ; then
- elog "Using generic C implementation on non-amd64/x86 with USE=cpudetection"
- elog "--enable-fat is a no-op on alternative arches."
- elog "To obtain an optimized build, set USE=-cpudetection, but binpkgs should not then be made."
- fi
+ # Move the wrappers from GMP back into place (may have been destroyed by previous econf run)
+ cp "${T}"/gmp-gnuconfig/config.guess "${S}"/config.guess || die
+ cp "${T}"/gmp-gnuconfig/config.sub "${S}"/config.sub || die
# See bug #883201 again.
if ! use cpudetection && ! tc-is-cross-compiler ; then
@@ -131,6 +150,7 @@ multilib_src_configure() {
einfo "GMP guessed processor type: ${gmp_host}"
ewarn "This build will only work on this machine. Enable USE=cpudetection for binary packages!"
+ export ac_cv_build="${gmp_host}"
export ac_cv_host="${gmp_host}"
fi
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 1100e9326e3c..0a239bb225b0 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
Binary files differ
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 47278a42755c..659632cf23a0 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -8,4 +8,4 @@ EBUILD lablgtk-2.18.10.ebuild 1978 BLAKE2B aec065ed8ba21ec22d432caec6f0ca68725db
EBUILD lablgtk-2.18.12.ebuild 1983 BLAKE2B f5e91f7cf3f5e85cb35a3c74b13c6e00db07e9c1ea79e3e5dbacd9e79db36b0f4350d26b44b9d5496675437d03705e20cb0b5b526f01002ed96f3192332f2648 SHA512 a86cca1cd8a65d1e7af8177e345dd2b382164599a1ed1e9f3f66efecd5782d9f90a81bded3cd23caf1d017258b59478c08cedf009f34d103f3e0718d24a02f90
EBUILD lablgtk-3.1.1.ebuild 703 BLAKE2B 63b744a767e6f1f238434a5e8457c0c01066992d4ced47b839e623b3a9535a15e3285b466a5477a01a17d10a4a0abb135b2d40e202288f89944029c3881e9719 SHA512 cfb13c7b8a4661174c84f6f5966b56bd6ff3c11e18b28149922329d9f8c9eb5ae4d8cc0811bfdf8f53f04b8f66f54118f457d53852bffa755c89e3ffe0612cb0
EBUILD lablgtk-3.1.2.ebuild 809 BLAKE2B 240985d82a7da9d69c117e6d5c61d3d3e8538bc9de5684d267f5d5983bdac0a335b13e8ff66314ab38dcd94204c93175a9b2f887ac35afa1c8a96f3e8c33e32e SHA512 376d0c3f2026f8b434fd1bf2f2854df478149398680988dcc97ac859702567647ae3769db823f54eeb130de425f2add64cc29255d303460406e8807fea3c762a
-MISC metadata.xml 640 BLAKE2B fdb7bc48ab9b0bca49bc8cdefb94916472a18320a9824016b4dda58371c82256d5fddfc17db259b607a2cfbc4b48b2ae971430af0de5d96f096106b936029c31 SHA512 73c23233c17f7f7797784e3dc6f58b2f716e720b5b0cd162909abc40bc6fc381b5477914bb295ae9a8afdeba62239db300453d17e3619b7dad35b7fb72d8fd9f
+MISC metadata.xml 805 BLAKE2B c3af7eefb1a7e20b60697db9607b24c035fdb6dfcdd1ab2813e60ddbaa1536fce2c7a06793f989d9550908f0d785813fbff4fde183d877bf72dae6fa5203023c SHA512 0604ce1872d1b6638188873602d2937c8aae93c4f5e46573c884baea8bcc94f6edd8b168405f869f0e68cc73c4390bbdc604b36909211a279a22934fd4e179ca
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 3d0a13718793..4d3ab587ee41 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -10,9 +10,15 @@
<name>Mark Wright</name>
</maintainer>
<use>
- <flag name="glade">Enable libglade bindings compilation.</flag>
- <flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
- <flag name="sourceview">Enable GtkSourceView support</flag>
+ <flag name="glade" restrict="&lt;dev-ml/lablgtki-3">
+ Enable <pkg>gnome-base/libglade</pkg> bindings compilation
+ </flag>
+ <flag name="gnomecanvas" restrict="&lt;dev-ml/lablgtki-3">
+ Enable <pkg>gnome-base/libgnomecanvas</pkg> bindings compilation
+ </flag>
+ <flag name="sourceview">
+ Enable GtkSourceView (<pkg>x11-libs/gtksourceview</pkg>) support
+ </flag>
</use>
<upstream>
<remote-id type="github">garrigue/lablgtk</remote-id>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d1f5fd6938eb..69ac5ecbf824 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/canonicaljson/Manifest b/dev-python/canonicaljson/Manifest
index f164d5b67d0c..47bdcfa3c204 100644
--- a/dev-python/canonicaljson/Manifest
+++ b/dev-python/canonicaljson/Manifest
@@ -1,5 +1,5 @@
DIST canonicaljson-1.6.3.gh.tar.gz 10400 BLAKE2B 9d97ad9f8c0803fdfd1f4d2f85291fb175d19be23fb9c3bdf717030b9dae30f810329118c484cdf9dab5d77f01ea41b08653559fa188c90305126bdf3f4e5f9d SHA512 4b2cb7524425b8a4dde2359273f60110ca01081d31b0add158f106ff1f8874366978d6a15baed53a948503d4013b87a0b75ad7f6e8ea6ce42f3f9fc95672280f
DIST canonicaljson-1.6.4.gh.tar.gz 10408 BLAKE2B 4d55bb90cd4bbd5e019ffd0d505651c99dc6b296e9c0a52582265438586890cd6b663116ba0b66807b7a665c54eea001e039ca86c2fef9175b72a318a11a79a7 SHA512 7be1300c17d51f917b1e81931f6d0dd681b1eef9b7f4e82ba3ae683609d74fd924eb3a832c8261611f556c190329748966bf15abe34bc1d22f2ecdf29372b560
EBUILD canonicaljson-1.6.3.ebuild 606 BLAKE2B 03a03d128b260bb43c081a6e70fc771d6478b2880d37832bc81fd52cc0e0b9a343273963c9d62634e2e81ec54b16a29f3dadcdaa6c636efb6457386c4ce05d2b SHA512 af5c6138a30308a8693104fcef490bf2732f60f7d97d753f3775ec15fc2ce2bc128e136bbcb57b72de6662688c0bd0a9185719c8df84b5b08cc7d14d7e9689e1
-EBUILD canonicaljson-1.6.4.ebuild 610 BLAKE2B c40730d0df95adde638b0d9859173fff9543eed574b034f7c205456883ad837c0671a9db57f55570938f85d11af5ecdf8f3321abfb8239103c1d6ec2d839541a SHA512 222dec830ff47e4065fbbc63e7e182d49900b1b095586086a700a57e953f55132e99312fd53826020d23e40401f2371589e4080792ec5824e1c86ccf20ef0954
+EBUILD canonicaljson-1.6.4.ebuild 609 BLAKE2B e486da1f4e5d19262d2144c9c388e55274ce4ae3e7c6175ad89512b3020e8be05ef5cb2cdb54155ca50b35958adcf6f4b56b9ce99708d7787d7ebc23ae996c75 SHA512 380c813a663dcf9b3a136492cd88e71e7e050fc64789e9379127b938a4b8df013e552ef5966c9414f86edb6cbec78c60bfa34e67bd2fbea006b8dfa1e803940a
MISC metadata.xml 562 BLAKE2B 09eeef3180d91d94572ed2095300f0a9638110d9fe6e2ebd9ab1bac29a10062dd630088ccc5774d49ecb1a83ee3f76f711b7c7166cd56497586fda6261114f8b SHA512 e459cb2290e3d64f41ebaf72ee51ab70c6a1638860a8be30e77451cbda03cbfa50a77088d2369d1fdf1c4984c8c04ac35c5e4005af3f429c1d2697beca6ef0b7
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.4.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.4.ebuild
index fdad35dc04ab..6441edec0649 100644
--- a/dev-python/canonicaljson/canonicaljson-1.6.4.ebuild
+++ b/dev-python/canonicaljson/canonicaljson-1.6.4.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/python-${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
RDEPEND="
dev-python/simplejson[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c8151c116360..959e56b7cfed 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 5a6cb80133ee..2e31626a800d 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,5 +1,6 @@
+AUX gperf-3.1-clang-16-wregister.patch 766 BLAKE2B 52117a973bf01ed6c8c43d383f128924936ef4b1c6dcb0155753924b2826659d9ca67cf85503aeaf82d5e9367925505f908a4273146352242be8023aa98ce1fc SHA512 44567048ca49cd6fc9325baa2c83d3c608e8930cf23b7ddb10950ff1f8db71bdb9b3dc040a4a2d4fbaf330877edcfa485a4469785610ceb12342a843a46a2c2d
AUX gperf-3.1-strncmp-decl-mismatch.patch 819 BLAKE2B 627af81f91b5fdfd1bd3978adeed9a0d00a5d6b3f8aae54fe0ce21cfaf9384734a61a5986723f72f4c55efdccbed90ec651008d6df651a10322c04b4099431bf SHA512 167823f5908951c79e9ec5b77106a1acbc011bc34636a845d50f55689cf9a7a1f4652a628dc786a29d1dd764e94d1055e32eea1f8c3852d9622e14816969c7f4
DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.1-r1.ebuild 667 BLAKE2B 62e7eb9a8f756795ac270165257fddcc227fe7f2760077829839f624f67a1e27661daab3fdbebe21415f99bb3b0deacc0031a102ba018fc086bff0dfca07b2f4 SHA512 7b4329ee7a2e34c2662c947ea63a2b9462a651cc0c90bb544b52d3e81ba271866c0389adf9e46445f0898000f3ee7db0a862b9d6487261bb3d77f50195eab117
+EBUILD gperf-3.1-r1.ebuild 712 BLAKE2B 69c0e6466bdd826c5411415094fb0f820b55ae6bb0cadae429123e749fc1d3f933b506f1efc9cd8e8909979b15d1df806367b9ef050e9dde88c949035df28222 SHA512 8e514b4c53feef088853cc154c72d4e1d1fff20e6c320f83992790b0612cf92e5e83efb7ba5c304df13c2f960942d052812397066b2c1ba313256507e6d4804f
EBUILD gperf-3.1.ebuild 598 BLAKE2B bc597678be8b568a5a249b9c3e49b40ad99beb65d3fe207d08179499cfac69cd41139322fefc4c76e0ccded8fe8e6614d2e09b77395e8502acc512d2811a296e SHA512 0524b8e6cb782ea9c839991192163d55eaff8d1b10bd4b9045dd7311e1ac2acac684a6d92e1be0c0d0b56af1d2c7d30ee5847cc580387b05eb7aa9d79d227463
MISC metadata.xml 300 BLAKE2B 08411b1e2990305e2459a483ee439bd127e2f6e556b621ca68376c3b22373123e5382d5445321451c502237046c5b7c806af389c3115729e0c96c6df3ae45d05 SHA512 094bde403ea70f64268a627bc5d9342f8e86d727c7c10b74214a1aa65d23baef8fc189a4771a4c838ee098b979af8e27614fc2480ce258394276df5b5f18d13b
diff --git a/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch b/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch
new file mode 100644
index 000000000000..4bbcca6d57e0
--- /dev/null
+++ b/dev-util/gperf/files/gperf-3.1-clang-16-wregister.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/882787
+https://git.savannah.gnu.org/gitweb/?p=gperf.git;a=commit;h=a63b830554920476881837eeacd4a6b507632b19
+
+From a63b830554920476881837eeacd4a6b507632b19 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 30 Aug 2020 12:36:15 +0200
+Subject: [PATCH] Make the code C++17 compliant.
+
+* lib/getline.cc (getstr): Don't use the 'register' keyword.
+
+--- a/lib/getline.cc
++++ b/lib/getline.cc
+@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
+
+ for (;;)
+ {
+- register int c = getc (stream);
++ int c = getc (stream);
+
+ /* We always want at least one char left in the buffer, since we
+ always (unless we get an error while reading the first char)
diff --git a/dev-util/gperf/gperf-3.1-r1.ebuild b/dev-util/gperf/gperf-3.1-r1.ebuild
index bdabce4d841e..093d0f549a5e 100644
--- a/dev-util/gperf/gperf-3.1-r1.ebuild
+++ b/dev-util/gperf/gperf-3.1-r1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
PATCHES=(
"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
+ "${FILESDIR}"/${P}-clang-16-wregister.patch
)
src_prepare() {
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 0bf7cec436db..721da0eb4f8a 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
Binary files differ
diff --git a/games-util/game-device-udev-rules/Manifest b/games-util/game-device-udev-rules/Manifest
index 6a3546b3e053..57c3956d40da 100644
--- a/games-util/game-device-udev-rules/Manifest
+++ b/games-util/game-device-udev-rules/Manifest
@@ -1,4 +1,4 @@
AUX 60-game-input-20220311.rules 225 BLAKE2B 049966d6eb8e061bec5b18b3361957ceb29d23782a0cf361bebec618d1a4b4d2924782abb601cc4bdd15ff959346c42a33ff40da17feef02acf284294bbcbdc2 SHA512 1fd23d370d17f7c98445671c1d0138db7e69b405e8c630e54a094da021fb5fb716966d1da1f22043f9dfadc42e89efc3147c9bbc04c4100383de7ca2887a0700
DIST steam-devices-d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa.tar.gz 2305 BLAKE2B 677cec02dfa1899b9bad9440a5810175b731234db271413c2027a5a1a81dbdaa8c5ccd922478c07304262d5c3bf16891875dcdab08341720b97953035d5ae93d SHA512 54a0a9f293ca03c01c5f3609c08e9e8cc1273a034b1164399623c55ec994414ecacff04d049bc4195da5f0601bb17de52c9e1770a0161caac9bb4b74d921b35b
-EBUILD game-device-udev-rules-20220311.ebuild 1925 BLAKE2B e2bcf78a40df049e69ba853fab5b10d4148153c160accc39db93b4b9500cb68008e8c68c4261469cdb1821475e3b9488457dabd819b49c6b748502f465322943 SHA512 274a2eba9c1872b344ace62db06fd7c41f8130b7edf1813cff7b217c59cf9fa61933b3dcd4a0752cfe5fd11122cbebfee2400905acde360ad079ae97f337d25f
+EBUILD game-device-udev-rules-20220311.ebuild 1927 BLAKE2B d06592e4c0b9d4ef7bebc01b5b3cee1f531404674462d5094a127f6444b2bf681f297629220168babef1c30af14b6561184c62fdb6e917f91f35013109d690e4 SHA512 aaad7abcbd0a5d3d4c4f3dd8641fd847d09a18b782bbcdb9b12726b7e28a7d3c24d9129737cb1532d28c514d031e04335f2e2dbc537d0039ae73a34a78d2ddbe
MISC metadata.xml 362 BLAKE2B dc08f40ec0b96ccae5aae0316565ea1b9b79d27d7c656d52761fa9c6c671e6e8eb37572d6820182b95b383641d3305aca071d802e6feec5e2e406022a5e0ea5d SHA512 ade0f9814d7adb32c77232b9a9e5e00782562b93f330e925f55366c78b4171f731c1916f41447386a5ef8ec3822db2d00c9ec1d2668180e9e5f6423b3423a0c0
diff --git a/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
index 7954b2916c15..8c590397a84e 100644
--- a/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
+++ b/games-util/game-device-udev-rules/game-device-udev-rules-20220311.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
local SRC DEST EXTRA
for SRC in 60-steam-{input,vr}.rules; do
DEST=${SRC//steam/game}
- EXTRA=${FILESDIR}/${DEST/./-${PV}.}
+ EXTRA=${FILESDIR}/${DEST/./-"${PV}".}
# Make changes in a copy.
cp -v "${SRC}" "${DEST}" || die
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3338893d222b..a707dcc2c3c3 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index e358f81ad9f5..2e68d99fb9f1 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -5,5 +5,5 @@ AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f9925
DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
EBUILD exempi-2.4.5-r1.ebuild 1200 BLAKE2B 2be269505b74dc4c0d8a2f2f05a0f99a2796b9a09a9711fd2e64926daa5c9126822c0e9e6e3550fe421a272c597dbfe74283c389b887b1001722198f15282616 SHA512 600901867f7a75d18fc727df7f379bf3e0c9b4a1dfbda64f157299347e6d3a50377951db7ea4ea056ab40559e3b1ab3b45810abfcda2169bd9723b6d4943746c
-EBUILD exempi-2.6.2.ebuild 1369 BLAKE2B 555bcc5adbf1064565738ec2540749852503d314372629e07124e39f9787ed9efbbcd72e80947a1a9942c15101646d86edbe1a2709484eb4630594bdaab50040 SHA512 57425b88ba3989f084fa1eb8216bbf9f29b388b51ab665777d5cb8a0e1bf9bd25993086ccc052ca787c60765883d43d4b4dffce7057c8b584dd0b88bdcdfa239
+EBUILD exempi-2.6.2.ebuild 1368 BLAKE2B 8bfbbacc9443b6dff82cd6e2a5211b22bfe22283610a10fd1092e5348e61a03cd4cae3f1c833c626a3ba97680d2355a241ecb9f19a66cb522c8a5bd0c2d74110 SHA512 1d705cc11baec604f5de72cd3c4783006119a0c3a3d20ab20290f8822588ef5c28d36f786dc334ddf5047eb86c4503669fe29629f6067e53ab4a9921c6198ce1
MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.6.2.ebuild b/media-libs/exempi/exempi-2.6.2.ebuild
index 0d4f83b919f5..52dcf3aa99d1 100644
--- a/media-libs/exempi/exempi-2.6.2.ebuild
+++ b/media-libs/exempi/exempi-2.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.bz2"
LICENSE="BSD"
SLOT="2/8"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 56c8dd4ccad5..2841a5bfac78 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -9,7 +9,7 @@ DIST openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz
DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
EBUILD openimageio-2.3.19.0.ebuild 4645 BLAKE2B 2502e0f959e2c11461e8dee961a1c4f1168e8803ca017b5350cb0a7313d3e7320a03cfb8004b27ca6448bd9a2f0e79b146e67ed6119c3afad002a9fcad588f6e SHA512 a29233608bb70379242ba0ada644e98030b527d178acddf6abbf7cf276a39a3deec488003b5fe4837e6a66f2f2fd4021336289570095553316c1707752d02f31
EBUILD openimageio-2.3.20.0.ebuild 4896 BLAKE2B 6b5f2ac2ad0b0d2771889def16899a1cc5d4bce8cd013a76b1c22efd9a5d689e4fe1af77fe63950db16cf2411baad965833c265b21dba1234dd80b4b35d4cefa SHA512 836201f3a028440f5ab4747bb495d5e277a98f6468d3dd567abad774c4b7db45ee0b2bfbecab32cc0509c93eacf73f674165a62d6c5fe37cb56b1dfb46464541
-EBUILD openimageio-2.3.21.0.ebuild 4895 BLAKE2B fdc8fb3f7d4ceb873e3ced40ae5d317e4c88bc0c50944bb21bd029410349f12d83ce3d67a48f0d749aa11cd8b1d759c58c1148bc2f3179a5cf69f9524b0c0b72 SHA512 7666901b7db13ddb21a542aedbe6a2c8e3c658e886b8a5ad56a0213b5891f011db83eb3546fd3ffa51600499d22c3d9228961e8fb6e1d48e2b43080e720cb15e
+EBUILD openimageio-2.3.21.0.ebuild 4894 BLAKE2B 1192fafcbc01c79b1918e22d0185180c13e699a5b385c964f216a8bbd37cf7d9ad89dcb26400f214c9501eec1682f101cdb82e8aa7814f5260b0860fb499289b SHA512 1928cfcd486d0d22fbd2b9be7a9e9864af3ff8a58bc4765266f09a8e86bc02b6f62d6a704fd0457661725959c372ac61dbadc2c336e911e599ada777a01e7a63
EBUILD openimageio-2.4.4.1.ebuild 5464 BLAKE2B cb303e8afc4ae1cc79b38e88db41df78f9e5a28691432bb02ddc72a60d36292fd48dd5e57b60c4be08e2a2f50e7a6b170c4dcf68f6830ee82f230af18bb170fa SHA512 369dd8489080853d478e3cbcb1b9bbbf769c89de3c5fa7710c29c3b82bc62f17ee1e04bbc5034a555cae3357ffeb9fd4c2b01f7fe8d7fe830c0e7b697efb595f
EBUILD openimageio-2.4.5.0.ebuild 5527 BLAKE2B 0131bf36b443220f6f0973116b47fffab81a3ecce804993f2cad45b62f2d05675d35b9044da56428dd70333ed6943899bbb7491fb41c75859336e035714bd17a SHA512 35cb1d25fc2c85ffc5986d2b0f3c94e143cdae711e7d402be987657406419de02c7739aa8f6424f5e3bca670df6051e01a054119f3dd3a6d71b031a4ecdc8baa
EBUILD openimageio-2.4.6.0.ebuild 5608 BLAKE2B 3a720a7779653da932d9f3afaa02ef125d7ff83ad2b087d20be2ec6bb59e5a6258ab51ed2e76cff7f968d46490f21e3154e6098acd9a6b9d9c40e96e22425cbe SHA512 6db2bf05d80f5ef1072a4cff8316021f88e2c76a6140ef92fafac9a44f55df8ce992029dcc28524e6bf559789a9cd77d4ed4d119d5751dfc0faa70733ba35aa9
diff --git a/media-libs/openimageio/openimageio-2.3.21.0.ebuild b/media-libs/openimageio/openimageio-2.3.21.0.ebuild
index 4568beee78a3..c4631295e6db 100644
--- a/media-libs/openimageio/openimageio-2.3.21.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.21.0.ebuild
@@ -23,7 +23,7 @@ LICENSE="BSD"
# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
# for changing to openexr 3 which broke ABI.
SLOT="0/$(ver_cut 1-2).1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
X86_CPU_FEATURES=(
aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a03c27a267b2..42ae3dbb1c64 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3fe07d7cb105..ceb4d8d5fe59 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,7 +11,7 @@ AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da
DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
EBUILD vlc-3.0.17.4-r2.ebuild 13629 BLAKE2B 3eb7133d0acea2d9abb614f5fdd72188a603301321e92558312a1850c28ed17a78ad64a13e7cfa7928ac85ef7e12ac478b4089a28f97b0401c944f0f85aba4e8 SHA512 13a7d4d473e14e0e87a7ce17a9db384129ccb53512ac33e326e0b4dc6b262814e68d29e1407c2ea11a28086beedda70a1dc538edb453cf6fe2092095642bbf04
-EBUILD vlc-3.0.18.ebuild 13463 BLAKE2B ad5164b999ad7de7d128b60904aaf4854f7d4500ea0e9ab6bf0625f47f19133f75d4bfd642d58f2c34c87b91ac68a997636b66e942401e94dcedfde1a235f736 SHA512 ce9aacfec05f44fa6f17ff7cfbf1278c2050e347b038f497693b7ce11e367863da79b8f7baf938cf2ddfcabc5b0ce737b629926d0a533b5d671c627d632527f2
+EBUILD vlc-3.0.18.ebuild 13462 BLAKE2B 79f43d9ce3d0350c9846d1d55859a7c655a3dadb491794bfc4f8c7357c3c9933da830094de1e29d39b3d370cbdbeaa84336f1e348e95afc7f8b29e3c7e96018b SHA512 1bd7908f7db3e0d97c56351db58394b2a9bf4dda0e89a648295c477c516e519b592942a15cf338ad2df3f87f980e7e8ac40844d367f2e73019b492d74ee34b53
EBUILD vlc-3.0.9999.ebuild 13460 BLAKE2B d22acd93a5454be55ac2fbbe85adce8cf1b9105badeb062d03a608afd5a94f4d571374dbe503d1c3592a423702f074917760897c55b1dce82586d4ff79f659bd SHA512 8212b47b6726bca0110b53db38ea7c538112a8eb4243e8ad69ae3780498bfb52d61af4ddccb2995cfb57bc4303c93240fcb38513bacd1bcfeaf02b9f5ef75043
EBUILD vlc-9999.ebuild 13510 BLAKE2B 4469d35b248303fe06842de7d15fe8fddb0092c81f786883fb3561cbe9a8ea6d80bd20e3d6605764168d68b6478666e003e0d0839773f2deef8f6c4344f7b76c SHA512 4acfbc0cee4d3c884aefe1f3b9cd193b765f925f3d0a368c20d7ebea08c25125ecea2be91ef489c9a506d534b1693e44f4893b86c42630a5a74de706c2b80b5a
MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045
diff --git a/media-video/vlc/vlc-3.0.18.ebuild b/media-video/vlc/vlc-3.0.18.ebuild
index bcc17976c2b2..e67e949893de 100644
--- a/media-video/vlc/vlc-3.0.18.ebuild
+++ b/media-video/vlc/vlc-3.0.18.ebuild
@@ -20,7 +20,7 @@ else
else
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
fi
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86"
fi
inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a94e62486bcd..86c744fa0a04 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
Binary files differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 26e5b9bd6a4f..76f91968a266 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Dec 2022 08:09:47 +0000
+Tue, 06 Dec 2022 14:09:40 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fe18c50d2cf5..68235563c53e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-12-06T08:09:52Z
+TIMESTAMP 2022-12-06T14:09:43Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOO+NBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOPTSdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBBVA//dTWkxH1TAG5xwgdPv/LpdVZ58qVPSf3JspC24hJZZ+f+yQDfwjtf4JGo
-YQQCBPvyaWE9Menv85pkgYMMJ//dIoo8RK3cAYnQIMzXPmxdFar2zpiA9iUQ34TS
-FpC+4ym7U9OOBn+y4Nu4gE2qN7TVbvg7HNMdkRoEVRLPa/Y/e1tdesmzInhKHnlQ
-nYiZrAIQkBIFuytnJVGKtHB3KUhRLKuTU6fvpkDSIWZDzhT3lL1/4DCmf42jDrGz
-dXh5NXwrZSy1juJ5OvkXu3/t7EOtxvCsYm9ExHK3CcGLGW9CTOYWLyPTPfs6HUZ6
-gq5iXWowPloD5Jt5tPasW3dYrBI8iXyBrqUzBqSppqwlQlCv44uIqoLKK97uDmbd
-ueZtkwGFBxT+QqVNfli77RBSyuXulWPHdZsNOCytwvHBxn1dzT+bUeIkIo3OqvB7
-eem6QFxgpHnJvR059PMP1+w8g517A1wG5AvC9WZnohwvqpztjQBkXx7bdh9majNk
-GPH4+wW/xpcPbiHg1077amQs/onQpESUV/F3v9ATBdnDs8Egga0IyWE/o/vnVuTw
-pV07sOThmX6q9J2VQHuLvKVkB9amkUNy9JlG47yUcbzYFhOZoKrNlN9/LZXY4dPC
-QOjtVhMgM2txF6rcR9qXyx9TL1zpF5FLUPo+QjlzMHuKdqjajsk=
-=3ayQ
+klA1ExAAgY8V0YaPq5bujtrvNmBd2SNObaV3Y/e0gR96UnejU8VWs6iv5HhiNh23
+V959wDfRRsIb02VtDM1lhlVehpJJ+QUz1cSUKpLM1mrMtWTxYA+TjCNYuby/aiVb
+QpeLkwlWLLfsLezGDSNnIAhe2lZ+vO9apaOtkrggpyA1+VADkjPDEEs4PiALRKmA
+z5rlS4G3CWYVYtBh+oc/mCm1ePHVdVg46Qlo0czS/nxUngoG7tLJp96hXCQE38d6
+xrDu/AbdxWLi+Xv6C0Qn/c1IBTpZqregTp7ICeH4c3oBqI+l5sPiPhUzvtug89JB
+EO21uoNNkphX7G+nXIRjh2448mBUw10IK6IVGbetN42WGv8Mvu4+R3XAVt4xYHw1
+Aykef0EfLFSLI6gFo85KTMkm255EC/ZbQJBM1HB0vOVJ1nnaj7AOL970mbtQSUPh
+10/p+sLMrIUOCrDOPCzTLWJ6xyI8KSf/qDPSObfhby49ltQAouNfhCZS0lbgMp4I
+tzGnh39nR7EWpDeCLx/Sj0WttYGyH4mDaUAOVjiIQI10mzvdMfY4LhKtAMs+xW6T
+QR8NLUEjNgh2FYGe5hKUGCM4hys6DK4ZIjcbCpDRq5OV7Mpd4zyDtlPGBVlEIpiO
+diH/DuSCTxF4Vzkw0PCE3XKfGFfEcc2A8ymY1Vo7kaqg7N+Wvns=
+=zlSM
-----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 26e5b9bd6a4f..76f91968a266 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Dec 2022 08:09:47 +0000
+Tue, 06 Dec 2022 14:09:40 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6d30e2615fca..9ec965bcf6ac 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index ad8cf71f1690..64f385f536c2 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-admin/clustershell-1.8.4 b/metadata/md5-cache/app-admin/clustershell-1.8.4
index 1f95bd8e7c26..a7ead14455d3 100644
--- a/metadata/md5-cache/app-admin/clustershell-1.8.4
+++ b/metadata/md5-cache/app-admin/clustershell-1.8.4
@@ -5,7 +5,7 @@ EAPI=8
HOMEPAGE=https://github.com/cea-hpc/clustershell/
INHERIT=distutils-r1
IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2.1+
RDEPEND=dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.8.4.tar.gz -> clustershell-1.8.4.gh.tar.gz
_eclasses_=distutils-r1 da32ffc285e9f13313f2387570e35b87 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-r1 2d51fd03931e743811ce30d198e4dcfd python-utils-r1 25c880c1db58e21b80b684bacc964958 toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=4dc31ffb71ecb08ef6579828902874ea
+_md5_=561608cf7bb9acc224bd2702307ac124
diff --git a/metadata/md5-cache/app-admin/clustershell-1.9 b/metadata/md5-cache/app-admin/clustershell-1.9
new file mode 100644
index 000000000000..74e706490a3d
--- /dev/null
+++ b/metadata/md5-cache/app-admin/clustershell-1.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-shells/pdsh net-misc/openssh sys-devel/bc ) test? ( dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python framework for efficient cluster administration
+EAPI=8
+HOMEPAGE=https://github.com/cea-hpc/clustershell/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cea-hpc/clustershell/archive/v1.9.tar.gz -> clustershell-1.9.gh.tar.gz
+_eclasses_=distutils-r1 da32ffc285e9f13313f2387570e35b87 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-r1 2d51fd03931e743811ce30d198e4dcfd python-utils-r1 25c880c1db58e21b80b684bacc964958 toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=dda09546610cea0a9d89f937cbefdc84
diff --git a/metadata/md5-cache/app-admin/logsurfer+-1.8-r5 b/metadata/md5-cache/app-admin/logsurfer+-1.8-r5
new file mode 100644
index 000000000000..e448181bc205
--- /dev/null
+++ b/metadata/md5-cache/app-admin/logsurfer+-1.8-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Real Time Log Monitoring and Alerting
+EAPI=8
+HOMEPAGE=https://www.crypt.gen.nz/logsurfer/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist GPL-2+
+RDEPEND=acct-group/logsurfer acct-user/logsurfer
+RESTRICT=bindist
+SLOT=0
+SRC_URI=mirror://sourceforge/logsurfer/logsurfer-1.8.tar.gz
+_eclasses_=multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=73c329233272a2bc5fabe4f4ceddb8cf
diff --git a/metadata/md5-cache/app-alternatives/Manifest.gz b/metadata/md5-cache/app-alternatives/Manifest.gz
index 673423604e09..1fbea7741efe 100644
--- a/metadata/md5-cache/app-alternatives/Manifest.gz
+++ b/metadata/md5-cache/app-alternatives/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-alternatives/awk-2 b/metadata/md5-cache/app-alternatives/awk-3
index fb003729930b..41915ee2a5bb 100644
--- a/metadata/md5-cache/app-alternatives/awk-2
+++ b/metadata/md5-cache/app-alternatives/awk-3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install postrm
+DEFINED_PHASES=install postrm preinst
DESCRIPTION=/bin/awk and /usr/bin/awk symlinks
EAPI=8
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Base/Alternatives
@@ -10,4 +10,4 @@ RDEPEND=!app-eselect/eselect-awk gawk? ( sys-apps/gawk ) busybox? ( sys-apps/bus
REQUIRED_USE=^^ ( gawk busybox mawk nawk )
SLOT=0
_eclasses_=app-alternatives 7e9cb9b9eda5c46d0e04f3c992226ff2
-_md5_=2a3b4fc0629b88a771dbb506b57b690f
+_md5_=e57659d0dec19fe49e06cd62dea91035
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index bd71334f87f4..57c94f91eca7 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-dicts/aspell-ast-0.01-r1 b/metadata/md5-cache/app-dicts/aspell-ast-0.01-r1
index 2019fa9d2892..521825880b8b 100644
--- a/metadata/md5-cache/app-dicts/aspell-ast-0.01-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ast-0.01-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/gnu/aspell/dict/ast/aspell6-ast-0.01.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=b89190113b9720958aa1939268ef9b3c
+_md5_=f283b42a2c4cd77084def5da46979d28
diff --git a/metadata/md5-cache/app-dicts/aspell-be-0.01-r2 b/metadata/md5-cache/app-dicts/aspell-be-0.01-r2
index 8d2c9c6ae213..fd4821895f31 100644
--- a/metadata/md5-cache/app-dicts/aspell-be-0.01-r2
+++ b/metadata/md5-cache/app-dicts/aspell-be-0.01-r2
@@ -12,4 +12,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/aspell/dict/be/aspell5-be-0.01.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=af4a4e564055a23668387c9cc60f7ab3
+_md5_=5541308aca6d393d2387326287c0eaef
diff --git a/metadata/md5-cache/app-dicts/aspell-ca-2.5.0-r1 b/metadata/md5-cache/app-dicts/aspell-ca-2.5.0-r1
index 1302c1d7df2c..b10f9528c3b1 100644
--- a/metadata/md5-cache/app-dicts/aspell-ca-2.5.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ca-2.5.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://www.softcatala.org/pub/softcatala/aspell/2.5.0/aspell6-ca-2.5.0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=89a12f3199153d10a64fb38ec2913113
+_md5_=d0c9683d073d3ba510ccec90d44e24c9
diff --git a/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0-r1 b/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0-r1
index 0eb3fac3f20c..865cae16d2a6 100644
--- a/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-de-20161207.7.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/aspell/dict/de/aspell6-de-20161207-7-0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=375c901630d312655615c032a7ab4b24
+_md5_=dd55db985ba730a32fb67e3e3ec5ee68
diff --git a/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2-r1 b/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2-r1
index 272676c6ca16..5c2cf1fc01a7 100644
--- a/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2-r1
+++ b/metadata/md5-cache/app-dicts/aspell-eo-2.1.20000225.2-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/aspell/dict/eo/aspell6-eo-2.1.20000225a-2.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=0c67460709618a7b773b6707dc23cc52
+_md5_=977b02685b48ef16a2e31c9ecbd189fc
diff --git a/metadata/md5-cache/app-dicts/aspell-ga-5.1.0-r1 b/metadata/md5-cache/app-dicts/aspell-ga-5.1.0-r1
index 36e4ccbf659a..2823dd2ef79a 100644
--- a/metadata/md5-cache/app-dicts/aspell-ga-5.1.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ga-5.1.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://github.com/kscanne/gaelspell/releases/download/v5.1/aspell5-ga-5.1-0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=bdcf68709db7047a7bc06416efbdbb2b
+_md5_=9ba76e509b33afe041dec0ca1f9738af
diff --git a/metadata/md5-cache/app-dicts/aspell-gl-0.5.2-r1 b/metadata/md5-cache/app-dicts/aspell-gl-0.5.2-r1
index a01e14e135d7..1c1210c4f20e 100644
--- a/metadata/md5-cache/app-dicts/aspell-gl-0.5.2-r1
+++ b/metadata/md5-cache/app-dicts/aspell-gl-0.5.2-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/aspell/dict/gl/aspell6-gl-0.5a-2.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=9a2d91bab84d70762f6b8d1fc203e2b2
+_md5_=0df0e5dc1e54ad3f6b47fa8a968ad44b
diff --git a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0-r1 b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0-r1
index d2f962c74127..cd2b424073a0 100644
--- a/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-it-2.4.20070901.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://sourceforge/linguistico/aspell6-it-2.4-20070901-0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=903ce5e7bc8491c605d2c201a5c8f9f3
+_md5_=398d1b32735f4866730769414692c6fd
diff --git a/metadata/md5-cache/app-dicts/aspell-lt-1.3.2-r1 b/metadata/md5-cache/app-dicts/aspell-lt-1.3.2-r1
index 74797b7ee06f..7b3ca75dde71 100644
--- a/metadata/md5-cache/app-dicts/aspell-lt-1.3.2-r1
+++ b/metadata/md5-cache/app-dicts/aspell-lt-1.3.2-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://github.com/ispell-lt/ispell-lt/releases/download/rel-1.3.2/aspell6-lt-1.3.2.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=d81dec05a24a44bca84f827f67b49c3b
+_md5_=12f16d57503934c22bea06fcc516180b
diff --git a/metadata/md5-cache/app-dicts/aspell-ml-0.04.1-r1 b/metadata/md5-cache/app-dicts/aspell-ml-0.04.1-r1
index 26a24c53659a..35caa349ce62 100644
--- a/metadata/md5-cache/app-dicts/aspell-ml-0.04.1-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ml-0.04.1-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://download-mirror.savannah.gnu.org/releases/smc/Spellchecker/aspell6-ml-0.04-1.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=c223ca32529c76dc3f8be26ef676363d
+_md5_=6ba444efb1d058926bdc14c11dac075c
diff --git a/metadata/md5-cache/app-dicts/aspell-pt-20220621 b/metadata/md5-cache/app-dicts/aspell-pt-20220621
index 5508920d41a2..5807cecb73ca 100644
--- a/metadata/md5-cache/app-dicts/aspell-pt-20220621
+++ b/metadata/md5-cache/app-dicts/aspell-pt-20220621
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-20220621.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=10fd936724a89f68d2aa22f2523098c3
+_md5_=64e92f82b2702564873d9d88edafa38e
diff --git a/metadata/md5-cache/app-dicts/aspell-ro-3.3.10-r1 b/metadata/md5-cache/app-dicts/aspell-ro-3.3.10-r1
index dcdd1f1ee963..717d9e8860c7 100644
--- a/metadata/md5-cache/app-dicts/aspell-ro-3.3.10-r1
+++ b/metadata/md5-cache/app-dicts/aspell-ro-3.3.10-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://sourceforge/rospell/aspell5-ro-3.3.10.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=266735dda4c7dea580ec1e970d94d8c3
+_md5_=551039a70d243bfef36c67cc94e949d3
diff --git a/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r2 b/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r2
index 300826e05c2c..6db1c1daeb4d 100644
--- a/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r2
+++ b/metadata/md5-cache/app-dicts/aspell-ru-0.99.1-r2
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=a30f3b0b0466acff3872b641a7320548
+_md5_=3e72f47e65aa3e835b015dd67b113b3c
diff --git a/metadata/md5-cache/app-dicts/aspell-sc-1.0-r1 b/metadata/md5-cache/app-dicts/aspell-sc-1.0-r1
index 5a10ef1b22b4..99a1474fd367 100644
--- a/metadata/md5-cache/app-dicts/aspell-sc-1.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-sc-1.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/gnu/aspell/dict/sc/aspell5-sc-1.0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=4f688f5d9b7d62af4c508b7790d4f2ae
+_md5_=baaecdd39a999954d6ffb0fbb80b05ff
diff --git a/metadata/md5-cache/app-dicts/aspell-sk-2.02.0-r1 b/metadata/md5-cache/app-dicts/aspell-sk-2.02.0-r1
index b1e75c39ead5..998bbfceae83 100644
--- a/metadata/md5-cache/app-dicts/aspell-sk-2.02.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-sk-2.02.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://spell.linux.sk/file_download/103/aspell6-sk-2.02-0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=5e15baba9c84c68e057126b31346682c
+_md5_=591b67754995178e6fb6848711155b77
diff --git a/metadata/md5-cache/app-dicts/aspell-sr-0.02-r1 b/metadata/md5-cache/app-dicts/aspell-sr-0.02-r1
index cbafc62beadf..4836b566296c 100644
--- a/metadata/md5-cache/app-dicts/aspell-sr-0.02-r1
+++ b/metadata/md5-cache/app-dicts/aspell-sr-0.02-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/aspell/dict/sr/aspell6-sr-0.02.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=72eaba65b146d592acd9df8b118d4586
+_md5_=6005bf5c88a4025f3244216dea20a6f4
diff --git a/metadata/md5-cache/app-dicts/aspell-tet-0.1.1-r1 b/metadata/md5-cache/app-dicts/aspell-tet-0.1.1-r1
index e41417f482d1..c6ca94aba85c 100644
--- a/metadata/md5-cache/app-dicts/aspell-tet-0.1.1-r1
+++ b/metadata/md5-cache/app-dicts/aspell-tet-0.1.1-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=mirror://gnu/gnu/aspell/dict/tet/aspell5-tet-0.1.1.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=058d86fd335e411829a297e90128c76a
+_md5_=f6bda1785f7a00f61f5529088a341582
diff --git a/metadata/md5-cache/app-dicts/aspell-tl-0.4.0-r1 b/metadata/md5-cache/app-dicts/aspell-tl-0.4.0-r1
index 2924d0d197c1..6210b376c558 100644
--- a/metadata/md5-cache/app-dicts/aspell-tl-0.4.0-r1
+++ b/metadata/md5-cache/app-dicts/aspell-tl-0.4.0-r1
@@ -11,4 +11,4 @@ RDEPEND=app-text/aspell
SLOT=0
SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tagalog-wordlist/aspell6-tl-0.4-0.tar.bz2
_eclasses_=aspell-dict-r1 dc35762817047596da90d52917261158
-_md5_=a4ee36110834670a7a64a5e84802b9dd
+_md5_=42ece2b8d4bd772985579054def967ed
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 1c9014d3d99b..21603724ed3a 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.12 b/metadata/md5-cache/app-doc/gnucash-docs-4.12
new file mode 100644
index 000000000000..cee33b07d85d
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.12
@@ -0,0 +1,13 @@
+BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2 dev-libs/libxslt sys-devel/make >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Documentation package for GnuCash
+EAPI=8
+HOMEPAGE=https://www.gnucash.org/
+INHERIT=cmake optfeature
+IUSE=l10n_de l10n_it l10n_ja l10n_pt
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.12.tar.gz -> gnucash-docs-4.12.tar.gz
+_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 optfeature 1a2157392a869265b2afcb63a26c12ac toolchain-funcs 959e1d99122907eb98a3a660297a967e xdg-utils ac0e315a3688929e34ac75b139e7349a
+_md5_=cc7407a6918fc39ca8e4173a610cbf4b
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.4 b/metadata/md5-cache/app-doc/gnucash-docs-4.4
deleted file mode 100644
index cfa8043b4d23..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt
-DESCRIPTION=Documentation package for GnuCash
-EAPI=7
-HOMEPAGE=https://www.gnucash.org/
-INHERIT=autotools optfeature
-IUSE=l10n_de l10n_it l10n_ja l10n_pt
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 FDL-1.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.4.tar.gz -> gnucash-docs-4.4.tar.gz
-_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 optfeature 1a2157392a869265b2afcb63a26c12ac toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=e74eae164bf6539f22ae5c05c0126622
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.5 b/metadata/md5-cache/app-doc/gnucash-docs-4.5
deleted file mode 100644
index 826b6e2fbedb..000000000000
--- a/metadata/md5-cache/app-doc/gnucash-docs-4.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt
-DESCRIPTION=Documentation package for GnuCash
-EAPI=7
-HOMEPAGE=https://www.gnucash.org/
-INHERIT=autotools optfeature
-IUSE=l10n_de l10n_it l10n_ja l10n_pt
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 FDL-1.1
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.5.tar.gz -> gnucash-docs-4.5.tar.gz
-_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 optfeature 1a2157392a869265b2afcb63a26c12ac toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=00874a1b186ca10ceb3e1feead6ff6cb
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 12f05a50b696..90f598fce38a 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-editors/jupp-3.1_p41 b/metadata/md5-cache/app-editors/jupp-3.1_p41
index 72effd76552f..80e01d1ef2f4 100644
--- a/metadata/md5-cache/app-editors/jupp-3.1_p41
+++ b/metadata/md5-cache/app-editors/jupp-3.1_p41
@@ -9,4 +9,4 @@ LICENSE=GPL-1
RDEPEND=ncurses? ( sys-libs/ncurses:0= ) !app-editors/joe
SLOT=0
SRC_URI=http://www.mirbsd.org/MirOS/dist/jupp/joe-3.1jupp41.tgz
-_md5_=6a13ac40c26d4d94dc96593ae1c39277
+_md5_=03dea7231438037cf49d8f7d794ad55e
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 81231b00510b..05b4f3135bca 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-office/gnucash-4.12 b/metadata/md5-cache/app-office/gnucash-4.12
new file mode 100644
index 000000000000..fb88b2a46101
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-4.12
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/swig dev-util/cmake virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject[python_targets_python3_11(-)] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool test? ( >=dev-cpp/gtest-1.8.0 )
+DESCRIPTION=A personal finance manager
+EAPI=8
+HOMEPAGE=https://www.gnucash.org/
+INHERIT=cmake gnome2-utils python-single-r1 xdg-utils
+IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=doc? ( ~app-doc/gnucash-docs-4.12 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject[python_targets_python3_11(-)] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
+REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) smartcard? ( aqbanking )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.12/gnucash-4.12.tar.bz2
+_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d flag-o-matic 69394e25812406faa1f90edaf4969395 gnome2-utils 2116cec8f46f4d1b0a88c5b1f1575dd3 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-single-r1 a5747fe6dc0651d95cb78eddd5e160a8 python-utils-r1 25c880c1db58e21b80b684bacc964958 toolchain-funcs 959e1d99122907eb98a3a660297a967e xdg-utils ac0e315a3688929e34ac75b139e7349a
+_md5_=cacc5ad973411b39a0ce6a589759ea0c
diff --git a/metadata/md5-cache/app-office/gnucash-4.4 b/metadata/md5-cache/app-office/gnucash-4.4
deleted file mode 100644
index 93e20de5ee4c..000000000000
--- a/metadata/md5-cache/app-office/gnucash-4.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/swig dev-util/cmake virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) >=dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool
-DESCRIPTION=A personal finance manager
-EAPI=7
-HOMEPAGE=https://www.gnucash.org/
-INHERIT=cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
-IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-PDEPEND=doc? ( ~app-doc/gnucash-docs-4.4 gnome-extra/yelp )
-RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
-REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) smartcard? ( aqbanking )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.4/gnucash-4.4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/app-office/gnucash/gnucash-4.4-Fix-build-with-glib-2.68.patch.xz
-_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 gnome2-utils 2116cec8f46f4d1b0a88c5b1f1575dd3 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-single-r1 a5747fe6dc0651d95cb78eddd5e160a8 python-utils-r1 25c880c1db58e21b80b684bacc964958 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 959e1d99122907eb98a3a660297a967e wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils ac0e315a3688929e34ac75b139e7349a
-_md5_=16bcd56930ace6328c46201a76116d5e
diff --git a/metadata/md5-cache/app-office/gnucash-4.5 b/metadata/md5-cache/app-office/gnucash-4.5
deleted file mode 100644
index 16a72b645d41..000000000000
--- a/metadata/md5-cache/app-office/gnucash-4.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/swig dev-util/cmake virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) >=dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool
-DESCRIPTION=A personal finance manager
-EAPI=7
-HOMEPAGE=https://www.gnucash.org/
-INHERIT=cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
-IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes register2 smartcard sqlite test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=doc? ( ~app-doc/gnucash-docs-4.5 gnome-extra/yelp )
-RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
-REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ) smartcard? ( aqbanking )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.5/gnucash-4.5.tar.bz2
-_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 gnome2-utils 2116cec8f46f4d1b0a88c5b1f1575dd3 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-single-r1 a5747fe6dc0651d95cb78eddd5e160a8 python-utils-r1 25c880c1db58e21b80b684bacc964958 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 959e1d99122907eb98a3a660297a967e wrapper 4a1902f969e5718126434fc35f3a0d9c xdg-utils ac0e315a3688929e34ac75b139e7349a
-_md5_=5a1336d1a7e9662d2f68fd036ce3f26c
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 4f2e33c75e8f..86b58126d22b 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.94.4 b/metadata/md5-cache/app-portage/portage-utils-0.94.4
new file mode 100644
index 000000000000..fcd2e8823269
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portage-utils-0.94.4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare pretend setup
+DEPEND=qmanifest? ( !static? ( app-crypt/gpgme:= app-crypt/libb2:= dev-libs/openssl:= sys-libs/zlib:= ) ) qtegrity? ( !static? ( dev-libs/openssl:= ) ) qmanifest? ( static? ( app-crypt/gpgme[static-libs] app-crypt/libb2[static-libs] dev-libs/openssl[static-libs] sys-libs/zlib[static-libs] ) ) qtegrity? ( static? ( dev-libs/openssl[static-libs] ) )
+DESCRIPTION=Small and fast Portage helper tools written in C
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=openmp +qmanifest +qtegrity static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=qmanifest? ( !static? ( app-crypt/gpgme:= app-crypt/libb2:= dev-libs/openssl:= sys-libs/zlib:= ) ) qtegrity? ( !static? ( dev-libs/openssl:= ) )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.94.4.tar.xz
+_eclasses_=flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=57d61e7b07df65a218f64c719222c78a
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c5aa2a7b1fd1..817bdf202db7 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
new file mode 100644
index 000000000000..85193f4aa1f7
--- /dev/null
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.82
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/awk sys-devel/flex doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff
+DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
+EAPI=7
+HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
+INHERIT=autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+IUSE=doc
+KEYWORDS=~amd64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-3+ MIT SGMLUG
+RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= sys-apps/groff virtual/latex-base >=app-text/sgml-common-0.6.3-r7
+SLOT=0
+SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.82/linuxdoc-tools-0.9.82.tar.bz2
+_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 gnuconfig b6b3e92f8b8c996400074b5f61a59256 latex-package c20e442c3953c765f636630631c96194 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 perl-functions c3fca037246e877693badea0df3b0ef8 sgml-catalog-r1 5d1d74baed1e6235b9a698917e954236 toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=3f267fb32f631f992697de9c16c5e6ba
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 0757de926688..db193bc2b35f 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-ada/gtkada-23.0.0 b/metadata/md5-cache/dev-ada/gtkada-23.0.0
new file mode 100644
index 000000000000..ef35ff78dc62
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gtkada-23.0.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DESCRIPTION=A complete Ada graphical toolkit
+EAPI=7
+HOMEPAGE=http://libre.adacore.com//tools/gtkada/
+INHERIT=ada autotools multiprocessing
+IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-libs/atk dev-libs/glib:2 media-libs/fontconfig media-libs/freetype x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
+SLOT=0/23.0.0
+SRC_URI=https://github.com/AdaCore/gtkada/archive/refs/tags/v23.0.0.tar.gz -> gtkada-23.0.0.tar.gz
+_eclasses_=ada 4770f6893bca382df11995a475063cf0 autotools 6dcd6b6a486e79928e1243ff9ba41fcc gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=bf3537be5d234b007a9fb13acf9662ed
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1cdcf5e7f44a..6cac64e15fcc 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.5 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
index 3ce089b43c00..0e6854176549 100644
--- a/metadata/md5-cache/dev-java/jakartaee-migration-1.0.5
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.6
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0
RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.6.0:0 >=dev-java/commons-compress-1.21:0 >=dev-java/commons-io-2.11.0:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=!test? ( test )
SLOT=0
-SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz -> jakartaee-migration-1.0.5-sources.tar.gz
+SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.6/source/jakartaee-migration-1.0.6-src.tar.gz -> jakartaee-migration-1.0.6-sources.tar.gz
_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 257a59d157060d7bd51a13e68c614dd5 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=633b9d98bf9ef477362f98cb6c751c3b
+_md5_=99e160dd22484b5da83b333338be687e
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.70 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.70
new file mode 100644
index 000000000000..ff795f65b01b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.70
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 3.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 257a59d157060d7bd51a13e68c614dd5 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 verify-sig afb98fe4696292e4234ce36713fd4e9e
+_md5_=cee843021497cb85545abd2aaa566001
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.70 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.70
new file mode 100644
index 000000000000..b621a6661c73
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.70
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.70:3.0 ~dev-java/tomcat-servlet-api-9.0.70:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 2.3 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.70:3.0 ~dev-java/tomcat-servlet-api-9.0.70:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.3
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 257a59d157060d7bd51a13e68c614dd5 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 verify-sig afb98fe4696292e4234ce36713fd4e9e
+_md5_=3dbd459cc9340613221f38e9d3a2d2de
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.70 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.70
new file mode 100644
index 000000000000..7a7c1f08df20
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.70
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.70:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.70:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-pkg-simple 257a59d157060d7bd51a13e68c614dd5 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 verify-sig afb98fe4696292e4234ce36713fd4e9e
+_md5_=fb9cd723f35bc1788cd5ab3334848745
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 50eaca6d854e..91dc99096913 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220127-r2 b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220127-r2
index ae6073810e10..bad331a8f544 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220127-r2
+++ b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220127-r2
@@ -9,4 +9,4 @@ LICENSE=MIT
SLOT=2/2.1.0_beta3_p20220127
SRC_URI=https://github.com/LuaJIT/LuaJIT/archive/1d7b5029c5ba36870d25c67524034d452b761d27.tar.gz -> luajit-2.1.0_beta3_p20220127.tar.gz
_eclasses_=multilib 5ca4e49abed8e3a2f7b56920eadee157 pax-utils 91d47e5d20627c717aa878b9167c62a8 toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=05d47098edfdcc31e1e46c60aa200faf
+_md5_=f6ca7bedfc6a49bde7418a645700851a
diff --git a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220613 b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220613
index 6927dd6fc234..1c942dd4cb71 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220613
+++ b/metadata/md5-cache/dev-lang/luajit-2.1.0_beta3_p20220613
@@ -9,4 +9,4 @@ LICENSE=MIT
SLOT=2/2.1.0_beta3_p20220613
SRC_URI=https://github.com/LuaJIT/LuaJIT/archive/0065cff7e0222c234b75a71e72b8883df5d000c2.tar.gz -> luajit-2.1.0_beta3_p20220613.tar.gz
_eclasses_=multilib 5ca4e49abed8e3a2f7b56920eadee157 pax-utils 91d47e5d20627c717aa878b9167c62a8 toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=094fd08524e57253db5f561979d1cad7
+_md5_=665142e5eabcb8dc4d49836060d974c6
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 24e7ee0a646c..ff48b2fa6cd8 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-libs/gmp-6.2.1-r4 b/metadata/md5-cache/dev-libs/gmp-6.2.1-r5
index de4c4105948e..3a8c03346b81 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.2.1-r4
+++ b/metadata/md5-cache/dev-libs/gmp-6.2.1-r5
@@ -1,9 +1,9 @@
-BDEPEND=app-arch/xz-utils sys-devel/m4 >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
+BDEPEND=app-arch/xz-utils sys-devel/m4 sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare pretend test
DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numbers
EAPI=8
HOMEPAGE=https://gmplib.org/
-INHERIT=libtool multilib-minimal toolchain-funcs
+INHERIT=gnuconfig libtool multilib-minimal toolchain-funcs
IUSE=+asm doc +cpudetection +cxx pic static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( LGPL-3+ GPL-2+ )
@@ -11,5 +11,5 @@ REQUIRED_USE=cpudetection? ( asm )
RESTRICT=!cpudetection? ( bindist )
SLOT=0/10.4
SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.2.1/gmp-6.2.1.tar.xz mirror://gnu/gmp/gmp-6.2.1.tar.xz doc? ( https://gmplib.org/gmp-man-6.2.1.pdf ) https://dev.gentoo.org/~sam/distfiles/dev-libs/gmp/gmp-6.2.1-arm64-darwin.patch.bz2
-_eclasses_=libtool 241a8f577b9781a42a7421e53448a44e multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 87f1b83e21a473787b821ef3d0437bf3 multilib-minimal 4b0f1857965db8869a729948d5277e0b toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=06f5c8aec63a2fd1bb8ce3c6c2d4df3c
+_eclasses_=gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 87f1b83e21a473787b821ef3d0437bf3 multilib-minimal 4b0f1857965db8869a729948d5277e0b toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=a02686f300dcd1a36fbcf74672cb6490
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 0f93c0f654f8..a361b3717914 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-python/canonicaljson-1.6.4 b/metadata/md5-cache/dev-python/canonicaljson-1.6.4
index 66e87109c2b6..a5ea561d62b1 100644
--- a/metadata/md5-cache/dev-python/canonicaljson-1.6.4
+++ b/metadata/md5-cache/dev-python/canonicaljson-1.6.4
@@ -5,7 +5,7 @@ EAPI=8
HOMEPAGE=https://github.com/matrix-org/python-canonicaljson/ https://pypi.org/project/canonicaljson/
INHERIT=distutils-r1
IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
LICENSE=Apache-2.0
RDEPEND=dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/matrix-org/python-canonicaljson/archive/v1.6.4.tar.gz -> canonicaljson-1.6.4.gh.tar.gz
_eclasses_=distutils-r1 da32ffc285e9f13313f2387570e35b87 multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-r1 2d51fd03931e743811ce30d198e4dcfd python-utils-r1 25c880c1db58e21b80b684bacc964958 toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=d947737777ab2103971590f23ac888ea
+_md5_=92594ef61d13a0151d50b6ffee00fff9
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 8e8566556c1f..93b678456a4a 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/dev-util/gperf-3.1-r1 b/metadata/md5-cache/dev-util/gperf-3.1-r1
index 4fa23bc5836c..570a1b4a13c8 100644
--- a/metadata/md5-cache/dev-util/gperf-3.1-r1
+++ b/metadata/md5-cache/dev-util/gperf-3.1-r1
@@ -6,4 +6,4 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gnu/gperf/gperf-3.1.tar.gz
-_md5_=d1e2afc67bca1bfc4788275462c91db7
+_md5_=285259338f3ebc344734d26e579397f5
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 73df6f61a9d8..91bfdbd9f8cd 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/games-util/game-device-udev-rules-20220311 b/metadata/md5-cache/games-util/game-device-udev-rules-20220311
index 033fc04f1b64..3ae00d092a98 100644
--- a/metadata/md5-cache/games-util/game-device-udev-rules-20220311
+++ b/metadata/md5-cache/games-util/game-device-udev-rules-20220311
@@ -12,4 +12,4 @@ REQUIRED_USE=acl? ( || ( elogind systemd ) )
SLOT=0
SRC_URI=https://github.com/ValveSoftware/steam-devices/archive/d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa.tar.gz -> steam-devices-d87ef558408c5e7a1a793d738db4c9dc2cb5f8fa.tar.gz
_eclasses_=multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e udev eec0bbab06977f1cfc5597269c1fa152
-_md5_=9fb94704f36a095d3af89948ddc60e30
+_md5_=03f65280b95a8ff6db61e617751bbab0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 19f46303423f..238929cf5956 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-libs/exempi-2.6.2 b/metadata/md5-cache/media-libs/exempi-2.6.2
index 8001d9d8d4cc..9901d77be7fe 100644
--- a/metadata/md5-cache/media-libs/exempi-2.6.2
+++ b/metadata/md5-cache/media-libs/exempi-2.6.2
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
INHERIT=autotools
IUSE=examples test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86
LICENSE=BSD
RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
RESTRICT=!test? ( test )
SLOT=2/8
SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.6.2.tar.bz2
_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=9000bd5bb2c77da91eb57e9a54e7b06e
+_md5_=b4800269d50d948d01cfb19ca74c697d
diff --git a/metadata/md5-cache/media-libs/openimageio-2.3.21.0 b/metadata/md5-cache/media-libs/openimageio-2.3.21.0
index 13cd6467aeb5..0a34992debfb 100644
--- a/metadata/md5-cache/media-libs/openimageio-2.3.21.0
+++ b/metadata/md5-cache/media-libs/openimageio-2.3.21.0
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
INHERIT=cmake font python-single-r1
IUSE=dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype cpu_flags_x86_aes cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
LICENSE=BSD
RDEPEND=dev-libs/boost:= dev-cpp/robin-map dev-libs/libfmt:= dev-libs/pugixml:= >=media-libs/libheif-1.7.0:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=dev-libs/imath-3.1.2-r4:= >=media-libs/opencolorio-2.1.1-r4:= >=media-libs/openexr-3:0= media-libs/tiff:0= sys-libs/zlib:= dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-2.0:2= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) openvdb? ( dev-cpp/tbb:= media-gfx/openvdb:= ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( dev-libs/boost:=[python,python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pybind11[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost:=[python,python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pybind11[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost:=[python,python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pybind11[python_targets_python3_10(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) truetype? ( media-libs/freetype:2= )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) test
SLOT=0/2.3.1
SRC_URI=https://github.com/OpenImageIO/oiio/archive/v2.3.21.0.tar.gz -> openimageio-2.3.21.0.tar.gz test? ( https://github.com/OpenImageIO/oiio-images/archive/245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz -> openimageio-oiio-test-image-245e50edede2792205080eadc1dedce33ff5c1e4.tar.gz https://github.com/AcademySoftwareFoundation/openexr-images/archive/f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz -> openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz )
_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d flag-o-matic 69394e25812406faa1f90edaf4969395 font 5e03cb70902daa9ff8967c61130f0f60 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 python-single-r1 a5747fe6dc0651d95cb78eddd5e160a8 python-utils-r1 25c880c1db58e21b80b684bacc964958 toolchain-funcs 959e1d99122907eb98a3a660297a967e xdg-utils ac0e315a3688929e34ac75b139e7349a
-_md5_=a90e069decc2ef9b2dc36a6b65199f9f
+_md5_=e535c2a3d9653be74acc806b0089d87c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 65feb0e06c31..06324889e12e 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/media-video/vlc-3.0.18 b/metadata/md5-cache/media-video/vlc-3.0.18
index 709152665e81..8f11e38107c5 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.18
+++ b/metadata/md5-cache/media-video/vlc-3.0.18
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.videolan.org/vlc/
IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
INHERIT=autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
IUSE=a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +lua_single_target_lua5-1 test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv -sparc x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc ppc64 ~riscv -sparc x86
LICENSE=LGPL-2.1 GPL-2
RDEPEND=media-libs/libvorbis net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz:= virtual/ttf-fonts ) bluray? ( >=media-libs/libbluray-1.3.0:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.1.2:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-6.1.1:= >=media-libs/libdvdread-6.1.2:= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( >=media-video/ffmpeg-3.1.3:=[postproc,vaapi?,vdpau?] ) flac? ( media-libs/flac:= media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.4.2:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:=[unicode(+)] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) projectm? ( media-fonts/dejavu >=media-libs/libprojectm-3.1.12:0= ) pulseaudio? ( media-sound/pulseaudio ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.4.2:= ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) wayland? ( >=dev-libs/wayland-1.15 dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( >=media-libs/x264-0.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) lua? ( ^^ ( lua_single_target_lua5-1 ) ) skins? ( gui truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
SLOT=0/5-9
SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.18/vlc-3.0.18.tar.xz
_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc flag-o-matic 69394e25812406faa1f90edaf4969395 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e virtualx 644887c82aefdf12001489391fca4f02 xdg 6024fbc93167fad782e2032933654857 xdg-utils ac0e315a3688929e34ac75b139e7349a
-_md5_=9b9c2ff08b7e68f99db25e98a03f1c3f
+_md5_=b8af71f9d77acc2a0411c0f21e4b4f5a
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 86089bf58b6a..7f8191970ca5 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.29 b/metadata/md5-cache/net-analyzer/zabbix-5.0.29
index 1aaa035b7563..a227f0434016 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.29
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.29
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://www.zabbix.com/
INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
IUSE=+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( dev-libs/libpcre net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
SLOT=0/5.0
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.29.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.29-go-deps.tar.xz )
_eclasses_=go-module 4c4b34f361efda91762ffeda8f632c02 java-pkg-opt-2 a71433e535af8faae0c0f6c861a32054 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 959e1d99122907eb98a3a660297a967e user-info 69a1ed744ec33cf2c910ff2bd6084d11 webapp 67df5bab481d0b9428f9ab7b3de690e4
-_md5_=94de55f9e697c405a82ad7d8e34e782e
+_md5_=f5617c1889a277ab980a67d6b04828b3
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.10 b/metadata/md5-cache/net-analyzer/zabbix-6.0.10
index c61f2707bd58..af0975735259 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.0.10
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.10
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://www.zabbix.com/
INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
SLOT=0/6.0
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.10.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.10-go-deps.tar.xz )
_eclasses_=go-module 4c4b34f361efda91762ffeda8f632c02 java-pkg-opt-2 a71433e535af8faae0c0f6c861a32054 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 959e1d99122907eb98a3a660297a967e user-info 69a1ed744ec33cf2c910ff2bd6084d11 webapp 67df5bab481d0b9428f9ab7b3de690e4
-_md5_=e9793a98c4fe53cc5c4105f0e4cf0481
+_md5_=c850cd97fa01f490a67f93520c3380eb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.12 b/metadata/md5-cache/net-analyzer/zabbix-6.0.12
new file mode 100644
index 000000000000..191b2cf70cb0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.12
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.12.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.12-go-deps.tar.xz )
+_eclasses_=go-module 4c4b34f361efda91762ffeda8f632c02 java-pkg-opt-2 a71433e535af8faae0c0f6c861a32054 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 959e1d99122907eb98a3a660297a967e user-info 69a1ed744ec33cf2c910ff2bd6084d11 webapp 67df5bab481d0b9428f9ab7b3de690e4
+_md5_=e9793a98c4fe53cc5c4105f0e4cf0481
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.4 b/metadata/md5-cache/net-analyzer/zabbix-6.2.4
index fcf1928597ca..152faaac742d 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-6.2.4
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.2.4
@@ -6,7 +6,7 @@ EAPI=8
HOMEPAGE=https://www.zabbix.com/
INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
@@ -14,4 +14,4 @@ RESTRICT=test strip
SLOT=0/6.2
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.4.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.4-go-deps.tar.xz )
_eclasses_=go-module 4c4b34f361efda91762ffeda8f632c02 java-pkg-opt-2 a71433e535af8faae0c0f6c861a32054 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 959e1d99122907eb98a3a660297a967e user-info 69a1ed744ec33cf2c910ff2bd6084d11 webapp 67df5bab481d0b9428f9ab7b3de690e4
-_md5_=e9793a98c4fe53cc5c4105f0e4cf0481
+_md5_=c850cd97fa01f490a67f93520c3380eb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.6 b/metadata/md5-cache/net-analyzer/zabbix-6.2.6
new file mode 100644
index 000000000000..193ae349ad8d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.2.6
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig agent2? ( >=dev-lang/go-1.12 app-arch/unzip ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=8
+HOMEPAGE=https://www.zabbix.com/
+INHERIT=webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+IUSE=agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) gnutls? ( net-libs/gnutls:0= ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls:= net-nds/openldap:= ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c:= ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) openssl? ( dev-libs/openssl:=[-bindist(-)] ) oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) postgres? ( dev-db/postgresql:* ) proxy? ( dev-libs/libevent:= sys-libs/zlib ) server? ( dev-libs/libevent:= sys-libs/zlib ) snmp? ( net-analyzer/net-snmp:= ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) server? ( app-admin/webapp-config !pcre2? ( dev-libs/libpcre ) pcre2? ( dev-libs/libpcre2:= ) net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=|| ( agent agent2 frontend proxy server ) ?? ( gnutls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+RESTRICT=test strip
+SLOT=0/6.2
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/6.2/zabbix-6.2.6.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.6-go-deps.tar.xz )
+_eclasses_=go-module 4c4b34f361efda91762ffeda8f632c02 java-pkg-opt-2 a71433e535af8faae0c0f6c861a32054 java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca tmpfiles 216aa76c3a6fcb5d893c23a0de86048f toolchain-funcs 959e1d99122907eb98a3a660297a967e user-info 69a1ed744ec33cf2c910ff2bd6084d11 webapp 67df5bab481d0b9428f9ab7b3de690e4
+_md5_=e9793a98c4fe53cc5c4105f0e4cf0481
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 0307ad44a468..549ce547d93f 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-ftp/atftp-0.8.0 b/metadata/md5-cache/net-ftp/atftp-0.8.0
index 9c7401efe49c..1b978f6708b4 100644
--- a/metadata/md5-cache/net-ftp/atftp-0.8.0
+++ b/metadata/md5-cache/net-ftp/atftp-0.8.0
@@ -12,4 +12,4 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0= ) pcre?
SLOT=0
SRC_URI=mirror://sourceforge/atftp/atftp-0.8.0.tar.gz
_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc flag-o-matic 69394e25812406faa1f90edaf4969395 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=12942478709989697e9822cf66e1db07
+_md5_=a021b5c278339755fee2d618ea52c5a1
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 54d2d75728ac..e089cc896c86 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-irc/dccserver-0.5-r2 b/metadata/md5-cache/net-irc/dccserver-0.5-r2
new file mode 100644
index 000000000000..5cb00a35c383
--- /dev/null
+++ b/metadata/md5-cache/net-irc/dccserver-0.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile prepare
+DEPEND=dev-libs/libbsd
+DESCRIPTION=Linux implementation of the mirc dccserver command
+EAPI=8
+HOMEPAGE=https://www.nih.at/dccserver/
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libbsd
+SLOT=0
+SRC_URI=https://www.nih.at/dccserver/dccserver-0.5.tar.gz
+_eclasses_=multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e
+_md5_=09cd7fb91cb66adc209c77bf6e0e1fe9
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c042098ed88b..a7adc677c02b 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.38.2 b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2
index 171ec3a4bfb2..5ccac42ce8f8 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.38.2
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.38.2
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
IUSE=aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86
LICENSE=LGPL-2+ BSD
RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
SLOT=4/37
SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.38.2.tar.xz
_eclasses_=check-reqs 5e6dfbd7a8d3238a79f009fae7ac469c cmake 44afbf15c35884f7c840470f1cf05d0d flag-o-matic 69394e25812406faa1f90edaf4969395 gnome.org 429073e99d7067d3462e875bf5c6e14a gnome2 4f729d9211b2e3c00a285d6301a557e1 gnome2-utils 2116cec8f46f4d1b0a88c5b1f1575dd3 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 optfeature 1a2157392a869265b2afcb63a26c12ac python-any-r1 f2f00fb79b5e888b5011d4c51240ae97 python-utils-r1 25c880c1db58e21b80b684bacc964958 ruby-single 4e65f388d03c4681739781edf3bbf119 ruby-utils 97c8e15d89dc6537e36cddedf413ed22 toolchain-funcs 959e1d99122907eb98a3a660297a967e xdg 6024fbc93167fad782e2032933654857 xdg-utils ac0e315a3688929e34ac75b139e7349a
-_md5_=b642ca01a7a9024c09e190ffa613f32c
+_md5_=82ca59f63b32c0ea8e60ac5904a1f069
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index f5248bc4f220..c03779c29174 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-misc/freerdp-2.9.0 b/metadata/md5-cache/net-misc/freerdp-2.9.0
index c2daa65f68e1..d5d657488b45 100644
--- a/metadata/md5-cache/net-misc/freerdp-2.9.0
+++ b/metadata/md5-cache/net-misc/freerdp-2.9.0
@@ -6,11 +6,11 @@ EAPI=8
HOMEPAGE=http://www.freerdp.com/
INHERIT=cmake flag-o-matic
IUSE=alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv
-KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
LICENSE=Apache-2.0
RDEPEND=dev-libs/openssl:0= sys-libs/zlib:0 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) usb? ( virtual/libudev:0= sys-apps/util-linux:0= dev-libs/dbus-glib:0= virtual/libusb:1= ) X? ( x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) ) ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/libXrandr ) jpeg? ( media-libs/libjpeg-turbo:0= ) openh264? ( media-libs/openh264:0= ) pulseaudio? ( media-sound/pulseaudio ) server? ( X? ( x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst xinerama? ( x11-libs/libXinerama ) ) ) smartcard? ( sys-apps/pcsc-lite ) systemd? ( sys-apps/systemd:0= ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) X? ( x11-libs/libX11 x11-libs/libxkbfile )
RESTRICT=!test? ( test )
SLOT=0/2
SRC_URI=https://pub.freerdp.com/releases/freerdp-2.9.0.tar.gz
_eclasses_=cmake 44afbf15c35884f7c840470f1cf05d0d flag-o-matic 69394e25812406faa1f90edaf4969395 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils 8ed38f92fe095be374d6c4c8d4c0dda7 toolchain-funcs 959e1d99122907eb98a3a660297a967e xdg-utils ac0e315a3688929e34ac75b139e7349a
-_md5_=b3a7d23ae47d84bf76997e54312a122d
+_md5_=a2e29fb0945013bc8427131c98c8078a
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index a6cddfa5417e..5567a519c2a8 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.17 b/metadata/md5-cache/net-proxy/haproxy-2.2.17
deleted file mode 100644
index df5542dc5c5e..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs flag-o-matic lua-single systemd linux-info
-IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl +lua_single_target_lua5-3
-KEYWORDS=amd64 arm ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
-SLOT=0/2.2
-SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.17.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=09151a048c879da37027395ca8fa1f22
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.21 b/metadata/md5-cache/net-proxy/haproxy-2.2.21
deleted file mode 100644
index f90e9f1a0b5c..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs flag-o-matic lua-single systemd linux-info
-IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl +lua_single_target_lua5-3
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
-SLOT=0/2.2
-SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.21.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=f743b48293d5f260e6a2965182e4e31b
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.24 b/metadata/md5-cache/net-proxy/haproxy-2.2.24
deleted file mode 100644
index 1b8b6211c4a4..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs flag-o-matic lua-single systemd linux-info
-IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
-SLOT=0/2.2
-SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.24.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=2dcac46250fc4aa474bd8e80fb069d59
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9999 b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
index 08ef6bf97c89..cb87ac444269 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
SLOT=0/2.2
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 69394e25812406faa1f90edaf4969395 git-r3 2347f8fe2d392b2a091191f94be37e6f linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=bd3a5f914f0dca7024016a50f9fa2a49
+_md5_=b4c9b1d8ac160e27595d532eee31f1b6
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.14 b/metadata/md5-cache/net-proxy/haproxy-2.4.14
deleted file mode 100644
index 446616f35d4d..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs lua-single systemd linux-info
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl +lua_single_target_lua5-3
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
-SLOT=0/2.4
-SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.14.tar.gz
-_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=b8dca3aefe64778affa800bc054ecff9
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.17 b/metadata/md5-cache/net-proxy/haproxy-2.4.17
deleted file mode 100644
index 1c1f6dfd0fbb..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs lua-single systemd linux-info
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
-SLOT=0/2.4
-SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.17.tar.gz
-_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=6b36b5e40f910edf54e73dce7097be37
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.19 b/metadata/md5-cache/net-proxy/haproxy-2.4.19
index 88966249986f..96481b118657 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.19
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.19
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_
SLOT=0/2.4
SRC_URI=http://haproxy.1wt.eu/download/2.4/src/haproxy-2.4.19.tar.gz
_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=3a362ccc72f14618721eca65a0b269a6
+_md5_=8668b76ecf4c50e9df747f7b3325aa40
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index 2cd1f401bc2d..a86008eaa060 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
SLOT=0/2.4
_eclasses_=git-r3 2347f8fe2d392b2a091191f94be37e6f linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=3a362ccc72f14618721eca65a0b269a6
+_md5_=8668b76ecf4c50e9df747f7b3325aa40
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.10 b/metadata/md5-cache/net-proxy/haproxy-2.5.10
index 620048b823a9..bc97a4f418c6 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.10
+++ b/metadata/md5-cache/net-proxy/haproxy-2.5.10
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( sl
SLOT=0/2.5
SRC_URI=http://haproxy.1wt.eu/download/2.5/src/haproxy-2.5.10.tar.gz
_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=9f51a08fa1a8c6ab8d921325d79bbd53
+_md5_=455304dc0c0cc8d47ffe947a02fde706
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.4 b/metadata/md5-cache/net-proxy/haproxy-2.5.4
deleted file mode 100644
index 58181ec9d168..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs lua-single systemd linux-info
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl +lua_single_target_lua5-3
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
-SLOT=0/2.5
-SRC_URI=http://haproxy.1wt.eu/download/2.5/src/haproxy-2.5.4.tar.gz
-_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=b8dca3aefe64778affa800bc054ecff9
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.9 b/metadata/md5-cache/net-proxy/haproxy-2.5.9
deleted file mode 100644
index 7ab26371b302..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs lua-single systemd linux-info
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
-SLOT=0/2.5
-SRC_URI=http://haproxy.1wt.eu/download/2.5/src/haproxy-2.5.9.tar.gz
-_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=9f51a08fa1a8c6ab8d921325d79bbd53
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.9999 b/metadata/md5-cache/net-proxy/haproxy-2.5.9999
index f6d95812bafb..450475ce91e3 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.5.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
SLOT=0/2.5
_eclasses_=git-r3 2347f8fe2d392b2a091191f94be37e6f linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=9f51a08fa1a8c6ab8d921325d79bbd53
+_md5_=2d7ea4161f48e83d26cb1dbaa965f3bc
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.6 b/metadata/md5-cache/net-proxy/haproxy-2.6.6
index 8c7f64c902d8..db98dd30e9ea 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.6
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.6
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_
SLOT=0/2.6
SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.6.tar.gz
_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=542eb0e1bde690bf0143b68deefa423a
+_md5_=08a319b8474d7d28c2e884149c30ff55
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.7 b/metadata/md5-cache/net-proxy/haproxy-2.6.7
index af5313b24cc2..50f87d248422 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.7
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.7
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_
SLOT=0/2.6
SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.7.tar.gz
_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=542eb0e1bde690bf0143b68deefa423a
+_md5_=08a319b8474d7d28c2e884149c30ff55
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.9999 b/metadata/md5-cache/net-proxy/haproxy-2.6.9999
index abefba499d55..c15b313168a2 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
SLOT=0/2.6
_eclasses_=git-r3 2347f8fe2d392b2a091191f94be37e6f linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=542eb0e1bde690bf0143b68deefa423a
+_md5_=08a319b8474d7d28c2e884149c30ff55
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.7.0 b/metadata/md5-cache/net-proxy/haproxy-2.7.0
index da4ee96ca25e..e91d9cadb788 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.7.0
+++ b/metadata/md5-cache/net-proxy/haproxy-2.7.0
@@ -13,4 +13,4 @@ REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_
SLOT=0/2.7
SRC_URI=http://haproxy.1wt.eu/download/2.7/src/haproxy-2.7.0.tar.gz
_eclasses_=linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=542eb0e1bde690bf0143b68deefa423a
+_md5_=08a319b8474d7d28c2e884149c30ff55
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.7.9999 b/metadata/md5-cache/net-proxy/haproxy-2.7.9999
index 44dc174cb7ef..a06269d51f7c 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.7.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.7.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
SLOT=0/2.7
_eclasses_=git-r3 2347f8fe2d392b2a091191f94be37e6f linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=542eb0e1bde690bf0143b68deefa423a
+_md5_=08a319b8474d7d28c2e884149c30ff55
diff --git a/metadata/md5-cache/net-proxy/haproxy-9999 b/metadata/md5-cache/net-proxy/haproxy-9999
index 70f663038984..9a9b48c0e18e 100644
--- a/metadata/md5-cache/net-proxy/haproxy-9999
+++ b/metadata/md5-cache/net-proxy/haproxy-9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
SLOT=0/9999
_eclasses_=git-r3 2347f8fe2d392b2a091191f94be37e6f linux-info 7a3f8b289bc442b8151fb29bfefe3b76 lua-single aee383a0de35701b9eb0b27077a1c143 lua-utils e69ff116248d78546ae1a234c086fe80 multilib 5ca4e49abed8e3a2f7b56920eadee157 systemd 5f4bb0758df2e483babf68cd517078ca toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=542eb0e1bde690bf0143b68deefa423a
+_md5_=08a319b8474d7d28c2e884149c30ff55
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 7a7e8ed263ad..d07a8699e89d 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0 b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
index ea3afb92e650..99dc70319ccf 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
+++ b/metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
@@ -12,4 +12,4 @@ RDEPEND=app-crypt/libsecret >=net-libs/libnma-1.1.0 net-misc/networkmanager >=ne
SLOT=0
SRC_URI=https://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.6.0.tar.bz2
_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 toolchain-funcs 959e1d99122907eb98a3a660297a967e
-_md5_=febdb1a6b12761ce9a4b8b99b81e72da
+_md5_=a6ebb260d5668db19a890b42480dca19
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index c0eea80b40b7..7b5c551fd7d1 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.70 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.70
new file mode 100644
index 000000000000..351ecf7ff9bc
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.70
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+SLOT=9.0.70
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/KEYS -> openpgp-keys-apache-tomcat-9.0.70-KEYS.asc
+_md5_=2a0dd85294d3a36dbaa4f7672373bf44
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 646b472de12e..19cb3ffe9a80 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2865.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2867.29
index 60ef54b0d01e..6055b8b74ba4 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2865.3
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.6.2867.29
@@ -10,6 +10,6 @@ LICENSE=Vivaldi
RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2865.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2865.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2865.3-1_arm64.deb )
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2867.29-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2867.29-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.6.2867.29-1_arm64.deb )
_eclasses_=chromium-2 1004ce9fd1ae9622a0b7eabcd8fc0d69 desktop 7eb20ad915a0a318176d51bc2508ff5c linux-info 7a3f8b289bc442b8151fb29bfefe3b76 multilib 5ca4e49abed8e3a2f7b56920eadee157 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 toolchain-funcs 959e1d99122907eb98a3a660297a967e unpacker bc57272a0491765c71d973c8cfd35063 xdg 6024fbc93167fad782e2032933654857 xdg-utils ac0e315a3688929e34ac75b139e7349a
_md5_=a7a95f70f001c3763cc0797c10fee920
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index b282c1a00b5a..7fcd2db0cfa6 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.70 b/metadata/md5-cache/www-servers/tomcat-9.0.70
new file mode 100644
index 000000000000..d1766162d8cd
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.70
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.70:9.0.70 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-el-api-9.0.70:3.0 ~dev-java/tomcat-jsp-api-9.0.70:2.3 ~dev-java/tomcat-servlet-api-9.0.70:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-el-api-9.0.70:3.0 ~dev-java/tomcat-jsp-api-9.0.70:2.3 ~dev-java/tomcat-servlet-api-9.0.70:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.70/src/apache-tomcat-9.0.70-src.tar.gz.asc )
+_eclasses_=java-ant-2 5cf479aa9e0ac9cc55899f2762c2aaa0 java-pkg-2 3b09e051fc2045a0f0b9471b87d4f8bd java-utils-2 c79d65661a9f4f72b60376c9e4b3dfa1 multilib 5ca4e49abed8e3a2f7b56920eadee157 prefix eab3c99d77fe00506c109c8a736186f7 toolchain-funcs 959e1d99122907eb98a3a660297a967e verify-sig afb98fe4696292e4234ce36713fd4e9e
+_md5_=7c53fbb4ecc87c3270bf5a8797db4298
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 674c0d5cd932..48c603093a3a 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/x11-libs/libICE-1.1.0 b/metadata/md5-cache/x11-libs/libICE-1.1.0
deleted file mode 100644
index c0b6790536d9..000000000000
--- a/metadata/md5-cache/x11-libs/libICE-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto x11-libs/xtrans
-DESCRIPTION=X.Org Inter-Client Exchange library
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libICE
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libICE-1.1.0.tar.xz
-_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc flag-o-matic 69394e25812406faa1f90edaf4969395 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 multilib-build 87f1b83e21a473787b821ef3d0437bf3 multilib-minimal 4b0f1857965db8869a729948d5277e0b toolchain-funcs 959e1d99122907eb98a3a660297a967e xorg-3 c0aa5351d86840baa910da59e2c4a2dc
-_md5_=dd631e4959ca5b1cc0721251fa1a0628
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b0ad3d0f21fb..850a3e914df6 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r2 b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r2
new file mode 100644
index 000000000000..0bce23b33c56
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/notify-osd-0.9.34-r2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-util/glib-utils gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon
+DESCRIPTION=Canonical's on-screen-display notification agent
+EAPI=8
+HOMEPAGE=https://launchpad.net/notify-osd
+INHERIT=autotools gnome2-utils savedconfig
+IUSE=minimal savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gnome-base/gsettings-desktop-schemas !minimal? ( x11-themes/notify-osd-icons )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/notify-osd/precise/0.9.34/+download/notify-osd-0.9.34.tar.gz
+_eclasses_=autotools 6dcd6b6a486e79928e1243ff9ba41fcc gnome2-utils 2116cec8f46f4d1b0a88c5b1f1575dd3 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multilib 5ca4e49abed8e3a2f7b56920eadee157 portability 58227860123d3e8da23290064ce3373e savedconfig 4011d8d7370446e970e2c92b20a31341 toolchain-funcs 959e1d99122907eb98a3a660297a967e xdg-utils ac0e315a3688929e34ac75b139e7349a
+_md5_=8f568cfff91c0cb8b61772f9110e11d2
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4ad45e58421d..ff2351ab36f4 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
Hash: SHA512
MANIFEST Manifest.files.gz 14598 BLAKE2B dd3bd1269baca9127ec20d35028ac080296d0f294040056402ba0b8b32f65d9b77b38974a70f4979cc85acd7f28d3ab278e9c58e548b6166a53bef6c9a5fd97d SHA512 fa21828a5a015c35127c2ab36ff2dc8197f2159e8002397e5e72877978e625b2ed4b80479487964a67eb2e5e2432f81d46188162c5b895a1cef9c293ad73cc21
-TIMESTAMP 2022-12-06T08:09:52Z
+TIMESTAMP 2022-12-06T14:09:43Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOO+NBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOPTSdfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCbvA/+PwwVrx45ddGqJsmlqQHaOB+ndMek0ZS72qRhUUiwzp8Yt5mPnBTcR93d
-XzYxYkp0QbqoN7dL5uo7doBbaW47OXB/vLCSxoHzFiHMF/n/oVyYRfu9lzodNTzN
-OZ0GEuVTzPiPg638h/QMeUb/jplZq7TYRX/xvjF+doJGXeoU3q4626aoa1cZ87NK
-X3trSxn/slfMe/QcnR6jR/HsoK/29r/9PTS0cm0jmGToZSmomrdPziUFCUA6NQCf
-zyTuqvJkVkY7OYgBnA4CjhKozrzIGA6kKjh+vqo1L875ISs82dKxOCS76OlcN2PQ
-eONcVYm4BJymhf8JYmt3DXjePmJGTpoRYAIgQaItzxPn9tWcn4JtOhjTPWvfFobq
-5jNWANMT+AbVdEUyTJv1cVNJ2fhsYYUhfnSoswZN2wbonmNzQxHbpzaSYBw9ri5S
-JqXO/ElMoamXXSdSBvH8NuNUbLHiuU48B3GN7hhN1tc8/7ZPsNwgVdg2qceC8c1c
-IL2vohF4GYECt3Lq88ywMeXlrfI0pkREBmLODzQ0rAKGB036XTwYc1iSCPqDnpZA
-hLX1uj6FE3TDDzwluT34e/MGMlwrCnVFjYeSzhVZuYYmRpLMi0Szf/gdOohVQ7wT
-qNlTolDbfDvteKU9BEeqilTbj3CTJXWvcCvS8nmoUtxLYooPCRg=
-=KtGN
+klAOMxAAnxyWSTm+w1Bis0FGKEwx7tIwyytIa84wLSXthN0YbmpVcDiYD8PYKwVu
+FYaGN3pxj9JlbhAQzRwulyzIfGTU+H9rOHS/oci967AGKu3OqLyPV07+FFbA6MLM
+3gpyjmXWh3prfADaKZElrA3gDzHTzmf6FQ0XNMqZsu6tyF6nNMws2YKIWYLzGw3X
+zEdNdE8FavtCuxhKcPpaIvOT2Nsza8bgWFarouEsl4prTXSV4mvDUCsY98cuLCID
+0Hhoz+E2sG9GwVGtzS3eq/9GAs6UfHK0E4lb+wVM93IfElBndFYykx1yDB7hJlAJ
+UTZijccEU5RaBCZCC1N08g7SkRGb9maY12zgDgcb6RyhKK8e+V3HtUYvwAwA2lZU
+/qDwCX3mOB0NWxc5Ijk2o3+Gpz3YncuUOCYNhvo/T/zSe7Y0LilSU4jMlQ9mFcmU
+pl8Sy3ghzHN7o96uq87dcnIkEPZnN8NjQBxJKhWJTXGQUltpJ0TJScWqqXRL41O/
+KYaMPYe1746hqSdsmAj1wut+Z5TQsVxmiAoVtCCZK2nocpV5uS7jJL8MVyhxugAz
+y0lwSXOH8GQL0jGgBrv9A7mGG+pUMCJpZh168lFoxtqZ+qzt+sBoZcTCAjHtJBml
+B6FZOOfFjBO5HPRAf5Dicfk9dmz6SYEg9l7GQiJ/wLhV8GTGbAk=
+=4Kvj
-----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 26e5b9bd6a4f..76f91968a266 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Dec 2022 08:09:47 +0000
+Tue, 06 Dec 2022 14:09:40 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index aa93f2726ae9..a9a6ea62e678 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Dec 6 08:09:47 AM UTC 2022
+Tue Dec 6 02:09:40 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 308800d4a96e..0c5a51aa097b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Dec 2022 08:15:01 +0000
+Tue, 06 Dec 2022 14:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1c6ab3c508b1..e2b816ea7e54 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4f000d2d3c7b32d958afd89467ce215d629efb45 1670313012 2022-12-06T07:50:12+00:00
+1ce64dc7353239e48fa8b8eb5eacf232c94598ef 1670331916 2022-12-06T13:05:16+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e57d29738408..e587b4364303 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1670314201 Tue 06 Dec 2022 08:10:01 AM UTC
+1670335801 Tue 06 Dec 2022 02:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 26e5b9bd6a4f..76f91968a266 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 06 Dec 2022 08:09:47 +0000
+Tue, 06 Dec 2022 14:09:40 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e865f647d822..faec13064e45 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index abab47c97305..12bfaeb4041f 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -27,6 +27,8 @@ DIST zabbix-6.0.10-go-deps.tar.xz 27482516 BLAKE2B 64b9f2d093aaa8b7b1b39d4736f9b
DIST zabbix-6.0.10.tar.gz 39516402 BLAKE2B 00e81dcea63433cb93ef9bd77094bef89f7d604d8c07b9da5959c79d54f026b1256f486395229e0232aa96271b72fd9f3c67e08dfb96321be398b8b4fa832f6f SHA512 4fc70d89f61f50e5a6b9bbd1a25d9cac6d734872d3558df83b01abe04832773cdbab6e0f214045c117b6e2fcd7ae3fba08701be942cf18344e6b5a78151665d6
DIST zabbix-6.0.11-go-deps.tar.xz 27480580 BLAKE2B 443ecbd9fd0d66cacc75f53d5f56ae996bce52e04827de97948ffc6a3e02888b4b5122eba2425465624e34bc628992f7a520bc8e0281444baed0aa1631f3bec1 SHA512 0936626b658f1811e8aebdd59ca506b33f1a95696018b088cfe04479386ecbcfe4c6c7fac6d26487e28d36cb6283028312c3bc2d27bde8cf54698236d3bc6ba4
DIST zabbix-6.0.11.tar.gz 40388383 BLAKE2B e6ded007285aac58bb4c29075ac8d34f6ab0db1a74702269b63dc8772ebdf8b2986737fa91d39c9e8bacee5e1e12d7d7bb9580221f9b4917cbc829784639201d SHA512 decb9fcf5de8f0d81cd0b16b6a5e341742c97baed0faf2d5f22bba98fd9fad4e154360724b5aedc378d5b5e2c64eda36f308e3eb6e6f8e80a5cf082ea95ebef6
+DIST zabbix-6.0.12-go-deps.tar.xz 27481268 BLAKE2B cfeca38b63a6271b4ff6819143e0214d3b468e3f7b681cc0bde443192e84ec4b66eb9b8ce38be01fa74a186f8904dfe73af04ad98007880e9ad6aab5c4b978b3 SHA512 c021efe15b61eeebad855ee9d8081f06796d126f3215bac4cb8a36384185aa2a67c0af580b5fcd830e6da832eb1057c02621c71569e30735fb0bef172f26d3b4
+DIST zabbix-6.0.12.tar.gz 40419443 BLAKE2B 18e328a3361947292b3c78fc75dbcfc464f3419fb35bd0895049c90d26d362edbe0a727d1ab955f428ec812d6f38f68717f3c635216aff0468f188321b476495 SHA512 7cd254282523002d2e4d86295258ea0f56921b54c88d604300104f32ea5807c0b39b5550a9dd98e03ad41adf4dd8e93a7b1deb200d513283dca51d49d46bda4d
DIST zabbix-6.0.9-go-deps.tar.xz 35300488 BLAKE2B 7a516774f812e41a8640a68de11fb2f9e8e4d1da90d3c7a76807b25025ab32400e3c9efff7818ed90868da2d753c61e0f03126df0f7661cd440b1b59dc216217 SHA512 0f2c1e79b4b894384c9c09056242ccec732ffe49e80a6167748da4671e6f869486c1be70a83f09beaef356cfde4ec1b1a34ce2c5b122a0f19f351a82614d1389
DIST zabbix-6.0.9.tar.gz 34515806 BLAKE2B c9b5a432ede5fc5307c30ee1c1f986cb1cb8f0351a46f9f0ee9add2c5d86a9b96ed933d2c6801022451cc8b52babc54deba8ba2478d90136a12798728f83366f SHA512 20211e2eab47d03a5de221f3a466aaff24c01b868208d4cbd7a10a16a10cd20172f009842c631169962c06e13ca8b0c6f0b6bd3cfd060b68b59f95a136a2e207
DIST zabbix-6.2.3-go-deps.tar.xz 35349056 BLAKE2B 1548167558be12e7519e59e011eb6e761a0a5e1625fb460bbf3106ca5a895277789ce4b2f649884ebb0f236997771378ea47919f3e6fb6a4f4908a29ef34385e SHA512 a8934a5bb2367395c1ba6bf7ccd830c951fb585e7dc054d29f2667bfc45d18eed13889f4c31f8f417aba1920df06512e927c77975f70ab419e7525768caece7f
@@ -35,14 +37,18 @@ DIST zabbix-6.2.4-go-deps.tar.xz 27489292 BLAKE2B 174c822aa1488fd2dfb726ed2cd5d2
DIST zabbix-6.2.4.tar.gz 40299367 BLAKE2B ee74829acbac90a37bc3bcf3c95a92a7df1f83099cda7c9ba9ed225d3bdfa0e49667c5aa1522dbdac1ca2da8b621f94d384c857af8c66db87353f044f6ec0420 SHA512 16249f78f09e6c07a993972a7e72ef85083e08adfdcd6383b51a60ad172a48bdb4510a09dc82e8a36c5d748d3db155d3e4ca14909e2f2b4104bde200f151a596
DIST zabbix-6.2.5-go-deps.tar.xz 27499244 BLAKE2B c8c7e59e0c2d61224bbfd11690a54b411a981e4ab3a39e217a03be83bdae04914898ab7b38c00d3a48900b769eabf51901410247a204915e0e901182c69266f3 SHA512 0c13f15b2ed62a6eb418244560cd40e277d333f17e65ceb9125335408fd632870d260f986b5c76328bc91e6b0b619816836c543f5d87ef5d957904aad722f613
DIST zabbix-6.2.5.tar.gz 41020695 BLAKE2B 5e21867358cc6c4374695b7da6d74b8c3642bf4e1f41ebcdb2a158c01e5a4b6ffd679728a35badeb3cbefe0968d97577e9141340b32287cb01d89e0f227b964a SHA512 3cf5745942f69eee348c37ddb1bb68937c628ee97d050b0bfed37be66e4a30a6448829cbfa000f9388761e6611af9ae7046fdc63b608f3bcce1575bfa476dd5b
+DIST zabbix-6.2.6-go-deps.tar.xz 27486336 BLAKE2B e17aa599bc6be82e211f48642c03a73594965dd51a83b7e7e9ccbe949865034348a33cb413824d3d1aabd6aba56751132ef95dc333f75657bce3cc3fa4f1ef01 SHA512 eb18c6a78b0523543b7273c489d2dda94adb983df802b03020374b4bda51a44bf01e92bafe556242710f942474a9547a8366f724187f9a429e28bb94c0fa9c57
+DIST zabbix-6.2.6.tar.gz 41038757 BLAKE2B bc2dd394085d2bb32a052f682d7271b14967ca4100ada34a1145e0b137c32036202346a7ee7bed06f62ddf6a6c9b1033b9b1534aef50850a6d49446b40e6aa21 SHA512 03f2396fea0794f0a66a00880e7a46d0295a562fab2cfdd0890b2f9369bb1bfe6ee19398ab062bcdcdd9ef1415a6fa599a1f5e8135fb54ef6855e9f435619097
EBUILD zabbix-4.0.44.ebuild 9425 BLAKE2B 99915e322601540a008f2672090b0b9aaa56514afc03ea29c23495c84d493109da12faf142b9bbde2330995e2b2299b0ebd29af78c59330a6184df570072a148 SHA512 e72962f9d932ebd4114d3a6277a9a73523589deb2d68926193e9e1a85df89f4c7aa28367794300f609975133e68f756a31ab4388edbfe3ccc1e9138e3dfc0d56
EBUILD zabbix-5.0.28.ebuild 10142 BLAKE2B a71d8c7d65a4fdf930662b476416c416f519aaedd1489ede7da5b442d5aa2788625385bc8f0af28202f1261d10ebaa0b6dab3d449a7391df036b09a8646791cd SHA512 8053a8a2445a8aee9f029fb5ef61478b4e6beb4dbd0181c3054f34a59d8c6ef7f07c094588ede931371e02faf672c8d89f6e2f2baa1e5fee0e9866f34ed426a4
-EBUILD zabbix-5.0.29.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
+EBUILD zabbix-5.0.29.ebuild 10143 BLAKE2B c03425e764c70a978af6efb30f519714cab1bea66b92b40901ef698940cca273a2c6b57dddf3ef58a7f940dca4f3c6e4143962a0518a57e31e3733c77ea7e237 SHA512 99b214aa804a1b1de730779dd8347401886a7339c9fd201e0954ebabec13d1ad5a8e55a3c1603240c0725d41271cd2fbfb5ae279542ab11094aa6556c3a40be2
EBUILD zabbix-5.0.30.ebuild 10144 BLAKE2B 8654a84618f3e5ab22ca790bebc7db5badb60c0bea942027b74e50422be47f39380a873a2e01deadd58b9aa978b30392811fb6de88291416f15073d291163d85 SHA512 0a67f7c92f94eddd9be23aef921ad3306b2093f77a26a9cc9234cc0ce764e24ea292f221ba0f751148eea557974dd0f9a35c87ef748040d84dd2b4dc66740d14
-EBUILD zabbix-6.0.10.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.0.10.ebuild 10738 BLAKE2B a67ba091b097aa2b8f0239abac57a7f5de3f5d821d473d7f8a8b30d74ce476fd27b8d075ba9ff931b2ae225bd13c7de90a789aacc5b24963f253ffb66c3644e2 SHA512 bdafec75d8d17525e8690899613b7e8a96d331460580c370c52f483dc3bf39a7e1c4a777eed96e5e6587d5812c4d29e8bc630367979f612197fa8d5d19cd90ec
EBUILD zabbix-6.0.11.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.0.12.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
EBUILD zabbix-6.0.9.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
EBUILD zabbix-6.2.3.ebuild 10737 BLAKE2B e249cd00548e05fa986df84d4d53c5277195b60a6aa433c8f6cc0d6824e950efc00b644b7f6b7af638431d57f26149b0848139fdaaa295d282497b8aa56cdfe0 SHA512 a94a896619edb99e9ab841c63516a4a6fd673ea21a1b6276d65a9dff5e55f93825b88396defdb164c59f550e3537c18e5a59698aa98e6c50919dc9f1bc3f75fc
-EBUILD zabbix-6.2.4.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.2.4.ebuild 10738 BLAKE2B a67ba091b097aa2b8f0239abac57a7f5de3f5d821d473d7f8a8b30d74ce476fd27b8d075ba9ff931b2ae225bd13c7de90a789aacc5b24963f253ffb66c3644e2 SHA512 bdafec75d8d17525e8690899613b7e8a96d331460580c370c52f483dc3bf39a7e1c4a777eed96e5e6587d5812c4d29e8bc630367979f612197fa8d5d19cd90ec
EBUILD zabbix-6.2.5.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
+EBUILD zabbix-6.2.6.ebuild 10739 BLAKE2B b303421391b42a2c83d7434e3bfbce982b6785e73b5bdd50a192f84f46bc0b978fa2dc07cbb2f342ff9112325006a627b1525f06966a4100895c43de2dc5d993 SHA512 edba9a7894ce55a9c7f708a0419de5c796412ba4d2d95377c236e18de6c93cc328fa7922f6525a780940d9531bcb36202eeafdddb1abd710ac26f9f2c69d46f6
MISC metadata.xml 1757 BLAKE2B 4c44773ec6767f5d7edf927347cfae3f45ba1afb0ac1399c5fd31a9ce8c493647b16d22b891d803a820cac76ab2b3a3966ac33704e6e1d728cb23c18f30e02d4 SHA512 e953034478edb317a3657e44725e5e18d0033d70f53a10a3e8d317f0cc2a014a3c5485135999435cf222fa63748d093888054d6556b8ca78b00e39a699d98968
diff --git a/net-analyzer/zabbix/zabbix-5.0.29.ebuild b/net-analyzer/zabbix/zabbix-5.0.29.ebuild
index d3c97bb80618..d6917e4fd2d6 100644
--- a/net-analyzer/zabbix/zabbix-5.0.29.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.29.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.10.ebuild b/net-analyzer/zabbix/zabbix-6.0.10.ebuild
index 4b12b01e37ea..d7ffa6a90273 100644
--- a/net-analyzer/zabbix/zabbix-6.0.10.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.0.10.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.0.12.ebuild b/net-analyzer/zabbix/zabbix-6.0.12.ebuild
new file mode 100644
index 000000000000..4b12b01e37ea
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.12.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+# cd src/go
+# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+ agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+ ?? ( gnutls openssl )
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+ server? ( ^^ ( mysql oracle postgres ) !sqlite )
+ static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ gnutls? ( net-libs/gnutls:0= )
+ java? ( >=virtual/jdk-1.8:* )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*
+ net-libs/gnutls:=
+ net-nds/openldap:=
+ )
+ libxml2? ( dev-libs/libxml2 )
+ mysql? ( dev-db/mysql-connector-c:= )
+ odbc? ( dev-db/unixODBC )
+ openipmi? ( sys-libs/openipmi )
+ openssl? ( dev-libs/openssl:=[-bindist(-)] )
+ oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+ postgres? ( dev-db/postgresql:* )
+ proxy? (
+ dev-libs/libevent:=
+ sys-libs/zlib
+ )
+ server? (
+ dev-libs/libevent:=
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp:= )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
+ proxy? (
+ !pcre2? ( dev-libs/libpcre )
+ pcre2? ( dev-libs/libpcre2:= )
+ net-analyzer/fping[suid]
+ )
+ server? (
+ app-admin/webapp-config
+ !pcre2? ( dev-libs/libpcre )
+ pcre2? ( dev-libs/libpcre2:= )
+ net-analyzer/fping[suid]
+ )
+ frontend? (
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
+ mysql? ( dev-lang/php[mysqli] )
+ odbc? ( dev-lang/php[odbc] )
+ oracle? ( dev-lang/php[oci8-instant-client] )
+ postgres? ( dev-lang/php[postgres] )
+ sqlite? ( dev-lang/php[sqlite] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ curl? ( net-misc/curl[static-libs] )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*[static-libs]
+ net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
+ )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ agent2? (
+ >=dev-lang/go-1.12
+ app-arch/unzip
+ )
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+ "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+ if use oracle; then
+ if [ -z "${ORACLE_HOME}" ]; then
+ eerror
+ eerror "The environment variable ORACLE_HOME must be set"
+ eerror "and point to the correct location."
+ eerror "It looks like you don't have Oracle installed."
+ eerror
+ die "Environment variable ORACLE_HOME is not set"
+ fi
+ fi
+
+ if use frontend; then
+ webapp_pkg_setup
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+ local econf_args=(
+ "$(use_enable agent)"
+ "$(use_enable agent2)"
+ "$(use_enable ipv6)"
+ "$(use_enable java)"
+ "$(use_enable proxy)"
+ "$(use_enable server)"
+ "$(use_enable static)"
+ "$(use_with curl libcurl)"
+ "$(use_with gnutls)"
+ "$(use_with ldap)"
+ "$(use_with libxml2)"
+ "$(use_with mysql)"
+ "$(use_with odbc unixodbc)"
+ "$(use_with openipmi openipmi)"
+ "$(use_with openssl)"
+ "$(use_with oracle)"
+ "$(use_with postgres postgresql)"
+ "$(use_with snmp net-snmp)"
+ "$(use_with sqlite sqlite3)"
+ "$(use_with ssh ssh2)"
+ )
+
+ if use pcre2; then
+ econf_args+=( --with-libpcre2 )
+ else
+ # If pcre2 is not enabled, then use the old pcre library.
+ econf_args+=( --with-libpcre )
+ fi
+
+ econf ${econf_args[@]}
+}
+
+src_compile() {
+ if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+ emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+ fi
+}
+
+src_install() {
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
+ /var/log/zabbix
+ )
+
+ for dir in "${dirs[@]}"; do
+ keepdir "${dir}"
+ done
+
+ if use server; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_server.conf
+ fperms 0640 /etc/zabbix/zabbix_server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+ fi
+
+ if use proxy; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_proxy.conf
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_agentd.conf
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+ dosbin src/zabbix_agent/zabbix_agentd
+ dobin \
+ src/zabbix_sender/zabbix_sender \
+ src/zabbix_get/zabbix_get
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+ fi
+ if use agent2; then
+ insinto /etc/zabbix
+ doins "${S}"/src/go/conf/zabbix_agent2.conf
+ fperms 0640 /etc/zabbix/zabbix_agent2.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+ keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+ newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+ dosbin src/go/bin/zabbix_agent2
+
+ systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+ newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+ fi
+
+ fowners root:zabbix /etc/zabbix
+ fowners zabbix:zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+ fperms 0750 \
+ /etc/zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+
+ dodoc README INSTALL NEWS ChangeLog \
+ conf/zabbix_agentd.conf \
+ conf/zabbix_proxy.conf \
+ conf/zabbix_agentd/userparameter_examples.conf \
+ conf/zabbix_agentd/userparameter_mysql.conf \
+ conf/zabbix_server.conf
+
+ if use frontend; then
+ webapp_src_preinst
+ cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+ webapp_configfile \
+ "${MY_HTDOCSDIR}"/include/db.inc.php \
+ "${MY_HTDOCSDIR}"/include/config.inc.php
+ webapp_src_install
+ fi
+
+ if use java; then
+ dodir \
+ /${ZABBIXJAVA_BASE} \
+ /${ZABBIXJAVA_BASE}/bin \
+ /${ZABBIXJAVA_BASE}/lib
+ keepdir /${ZABBIXJAVA_BASE}
+ exeinto /${ZABBIXJAVA_BASE}/bin
+ doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+ exeinto /${ZABBIXJAVA_BASE}/lib
+ doexe \
+ src/zabbix_java/lib/logback-classic-1.2.9.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-1.2.9.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-1.7.32.jar
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+ fi
+}
+
+pkg_postinst() {
+ if use server || use proxy ; then
+ elog
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
+ elog
+
+ zabbix_homedir=$(egethome zabbix)
+ if [ -n "${zabbix_homedir}" ] && \
+ [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+ ewarn
+ ewarn "The user 'zabbix' should have his homedir changed"
+ ewarn "to /var/lib/zabbix/home if you want to use"
+ ewarn "custom alert scripts."
+ ewarn
+ ewarn "A real homedir might be needed for configfiles"
+ ewarn "for custom alert scripts."
+ ewarn
+ ewarn "To change the homedir use:"
+ ewarn " usermod -d /var/lib/zabbix/home zabbix"
+ ewarn
+ fi
+ fi
+
+ if use server; then
+ tmpfiles_process zabbix-server.conf
+
+ elog
+ elog "For distributed monitoring you have to run:"
+ elog
+ elog "zabbix_server -n <nodeid>"
+ elog
+ elog "This will convert database data for use with Node ID"
+ elog "and also adds a local node."
+ elog
+
+ if ! use pcre2; then
+ ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
+ ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
+ ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
+ fi
+ fi
+
+ if use proxy; then
+ tmpfiles_process zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ tmpfiles_process zabbix-agentd.conf
+ fi
+
+ if use agent2; then
+ tmpfiles_process zabbix-agent2.conf
+ fi
+
+ elog "--"
+ elog
+ elog "You may need to add these lines to /etc/services:"
+ elog
+ elog "zabbix-agent 10050/tcp Zabbix Agent"
+ elog "zabbix-agent 10050/udp Zabbix Agent"
+ elog "zabbix-trapper 10051/tcp Zabbix Trapper"
+ elog "zabbix-trapper 10051/udp Zabbix Trapper"
+ elog
+
+ if use server || use proxy ; then
+ # check for fping
+ fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+ case "${fping_perms}" in
+ 4[157][157][157])
+ ;;
+ *)
+ ewarn
+ ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+ ewarn "you have to make /usr/sbin/fping setuid root and executable"
+ ewarn "by everyone. Run the following command to fix it:"
+ ewarn
+ ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+ ewarn
+ ewarn "Please be aware that this might impose a security risk,"
+ ewarn "depending on the code quality of fping."
+ ewarn
+ ;;
+ esac
+ fi
+}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-analyzer/zabbix/zabbix-6.2.4.ebuild b/net-analyzer/zabbix/zabbix-6.2.4.ebuild
index 4b12b01e37ea..d7ffa6a90273 100644
--- a/net-analyzer/zabbix/zabbix-6.2.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-6.2.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
?? ( gnutls openssl )
diff --git a/net-analyzer/zabbix/zabbix-6.2.6.ebuild b/net-analyzer/zabbix/zabbix-6.2.6.ebuild
new file mode 100644
index 000000000000..4b12b01e37ea
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.2.6.ebuild
@@ -0,0 +1,411 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# To create the go modules tarball:
+# cd src/go
+# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw
+# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod
+
+EAPI=8
+
+GO_OPTIONAL="yes"
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz
+ agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz )
+"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +pcre2 +postgres proxy server snmp sqlite ssh static"
+REQUIRED_USE="|| ( agent agent2 frontend proxy server )
+ ?? ( gnutls openssl )
+ proxy? ( ^^ ( mysql oracle postgres sqlite ) )
+ server? ( ^^ ( mysql oracle postgres ) !sqlite )
+ static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ gnutls? ( net-libs/gnutls:0= )
+ java? ( >=virtual/jdk-1.8:* )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*
+ net-libs/gnutls:=
+ net-nds/openldap:=
+ )
+ libxml2? ( dev-libs/libxml2 )
+ mysql? ( dev-db/mysql-connector-c:= )
+ odbc? ( dev-db/unixODBC )
+ openipmi? ( sys-libs/openipmi )
+ openssl? ( dev-libs/openssl:=[-bindist(-)] )
+ oracle? ( dev-db/oracle-instantclient[odbc,sdk] )
+ postgres? ( dev-db/postgresql:* )
+ proxy? (
+ dev-libs/libevent:=
+ sys-libs/zlib
+ )
+ server? (
+ dev-libs/libevent:=
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp:= )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
+ proxy? (
+ !pcre2? ( dev-libs/libpcre )
+ pcre2? ( dev-libs/libpcre2:= )
+ net-analyzer/fping[suid]
+ )
+ server? (
+ app-admin/webapp-config
+ !pcre2? ( dev-libs/libpcre )
+ pcre2? ( dev-libs/libpcre2:= )
+ net-analyzer/fping[suid]
+ )
+ frontend? (
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
+ mysql? ( dev-lang/php[mysqli] )
+ odbc? ( dev-lang/php[odbc] )
+ oracle? ( dev-lang/php[oci8-instant-client] )
+ postgres? ( dev-lang/php[postgres] )
+ sqlite? ( dev-lang/php[sqlite] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ curl? ( net-misc/curl[static-libs] )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*[static-libs]
+ net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
+ )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ agent2? (
+ >=dev-lang/go-1.12
+ app-arch/unzip
+ )
+"
+
+# upstream tests fail for agent2
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+ "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+ if use oracle; then
+ if [ -z "${ORACLE_HOME}" ]; then
+ eerror
+ eerror "The environment variable ORACLE_HOME must be set"
+ eerror "and point to the correct location."
+ eerror "It looks like you don't have Oracle installed."
+ eerror
+ die "Environment variable ORACLE_HOME is not set"
+ fi
+ fi
+
+ if use frontend; then
+ webapp_pkg_setup
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_configure() {
+ local econf_args=(
+ "$(use_enable agent)"
+ "$(use_enable agent2)"
+ "$(use_enable ipv6)"
+ "$(use_enable java)"
+ "$(use_enable proxy)"
+ "$(use_enable server)"
+ "$(use_enable static)"
+ "$(use_with curl libcurl)"
+ "$(use_with gnutls)"
+ "$(use_with ldap)"
+ "$(use_with libxml2)"
+ "$(use_with mysql)"
+ "$(use_with odbc unixodbc)"
+ "$(use_with openipmi openipmi)"
+ "$(use_with openssl)"
+ "$(use_with oracle)"
+ "$(use_with postgres postgresql)"
+ "$(use_with snmp net-snmp)"
+ "$(use_with sqlite sqlite3)"
+ "$(use_with ssh ssh2)"
+ )
+
+ if use pcre2; then
+ econf_args+=( --with-libpcre2 )
+ else
+ # If pcre2 is not enabled, then use the old pcre library.
+ econf_args+=( --with-libpcre )
+ fi
+
+ econf ${econf_args[@]}
+}
+
+src_compile() {
+ if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+ emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+ fi
+}
+
+src_install() {
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
+ /var/log/zabbix
+ )
+
+ for dir in "${dirs[@]}"; do
+ keepdir "${dir}"
+ done
+
+ if use server; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_server.conf
+ fperms 0640 /etc/zabbix/zabbix_server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+ fi
+
+ if use proxy; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_proxy.conf
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_agentd.conf
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+ dosbin src/zabbix_agent/zabbix_agentd
+ dobin \
+ src/zabbix_sender/zabbix_sender \
+ src/zabbix_get/zabbix_get
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+ fi
+ if use agent2; then
+ insinto /etc/zabbix
+ doins "${S}"/src/go/conf/zabbix_agent2.conf
+ fperms 0640 /etc/zabbix/zabbix_agent2.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
+ keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
+
+ newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
+
+ dosbin src/go/bin/zabbix_agent2
+
+ systemd_dounit "${FILESDIR}"/zabbix-agent2.service
+ newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
+ fi
+
+ fowners root:zabbix /etc/zabbix
+ fowners zabbix:zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+ fperms 0750 \
+ /etc/zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+
+ dodoc README INSTALL NEWS ChangeLog \
+ conf/zabbix_agentd.conf \
+ conf/zabbix_proxy.conf \
+ conf/zabbix_agentd/userparameter_examples.conf \
+ conf/zabbix_agentd/userparameter_mysql.conf \
+ conf/zabbix_server.conf
+
+ if use frontend; then
+ webapp_src_preinst
+ cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+ webapp_configfile \
+ "${MY_HTDOCSDIR}"/include/db.inc.php \
+ "${MY_HTDOCSDIR}"/include/config.inc.php
+ webapp_src_install
+ fi
+
+ if use java; then
+ dodir \
+ /${ZABBIXJAVA_BASE} \
+ /${ZABBIXJAVA_BASE}/bin \
+ /${ZABBIXJAVA_BASE}/lib
+ keepdir /${ZABBIXJAVA_BASE}
+ exeinto /${ZABBIXJAVA_BASE}/bin
+ doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
+ exeinto /${ZABBIXJAVA_BASE}/lib
+ doexe \
+ src/zabbix_java/lib/logback-classic-1.2.9.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-1.2.9.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-1.7.32.jar
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+ fi
+}
+
+pkg_postinst() {
+ if use server || use proxy ; then
+ elog
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
+ elog
+
+ zabbix_homedir=$(egethome zabbix)
+ if [ -n "${zabbix_homedir}" ] && \
+ [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+ ewarn
+ ewarn "The user 'zabbix' should have his homedir changed"
+ ewarn "to /var/lib/zabbix/home if you want to use"
+ ewarn "custom alert scripts."
+ ewarn
+ ewarn "A real homedir might be needed for configfiles"
+ ewarn "for custom alert scripts."
+ ewarn
+ ewarn "To change the homedir use:"
+ ewarn " usermod -d /var/lib/zabbix/home zabbix"
+ ewarn
+ fi
+ fi
+
+ if use server; then
+ tmpfiles_process zabbix-server.conf
+
+ elog
+ elog "For distributed monitoring you have to run:"
+ elog
+ elog "zabbix_server -n <nodeid>"
+ elog
+ elog "This will convert database data for use with Node ID"
+ elog "and also adds a local node."
+ elog
+
+ if ! use pcre2; then
+ ewarn "You are using zabbix with dev-libs/libpcre which is deprecated."
+ ewarn "Consider switching to dev-libs/libpcre2 (USE=pcre2) as soon as possible."
+ ewarn "See https://www.zabbix.com/documentation/6.0/en/manual/installation/upgrade_notes_600#pcre2-support"
+ fi
+ fi
+
+ if use proxy; then
+ tmpfiles_process zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ tmpfiles_process zabbix-agentd.conf
+ fi
+
+ if use agent2; then
+ tmpfiles_process zabbix-agent2.conf
+ fi
+
+ elog "--"
+ elog
+ elog "You may need to add these lines to /etc/services:"
+ elog
+ elog "zabbix-agent 10050/tcp Zabbix Agent"
+ elog "zabbix-agent 10050/udp Zabbix Agent"
+ elog "zabbix-trapper 10051/tcp Zabbix Trapper"
+ elog "zabbix-trapper 10051/udp Zabbix Trapper"
+ elog
+
+ if use server || use proxy ; then
+ # check for fping
+ fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+ case "${fping_perms}" in
+ 4[157][157][157])
+ ;;
+ *)
+ ewarn
+ ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+ ewarn "you have to make /usr/sbin/fping setuid root and executable"
+ ewarn "by everyone. Run the following command to fix it:"
+ ewarn
+ ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+ ewarn
+ ewarn "Please be aware that this might impose a security risk,"
+ ewarn "depending on the code quality of fping."
+ ewarn
+ ;;
+ esac
+ fi
+}
+
+pkg_prerm() {
+ (use frontend || use server) && webapp_pkg_prerm
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e6434cf20906..d6b37dc0f736 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/atftp/Manifest b/net-ftp/atftp/Manifest
index 30d4136069c0..cfbbdfd850aa 100644
--- a/net-ftp/atftp/Manifest
+++ b/net-ftp/atftp/Manifest
@@ -8,5 +8,5 @@ AUX atftp.service.conf 45 BLAKE2B dd52bd3ef0d72f28d2e317282026d354b6023f8b51634d
DIST atftp-0.7.5.tar.gz 253626 BLAKE2B aa0a0311d29fd52b77f8ae021407221f815a39fe85cabac36ee18dce8918a5b0accda455e2df5fecf34f09e93e583bfbc86162b60a7237bd6d34b0c658ec2970 SHA512 457101136e59f7a1657ce591e9ea678ab9091a59219d41b6c522fad4a3555c5cbcb8c9e0c3267fd871940d99b5f8673ab4ce5ec9737dee52f017e5c80a4e59d7
DIST atftp-0.8.0.tar.gz 133417 BLAKE2B 6c0ec29c78f345f24adb65fd162e4572bd5b91e067c8db1ff6600ed2ea9a8461693bb6635c2edf09c77693dc6227689406a97b1d6e86a742ffbe3849ab9d3ee3 SHA512 b700b3e4182970fb494ffabd49e39d3622b1aff5f69882549eff0b52a01c8c47babe51b451c4829f9b833ea2ea7c590a2f3819f8e3508176fa7d1b5c0e152b68
EBUILD atftp-0.7.5.ebuild 1452 BLAKE2B adde7d73031fbfa0bdddd4755b8bc0835eba3c2fadfb41c8e7bc127f625576241652c6924c501a40cbffb5ca9d13c0c365d72e81cebebc729a8f4c6cacef06e4 SHA512 b547a622c18051067effa2ef59d10c0982efb1deeea00cbdf6303b5d8cc757cc61739360fcca22134a59ca245e9e471b35c8f8c01e7ec0f6ff7bc8207d024419
-EBUILD atftp-0.8.0.ebuild 1562 BLAKE2B d6400688bf35104bc729a7760c291c5d26c6ebf572fb80635d50131d579afbce9408dbb7ef6ebeab9f82317df4a96262f426a92a6dee0ad65072f29b9dd68c68 SHA512 e924665d8cb45b0de2aeb2418e09c52070f240081b22cd8a942c2ec9b93479fe54f2abe1b0da088e6c8b66b72999ecf32de2ebcf7c8f9fd502c31185870e0e1d
+EBUILD atftp-0.8.0.ebuild 1608 BLAKE2B e5165ffae70cc55fdc317871a4b8cf1b64e6585bce1980a33abcdfc0094b351b20444a77b2b35ca8b800ec75a74ac3de520b40e6de8ec1c2d6c02057238d5cc9 SHA512 e9102a7a4a4fa0b283b947ea98d197a5f3a0fc9942d6e03f1aa842cdbc1bd3db975cad7f0c72f6084e59f410fad33d0184eea53f6fc93dba1844bb1b4d32510b
MISC metadata.xml 369 BLAKE2B bda58276c6f791d7acca2ad53faa8411be0fecf3f63966d7c940926b4bf66c9e6bc1657d3b3bcd2a43fc83bcb3d767aa558a373682d7236d9ce68a9020e22e6f SHA512 d12e08830646352971bf624cfeda13895436eb6e35cd751fa043edc3909574e3dcd62b3afe578c9f3e94d3ec68541dafc48ee71db631d4b458e7fea0cbb84607
diff --git a/net-ftp/atftp/atftp-0.8.0.ebuild b/net-ftp/atftp/atftp-0.8.0.ebuild
index 00e338888e1c..11ffcdcca64a 100644
--- a/net-ftp/atftp/atftp-0.8.0.ebuild
+++ b/net-ftp/atftp/atftp-0.8.0.ebuild
@@ -38,6 +38,8 @@ src_prepare() {
}
src_configure() {
+ filter-lto # https://bugs.gentoo.org/876939
+
econf \
$(use_enable tcpd libwrap) \
$(use_enable readline libreadline) \
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7c30fc5f32ed..bdf5d6751690 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
Binary files differ
diff --git a/net-irc/dccserver/Manifest b/net-irc/dccserver/Manifest
index 018a6c7a9029..7473817a5981 100644
--- a/net-irc/dccserver/Manifest
+++ b/net-irc/dccserver/Manifest
@@ -1,3 +1,5 @@
+AUX dccserver-0.5-include-bsd-string-header.patch 459 BLAKE2B fdb2c6538ad5c898fa7d6e0730f069751b0ceb319b9fb0310cf5dc0408c1ab0f9f1c662c43c59aec7722064674703831ee9a8adb0a909e21eac5acf19018c7cf SHA512 8ddb297dc7577c47276ba596aeba3ade6940cf6314b9d7c51e7780b1ed5ce6b395e77ec3d1dc77bcf77f1f46a1edf2c2878382519277dc1ded9574767a0f5362
DIST dccserver-0.5.tar.gz 139083 BLAKE2B cdb81051b65f79b6923b0b8cee5360f76395bd1a0d5d5b250a65a4ec12f3440f5e4c0f8c2020263c18265c03bd155563528bed3d80b9af6b468940cadcbbd70e SHA512 0fb2584dc4bee930fa259862206ba875cf0c7a8257799c3fe85d470de6827eab0b304b0e07b8692268fd1a63a82249204c447df92bed0dd994c78ec295040494
EBUILD dccserver-0.5-r1.ebuild 491 BLAKE2B 0efb0d84dfa6bcb646d8fc73a4c09ab5edda89489b9cb5747083a1e26b1314e2e4a0e257b86d9aeba8ba420e8abbe8fad113ad192f4cbc342718d3a84a634763 SHA512 479f2586538b5d808f610f825c403df5c9bbe25bba0f3962540af733ffab0cf259986b31467d77f95aa42a048a7d5807e499ffb00efe092a527cb11a762d0c62
+EBUILD dccserver-0.5-r2.ebuild 605 BLAKE2B ec72df9d17ebc2c9958d62b3900fc0926c27fd60b792a4c30d96086ee4c1c59b1d4b77e780af75d99700a951d13867168b926ce17b576e6b1f38b85a57e24b05 SHA512 6d9969da3b2c1fc82221dbcb597a5ea83e527481bb7ad3bbed2caa3cb8088a775681623b1a6b4e065940c7c7ed2e20d729e610bcde3f5f67cb86dc45de1f42fd
MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-irc/dccserver/dccserver-0.5-r2.ebuild b/net-irc/dccserver/dccserver-0.5-r2.ebuild
new file mode 100644
index 000000000000..1399170485f3
--- /dev/null
+++ b/net-irc/dccserver/dccserver-0.5-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux implementation of the mirc dccserver command"
+HOMEPAGE="https://www.nih.at/dccserver/"
+SRC_URI="https://www.nih.at/dccserver/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="dev-libs/libbsd"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-include-bsd-string-header.patch" )
+
+src_prepare() {
+ default
+
+ # Respect AR
+ sed -i -e "s/AR = /AR ?= /" lib/Makefile.in || die
+}
+
+src_compile() {
+ AR="$(tc-getAR)" default
+}
diff --git a/net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch b/net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch
new file mode 100644
index 000000000000..16474b64b82a
--- /dev/null
+++ b/net-irc/dccserver/files/dccserver-0.5-include-bsd-string-header.patch
@@ -0,0 +1,19 @@
+This uses strlcpy() from bsd/string.h. On non BSD system those headers are to find under
+/usr/include/bsd/. See also man libbsd.
+
+Bug: https://bugs.gentoo.org/875026
+Bug: https://bugs.gentoo.org/861377
+
+Pascal Jäger <pascal.jaeger@leimstift.de> (2022-11-29)
+
+--- a/lib/dcc.c
++++ b/lib/dcc.c
+@@ -37,7 +37,7 @@
+ #endif /* HAVE_ERR_H */
+ #include <errno.h>
+ #include <stdlib.h>
+-#include <string.h>
++#include <bsd/string.h>
+
+ #include "dcc.h"
+ #include "io.h"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4001b5447e32..ddada4db1d82 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bbf073fc341e..b054d557d948 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,5 +4,5 @@ DIST webkitgtk-2.38.2.tar.xz 33006668 BLAKE2B 822c4d526774fc1fe08e704045cd2fb59b
EBUILD webkit-gtk-2.36.7.ebuild 7425 BLAKE2B 1f261d15a60f1d07895652c369cdf572cea2bdd19236abd2a2de2b31b1f8994a644d85185368a07a708c7c4e956f4547b12ae14a8befd5b1c33fd02ebfb1b9fa SHA512 459a52070c6c83950dd278c3325bc83d184314ec4e613ccf3f34fc9cd4ce7d45d854a892452e9f620da37937050c470e21614daac03189cf082cfb07f50d92a6
EBUILD webkit-gtk-2.38.2-r410.ebuild 7813 BLAKE2B 1b428ecd3d3ebbdd9001f2d84cf570a3d8bcc7fcfce9280215e052b08f446814c3833fb0c7cfa3168d9e6d847183b16795ad42c71605ba0ee33455e05e89fe98 SHA512 02aab8f6a0e8a5cba84156a11d9eab4c35b677c02cae6fa5762cb4c42fa733cfb81518b83574bfe5a0f192980d68a262a0745741e90d7612cbfb14a50f107771
EBUILD webkit-gtk-2.38.2-r500.ebuild 7770 BLAKE2B 387c162ba68d2f766523814c7903dccf99e8c9d799fc2b4e528ca6612c88f70170c2edff79bb0bba68e01d3c66219ca27e34e102ad86816a62122c1f44bbcd73 SHA512 3863f906f7b0b66f3f76b086f70c33ddcd45c7304bd94243c423f6babe219dc2d2d28a536eb9bb04ef4e6ddad19d18add1a9db9534be634a3ac31e78424add2a
-EBUILD webkit-gtk-2.38.2.ebuild 7539 BLAKE2B 90d4bd642a7d512cb22cc5e2be83d63acd3b8fade2a714d91522463cbaf3a76552b5a4f71e083051fd785a42ab10cc90c28d02f2ef45189aef72f9a4fd441ec6 SHA512 9fff20b27bb349e5657c8b3948d9498f772d1e0dd18b85e0ef74223aedf166a5b2757d23be413698d2584a9310a3054416a95b200390b869b305011830e461ce
+EBUILD webkit-gtk-2.38.2.ebuild 7536 BLAKE2B 880e1470a63ba3539928fcf49baade07b83843f598cec0ef4feea8850e928a2b5d8cf33138caed03b67bdaa5d3f384a826cdd27589b290e8a816fdd198f8cea7 SHA512 1d87c403184bc51ee50ec6b6a62f00b996ab0b0a3d94566805492f12aea8e078be6731736d987b2d53d73d3ae7c8bd07416476b1da55e44df0ec81ef0786f570
MISC metadata.xml 756 BLAKE2B ac278b1ed9ad7d7dcce220e686ef4c67c79f7d4c25e43e0fedaad14925eb03c74140e49a4e86d2146d6d467f14a737fb2ff1e90b506ab4d43b79d3462d58cb24 SHA512 584ce6c8dc66e3e3b3677dbffe8b2a58bb81146f3dc8eaf830597781f03580e0b94620322834b6e558ac9fcb06b3eda02645803f63d78e88104ecc0950c6f369
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
index a62b480222e4..ebed392c80ad 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.38.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~sparc ~x86"
IUSE="aqua avif +egl examples gamepad gles2-only gnome-keyring +gstreamer +introspection pdf +jpeg2k +jumbo-build lcms seccomp spell systemd test wayland X"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6b204906e19f..b6e4aac1417c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 101adc1c2339..02c8fcc82450 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -3,7 +3,7 @@ AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d11
AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
AUX asterisk.tmpfiles-16.22.0-18.8.0.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d4626d3791e3cb664b03ff51260892167a22c3cfca2caa02d162e7476070ec1374a92ef24ec799dc SHA512 680a4478d3a501c26fa19e29fad18389e7e02f04c8b9a676ae0f192fa6afbed95a826b74696c6c5459aba5aba6a16c57df8a9c5ff486e9dc8f1cbd01185e9320
-AUX asterisk_wrapper-16.26.1-18.12.1 6667 BLAKE2B d3d3c3403fdd7894ab63cd6a96482dafaaf004742b92d35839cbf1766bc50951922bfa72e73d9ac625a512e12c3a99c600195d6b1f42ca8d9d36daf4e99f80b0 SHA512 2cbe12e9d25afdd2958efee81b17347f3a325968ef933d8927ef9ed92eaacf076fc45c610e3fc6b32cee9b9e0a346bbde8f0e43b11b7efc7d85083583baf9b14
+AUX asterisk_wrapper-16.26.1-18.12.1 6673 BLAKE2B 3f760e26135ca1e1992205d4183ea56082765b502152b3d87d1cb276c5e84e84abcc612cb16bc13eeb585b6a4d0daf2134032207d8a7016dae59ddeb72aa7996 SHA512 1bcf747ce20cf3aeca36f9375a06ad0a031099ad50951e2049b57abf82eef673ebed499de9e81944fee6167498886e47732b4102e79f65b2c99c059ab756c166
AUX confd-16.26.1-18.12.1 4050 BLAKE2B cda2632a9b951f2061d4d7e25b221d0473c623860aa96eeb2bf0b8a8354606cc6b22e98ac3450d160e13507c21174d086ebecce3a4b6a470a3e19dc6a6a98784 SHA512 922c59f08f75f9c18955d7337caa8e1b12a0037909903f6afee707ffca8b784011ba35188b8a921ea8b9c6238556dc70bdd1b5716af7894c09821c03b4808340
AUX initd-16.26.1-18.12.1 8869 BLAKE2B ac5d389e3af994453f258b23a1cd5c5630d19b7a1c9af78804517eab219a71d6c7bb901048ea052ed1ba89f4f553d1bf4d40252bc7838f0169e9561855574a90 SHA512 ceb6b484c97800e4e1ddfed9f1e6a8d91788f41b4abd3214882d716ea4eb01c39a2fb828351b2aa33bd1f053dee1af8f2a1c416fdf98df43860996463bf1c13c
DIST asterisk-16.26.1.tar.gz 28001023 BLAKE2B d426566827bd3466720f94eed04a654edac3566fd7cdd77e0a1596d4536b5612e24d48e8dc6891a89f2f63feef938a5c1fd6898c5a5efcd56d1a11500fa9e00b SHA512 cc8c72c8167210bc506ee224f83208d1c0f983a9e061465a25b133fce526fdf56693a9e5cbb1f65d13cb9c9515619663748b332c704d17e21d90ef37a697948a
diff --git a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1 b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
index 477812171a86..8624bfa3383e 100644
--- a/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
+++ b/net-misc/asterisk/files/asterisk_wrapper-16.26.1-18.12.1
@@ -166,9 +166,9 @@ while [[ -r "${rundir}/${progname}.pid" ]]; do
if [[ -r core ]]; then
if [[ -n "${corerename+yes}" ]]; then
core_target="${core_pattern}"
- core_target="${core_target//%h/$(hostname)}"
- core_target="${core_target//%D/$(date +%Y%m%d)}"
- core_target="${core_target//%T/$(date +%H%M%S)}"
+ core_target="${core_target//%h/"$(hostname)"}"
+ core_target="${core_target//%D/"$(date +%Y%m%d)"}"
+ core_target="${core_target//%T/"$(date +%H%M%S)"}"
mv core "${core_target}"
core_target=$(readlink -f "${core_target}")
else
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 9c675dc30bb1..e0f67455b327 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,7 +1,7 @@
DIST freerdp-2.8.1.tar.gz 7311427 BLAKE2B 0d744e8146ea48af3108e522a86205fb14b5f2f8b1f68d9f24b61d62dcc9a3dec32e66329bb435cba0d236018b9446eed741abd25a64901b1140521fc4cd517f SHA512 0bfbdae1a41801981160a89e0d14ddd1ff6c05a0d9d970fa1d136922493085649f8f295763929bd9a5028092e21fb250697111323a2bb8b15a78ebb49eaf138b
DIST freerdp-2.9.0.tar.gz 7319428 BLAKE2B 358fcd14bd42b51d4d50e86cc71f9759179c82b466dd78a2f6996db84f3dd90495047f9c0da9a683edf894fdc96f4945237ad2fbeade12b173bac82f7be722b3 SHA512 de593640d4418c9395455b84c463e4cac8e51e9fd186ed5bce28132170ebc3c7338651582e0cc00272b530ea6e7c2664e802d748b3f6eba5fbe534dcf59d406a
EBUILD freerdp-2.8.1.ebuild 2973 BLAKE2B 1cd3635a56c7e38efe6b61937bb155829f6e40fb3e3f78d0ae249cf420575eb60dab8e4cea7015647d35c9f57070ab9f7e5053a6cfbf1f4cccb612fd9fa8c70e SHA512 d8041a4c1675b0c24458cf3101882a39925571b6bd0198ee870ddc38630dd8b023b30f9d2e8d9c5c7579be99bfa33bdc1d95c59b40cd2f668663453ca9b437d5
-EBUILD freerdp-2.9.0.ebuild 2981 BLAKE2B d40a82d03c942f6f8cfecbcd55a2f9d5ea254691c489b998d24c5f3505d17fc73168c4a5648bcb257911dab39915c7198c87d9ad0a2667d5b719e4de1ddbecc6 SHA512 4e337e329f60ce086e067e65a59e9a3f63dfb6b84f0b676534e1d676ecb1c00d0ea86f6e549eee3ec1bc49be5ec678dc6d6b28807443bf4bf9e98125d73a434d
+EBUILD freerdp-2.9.0.ebuild 2980 BLAKE2B 4c41089174e16cdecefe1d3aee0e47e1446b60ee80c82395b5d52f788dc691bee26214b234e36417a122beee95f0a07a9abcc0dda54e54876f8b417fed9095cd SHA512 c47699c6749da17218f8c4c1242fd2aaa79d5a90f06603497b93548c7b6b75541bf8713401971a5e27ccebaffcbc7327e01f5bd7b5a6fce234adb48897cd4de0
EBUILD freerdp-2.9999.ebuild 2986 BLAKE2B 7ee5f140858d328505202e8861b9bdb8d84574f05ac8f1d5594da1a33ca53a122d7e2dd32fb94a2096a134b924a93def1ed5c8b59544e59260ac86eb0096dfa1 SHA512 6bb461850db6237a1ffe1902a5a82616bb4591ab2ea4dcd0688e0e7f8df8efeac44806021a5aced80cd6ab0daa43be9124100dc035289e1ab8121249c48783cf
EBUILD freerdp-9999.ebuild 2986 BLAKE2B 7ee5f140858d328505202e8861b9bdb8d84574f05ac8f1d5594da1a33ca53a122d7e2dd32fb94a2096a134b924a93def1ed5c8b59544e59260ac86eb0096dfa1 SHA512 6bb461850db6237a1ffe1902a5a82616bb4591ab2ea4dcd0688e0e7f8df8efeac44806021a5aced80cd6ab0daa43be9124100dc035289e1ab8121249c48783cf
MISC metadata.xml 482 BLAKE2B 9961a7b8e99468833978be3722ffcfa1fe38ed2b9c0de0ec7237fbbdd1484b674df65995e4802abe961e70df37e8a7d11c8d1e26f25779e5419b4439cd336ed3 SHA512 3dd28b1ac648b19794970f306d811ebcb860146da9dd4e0dc1ca72c493f78ddf63e95c8232c583a71bee7e6ad90bbad24ece5fca4e6f561a9c019767a4755b72
diff --git a/net-misc/freerdp/freerdp-2.9.0.ebuild b/net-misc/freerdp/freerdp-2.9.0.ebuild
index 017e251705a7..4e7072196f80 100644
--- a/net-misc/freerdp/freerdp-2.9.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.9.0.ebuild
@@ -15,7 +15,7 @@ else
MY_P=${P/_/-}
S="${WORKDIR}/${MY_P}"
SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
fi
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 411b1981462e..a77466d5498c 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
Binary files differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index ff33e0becbe0..b545e5eb47a9 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,42 +4,28 @@ AUX haproxy.confd-r1 637 BLAKE2B 5b79a652f0cd124ab9349ceee026c7b54de10c5c4ceccba
AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
AUX haproxy.initd-r7 1705 BLAKE2B 6592a149144680d0a0fe124a1c87f26d4a5ef222d1b80bc940f6c8eeaca4cb24c6eb1766b75e1334d3331955c1b7bc65bddc337d7f1ab01813e70ca77e046313 SHA512 1acdd4806539656daf32277d66b1596de4c91ece34a8ec43b4948cf8c95b65ccdea58b152717596659db2c14d63602653e3858a108927fa6091ffae1a5a08d7e
AUX haproxy.initd-r8 1677 BLAKE2B 2bc1d95f5718fd674dbac7f41df07f3d36f83667ffa91de7dea73878af368251ede94b0aed97074b6459a44d2867a69d10b4e4a26ca8a1a4c3e58f68078bbebf SHA512 164fbafeba8475085b7c3c3356f6a39a8c7ae9ed7d602391bd78185a55ed3aa342d5e4d0aa4c4e8f07581ea4299b50614b30808dff6e1f5beec834c55b3bf8a2
-DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67 SHA512 174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
-DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284 SHA512 2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
-DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c SHA512 021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8
DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c SHA512 652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799 SHA512 a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
-DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999 SHA512 98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220 SHA512 4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660 SHA512 82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9 SHA512 0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
-DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c SHA512 cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710 SHA512 99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.5.9.tar.gz 3843788 BLAKE2B dcff2af4beba435abfcf13337f91575a19b13360f0a5abfeedfd214b7811f4d7324ca29476bdef06712dd2a89413450234735e7101f7a22ab4b1b45b3b3c482c SHA512 b00756372f40de65b645cccecc11a835146d34588bd2c805f51c1bc3ab61b054af2a7cc62bbfa56607c26e42bbb791f2bbc191afb7ea992fe03b52e942112c3e
DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7 SHA512 0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d SHA512 d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
DIST haproxy-2.7.0.tar.gz 4105416 BLAKE2B 9ebbc26593dc5433f66d9ac553123023865ccea6fd578a6f0c57e56046baa231fb7d60c465415081632e22352b6d1b95e0cddcaab9fde2465677c86eda5166f9 SHA512 cc2eb49c6055cca1d4744cb715d43048621e3078b2621cc104b3e54671f6b9a0a530c0c044c23e4cbd276f3d792bfa46d88bf034c777a671dc49ace0777829ad
-EBUILD haproxy-2.2.17.ebuild 5356 BLAKE2B 3e66fd23b24ac10f251ca4c0b20b9fc7f51c55a7235ea362b22f71f9e581c36c93dcb4046cc14dcf687669eb64a71e221f7affd9e811cf94361e4e86754fb3bd SHA512 316ba774a164527afb0c56da9fe3433cc3c96becef081388b5756d819e0962d15a61d67388e9776ee194582a1e7dd97105ee58e194c94689047aad38b20509c1
-EBUILD haproxy-2.2.21.ebuild 5358 BLAKE2B 74e840c6a726c6c00e26de01e8ed0e9923a7a7623a9984a67a5d2322fe7be38eb26559cce3fc1bcfadeb00246e42c0ed076a2b2662776f596e14a8f9ab1f5d12 SHA512 2049483a3f1eb1907573fcb134d9cfff2b27dc50a45df9025c3e734a1bde76d4cc7f5c0affdf52877889d267b32bb1fcc402dd1f8d9338004e9aac2aac879dd7
-EBUILD haproxy-2.2.24.ebuild 5333 BLAKE2B 8814d4213f00ee1a095d88361e4ec82530f29e6b2c616cd5953dbfb2a1a5e286f83c5995e6344e0f49cd1a9b057cc31ab9b68034587ff716e09d97227f1eb4f2 SHA512 359a68d2054f4260d0b375d46e19ba391aee72e6cbe5e51e8c098916b42e229372830668bccf44935eea81f01848d76751df85a00f10de74df0a86785b624490
EBUILD haproxy-2.2.25.ebuild 5333 BLAKE2B c1c676cc8fc95fa117ba79647d5516882124700ef6df766e6ad823fe03808542e543fb7dab0af490c15c2ef869dce7007e57c43961bb6560ef6f356349562750 SHA512 ef5f1ea431dae5cd6786b949c97bfbb2551b830aa8a4d4068224ad0f817764c5aac43af1f910dfbcc47a99f9727f7c298c99a3e6e226fe6e41c9bb8f719e4c8f
-EBUILD haproxy-2.2.9999.ebuild 5296 BLAKE2B 72ed307925987606f8de230a9f68ed8a8deeb150ea298e873d16062bfbf40d15c2e01bd5a3a99c093134f932d96cb0c5f6f3f4cfdf65fa796f1fcf3936d6bce0 SHA512 d9c6c8c8c17abfdebea17522aeeb4bea21993691953e29609185687c5483377f9a0340bad1c1bf7d1b3c26a5224f728082810fa276e4b54e1ea5756497d5548c
-EBUILD haproxy-2.4.14.ebuild 5590 BLAKE2B 7799b5643ffb5ac4a2135eaaac3e4aeed4bb1d02a9fe5065eed725835888cfa1f841438d748b6c4441dc86dbf08d75386ccc8e346abfe60896845c5bf952dbac SHA512 44da861d3b23c38717b6761856ae97d28caa10d25c2064e33d5f04a337487d83473d5105c39590f0a1f94ec7bb5d22033fe6af347134a944dd12b9faef461dc1
-EBUILD haproxy-2.4.17.ebuild 5611 BLAKE2B c67508e6b9c78354cc30fe43a8b0470ce1f929b69fef90f4bbe6e0c193c834a6771d57975c58e9d4292cb696b24704a0c32cd3c846381f2cb72899717b9dca81 SHA512 ab4786ee7cf9515a13aa40bbb253bf9797f2208fa02c2de848e0714510e176423fcfc6de40dcef3b7ddc6b6824529b6b8eeb092b3992e478f3193435d95d046a
+EBUILD haproxy-2.2.9999.ebuild 5307 BLAKE2B fadebcc09d3b50f9fb2d6b831f22cf5d0008edfa2b85e5cfb3dee019e931e6c1850cdef752c7d7a5ada9ba356938c7a61a03fc85fc3d7c6b7b858c64c028ad8f SHA512 94446f80c401427e8d0b6eaa9cb823df845c3a3ff7b218e35ca34eb33fb28a48b2fb158c4057bf61c0122440fed9e7893146b2e582d39ef0075066b54ec68804
EBUILD haproxy-2.4.18.ebuild 5565 BLAKE2B 92ceae99349779d8a21a265ecc39dd8b1f4c071d3ec9370b42e5167a1751e2de50855258470a88cef2d512e20907c3ffd3398db955aa74c077644cd15fd7bcac SHA512 81d947bc32bb71ca838dab046f38a71ab2309ae577d7edd7b7b262a8b244b880a9368ebbca46ce24c589143c5810ce5e8401628af62dbfb5be82c1c02844b828
-EBUILD haproxy-2.4.19.ebuild 5528 BLAKE2B 44508bd7b0c7e8cb6e74bd9bebb1c51c7a5d237541f2df20ab933c78ac06c3a4c66cbbbfca52d74a150111c5ad15571fe84946b61b06807ef626820a39bbd740 SHA512 bd211f5ec102edd817c01ca1b394a962afdcc34663aed38fdea4c574bbdb424cb27bfe39096cf9b3fe5d6bcaa2bbdc549f7f4358226b8705a0a361f780557a70
-EBUILD haproxy-2.4.9999.ebuild 5528 BLAKE2B 44508bd7b0c7e8cb6e74bd9bebb1c51c7a5d237541f2df20ab933c78ac06c3a4c66cbbbfca52d74a150111c5ad15571fe84946b61b06807ef626820a39bbd740 SHA512 bd211f5ec102edd817c01ca1b394a962afdcc34663aed38fdea4c574bbdb424cb27bfe39096cf9b3fe5d6bcaa2bbdc549f7f4358226b8705a0a361f780557a70
-EBUILD haproxy-2.5.10.ebuild 5521 BLAKE2B 655314c22537e8f7faf35d1bb9108214db58a44c73823e82378985c03a68a66ebbdf9b945f55a352bfcef8029a5894d71bab23869c6b7cf396248df8ffa863ce SHA512 1dd4754dfc024c9765f8213ba18bb1851c7705ca1f2efae038a9bd18fb72e6d06ac7b4771084b9f0eb3a1d99c4da8b67b2b263fc7d5a7ae16fd8be46b4e24f9f
-EBUILD haproxy-2.5.4.ebuild 5590 BLAKE2B 7799b5643ffb5ac4a2135eaaac3e4aeed4bb1d02a9fe5065eed725835888cfa1f841438d748b6c4441dc86dbf08d75386ccc8e346abfe60896845c5bf952dbac SHA512 44da861d3b23c38717b6761856ae97d28caa10d25c2064e33d5f04a337487d83473d5105c39590f0a1f94ec7bb5d22033fe6af347134a944dd12b9faef461dc1
+EBUILD haproxy-2.4.19.ebuild 5582 BLAKE2B 3c8dcd42a64ec6ed4002c25af53f084b0ca90cc63b45e6b83e645bebf55aab2dd1dd4f4c3e76e832c412c19d234908287d4d72660d9a5311f94788d57ec01827 SHA512 745a7e9dd84813b7b5a005b7373936ac7632a2cfea803a6469af50ffeee287ad442ee65c2bb59625ea354a7c58c078c500453c573b1cf1676b92632c24c2cdbd
+EBUILD haproxy-2.4.9999.ebuild 5582 BLAKE2B 3c8dcd42a64ec6ed4002c25af53f084b0ca90cc63b45e6b83e645bebf55aab2dd1dd4f4c3e76e832c412c19d234908287d4d72660d9a5311f94788d57ec01827 SHA512 745a7e9dd84813b7b5a005b7373936ac7632a2cfea803a6469af50ffeee287ad442ee65c2bb59625ea354a7c58c078c500453c573b1cf1676b92632c24c2cdbd
+EBUILD haproxy-2.5.10.ebuild 5575 BLAKE2B 4404d6649ede0709592da2c772a753666f28146fb87b9b9a42bdbf32b8901d586956775c3bb7c524047e629f16e54024f89e38406da143c63f18d327174391da SHA512 571c6d1c3cc5071dd29bedadb85fc52f410f2114cf226c25d573285a38da5b1ad9dd5c8da524a01fd87152e7d9b0ad32b929bd9ddcc14f7e00d69fc8644234bb
EBUILD haproxy-2.5.7.ebuild 5558 BLAKE2B a7d3b8ea1539094648cddc089c0c451de3f774185a7349aa1bf0000f01da5e6ee9abf2308d0e36020421af1e232f89ab6bfb9ce7eedf185ce7b233e6f9d9169a SHA512 fc4fce227418754b9f778cc1b9584f29592a78f651bd61c1aca938cdf4da792ebde6bef1b496f7aa30d1401a8e287724bfe93e3de73fa4911a9f0ce87ca4c8cd
EBUILD haproxy-2.5.8.ebuild 5558 BLAKE2B eff4390c9fbd61a3d2e30596b3a7da09aff6448b2c180bb21cd27ea4be9f3e5ef61338962b5e1bc530590115339e046af271314951907ceadb65c82b7d8cc582 SHA512 f74875c05b6a9c7126c8b5c5994247cf49257a47d7afccd9bb44f3f6da4fb5a593647fc123575781acdca0cc4b9210124390fb5b24a426b2b6681b4570bbba0d
-EBUILD haproxy-2.5.9.ebuild 5521 BLAKE2B 655314c22537e8f7faf35d1bb9108214db58a44c73823e82378985c03a68a66ebbdf9b945f55a352bfcef8029a5894d71bab23869c6b7cf396248df8ffa863ce SHA512 1dd4754dfc024c9765f8213ba18bb1851c7705ca1f2efae038a9bd18fb72e6d06ac7b4771084b9f0eb3a1d99c4da8b67b2b263fc7d5a7ae16fd8be46b4e24f9f
-EBUILD haproxy-2.5.9999.ebuild 5521 BLAKE2B 655314c22537e8f7faf35d1bb9108214db58a44c73823e82378985c03a68a66ebbdf9b945f55a352bfcef8029a5894d71bab23869c6b7cf396248df8ffa863ce SHA512 1dd4754dfc024c9765f8213ba18bb1851c7705ca1f2efae038a9bd18fb72e6d06ac7b4771084b9f0eb3a1d99c4da8b67b2b263fc7d5a7ae16fd8be46b4e24f9f
-EBUILD haproxy-2.6.6.ebuild 5520 BLAKE2B 3c23b9c0a3d2612c9d64594bcdfef98e253a3f7bedd2ae80110eeca36495fff05c2f40cba4a662a6187c7ded8da71230e06a13181eca5d108cd2b44aeafbed79 SHA512 984f8aeed5313a14c720de4669ba11affea0c0b0074f1025152c62bf5c04178367f079bfa2becd1139277b1c2d72aa753b6db4feb55ed6e3a5fbb4dfe17849bd
-EBUILD haproxy-2.6.7.ebuild 5520 BLAKE2B 3c23b9c0a3d2612c9d64594bcdfef98e253a3f7bedd2ae80110eeca36495fff05c2f40cba4a662a6187c7ded8da71230e06a13181eca5d108cd2b44aeafbed79 SHA512 984f8aeed5313a14c720de4669ba11affea0c0b0074f1025152c62bf5c04178367f079bfa2becd1139277b1c2d72aa753b6db4feb55ed6e3a5fbb4dfe17849bd
-EBUILD haproxy-2.6.9999.ebuild 5520 BLAKE2B 3c23b9c0a3d2612c9d64594bcdfef98e253a3f7bedd2ae80110eeca36495fff05c2f40cba4a662a6187c7ded8da71230e06a13181eca5d108cd2b44aeafbed79 SHA512 984f8aeed5313a14c720de4669ba11affea0c0b0074f1025152c62bf5c04178367f079bfa2becd1139277b1c2d72aa753b6db4feb55ed6e3a5fbb4dfe17849bd
-EBUILD haproxy-2.7.0.ebuild 5520 BLAKE2B 3c23b9c0a3d2612c9d64594bcdfef98e253a3f7bedd2ae80110eeca36495fff05c2f40cba4a662a6187c7ded8da71230e06a13181eca5d108cd2b44aeafbed79 SHA512 984f8aeed5313a14c720de4669ba11affea0c0b0074f1025152c62bf5c04178367f079bfa2becd1139277b1c2d72aa753b6db4feb55ed6e3a5fbb4dfe17849bd
-EBUILD haproxy-2.7.9999.ebuild 5520 BLAKE2B 3c23b9c0a3d2612c9d64594bcdfef98e253a3f7bedd2ae80110eeca36495fff05c2f40cba4a662a6187c7ded8da71230e06a13181eca5d108cd2b44aeafbed79 SHA512 984f8aeed5313a14c720de4669ba11affea0c0b0074f1025152c62bf5c04178367f079bfa2becd1139277b1c2d72aa753b6db4feb55ed6e3a5fbb4dfe17849bd
-EBUILD haproxy-9999.ebuild 5520 BLAKE2B 3c23b9c0a3d2612c9d64594bcdfef98e253a3f7bedd2ae80110eeca36495fff05c2f40cba4a662a6187c7ded8da71230e06a13181eca5d108cd2b44aeafbed79 SHA512 984f8aeed5313a14c720de4669ba11affea0c0b0074f1025152c62bf5c04178367f079bfa2becd1139277b1c2d72aa753b6db4feb55ed6e3a5fbb4dfe17849bd
+EBUILD haproxy-2.5.9999.ebuild 5582 BLAKE2B 7f5c9705cd71bca09e332e8766d8d50d0c83dfb0d8ced0d800dda204faae70c67ffee0b6578e043509d6d000384dbb846b84767e4215b9ad528bcf695506674f SHA512 d6f2ff4d868bd61fb82a0925c07b39b81e6548c00a5698eb640533e206787a06c6bd7d7df15c83c2c566dce1e55a6e06d8922baa2beba3539e6ce8d360b4ff2b
+EBUILD haproxy-2.6.6.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
+EBUILD haproxy-2.6.7.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
+EBUILD haproxy-2.6.9999.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
+EBUILD haproxy-2.7.0.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
+EBUILD haproxy-2.7.9999.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
+EBUILD haproxy-9999.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
MISC metadata.xml 2063 BLAKE2B ddd51cff72847b617a457ac2baee4dd18a90a6a23e0982bc932ab8d3d101312dc2265884d38fcdc1a1cbb3d982b078e5b03a3c13fce07568d9d477688d210b09 SHA512 2198d3735f32f9c22787b1b43fd59bd6a0018ae25e104ee34ce0f27682ad8d6405a37c1c890b5eb41deabe5a5011d07d379e5df780bd8ab2877bd435bb875a1e
diff --git a/net-proxy/haproxy/haproxy-2.2.17.ebuild b/net-proxy/haproxy/haproxy-2.2.17.ebuild
deleted file mode 100644
index 6009c169081c..000000000000
--- a/net-proxy/haproxy/haproxy-2.2.17.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm ppc x86"
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- pcre2-jit? ( pcre2 )
- pcre? ( !pcre2 )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- pcre2? (
- dev-libs/libpcre2:=
- pcre2-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- slz? ( dev-libs/libslz:= )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE) )
- args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use pcre2 PCRE2) )
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- if use prometheus-exporter; then
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
- emake -C contrib/systemd SBINDIR=/usr/sbin
-
- if use tools ; then
- for contrib in ${CONTRIBS[@]} ; do
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym ../sbin/haproxy /usr/bin/haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit contrib/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.2.21.ebuild b/net-proxy/haproxy/haproxy-2.2.21.ebuild
deleted file mode 100644
index 75cceb7c91f7..000000000000
--- a/net-proxy/haproxy/haproxy-2.2.21.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~ppc x86"
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- pcre2-jit? ( pcre2 )
- pcre? ( !pcre2 )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- pcre2? (
- dev-libs/libpcre2:=
- pcre2-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- slz? ( dev-libs/libslz:= )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE) )
- args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use pcre2 PCRE2) )
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- if use prometheus-exporter; then
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
- emake -C contrib/systemd SBINDIR=/usr/sbin
-
- if use tools ; then
- for contrib in ${CONTRIBS[@]} ; do
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym ../sbin/haproxy /usr/bin/haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit contrib/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.2.24.ebuild b/net-proxy/haproxy/haproxy-2.2.24.ebuild
deleted file mode 100644
index 4ec0188ead43..000000000000
--- a/net-proxy/haproxy/haproxy-2.2.24.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
- EGIT_BRANCH=master
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre2:=
- pcre-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- slz? ( dev-libs/libslz:= )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- # Switching to PCRE2 by default, bug 838013
- PCRE=
- PCRE_JIT=
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE2) )
- args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- if use prometheus-exporter; then
- EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
- emake -C contrib/systemd SBINDIR=/usr/sbin
-
- if use tools ; then
- for contrib in ${CONTRIBS[@]} ; do
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym ../sbin/haproxy /usr/bin/haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit contrib/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
- has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
- has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
- has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
- has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
- has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
- has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index c3fd5e9e2c2b..2bf20bf3ac64 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -108,14 +108,16 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
emake -C contrib/systemd SBINDIR=/usr/sbin
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
# Those two includes are a workaround for hpack Makefile missing those
emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
done
fi
}
diff --git a/net-proxy/haproxy/haproxy-2.4.14.ebuild b/net-proxy/haproxy/haproxy-2.4.14.ebuild
deleted file mode 100644
index 72d321d72102..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.14.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- pcre2-jit? ( pcre2 )
- pcre? ( !pcre2 )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- pcre2? (
- dev-libs/libpcre2:=
- pcre2-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE) )
- args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use pcre2 PCRE2) )
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym ../sbin/haproxy /usr/bin/haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.4.17.ebuild b/net-proxy/haproxy/haproxy-2.4.17.ebuild
deleted file mode 100644
index 24d2e8eda754..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.17.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
- EGIT_BRANCH=master
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre2:=
- pcre-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-lua54.patch
-)
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- # Switching to PCRE2 by default, bug 838013
- PCRE=
- PCRE_JIT=
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE2) )
- args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym ../sbin/haproxy /usr/bin/haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.4.19.ebuild b/net-proxy/haproxy/haproxy-2.4.19.ebuild
index 4d418328ed38..ab90e472bdf0 100644
--- a/net-proxy/haproxy/haproxy-2.4.19.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.19.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 4d418328ed38..ab90e472bdf0 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.5.10.ebuild b/net-proxy/haproxy/haproxy-2.5.10.ebuild
index bc614b04caba..0ad63d10f264 100644
--- a/net-proxy/haproxy/haproxy-2.5.10.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.10.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.5.4.ebuild b/net-proxy/haproxy/haproxy-2.5.4.ebuild
deleted file mode 100644
index 72d321d72102..000000000000
--- a/net-proxy/haproxy/haproxy-2.5.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- pcre2-jit? ( pcre2 )
- pcre? ( !pcre2 )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- pcre2? (
- dev-libs/libpcre2:=
- pcre2-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE) )
- args+=( $(haproxy_use pcre-jit PCRE_JIT) )
- args+=( $(haproxy_use pcre2 PCRE2) )
- args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym ../sbin/haproxy /usr/bin/haproxy
-
- newconfd "${FILESDIR}/${PN}.confd" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.5.9.ebuild b/net-proxy/haproxy/haproxy-2.5.9.ebuild
deleted file mode 100644
index bc614b04caba..000000000000
--- a/net-proxy/haproxy/haproxy-2.5.9.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
- EGIT_BRANCH=master
-else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
- EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre2:=
- pcre-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- # Switching to PCRE2 by default, bug 838013
- PCRE=
- PCRE_JIT=
- )
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE2) )
- args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
- args+=( $(haproxy_use ssl OPENSSL) )
- args+=( $(haproxy_use slz SLZ) )
- args+=( $(haproxy_use zlib ZLIB) )
- args+=( $(haproxy_use lua LUA) )
- args+=( $(haproxy_use 51degrees 51DEGREES) )
- args+=( $(haproxy_use wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc ROADMAP doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${EROOT}/usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index bc614b04caba..5876aa5e5014 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-3 lua5-3 )
[[ ${PV} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs lua-single systemd linux-info ${SCM}
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.6.6.ebuild b/net-proxy/haproxy/haproxy-2.6.6.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.6.6.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.6.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.6.7.ebuild b/net-proxy/haproxy/haproxy-2.6.7.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.6.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.7.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.7.0.ebuild b/net-proxy/haproxy/haproxy-2.7.0.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.7.0.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.0.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-2.7.9999.ebuild b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-2.7.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.9999.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index f96d1cb3df1e..fd42fd4cb085 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -97,19 +97,27 @@ src_compile() {
fi
# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" \
+ TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
+ emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
+ SBINDIR=/usr/sbin
if use tools ; then
for extra in ${EXTRAS[@]} ; do
if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+ emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
+ EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
+ PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
else
# Those two includes are a workaround for hpack Makefile missing those
emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ CC="$(tc-getCC)" ${args[@]}
fi
done
fi
@@ -140,7 +148,10 @@ src_install() {
if use tools ; then
has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
+ has admin/iprange "${EXTRAS[@]}" && {
+ newbin admin/iprange/iprange haproxy_iprange
+ newbin admin/iprange/ip6range haproxy_ip6range
+ }
has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
has dev/hpack "${EXTRAS[@]}" && {
newbin dev/hpack/gen-rht haproxy_gen-rht
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 154c07d8e1a9..dfd36cafae2f 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
Binary files differ
diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index 87727ec027e0..c7ce02b6e153 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,3 +1,3 @@
DIST NetworkManager-strongswan-1.6.0.tar.bz2 302787 BLAKE2B 2c54f9f13ab61d4a265dd6639cba93089a211f0b75cb976f638a4f5a6565b1386b273a9e80fca90c6581706592e3c396790143e910d2ecac574380eed278b325 SHA512 ecfae6c100f9344d07a9d67f01894edbd509178698ad3bce6f8c1ccdd53e08baca4e95c10f7f72991b163042f9cc19d876bcf71ab8b2efb10a25c5e00fe03572
-EBUILD networkmanager-strongswan-1.6.0.ebuild 1024 BLAKE2B 8b6e5f15eda4c4e6b2cb863d476e3756df0cb7c22621fc5d5e78828610cb34e62dede83e446191f774caf14677387ee6115e083902fdf8ec1907a5e6fded8f48 SHA512 10dc8090e47e52007d796a1e5403a4de0970f66a02fe8dac89440491491bbdc82bb450188fb8817d5b41cd8297ec476eee712092abda9901791c5f335420f2f0
+EBUILD networkmanager-strongswan-1.6.0.ebuild 1026 BLAKE2B 4a40958cf4b335cb50516bb58279aa6bf7384238afc2396eeb686a470f300958d550e188241258f460d56e5ea088a812af72223b2603a48dab7080625e6e7197 SHA512 651ddf0efc2828582a0ea46820683bcf1c0939c7976d26140f31c3c8d61b6cda5a3db48a9d779fd8c2380d985ca6a343636cd54d0ffa81d520de0d8194cf8fd7
MISC metadata.xml 319 BLAKE2B 059375d01a100a58269896ad39d73294d0b4444ad72c33df15bdf0b6758071137a8575111f1f0af3b23e031487d44bf1aa40feb3c9f2a42fb91e50dd0b4bc1eb SHA512 c4b162f808c01eb0182d63fb473eabd461eca665036b47f65d14cf2f05b0e37c8c32a6a4934d3e28e4cf6a2766eb134786152c1cf21814102bb0bbba63ad9320
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
index 86e540e050db..72f1817ebf23 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
inherit autotools
MY_PN="NetworkManager"
-MY_P="${P/networkmanager/${MY_PN}}"
+MY_P="${P/networkmanager/"${MY_PN}"}"
DESCRIPTION="NetworkManager StrongSwan plugin"
HOMEPAGE="https://www.strongswan.org/"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 48324a953aa4..a5d49e953077 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/arch/loong/package.use.mask b/profiles/arch/loong/package.use.mask
index 4315895f0fb1..4bf77e1060c7 100644
--- a/profiles/arch/loong/package.use.mask
+++ b/profiles/arch/loong/package.use.mask
@@ -173,7 +173,6 @@ net-libs/libssh mbedtls
# WANG Xuerui <xen0n@gentoo.org> (2022-04-24)
# Unmask experimental-loong on packages; we're loong.
dev-libs/libffi -experimental-loong
-sys-kernel/linux-headers -experimental-loong
sys-libs/glibc -experimental-loong
sys-libs/libseccomp -experimental-loong
diff --git a/profiles/package.mask b/profiles/package.mask
index aeadd74ac7ea..e3e6960242a3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
#--- END OF EXAMPLES ---
+# Sam James <sam@gentoo.org> (2022-12-06)
+# Broke C++ reverse dependencies. Please upgrade to 1.1.0-r1. See bug #884369.
+=x11-libs/libICE-1.1.0
+
# Hans de Graaff <graaff@gentoo.org> (2022-12-05)
# ruby27-only package. No longer maintained upstream. Last release in 2017.
# No reverse dependencies. Removal in 30 days.
diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
index 6cc70f2fb18a..5ccad25049d5 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-11-09)
# Older GMP releases have a bug in their arm64 Darwin ASM
# 6.2.2 isn't released but this will catch any releases we know are broken
# like 6.2.1, and it's already fixed in git upstream.
-<dev-libs/gmp-6.2.2 asm
+<dev-libs/gmp-6.2.2 asm cpudetection
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index eec4afcd6e18..a5174aec5871 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -1,4 +1,4 @@
-apache https://dlcdn.apache.org/ https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
+apache https://dlcdn.apache.org/ https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.mirrors.hoobly.com/ https://apache.osuosl.org/
cpan https://cpan.metacpan.org https://www.cpan.org
cran https://cran.r-project.org https://cran.us.r-project.org
debian https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a36b989489d7..8fe2b99156da 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2236,9 +2236,9 @@ dev-lua/lua-cjson:internal-fpconv - Enable internal number conversion routines,
dev-ml/dose3:parmap - Adds multi-core CPU support via dev-ml/parmap.
dev-ml/dose3:rpm4 - Adds support for handling rpm4 files.
dev-ml/dose3:zip - Adds support for handling zip files.
-dev-ml/lablgtk:glade - Enable libglade bindings compilation.
-dev-ml/lablgtk:gnomecanvas - Enable libgnomecanvas bindings compilation.
-dev-ml/lablgtk:sourceview - Enable GtkSourceView support
+dev-ml/lablgtk:glade - Enable gnome-base/libglade bindings compilation
+dev-ml/lablgtk:gnomecanvas - Enable gnome-base/libgnomecanvas bindings compilation
+dev-ml/lablgtk:sourceview - Enable GtkSourceView (x11-libs/gtksourceview) support
dev-ml/logs:cli - Enables the Logs_cli library that provides command line support for controlling Logs.
dev-ml/logs:fmt - Enables the Logs_fmt reporter.
dev-ml/logs:lwt - Enables the Logs_lwt library that provides Lwt logging functions.
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 56271d9c250a..a5156bdedd26 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
Binary files differ
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index b5c2d096a7b5..8b8dc4e529d4 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,7 +1,9 @@
DIST openpgp-keys-apache-tomcat-10.1.2-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
DIST openpgp-keys-apache-tomcat-8.5.84-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
DIST openpgp-keys-apache-tomcat-9.0.69-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.70-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
EBUILD openpgp-keys-apache-tomcat-10.1.2.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
EBUILD openpgp-keys-apache-tomcat-8.5.84.ebuild 566 BLAKE2B 05520c673ab0d06119f610501dfa55aa74c13a13bc7400c03e92e645f3470bf3034ecafd693e332b3d6e0f129f76f74c4f49e0446fa4e5bfbe84107ab9d5a31a SHA512 8b7ce48b7020f5aca73e9bfe7decea27d9a60fb6e9eb63b41c80acc49ee1befc6f635cdb1d50f26739f9fc11dda298d43606947e234f1058e4274ddb75942509
EBUILD openpgp-keys-apache-tomcat-9.0.69.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
+EBUILD openpgp-keys-apache-tomcat-9.0.70.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.70.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.70.ebuild
new file mode 100644
index 000000000000..14300fd78599
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.70.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}"
+
+src_install() {
+ local files=( ${A} )
+ insinto /usr/share/openpgp-keys
+ newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ea9d43b71cde..5ba088422775 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
Binary files differ
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 4d01078f8421..c15c355ba9df 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,9 @@
-DIST vivaldi-snapshot_5.6.2865.3-1_amd64.deb 101232472 BLAKE2B 7c23dda06e4f799c6adfd599fde56a86dc9dd13b8a54884bf63d363f624642e1282379add8c5116abb90c510895909e51b1c815e3c6de887dcc32d9c7a66c357 SHA512 0a5bfb3abae0e23b337b6d146922ab40d2c790f1e6877420c43edf8fb132d26d5a351e08cf22bc46be91db79cf3c53a644febe5ec3ebdf5f417abf2021c51d97
-DIST vivaldi-snapshot_5.6.2865.3-1_arm64.deb 90873684 BLAKE2B e2d6a8db2accd5c322f643b78c329f1db5c586f02401fc365cdc8898856a48245f92a41f82e95def4f4c7959418d2ea806b92514078420ce2bcf29b9ac8eb305 SHA512 e0fce932c50b8a91efbc9b1417375eec1dbbe8acbf97e80c1fb297e6ef5d9491175abd31f9749c1df2700ee5ec958c2f7f65ebde4f4710dcb15d78d6633e43ec
-DIST vivaldi-snapshot_5.6.2865.3-1_armhf.deb 90168840 BLAKE2B 0c18d86cd28b18bae909004b3367b38a8b7a5749b8492d8a60b18cc518f45248b9ccdc5f101991e289c8caeb0bc3d60e2d586b48d33818df49cae707fce65445 SHA512 759f6a7333a5e0285a68340c4b7d67897f9e83ac1d7051965e5516bf776c5e5410852e062a8097c936362b45fa803aa3c55383db3b62cc59c6ae27a5345c75d5
DIST vivaldi-snapshot_5.6.2867.22-1_amd64.deb 101273840 BLAKE2B 9c23116d2fd76131718191e8e589ddf9593705bd2d18dab0e3d92e6058e2d38fbdd44fbbd5e76baf692adf9941cb30a08406c82e6e5eda8f265fa0c6872bd55c SHA512 1c4b689e33522ce7b1f7718b5ac4fba7c2dd4282cbb01d48c8efcfd40f400d85ff1f67f7609bec32be8780b5e7b0b16ea0b410ae03962d4323e2e7ae62467930
DIST vivaldi-snapshot_5.6.2867.22-1_arm64.deb 90938988 BLAKE2B 4b04f9e60f2e0ec74f1b800b05bef0d9291fa0a2d96a4e7f58e337c3be2e44d31d49ce866eeb8866e795ad2ed94ea75990d82ff3a10c136d627fd01327083295 SHA512 f1c3110f82f5a2967c14425bc95e292534f76eb5e0f454f43b6074873f7bb903db5644e6e5595d089ac836d11c5e22d1f93da2ebfa2cb6edc33a0fcb52c38f2e
DIST vivaldi-snapshot_5.6.2867.22-1_armhf.deb 91068076 BLAKE2B a918c874860f433dc7ea35f62320463b0c43de4c19ff7e559abfa99bd8ff3930f7e825f43cf3b9448928cfe0f95579582035c8d4a58905b0b3458dfa862aea5c SHA512 c7595754e2d33024f0d03d03f48d7d2ba14014ea72446ae71f5670933b387a0dcda1aa6ead50fa686aeb6a9bb8c01f4e0bab12f50776718042db43371ad5e8ed
-EBUILD vivaldi-snapshot-5.6.2865.3.ebuild 3681 BLAKE2B 864672e8b7188386f0faf79ce65a5dd6ecbd3eae18cd9ea8a2c02f328e08449217d96f69b0932bb2f25f19e17bbd4235aae4570a28b870a9965f7371cfb7d361 SHA512 71d94fe5e32d643ef42ec1f0b6d2cd440825338f14b9bc4e222b4464f98b8d01cbc48da90bbed428d2f12137f6dc5fc82bd2d0e3b680b7c99fb7a757c5e2aa25
+DIST vivaldi-snapshot_5.6.2867.29-1_amd64.deb 101318868 BLAKE2B 497f737007aa6f1eed519ddba6467da4987f28bfdec0319ca1c924c905269208353e9836b4ce0a6e3a0ca8776b28d367bb0e6df150230d53771d8eb5504710be SHA512 85fdeb29c5143e4d86c9a6d2725bb567647251550a89179ff3d911f6ba538ae0b3a81fa6198e30f19787b5fb52bed2e524e587ab32ca67223094e750c5a034e6
+DIST vivaldi-snapshot_5.6.2867.29-1_arm64.deb 90932908 BLAKE2B bd81ef65b633269fbb97fd740af4df90d7a356cb199c0d06b25e8aededc9b33791c2cb68cd356b76e40ad77cdcd62963c751a94307411fc804fac2e0fa22d6e4 SHA512 e39947441af79188b15e97353963b49cf1da7fc87afc24b0f183cc4f695be8a08bdbe576156eb474a912f6ae79558922385a0765e043e2a5c7ff1f6c931a1dfb
+DIST vivaldi-snapshot_5.6.2867.29-1_armhf.deb 91071132 BLAKE2B daf29e86d578d63634c6e062fe39f39869a690d9a39400b52527ed70fb70ada083894a78a50eeae4d9f057ff1457a70dd2dbf856fb982bfefcfa86c92ba349f1 SHA512 79d833b9a85f4a7e748d80f28e99c3e342b29c5979aed55c2a5b851e9376908e3d0c2292b9949699a7a1fe2c8ac90086e1e6ba7da82140630ef63c188b12a444
EBUILD vivaldi-snapshot-5.6.2867.22.ebuild 3681 BLAKE2B 864672e8b7188386f0faf79ce65a5dd6ecbd3eae18cd9ea8a2c02f328e08449217d96f69b0932bb2f25f19e17bbd4235aae4570a28b870a9965f7371cfb7d361 SHA512 71d94fe5e32d643ef42ec1f0b6d2cd440825338f14b9bc4e222b4464f98b8d01cbc48da90bbed428d2f12137f6dc5fc82bd2d0e3b680b7c99fb7a757c5e2aa25
+EBUILD vivaldi-snapshot-5.6.2867.29.ebuild 3681 BLAKE2B 864672e8b7188386f0faf79ce65a5dd6ecbd3eae18cd9ea8a2c02f328e08449217d96f69b0932bb2f25f19e17bbd4235aae4570a28b870a9965f7371cfb7d361 SHA512 71d94fe5e32d643ef42ec1f0b6d2cd440825338f14b9bc4e222b4464f98b8d01cbc48da90bbed428d2f12137f6dc5fc82bd2d0e3b680b7c99fb7a757c5e2aa25
MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2865.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2867.29.ebuild
index 82e87d9746ea..82e87d9746ea 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2865.3.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.6.2867.29.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e75977a9a642..2d5a90159644 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
Binary files differ
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 134ac14dabd7..5a3344ff3534 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -18,6 +18,8 @@ DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807
DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
+DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
+DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
EBUILD tomcat-10.0.27.ebuild 6470 BLAKE2B 14ca531ac0064810e68fe873a176d0a2fd64e411c2ff06f5c7195d8b6b80a61698fbf4c2bfd1bb5ff1f92784f2ddd89eb55f88eb40dbd33b2dd188e71c518c31 SHA512 08f574e72d42b649335dbf06d392d98e0070cc32776cbb5bd92c4449c0d62dc8db0d9f57fd485aa994a1ceacaf10fb5e136c4e9ff06e753a19ce93ac2a0b0213
@@ -27,4 +29,5 @@ EBUILD tomcat-8.5.83.ebuild 5137 BLAKE2B c0bb842eb6e512c6c9d80bc9d923ebeceaeec10
EBUILD tomcat-8.5.84.ebuild 5434 BLAKE2B 95a1bd6917983a7b165c5eb5cdebd8c33a7cddbaa67e4d572a346f865ff9c23f283d4c2499a72a460224df44215215b42265b31e41008b6d8e43860bb9fa1389 SHA512 464d8ad88c8eae91ed99e636106c3f30fb01e30120dd24f25f2e31e43f540420b9bd0e5bb4220a41bfff0f35ae2c21b1789636e338eab4a364d1a25435a8d5d3
EBUILD tomcat-9.0.68.ebuild 6034 BLAKE2B 0be969bd2004cfff3eef0b9b93e9d05a75e18af5458c9c3a13c88b16924b37580ed0450f491733096412262907d9b85d6a9751b1fed5278a06f32c76d98dadd0 SHA512 ed582425adb690fd5eb4c5df39b29c58cbf4219ff688c3154df368889218b8799efc145c871ebb3b1bf61199a67db24918b38ea86d2b63386ef230e2fa9437c1
EBUILD tomcat-9.0.69.ebuild 6425 BLAKE2B bbc5902443576230cefde4bd47d11bef3b1bf75c7ff9cb9f6151f321bc09ff3b954083152dcb2d4e53ca2d4b3e3e5ae4b3d67d93a8267ebfd65ee2261b490bd2 SHA512 5249e462b7ee53a2438bfe8bbc82d52aa078cda5944e1ffdaba2eb1c7f034310a63b5f093d6ab211690a71c4cadc0f90c29170355ab7c174c79692ad62a508db
+EBUILD tomcat-9.0.70.ebuild 6425 BLAKE2B bbc5902443576230cefde4bd47d11bef3b1bf75c7ff9cb9f6151f321bc09ff3b954083152dcb2d4e53ca2d4b3e3e5ae4b3d67d93a8267ebfd65ee2261b490bd2 SHA512 5249e462b7ee53a2438bfe8bbc82d52aa078cda5944e1ffdaba2eb1c7f034310a63b5f093d6ab211690a71c4cadc0f90c29170355ab7c174c79692ad62a508db
MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-9.0.70.ebuild b/www-servers/tomcat/tomcat-9.0.70.ebuild
new file mode 100644
index 000000000000..6a59dd70b4ee
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.70.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+ https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+ verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+SERVLET_API_SLOT="4.0"
+JSP_API_SLOT="2.3"
+EL_API_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/glassfish-xmlrpc-api:0
+ ~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+ ~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+ ~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+ dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
+ >=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=dev-java/ant-core-1.9.13
+ >=virtual/jdk-1.8:*
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+ fi
+
+ unpack ${MY_P}.tar.gz
+
+ mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+ ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+ ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+ default
+
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled servlet-api
+ rm -rv java/javax/{el,servlet} || die
+
+ eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+
+ java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+ java-ant-2_src_configure
+
+ eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+ LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+ einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+ einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 7deb6cabe28d..622c656f5761 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index dd923a87a6a9..43667169b44c 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -3,5 +3,4 @@ DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33c
DIST libICE-1.1.0.tar.xz 335864 BLAKE2B c18ae08d61632d6a495b479045cafadaabb556fc55d5107b8b6c323cc7523a153d083a89016e2a84aa810735c542ba7bac7fa70620036b74125f65bdf920c40d SHA512 bf8ca11a20bc120337003a8ef1c190e26e3650dede653287aae7893abd8c72191401d90ddc4bb9b367ae832eee23a22d02b0d4a3b9071c392f865379034b2838
EBUILD libICE-1.0.10-r1.ebuild 705 BLAKE2B ec84151d3792e185d97aee46735e9702f5396623b1ecb184b6efd125f534e2420686570e7e7153f1f52cebd90f45ee7551b749107ca5f9980995d6f9fe3d5d37 SHA512 5400d1d21ac457b08b33c0b78104fe2e1d4563465803853c119b412c33b7dabd8010f68a2f30ea2e0b532e8a82f8472bbad9cd7d0164d9e89fe37b5c44da11d0
EBUILD libICE-1.1.0-r1.ebuild 763 BLAKE2B 4ec6b574097f36a405fb26f8374a8243b880ef9a5e89a9286ba0701ff73f3573c447ce5f97585adbd8bbe307ab7888ccccab8ab54d34331ab21ef046de28c1c5 SHA512 8c3aa394e54351b8e8cf5e0abdb7c78f5f252eee44948026b1b8fcf47d5e530b5c2691f5143974403f50e65371e40d3b3e46aa1574c4f54bfd624d121f7a66c6
-EBUILD libICE-1.1.0.ebuild 699 BLAKE2B 8a4aed4393d107ba69e7d7b23a81999e9176acc168aa283133454bbedb6fb841df39241649aff8197e2e29877b8331c644a4500221ade297ff55e1872937503e SHA512 2362caae0fde4fcd8ebb5696cd7ec44da8122282bd165b0d8dd49c49870bc082be4f9643d916ed4b8b15c27b118ec0b890264db76aa0df6a83f0f8f77ec1479c
MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/libICE-1.1.0.ebuild b/x11-libs/libICE/libICE-1.1.0.ebuild
deleted file mode 100644
index 4166e1d11bec..000000000000
--- a/x11-libs/libICE/libICE-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_MULTILIB=yes
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org Inter-Client Exchange library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-DEPEND="x11-base/xorg-proto
- x11-libs/xtrans"
-RDEPEND="${DEPEND}
- elibc_glibc? (
- || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] )
- )
-"
-
-XORG_CONFIGURE_OPTIONS=(
- --enable-ipv6
- --disable-docs
- --disable-specs
- --without-fop
-)
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index fe1f1fdb28ed..23ec8952c99d 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
Binary files differ
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index 2fc7e0c39b76..e702ff1a86bf 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,3 +1,5 @@
+AUX notify-osd-0.9.34-fix-integer-conversion.patch 782 BLAKE2B a0af1547a98444ca7a8cc5fb1078c3c9a72a238c1e44d7ad232b7d17adbc8106d3ac375425e5bc34a55f35df3a67eb61dc20ee7fb2bdb2730dff5d42b9439fba SHA512 f31fc04921ff7dbefe77cd93fcc3819f17d44c7235934cb9ef57340e83e3d332449edcf7bcb6923a4956b5b32cec00df1ee5760261ea2579975a3d333def77bc
DIST notify-osd-0.9.34.tar.gz 635387 BLAKE2B 469369f9fde562c605c131608b56eb54ea2a5f3d16f530e5b383d04fd8de2fbd531b58ed43caceeaeef65840cb00917484c02f8af0d7a0fc464ab131c1193853 SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1
EBUILD notify-osd-0.9.34-r1.ebuild 1503 BLAKE2B b59b0bd60fcb8c299121cbd5feaff737bc7c610082c5ad6fea5e883bb1160a18f265b11282d611bc244aab61644bb06691df4200944b9a649e3b53e63a09360c SHA512 cd212fdeef62bf4c45a24bc895d5512437a13649aa92930fc16746d71acd0961a30b02017c16e58d491d427c62d7fd33b20277b5216113ec9b0ecc9a30160795
+EBUILD notify-osd-0.9.34-r2.ebuild 1600 BLAKE2B 2a5a6061320eba92aa3b3452b31d564de32a9c1d9b30c8a005c4ef1e28fc69026f29c354b707b574c6646a44e0258cff1c4e38d58cede654a2c38266b146497c SHA512 37dcfc6b18f40687894b4c3b332406e46e2b2d964b69df2a7b3499acf330c46d36e9b955dc01f217b156a57d2b94d2c7026fe06087f2c10675a1f0ff8b3235a7
MISC metadata.xml 251 BLAKE2B 7d2eba6fb2a179ee3d8de8ba1d8397cca76a8ddd87831b352e113013175917395d8509d08718420dd59827f593f5befd91e14291ec213baf9b8fd5816c08f358 SHA512 2d5b955fb57b228912a83143faf54bd2be9dc93cdfaa20955777e8cb28da6cd2acb36c9b69f60132b4f229d213b600e76285768e895b1b20098fc1bbc52eade8
diff --git a/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch b/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch
new file mode 100644
index 000000000000..3dffeebf497b
--- /dev/null
+++ b/x11-misc/notify-osd/files/notify-osd-0.9.34-fix-integer-conversion.patch
@@ -0,0 +1,24 @@
+Clang16 will not allow implicit pointer to integer
+conversions by default. (-Werror=int-conversion by default)
+This patch fixes the pointer to integer conversion.
+
+Bug: https://bugs.gentoo.org/879035
+Patch is upstreamed here: https://answers.launchpad.net/notify-osd/+question/704024
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/src/bubble-window.c
++++ b/src/bubble-window.c
+@@ -78,8 +78,8 @@ bubble_window_get_accessible (GtkWidget *widget)
+ {
+ AtkObjectFactory *factory = NULL;
+ AtkRegistry *registry = NULL;
+- GType derived_type = NULL;
+- GType derived_atk_type = NULL;
++ GType derived_type = 0;
++ GType derived_atk_type = 0;
+
+ /*
+ * Figure out whether accessibility is enabled by looking at the
+--
+2.38.1
+
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild
new file mode 100644
index 000000000000..37513942a8c4
--- /dev/null
+++ b/x11-misc/notify-osd/notify-osd-0.9.34-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools gnome2-utils savedconfig
+
+DESCRIPTION="Canonical's on-screen-display notification agent"
+HOMEPAGE="https://launchpad.net/notify-osd"
+SRC_URI="https://launchpad.net/${PN}/precise/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="
+ gnome-base/gsettings-desktop-schemas
+ !minimal? ( x11-themes/notify-osd-icons )
+"
+DEPEND="
+ dev-util/glib-utils
+ gnome-base/gnome-common
+ x11-base/xorg-proto
+ virtual/pkgconfig
+ >=dev-libs/dbus-glib-0.98
+ >=dev-libs/glib-2.16:2
+ >=x11-libs/gtk+-3.2:3
+ >=x11-libs/libnotify-0.7
+ >=x11-libs/libwnck-3:3
+ x11-libs/libX11
+ x11-libs/pixman
+ !x11-misc/notification-daemon
+ !x11-misc/qtnotifydaemon
+"
+
+RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
+
+# Patch is upstreamed here: https://answers.launchpad.net/notify-osd/+question/704024
+PATCHES=( "${FILESDIR}/${P}-fix-integer-conversion.patch" )
+
+src_prepare() {
+ default
+ sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+ restore_config src/{bubble,defaults,dnd}.c #428134
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf --libexecdir="/usr/$(get_libdir)/${PN}"
+}
+
+src_install() {
+ default
+ save_config src/{bubble,defaults,dnd}.c
+ rm -f "${ED}"/usr/share/${PN}/icons/*/*/*/README
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ gnome2_schemas_update
+}