gentoo auto-resync : 04:11:2022 - 03:13:18

12 files changed, 63 insertions, 307 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e549531ef6ac..a7f42978d87c 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index e5161ce534d4..0d12f1349ebc 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,3 +1,3 @@
 DIST mugshot-0.4.3.tar.gz 128500 BLAKE2B 88ed4a9a0efa70a14d90b831d00ad8c98d7c6dc4eff0e319e5ad08e904b0c0cf2c15bb26198f4ae1248e85959c08af165c9b6dc917dce35d986fdd73ff67eed8 SHA512 b5e91288b4de30124bd84c44b8f2a70e043af12e1f9580d07b13344b6c0343399037aadf153ea216d61cd12e4891ebb15557f1ad62c3b4d7c49584fa004ae65c
-EBUILD mugshot-0.4.3-r1.ebuild 1533 BLAKE2B c670b6d091532da46de04babaa4b1f557924c6ae126bd5ea241779e6c100bc7acb65acaae150474fc22eaaaa876f0284c557bd884296bf92aadf53dde7f1cda0 SHA512 65e0da1169bcf1a78ad6038fd585f2cfb03f42922f044d01303dea2e7b8c2f9522172d6440c35fe701cf90f508a0c08b0a3ae4d11326bac92aee9f889d6da84b
+EBUILD mugshot-0.4.3-r2.ebuild 1537 BLAKE2B ebde0790a2515bcf53eeeb1ee20650310872d39f8380823448aef5deb8d5ae5ea4d50f35f41bfd3400ee1f3ae10b3e92dbf724eeb7e12ea90257925d5f1186c7 SHA512 b0647ffc699a461db73b17e8302e29d35b0b0cf1207a895a93e1efd41a56c502421e22f6207eb2ab6f485b1d0891e6b305d66ef19f9577fdb168c6fc14b09c34
 MISC metadata.xml 944 BLAKE2B 59f4fc9d71e76357768b352815291f678bfae5667e5ce2a0dfa78255ff78fa08b894b8aad97e06231177e008ba693a96ed96718c44a0b464be91f21cf4a31ac8 SHA512 cba7b3abd264aa6cb7bd6ed03a21b03d60f453480e40caffb6343a928c540bed2455fd5651ff33c726f6ba3c111e2c6e8654260bf7acc16204f65b6ba89fce51
diff --git a/x11-misc/mugshot/mugshot-0.4.3-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild
index 61fadeb0cba2..bbdfe5a464ec 100644
--- a/x11-misc/mugshot/mugshot-0.4.3-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.3-r2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517="setuptools"
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 809e4fd413a8..3077ca6f9ab1 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,4 +1,6 @@
 AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
-EBUILD xflux-gui-1.2.0-r3.ebuild 1084 BLAKE2B 263db62178ed33870ea0c2ccca2dab34a6d9627f4a65e6e3c03668c50615e44b875aab6ec40122f1717bb6a7b26fae9f383780b5dc00d734b79edc3d966071d9 SHA512 14894a8655e93e0df6b69f24219a5dd7a311046852c1f7a24d61f858c059c4c93c14d57f56d5d08a51c4e3f8feee454147b0f890183db371baba1c236b09f871
+DIST xflux-gui-2.0.tar.gz 35805 BLAKE2B 7a15371d682b31c900f35bebd36e12b70d6095c4cdc9c33f43bad031d72b82d8d3800f7f34f7e31965725dfe075dc6934512eeced98aa685d0023a57dfb61103 SHA512 4a5235feecb06ee95d28d4c05bb710014aea120943b3cbe23f2d2130486de82295891d8211a02e52385edb577da3438dd1c2ba45b209ab4359eb3469df08eade
+EBUILD xflux-gui-1.2.0-r3.ebuild 1084 BLAKE2B 3c2050dea25ae4cecd4696da3ce5c5411e023b60bb3d9f10cba7d0b754225fcb5ffc32e1e1259278da8a59a57d91291c1d6605e7c3da95ff506cd21fa1997f39 SHA512 a3b8f77e4e38d6c902de71865791ecb5b7f1c2f768f96e043bae7d498f73cbc3b2d54ccad3d38ac17334e9d02ceb422ef48540423b81e2a446063b2f1943f060
+EBUILD xflux-gui-2.0.ebuild 1036 BLAKE2B 2e37ed8bdbbf7a0f94dd080cee35f53142f2d4731b8d46212441346e90bd32add8adab4abeecbe53452c39a384edf22c42872b4303235f9c494ffbd36efc0b0b SHA512 215b0d71cd2c7103f4d6fec642249eb419e4f4caba46df5c6d79992759e70be4fe36ebeceddaf29a74516c3e8d91a981e5bf741c1b449d6df40e5f7532c06d02
 MISC metadata.xml 738 BLAKE2B 9cba265844f261bb6629334f0d7982791d198fd13fbb76ffde6c7755f1141ccc403a76a45ea1af0cff639dc5a631b72ca1c6e9c1fde0716d1b86a0f97a4c1847 SHA512 1c80057a213da1fed5890ef29fe32ef4308dc7f67db8340e07439d5521738955a4d9ce1fbd1a7bae1a6ee8cab68e644ed407fa9754e1322142aa3eb91b192529
