gentoo resync : 12.05.2022

3 files changed, 35 insertions, 2 deletions

diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index 04d2f5fdde4e..9da166fa2e58 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -1,5 +1,6 @@
+AUX asdf-3.3.5-test-utilities.patch 1141 BLAKE2B 6ef47f9ffd639f5724d5583e2af3210e1e4091721c2f8251df16abc19ebe3c80cf4d09bef0c6af1f3aef0a61ece99a05073d90196e6b9e8a52883e7468687835 SHA512 583976c13d859d9ccb86ad6df4a7a7a7ce210588e020005a4f4844c5446db0830d99205bb2186d9a5bf2e9f3b25d19716d336ecbf66496357383166af7d373b7
 AUX gentoo-init.lisp 354 BLAKE2B 201ba124983acd9f86a35742079fa9d9af3c7c5b29c2c2f3021e07907dbd808a59bc82931558aea8bfb6821f600d0b2944eb5a3b518474e203323f7210c4685c SHA512 28a24bdc25b7f2304b1c837eb1ca44d5006de6bae1d8e5cfd2bc4bac800dfad9c9c7b3964fd0667c89da95051a42da9054bda3f94202867dbae7b02dfd2b03e4
 AUX source-registry.conf 138 BLAKE2B 1adc9396d0d23b361c52d70b1c10d7f5e031776b1a5bb168fe55a2fb90e03a6771511cfe52a26256620988f030cdc51d75e0ac3f433eb8a500aa5d8c119e0427 SHA512 244ce3e7cd9c5f483f99c8e43f2d62d16ea35b25897029b7b9038fe5412752f7d8c7ea11396fd87c218e77c63c5efe2f27c2a11fe49ffb79908f8e7b85bf64c9
 DIST asdf-3.3.5.tar.gz 520233 BLAKE2B 59697b9c6a691c43efe47c0e6d9fed5b8a0f2f2432f10cb58a643857bc3d332b730b180d5d13e87656b9106eab7787359ecd3b854447f5d9c8a871b3a1510448 SHA512 27221bbf798c94e427b8e2c0e8ecb5384102dd5f8f5d2cc18c2e3d44e0aa2f3b79538e0f2cb589442eb493abe00c8a63a04f6c1558979b78cd00165c6b33103b
-EBUILD asdf-3.3.5.ebuild 1541 BLAKE2B 903a49d00c911dbf44bc1e7b9d068a04ef7b4cc387e5c7f7c30d0880f540bc8f56f3dcc0db2f278d248b9717483db6590f5bd9c45575caeba01c690cfed5bc7d SHA512 20191a8362d02e297be7e2bbb35fca7270c08e0063a430c7642b0a15e8281e53698031740d961c2c2e527663089f0344092dcc5551f539bc8d63686af15eb2f0
+EBUILD asdf-3.3.5.ebuild 1649 BLAKE2B 53b8166adb7cb30ca19203a9183e2c6b58fef01ba03b459e0dffa225a2440b682ef7d859f96a0b6b877d01ab3e8ca3882b52e27f3474bc689a36b6212015d961 SHA512 19368d6b63b3f7e7167b17097db3c501563ea31b3c0076069a8f1499936b934b0d74139665658f05eae617140940b94d1f65ff221646f0bf3ecca55c6e50faf1
 MISC metadata.xml 262 BLAKE2B 9d57142b15b4db8306f29f0644b2898c7b8674bdeccf72f654028ba92be886bcf341a224babb36e26363e35761f2f571637b4774f2bad6259202ac4b9c32eb19 SHA512 2066fb6068acc9947350a565fae1b067f16fb7b3223338d7d2c023caf443c472bab6024bf84c3b8c2d71a53cb37a61a682971864dba11be196ae22e4996cdff2
diff --git a/dev-lisp/asdf/asdf-3.3.5.ebuild b/dev-lisp/asdf/asdf-3.3.5.ebuild
index b1153ce7066e..6307fc5a133c 100644
--- a/dev-lisp/asdf/asdf-3.3.5.ebuild
+++ b/dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PVR}"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -22,6 +22,11 @@ DEPEND="!dev-lisp/cl-${PN}
 PDEPEND="virtual/commonlisp
 	~dev-lisp/uiop-${PV}"
 
+PATCHES=(
+	# bug 841335, drop on next version bump
+	"${FILESDIR}"/${PN}-3.3.5-test-utilities.patch
+)
+
 install_docs() {
 	(
 		cd doc || die
diff --git a/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch b/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch
new file mode 100644
index 000000000000..d8529d16823d
--- /dev/null
+++ b/dev-lisp/asdf/files/asdf-3.3.5-test-utilities.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/841335
+Taken from https://github.com/roswell/asdf/commit/fd289d99d1c76601fb310f8ca26a48f807337c8d
+
+From fd289d99d1c76601fb310f8ca26a48f807337c8d Mon Sep 17 00:00:00 2001
+From: "Robert P. Goldman" <rpgoldman@sift.net>
+Date: Fri, 2 Jul 2021 15:57:34 -0500
+Subject: [PATCH] Fix garbled test.
+
+By accident a bad test slipped into a commit: this was due to my not
+understanding how `with-expected-failure` works.
+---
+ test/test-utilities.script | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test-utilities.script b/test/test-utilities.script
+index 09a03347..b1e00fa5 100644
+--- a/test/test-utilities.script
++++ b/test/test-utilities.script
+@@ -342,7 +342,7 @@
+ ;; (assert (directory-exists-p oddball-pathname))
+ ;; (pathname oddball-namestring)
+ ;; (assert-equal nil (uiop:subdirectories oddball-namestring))
+-(with-expected-failure ("UIOP:SUBDIRECTORIES does not handle non-standard pathnames.")
++(with-expected-failure (#+(or sbcl cmucl) t)
+     (assert-equal nil (uiop:subdirectories "/[foo")))
+ 
+ (DBG "check to make sure WITH-CURRENT-DIRECTORY checks its parameter for directory pathname")