gentoo auto-resync : 07:03:2023 - 17:57:54

11 files changed, 27 insertions, 117 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a92dbb75ff89..1b88c413d43e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 0f5cd1c883a0..7f2fe4ee9e32 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,3 @@
 DIST lib_users-0.15.tar.gz 25899 BLAKE2B e54dfe20cf5e3e3da3bddcf044cda36a5d51dec9baa808202d81ed0ef8a8b434b3c6f31a279b544308a32e6ebf91008ac2db49278da7624a6037ffdf1db309b6 SHA512 f9eab0d7c634602c496154dc20bd8374842df77c6abfaf69a0c34013f01c3a7541a006cb2b027539f6c088a55bea78682bf156723899d614f39ee48773fb9ea8
-EBUILD lib_users-0.15.ebuild 1066 BLAKE2B 5b7349728077c04747266652e9dd7baeac3c497a8193f4eede9c7e2fb4ede2a7334b0c9a7fc919d3ce61c94a5c7cb20ed329b455e605ccb553e99f399ed7a1bc SHA512 17f5a3669b698c7837a6fee4f5fb37ebc2fc0c74558060767c84fc9cec2cdb4b8dc8c199ea9de4476c8dc423c559d260c8dffdd8e2260de833fed8e92965e07f
+EBUILD lib_users-0.15.ebuild 1066 BLAKE2B f458b98a2b2b8c3d96d7572ff9353118b0520cc2319a5172d43aca04b5308bdfcd71a0e93c15d74932b90805e27e1f02911fb134801654153c0fa84a61addcee SHA512 5172c79024c9cd0bb91d2707f93ce4e5c3f37b873146d8edfc6ea4998cb2ee19860d565a499a717d85089c8d6f74d9ca509556156d18838fe627fcf51489e2b0
 MISC metadata.xml 344 BLAKE2B b11cff8e0077d50cf43e98a4c0502afec9c3c966f83513f392b97c1009fdaecbd73cb58ee8851e993e8e751f75f10adad6db97bf305d4f47afc016bb4b30f8d9 SHA512 ed9a5449f5efc28cdc6a615c889e2a312841db90524d3e12899c10824896f82535cc5c302b26525ed523f7e90cdf133edda0e3ee77f32563f3bfaad7b997301a
diff --git a/app-admin/lib_users/lib_users-0.15.ebuild b/app-admin/lib_users/lib_users-0.15.ebuild
index 2db99ae0a684..9f2529d2f966 100644
--- a/app-admin/lib_users/lib_users-0.15.ebuild
+++ b/app-admin/lib_users/lib_users-0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-r1
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4a3075c1bf68..9c8a13bb4680 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,5 +1,3 @@
-AUX sudo-1.9.13-gcc-13.patch 3385 BLAKE2B def19ddf47ad8ecbefc22c3637d8a9982fc59a09d120c319d03b0e8e3f33170d2c161c6398d2443266c2bad1cb3fd7f802505694388f8281dffad4abfff23420 SHA512 2bdd23fd20b58fa993e752221b92ea58f65c3a484059b30c672b79d5bc9310bb8e52abaf2f7bd6781daadfa9a2c59bda8dfaef793e855403253be463b8a6a43f
-AUX sudo-1.9.13-missing-bracket-as-if.patch 1073 BLAKE2B e5428dcfd8fa749fdae941ad997b23346fbd7e8f4dac36567fa7cdcdbc5e3233e774752d985c0f7b22c25a3a651af76f5d669eb05ac67b76d79772b448d4a4d6 SHA512 17fb75cdcb4fc0acab07fe5f6e4e4804b0416139309eacc84ce76587e18e73d5195ea5da2215b0d37832f796968bca37ef5d1faf8f9cc0300736c2569096b236
 DIST sudo-1.9.12p2.tar.gz 4909431 BLAKE2B 79eac710b757acae7aa98e6e6f495a475e5236be456e4687fb1441345ee296672ff80a5a60902cffcd257aa81a01fbc3857f3c52e51bb46f56c060fd299e0c05 SHA512 5e035246137d5820691f7ddfc13faec3886e3cf1563ed56633667d86ab4f1306f34cc0e27808f56790b6c6a4614826e54c5b7e47b31eb009b96dde3e52170c45
 DIST sudo-1.9.12p2.tar.gz.sig 566 BLAKE2B fa679038c33d2bf1476b56944872d3a18b66bf5c5fb2e660d1f8777cdb209928912ddd8d89d878bd2218df3acd1e7fee5aa850e8d01a1cfac6ab310c788149fa SHA512 0b2f10488c44bfcd94eed97002865d89f4a03a92ef3b890fac3121ef0f9e6c55387771ddead1a94dc92d85c35e3d28b4730f35cdc2aafb51128594555ea29876
 DIST sudo-1.9.13p3.tar.gz 5100355 BLAKE2B 46218ecf4cf06d2280ccf4c257b12a6f697eda17b96a6b7aa56f6c7f22d847ec2a8036b9f615c3328d985656539c95f37a40c6c72dfa5f65786ab45a28cf353f SHA512 c0c5cd0c6308868afdad2ecf55b86fdcf1f49889b30831c9db3bc56a63dc3a07686c285c20b2500494b2a76653e2ec69196abdc583312609a5db1c81a6e4e737