diff --git a/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild b/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild
index dcbcc417a9ac..80ea7e8c59b5 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.2.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/x11-misc/xflux-gui/xflux-gui-2.0.ebuild b/x11-misc/xflux-gui/xflux-gui-2.0.ebuild
new file mode 100644
index 000000000000..442492423668
--- /dev/null
+++ b/x11-misc/xflux-gui/xflux-gui-2.0.ebuild
@@ -0,0 +1,47 @@
+# 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_{8..11} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="A GUI for f.lux"
+HOMEPAGE="https://github.com/xflux-gui/fluxgui/"
+SRC_URI="https://github.com/${PN}/fluxgui/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/fluxgui-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libappindicator:3
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/libXxf86vm
+	x11-misc/xflux
+"
+
+python_compile() {
+	# Don't let the package compiling the schemas,
+	# as this could cause a file collision
+	export DISABLE_GSCHEMAS_COMPILED="true"
+
+	distutils-r1_python_compile
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index d1354b469a56..3a96559ee6f5 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,14 +1,6 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.73.5.tar.gz 2702734 BLAKE2B 494dbe8ac0cbb46c15655cdf56bc25010591bd00faec94608ccd9fa7cec01385c6756480e5a3f37b50f44984ed69d30f33570ca913dab7ede2b89a4bf0cc4016 SHA512 f2c335d4697e7d0535b2abb200af45b7d753f2964e94a35c2ec8d4fb8deae0842aef086e09430a50d4ff5ecee89eb1f6f881a0b430877209e4a8d83ee046c4f9
-DIST zim-0.74.0.tar.gz 2917916 BLAKE2B 32b1086395142d07b46425264e3ee6d6782d62f138fb661c0bc392b09054f0664e7a2d8b75f409a843b1e85c93a11e41e041019f69ef657e11d311253ba804ae SHA512 39e3849c14bc474b90583a708c8ead287b27a8eb5f714ad63f168f205fb6584c4ff2f9df45755aa3e3b012639891587c7153ae4e0fef71276241ddce6e32c01f
-DIST zim-0.74.1.tar.gz 2994036 BLAKE2B 9de89ce74bc08ec0b60f34d693ffdb3b8220efe6f03e3d77686c9d3db135713d7eb5e0beed35eb6f979e489f12b9d65b9b66e0e7449c45b955711684154ae6b8 SHA512 f78bf1ee6082488efe2e581984c85ffbddbfb7e5adfdf491232e93a8376580275f329e2d02c482afd70bbc70f62ca6f0b3bce636cff58b0a1d592dd4b8194e3a
-DIST zim-0.74.2.tar.gz 3008954 BLAKE2B d0ecf666804931412f6e32aef54193ed96c67049e0fd3e7a373973d4826f16a9483eaa0940cc953573c104c704115905b036e5d0355961c0be86bebc6189bd9a SHA512 112c1e9d28a10643711f665e03c8a37259637b3471338aaca0a834afcc96c658ca5bf863e63bd5f01ce1fcdfb3eef3f2dcf1d10f8113d2158af2e91234b023b9
 DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d
-DIST zim-0.75.0.tar.gz 3178872 BLAKE2B 71fcd9363fc238be6ca48f44e826d0ca1ac62fdb609f2397f2dbd6acf3601980b861bc1424e1834728179f1a9c29332bf4709010643b77c8daec6299688cbb0c SHA512 9b8c5be64b2d45de2b02770e91f1950928d8f2214fc0c6099cd57bf61e3749911f46c4ec7815c9e322559ce155db2475e3b1347a81d2b76a82cd848dd4af3864
-EBUILD zim-0.73.5.ebuild 1820 BLAKE2B eeb3f5184d8e68aa56f461979e48fc11bb96979aff04a8063993da14b88c05a52c695e7d5163e15992795d3669554c26aa13b12e1d0093f8c815ad57805ef3d5 SHA512 6b82081c2ade2497a49db760a3cf2ea0c7e073de9ca639e2deeeff5e68c0d5a299c93b35839c96fcd6764f8f3c939504f4541fb0d296d390680131def695b5d7
-EBUILD zim-0.74.0.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
-EBUILD zim-0.74.1.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
-EBUILD zim-0.74.2.ebuild 1822 BLAKE2B e07614d05c5b81cd4aab38029af5e07675e7a44579b78e27eaf683856e84760603050446535d53262fde93566f24e84822aac9456b0c0a1ec9275650b25ce9b7 SHA512 c8ccbf826b541d23125a2f37c3524257514ddc8c00413586ac43aaf3679e1392baffe48a1346ccab6cad9765ce973d9b10ac7b9fe2f2a5287ff7a9ae93cd4b19
+DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
 EBUILD zim-0.74.3.ebuild 1823 BLAKE2B 27fa3c392a5b6f0e8c38d566c2694d7b628acc2d0aca9bc384b3170dc2f65670fb8a961fc0943658303e1c05c9f0e8c7b0c2c21ff8cf38a679b1ad2a1b0dbb89 SHA512 0dd65dccb7dbe718b731d993129839a1a668715c0d466879582f12c4eaeaaf7e53d3a080500e2e15fd086cf0408c770f5e2d88994159f662e2dcec86dbbb4d63
-EBUILD zim-0.75.0.ebuild 1935 BLAKE2B f3a268e1ffe1ff269d99a225bf4e9446306177eaddb66cd20ad6d1c58069d872a254a12ed1c8f84a974e6726040952b4142f00353153586338a601d7d46f9135 SHA512 8021e08533d37cb8bfad05d59446f90ac505d3c0b2f2c44b6e1dd7c3b2b92d691c63166b5bb28dad02964eeb76ad714316e0476d1f0ed4eafc715b66e18ee69a
+EBUILD zim-0.75.1.ebuild 2029 BLAKE2B 336beab5409884b90db1187cf54bf37ac17acc91c7ccf115b9e0189c5101cfdf3e32acbfddc6a0a199d6ffc55932303423ea79c988f05d5698f892769647d2f2 SHA512 8ac03234494733bf66c11e6a763c5470f85b8fa698c1e0f4f927cefbafe796c56a59c9e10d3633f1dd8a71291073a6a862d2dc4ea6e3174b9f7764411ccbb963
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.73.5.ebuild b/x11-misc/zim/zim-0.73.5.ebuild
deleted file mode 100644
index db96dd8a5459..000000000000
--- a/x11-misc/zim/zim-0.73.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-	export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
diff --git a/x11-misc/zim/zim-0.74.0.ebuild b/x11-misc/zim/zim-0.74.0.ebuild
deleted file mode 100644
index 131369dc0283..000000000000
--- a/x11-misc/zim/zim-0.74.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-	export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
diff --git a/x11-misc/zim/zim-0.74.1.ebuild b/x11-misc/zim/zim-0.74.1.ebuild
deleted file mode 100644
index 131369dc0283..000000000000
--- a/x11-misc/zim/zim-0.74.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-	export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
diff --git a/x11-misc/zim/zim-0.74.2.ebuild b/x11-misc/zim/zim-0.74.2.ebuild
deleted file mode 100644
index 131369dc0283..000000000000
--- a/x11-misc/zim/zim-0.74.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-	export XDG_RUNTIME_DIR=fakethis
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
diff --git a/x11-misc/zim/zim-0.75.0.ebuild b/x11-misc/zim/zim-0.75.1.ebuild
index c1c46330e03f..a7fb11f78c96 100644
--- a/x11-misc/zim/zim-0.75.0.ebuild
+++ b/x11-misc/zim/zim-0.75.1.ebuild
@@ -59,6 +59,13 @@ python_test() {
 	virtx ./test.py
 }
 
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/icons
+	doins -r xdg/hicolor
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst