8 files changed, 21 insertions, 118 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 69ae262113cd..48d563024ce6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index bbb3947f7fd9..3e8ade116bf4 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,5 +1,3 @@
-DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a
 DIST dex-0.9.0.tar.gz 10056 BLAKE2B 7abc01ccc6938e926840e4448eb6436db77703c1f8e1fef334d97196803a0b59af0f05fc507d1ac4337367120f7d9d9a211aecec6ac3644424edee3599067a89 SHA512 d68f5482cb0948f27a724437ddfc6de9a0f502bfd0d5c60c76fb85dda3c30e4c432013e530f6a91138c9ac9ff36b3824cd5e382e9d29bb9fb2ec2b9de4133094
-EBUILD dex-0.8.0.ebuild 760 BLAKE2B 0832bad413e07aa4ff05dfa531d4837f69bd7614e93d90e8a973205f6f5668d943a4656616eac7a427add1f5523a82652e3ffea2e7580976fe8b18931645733d SHA512 81d2dde1e68fd9f4f73375892ad69fefecfcfc474d586911a286a90d0155a496d81dc11a904a1aaa35eb3b415842c5f50a59d41dd2e5cb66839c4142d61b31e1
-EBUILD dex-0.9.0.ebuild 759 BLAKE2B 0db07a341ea20c11b845432bf7f3a3af067b94edd12e8fcf8da70a61ee26a9a2fde1d3588b70b39f3dffd3c91141b2e68bd9d4adb78e640883417881643e641d SHA512 61c58e6aa8e77454128609b8ce1875feae20ca5fdac2135ff9dc27e02d4c7bc8ebc9035df4008a00461d7f20fc9ef99111cf49d684acf634eeb3f1d642cf15a4
+EBUILD dex-0.9.0.ebuild 1016 BLAKE2B 736d75c27d300123536c3342eaea0205bc497cb186caba97813ffe94d83f03d20ce587aed35bcc83d063895b8cb09a3be2f2fc296e2ec698b8924e4e1e007bcd SHA512 e27d303c297fc12dbd5b57a6571f09d3839d1dfb551a0126e227e83000bd37cb43b96edda68bb9d9317fadd4373a1a5a31e8d07eb2f0e70b3808bb7cc9bfa4d2
 MISC metadata.xml 241 BLAKE2B 2d8350e134c84a3974a561b48212a687b01b2507994e61afec958cad35c2fca29bfadc9918c4b101f5e75a257a7c434c0daa9d4cd6adcfa11433a675c7571fd7 SHA512 2d448dfb1d937c52578e7ad1bfd45a369712bab97c4c923ca6df5f75cdd5e79cd7448b65a0814849c3219043c0ad45a08908c58e61caf09d612b3c441dc9e42b
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
deleted file mode 100644
index 56393cf8cc9d..000000000000
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_9,3_10} )
-
-inherit python-r1
-
-DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
-HOMEPAGE="http://e-jc.de/"
-SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	# Makefile is for creating man page only
-	use doc && emake
-}
-
-src_install() {
-	dobin dex
-	python_replicate_script "${ED}/usr/bin/dex"
-	dodoc CHANGELOG.md README.rst
-	use doc && doman dex.1
-}
diff --git a/x11-misc/dex/dex-0.9.0.ebuild b/x11-misc/dex/dex-0.9.0.ebuild
index 9a26bc92b006..4774c80d2f54 100644
--- a/x11-misc/dex/dex-0.9.0.ebuild
+++ b/x11-misc/dex/dex-0.9.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
-
+PYTHON_COMPAT=( python3_{9..11} )
 inherit python-r1
 
 DESCRIPTION="DesktopEntry eXecution - tool to manage and launch autostart entries"
@@ -14,20 +13,31 @@ SRC_URI="https://github.com/jceb/dex/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="doc"
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# https://github.com/jceb/dex/issues/37
+RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( dev-python/sphinx )"
 
 src_compile() {
 	# Makefile is for creating man page only
 	use doc && emake
 }
 