diff --git a/app-admin/sudo/files/sudo-1.9.13-gcc-13.patch b/app-admin/sudo/files/sudo-1.9.13-gcc-13.patch
deleted file mode 100644
index 4ebdce7e9f67..000000000000
--- a/app-admin/sudo/files/sudo-1.9.13-gcc-13.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/sudo-project/sudo/issues/239
-https://github.com/sudo-project/sudo/pull/240
-
-From 20d1348354ddbfb1b1f95522f81d73ec00988358 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 15 Feb 2023 03:20:36 +0000
-Subject: [PATCH] sudo_fatal: Fix build where compiler recognises [[noreturn]]
- attribute (C23)
-
-If the compiler supports [[noreturn]] as a attribute as in C23,
-then we define sudo_noreturn to be it. When that's the case, we must place
-it at the beginning of the declaration, before any other *extension*
-attributes (__attribute(...)).
-
-sudo_dso_public is always an extension attribute, while sudo_noreturn only
-might be, so put it first.
-
-This only shows up with GCC 13 so far (see the linked GCC bug (notabug)
-for a bit more exploration). Clang 16 does support the attribute but doesn't let
-you sue it for earlier language versions (need to pass explicit -std=c2x,
-unlike with GCC here).
-
-This is essentially a followup to e707ffe58b3ccfe5c72f54c38eac1d7069d5021e.
-
-Tested with GCC 13.0.1 20230212 (unreleased), GCC 12.2.1 20230211,
-Clang 16.0.0_rc2, and Clang 15.0.7.
-
-Bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108796
-Closes: https://github.com/sudo-project/sudo/issues/239
-Fixes: e707ffe58b3ccfe5c72f54c38eac1d7069d5021e
-Fixes: 16ae61dcd7d3cd8bf6eb10a22fa742d4505da4e9
---- a/include/sudo_fatal.h
-+++ b/include/sudo_fatal.h
-@@ -171,12 +171,12 @@ sudo_dso_public int  sudo_fatal_callback_deregister_v1(sudo_fatal_callback_t fun
- sudo_dso_public int  sudo_fatal_callback_register_v1(sudo_fatal_callback_t func);
- sudo_dso_public char *sudo_warn_gettext_v1(const char *domainname, const char *msgid) sudo_attr_fmt_arg(2);
- sudo_dso_public void sudo_warn_set_locale_func_v1(sudo_warn_setlocale_t func);
--sudo_dso_public sudo_noreturn void sudo_fatal_nodebug_v1(const char *fmt, ...) sudo_printf0like(1, 2);
--sudo_dso_public sudo_noreturn void sudo_fatalx_nodebug_v1(const char *fmt, ...) sudo_printflike(1, 2);
--sudo_dso_public sudo_noreturn void sudo_gai_fatal_nodebug_v1(int errnum, const char *fmt, ...) sudo_printflike(2, 3);
--sudo_dso_public sudo_noreturn void sudo_vfatal_nodebug_v1(const char *fmt, va_list ap) sudo_printf0like(1, 0);
--sudo_dso_public sudo_noreturn void sudo_vfatalx_nodebug_v1(const char *fmt, va_list ap) sudo_printflike(1, 0);
--sudo_dso_public sudo_noreturn void sudo_gai_vfatal_nodebug_v1(int errnum, const char *fmt, va_list ap) sudo_printflike(2, 0);
-+sudo_noreturn sudo_dso_public void sudo_fatal_nodebug_v1(const char *fmt, ...) sudo_printf0like(1, 2);
-+sudo_noreturn sudo_dso_public void sudo_fatalx_nodebug_v1(const char *fmt, ...) sudo_printflike(1, 2);
-+sudo_noreturn sudo_dso_public void sudo_gai_fatal_nodebug_v1(int errnum, const char *fmt, ...) sudo_printflike(2, 3);
-+sudo_noreturn sudo_dso_public void sudo_vfatal_nodebug_v1(const char *fmt, va_list ap) sudo_printf0like(1, 0);
-+sudo_noreturn sudo_dso_public void sudo_vfatalx_nodebug_v1(const char *fmt, va_list ap) sudo_printflike(1, 0);
-+sudo_noreturn sudo_dso_public void sudo_gai_vfatal_nodebug_v1(int errnum, const char *fmt, va_list ap) sudo_printflike(2, 0);
- sudo_dso_public void sudo_warn_nodebug_v1(const char *fmt, ...) sudo_printf0like(1, 2);
- sudo_dso_public void sudo_warnx_nodebug_v1(const char *fmt, ...) sudo_printflike(1, 2);
- sudo_dso_public void sudo_gai_warn_nodebug_v1(int errnum, const char *fmt, ...) sudo_printflike(2, 3);
-
diff --git a/app-admin/sudo/files/sudo-1.9.13-missing-bracket-as-if.patch b/app-admin/sudo/files/sudo-1.9.13-missing-bracket-as-if.patch
deleted file mode 100644
index e341e93a99bc..000000000000
--- a/app-admin/sudo/files/sudo-1.9.13-missing-bracket-as-if.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/sudo-project/sudo/commit/defec5d46eec7345b62060049f72215ffd7f3e7e
-
-From defec5d46eec7345b62060049f72215ffd7f3e7e Mon Sep 17 00:00:00 2001
-From: "Todd C. Miller" <Todd.Miller@sudo.ws>
-Date: Tue, 14 Feb 2023 14:24:28 -0700
-Subject: [PATCH] Add missing '[' to AS_IF() call. Fixes GitHub issue #238.
-
---- a/configure
-+++ b/configure
-@@ -24525,7 +24525,8 @@ fi
- 
- if test X"$with_noexec" != X"no"
- then :
--  # Check for non-standard exec functions
-+
-+    # Check for non-standard exec functions
-     ac_fn_c_check_func "$LINENO" "exect" "ac_cv_func_exect"
- if test "x$ac_cv_func_exect" = xyes
- then :
-@@ -24564,7 +24565,7 @@ fi
- 
- 
- fi
--]
-+
- fi
- 
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
---- a/configure.ac
-+++ b/configure.ac
-@@ -3022,7 +3022,7 @@ AC_CHECK_FUNCS([setpassent setgroupent])
- dnl
- dnl Function checks for sudo_noexec
- dnl
--AS_IF([test X"$with_noexec" != X"no"],
-+AS_IF([test X"$with_noexec" != X"no"], [
-     # Check for non-standard exec functions
-     AC_CHECK_FUNCS([exect execvP execvpe])
-     # Check for posix_spawn, and posix_spawnp
-
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 68ded171d8a4..a94f39bbc4ab 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -1,4 +1,4 @@
 DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3f23d52971f6013165ce59a8f4b32ac6262c9719956d1bcdbe60797f07d77910b44a749ae545c4dc15f765525144709 SHA512 44294b276fd036908438cd984ebf70433639caa18d8330bab348433b4f39ea2c42c57fa8de4f0a6198f7875429a3ef9ebe61321c288d910f9be8b3414865f438
-EBUILD webapp-config-1.55-r2.ebuild 1675 BLAKE2B abfcb263604f1c9e44e0a257a670459dd1553b248a227ea471d9dbbeac98268d2669d23d23fc5106cb117bf077b76377ccca47be8c94b3bc556cc53b127c9ef8 SHA512 544a9d0234d8882e4b65d91e27422b6ba8b476e4951909778bfa29a384ead694ec6e8502e89429185ecbdcde74c620884babaf11aca8c83984b1babfaeb9ef26
-EBUILD webapp-config-9999.ebuild 1780 BLAKE2B edfcef7369b5cf66bb6efe9618028c4616e2b22dbf4d86427c47019b12696d2fdb75390acfa99adbf65e6d8490463f1704688372a5a44e0e9b6cee4cde10bcf9 SHA512 4aba8466f98061628e5c99a3d8e1e147626d4ef90bca1542b0a731d592d5732678ebc1d416e1565ba3b113aee6f1421c99fb4b4333fb9da333b3072751e72f16
+EBUILD webapp-config-1.55-r2.ebuild 1787 BLAKE2B 1b17975c92e0fbc0160e1e413dfb812ec5dd6966357408abc7f2db2478a83182e833650e416e288b74a4923ab3397c198f7d55d0b70e7ff4f524c40973bba959 SHA512 c910db16d538246dba10e62f22ef896752dbbf0d4a9fe5cdc5e78604447eb132d4783f525ff87337bbf876bcc23aef2e41e8f3ccedd7b962fb95a4ebc10027fb
+EBUILD webapp-config-9999.ebuild 1780 BLAKE2B c3c028949ecda5556b24430d4000b0f1f5f7f7c1ad17de4f90d9cf052e39846bf0d64721d92e3f5e9a4e764c85a311748b885b0d7c598d0d1f8717f038979a56 SHA512 298f6473a69b57353720c14034861382178006173a8e850159922dc20d10a823c9e31407046d4bb64d371967448d0c41d73ea127bf9dcc8f88ac39f44ad38236
 MISC metadata.xml 448 BLAKE2B 14bff33f87640b065d72b7bd98742c602e1cd30be80cde6bbc5bd923cb8529f55e4296e83e630e55a9c8342da063dc3762f515bccd2614fc50d68770260fd727 SHA512 20db75371335720225afe0111925fe6ba3979448987a27459786a4490b862073ac23374ba29c218e523ea465fb811c7686d5a36e073a35a2a2b2c4521b6961f2
diff --git a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
index 9ef0f49f155f..daf5ce1eeff8 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r2.ebuild
@@ -4,12 +4,18 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 prefix
 
-SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+if [[ ${PV} = 9999* ]]
+then
+	EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="https://sourceforge.net/projects/webapp-config/"
@@ -32,6 +38,11 @@ python_compile_all() {
 	emake -C doc/
 }
 
+python_test() {
+	PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+		die "Testing failed with ${EPYTHON}"
+}
+
 python_install() {
 	# According to this discussion:
 	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
@@ -54,11 +65,6 @@ python_install_all() {
 	doman doc/*.[58]
 }
 
-python_test() {
-	PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
-		die "Testing failed with ${EPYTHON}"
-}
-
 pkg_postinst() {
 	elog "Now that you have upgraded webapp-config, you **must** update your"
 	elog "config files in /etc/vhosts/webapp-config before you emerge any"
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 80bc77e30465..9aad95348cfe 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 prefix
 
@@ -38,6 +38,11 @@ python_compile_all() {
 	emake -C doc/
 }
 
+python_test() {
+	PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
+		die "Testing failed with ${EPYTHON}"
+}
+
 python_install() {
 	# According to this discussion:
 	# http://mail.python.org/pipermail/distutils-sig/2004-February/003713.html
@@ -60,11 +65,6 @@ python_install_all() {
 	doman doc/*.[58]
 }
 
-python_test() {
-	PYTHONPATH="." "${EPYTHON}" WebappConfig/tests/external.py -v ||
-		die "Testing failed with ${EPYTHON}"
-}
-
 pkg_postinst() {
 	elog "Now that you have upgraded webapp-config, you **must** update your"
 	elog "config files in /etc/vhosts/webapp-config before you emerge any"
diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
index 32acfba2c4a1..1c968bf8cbeb 100644
--- a/app-admin/xkcdpass/Manifest
+++ b/app-admin/xkcdpass/Manifest
@@ -1,3 +1,3 @@
 DIST xkcdpass-1.19.3.tar.gz 2570967 BLAKE2B bd3576b707db2652e6979ea25476fcda51df7bc84a5182668ff1cf2878a57c89ab56a7272fe2030c38533bf4f75855facd7fd8aefa6e5c6335a00c8ef80b228f SHA512 5336e57edd7fbeb655573910b0c0868381a8b43d5ccbb8d388cc24ef16ba094c27517a4fe7b11dbfc7ff906b65a303f90b20cdf9bc551b844453640378b5e555
-EBUILD xkcdpass-1.19.3.ebuild 1077 BLAKE2B d0e3ab445a1f86966d63de20cf3c78136e4582384c9e160796ec73012b8ab99c53fb2501341132e5cee370d6928444a8ebba369ceb43f5c0138c781b04dbd5e3 SHA512 203be3dd89c515a66533a84a1b4c5d6543be85b710a5fa929283c04f5a5afc6862305736d5f6e171f7bd1f3e42757c0a66437ec72a20846aeacf4495f156e8fd
+EBUILD xkcdpass-1.19.3.ebuild 1030 BLAKE2B 9b4c33bba664f78e0d4c95c79319b6599f6d228a7fbafb04d6806d6fc9d6ba6088bf1bed6717dc7af1e9268ac3d485f91d7eb22eb44eadffd3a30fded199e0f9 SHA512 aac6827d4e2b0d8e7a0a2df0168530c71c7207ea6ee155ae55946d5f689c173ecbca92b2388d4756bdb9f59f534014928c3cb62e388393c2d0c2b72ee67a03f6
 MISC metadata.xml 388 BLAKE2B a1477ba7c23e7ddab97dd869612794c1e1d0876cf9564bc54ecc6858280d6cc23dfac4e83d78f0f18543c5ae3804e1a701701e08ae6722e533c8c6f1dca29e71 SHA512 6a6bf779b5e0de8bb4a8be49253981590ee039b252db6bc4f25a8e1db6123a832fc7d628302e192aedd485e864b528d272da8a4e0f557987d4b7104c5d0ce985
diff --git a/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild b/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild
index 6362a71c03dd..57d1ac6aff4c 100644
--- a/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.19.3.ebuild
@@ -1,14 +1,13 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Password generator inspired by XKCD 936"
 HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD CC-BY-3.0
 	l10n_de? ( GPL-3 )