+src_test() {
+	dex_test() {
+		./dex --test 2>&1 | tee test.log || die
+		if grep -q "Failed example" test.log ; then
+			die "Tests failed with ${EPYTHON}"
+		fi
+	}
+
+	python_foreach_impl dex_test
+}
+
 src_install() {
 	dobin dex
 	python_replicate_script "${ED}/usr/bin/dex"
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index 36423eb3ebdc..0d29a4da1751 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,6 +1,3 @@
-AUX revelation-0.5.4-issue87-fix-meson-0.60.patch 352 BLAKE2B ea661c84f2c125de9a5bffbd0f947c8b90f18016033501396ff22b0d51ae5d3d10de7bdadac20c2f8ecd5e418a0694908b240ba6058ceb3ed4843f958b54e5a7 SHA512 3bc54de1c96e57f4e0ccf68f06f051cd57668ddd282061db8a5c9ccac6d8ca9657a9879308b7a4a72aefbeb0784b4826bdb7342feb19e19373d33d0e52602bf3
-DIST revelation-0.5.4.tar.xz 282600 BLAKE2B 519b01252b82acf0e927a9d19783792f83822cc1f1a4c3be4af3678d5446f8012d993e12397f44aae616aca88257970de7391a1269e24cc1ebc08275d0c962ed SHA512 bd536f6c03e443d91a20606765b661dc54f3e4c1f45d060d3829a894a31e553a61785bb31d7508267abd66e057fc1d93f1716ed1b553566d92a2580ad696606f
 DIST revelation-0.5.5.tar.xz 282252 BLAKE2B 7c4c430d24d79b820139dd2b4989dc2d78c967b16c864149d2aafa9e91ddc26a3351f42b5782812202f77a36529c46d9515cc1aea73346c7e8e017079b810a7d SHA512 17bfeda87e27c00f12bc068446d053cee394282e5eabea6d075ac262b5f400f31520d2f9b29f99097d1d6ad72bbcf5d2d9d4da2a0eba2806ff0adbf1bb47bb0f
-EBUILD revelation-0.5.4-r1.ebuild 1239 BLAKE2B 0cf12e19ed6484331e6f545e9254b2669a094b1d622be083bf98b5ce2526b8c9e1e4ce8faa712da6c8306111767fca513afac274cd773e27e05c8096c13f7fbb SHA512 1ca025de659f19a4cfc6ea039c02e468e21beea42349404cf965a675088f85de1c80a6bed164ebd4cd78864601947749a13310ee1e73aa506628821ec96eb925
 EBUILD revelation-0.5.5.ebuild 1206 BLAKE2B 13d4170feec99b927bb878957d0f26ba2b1ccd8aac85bc3a0ddd5b53389858d51840bd0471b8f91b8aeb925e8577c7bc059c87afb731fb00357071a025d0f366 SHA512 081b783c95b2154f2010d06c1a2a55e2e502e4f03ebf73432c43e5f426392c0445bd009617b7d42c396e333f74d223d0f39ab052d47fceb7d523c5dcf9a08193
-MISC metadata.xml 413 BLAKE2B cf3df69453155e356f6f30026a06610f4cd5639d8de0ae4842b82442234c235b3c8933bf6943193674b0f7ca894f00b8aebceb2de65f11186ea0c66c42e6bab9 SHA512 e00344899c210aa59b4ac218773745d418730c934784cf4cef0a71511bd7ca4888a9591ef0fcf4603579b189cb78ef2f8b7654c53c8839f75ce6d400bfc3d408
+MISC metadata.xml 508 BLAKE2B 56bfae4b0e27795147d666c1c3c52721a71c817dc637e6e6c5f301c298c523576ef040aa216b4156e9fe609cfed3b8756c18fa9d7515b639079e08531ff2e6f6 SHA512 307713b87335c7778f68484c143f842037380c4c55fa200e5630582544d1fdfddf00efb378ed286bc70d94918d6f1643508483779791bde7de499f9121e6a823
diff --git a/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch b/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch
deleted file mode 100644
index 4a224fc529d1..000000000000
--- a/x11-misc/revelation/files/revelation-0.5.4-issue87-fix-meson-0.60.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/mikelolasagasti/revelation/issues/87
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -59,7 +59,6 @@ rvl_appstreamdir = join_paths(rvl_datadir, 'metainfo')
- 
- # Merge the translations with the appdata file
- i18n.merge_file(
--  appdata,
-   input: appdata + '.in',
-   output: appdata,
-   po_dir: join_paths(meson.source_root(), 'po'),
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
index 3b67b534c310..f2900a6d8676 100644
--- a/x11-misc/revelation/metadata.xml
+++ b/x11-misc/revelation/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">mikelolasagasti/revelation</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.5.4-r1.ebuild b/x11-misc/revelation/revelation-0.5.4-r1.ebuild
deleted file mode 100644
index ff85436ffe63..000000000000
--- a/x11-misc/revelation/revelation-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_9 )
-
-inherit gnome2-utils python-single-r1 meson xdg
-
-DESCRIPTION="A password manager for GNOME"
-HOMEPAGE="https://revelation.olasagasti.info/ https://github.com/mikelolasagasti/revelation"
-SRC_URI="https://github.com/mikelolasagasti/revelation/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Upstream does not provide any test suite.
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-libs/libpwquality[python,${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3
-	dev-libs/glib
-	dev-libs/gobject-introspection
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/revelation-0.5.4-issue87-fix-meson-0.60.patch )
-
-src_prepare() {
-	find -name '*.py' -exec \
-		sed -i -e 's:Cryptodome:Crypto:' meson.build {} + || die
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}