gentoo auto-resync : 19:07:2023 - 19:05:16

2 files changed, 34 insertions, 27 deletions

diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index c7fc1945fe05..e09a4ac9a004 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,6 +1,6 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.74.3.tar.gz 3108228 BLAKE2B fbaaddbd5522ccffcba87da2f4080e93e46dfcdc22771a414daa813cdbc2982738c2bf6f068f4bddf788965b4cf45594f2720a697c04d71194f513d1d9b43875 SHA512 9f885571800e3aba327a46b3bc8677ca596fb2d0a58e2f65190d9e2bc90f013655947d86c1fc869e2d79a5c0ba8a7a4d907a00f8d7563116291df47d8c2c677d
 DIST zim-0.75.1.tar.gz 3212424 BLAKE2B 8db33315a8852b4efc5506cf94576f9b7cfa8574e77798d4e8bb61930a0d9ede5ea0bd2fc8c1ae479f49caee265981d70902b149e151e5f295cdcc5bbe98b131 SHA512 207d40af2342f16ba713a3809b06ddc6656bce22386fcaace65b0e04894218590d4c03b9c65d6eeb3c4edc46e85e103cfcf112e4298be07ba1f126d7732333c5
-EBUILD zim-0.74.3.ebuild 1827 BLAKE2B 44c738e81590a89088d535a374d58945a9ba7c2d2cdb8184e013e80707466124e2098d838b995af950dd63d18361e4a2d99ead2d3a70a378c10f53aa2ae66aa5 SHA512 aad716cb741690be4a1c5455b9ec1edaab3bdef8c28dbde24136b95eda1aa6a00d01ea71a85a684995f2246b99b19dd32aa67b66d8c906611a10bac72fb18760
+DIST zim-0.75.2.tar.gz 3257345 BLAKE2B 452716cbc6c149645c5146d8fcef2449c7c316ac57da9870dbe26b9fec13b6827a6368295277dc3b2b7a7874a7c930da27612a8e8e00b295ae9ecb3942d0e65b SHA512 ea6f361047690dfb314a3510d34880a4831d142c94fc0ca08e1c29869fd42d5fd1182c47edc241edeb512fed601a474af6d9970f819e8a8b67135c7589ae461a
 EBUILD zim-0.75.1.ebuild 2033 BLAKE2B a3552feacf33ad7fc2ee3290938179231b3c5db262031e9218b94069082ba03fcae349edeb38299974d2614eb21d5997f85c3cec9ead50b01fe3d589aff5340e SHA512 415c383ffc2f8f96661d7d1aeb1f1bc4e8d1b8f2d5b3c8313d28eba74b5915911b6f86c1b3a3970c652541eee94ef2af1eb02f7b97e8b51efe8b5a52453feb78
+EBUILD zim-0.75.2.ebuild 2035 BLAKE2B ac7cc28255a874b4bdec08274407da28df4695f16588bc82b245661586cb92313e1c0bade0a15957cfbc8f5d47fec3e56930b8fb0b60e37f4b0df96b23685521 SHA512 12fa574153f40f7d1c5cb488577c71482a75d03a4942912846259c3f409cd2c1fdfd2c8fb836e0495ed87e730cfcb6208d7255c6fe92c47bef9e2a970934aeed
 MISC metadata.xml 805 BLAKE2B 15e1443ba8c937c389eff2a4771ea9ae5c6cd52127fe991e02776bbf17cb18cafab377fcea5572779fa0784344b385d57b2fe19c8ba15c568ea6048bd9ea7a29 SHA512 2489ccdc635377d0e8029e60365a8b72fad3efeff99de9d191bf5e1143f32402ea08a188271cf5c31ff7570c81b9a21a9bca54c59fd50984062e91f6ae54225e
diff --git a/x11-misc/zim/zim-0.74.3.ebuild b/x11-misc/zim/zim-0.75.2.ebuild
index c29427e989c0..c5d76bac3fa8 100644
--- a/x11-misc/zim/zim-0.74.3.ebuild
+++ b/x11-misc/zim/zim-0.75.2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{9,10} )
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 virtualx xdg
+VIRTUALX_REQUIRED=test
+inherit distutils-r1 optfeature virtualx xdg
 
 DESCRIPTION="A desktop wiki"
 HOMEPAGE="
@@ -17,8 +19,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-RESTRICT="test"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -28,16 +29,13 @@ RDEPEND="
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
 "
-DEPEND="
-	${RDEPEND}
-"
+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
@@ -52,22 +50,31 @@ python_prepare_all() {
 	export XDG_RUNTIME_DIR=fakethis
 }
 
-python_install() {
-	distutils-r1_python_install
+python_test() {
+	if has_version dev-vcs/git; then
+		git config --global user.email "git@example.com" || die
+		git config --global user.name "GitExample" || die
+	fi
+
+	virtx ./test.py
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/icons
+	doins -r xdg/hicolor
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    app-text/gtkspell[introspection]"
-		elog "    dev-lang/R"
-		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
+
+	optfeature "Spell checker" app-text/gtkspell[introspection]
+	optfeature "GNU R Plot Editor" dev-lang/R
+	optfeature "Version control Bazaar support" dev-vcs/bzr
+	optfeature "Diagram Editor" media-gfx/graphviz
+	optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot"
+	optfeature "Score Editor" media-sound/lilypond
+	optfeature "Gnuplot Editor" sci-visualization/gnuplot
+	optfeature "Equation Editor" virtual/latex-base app-text/dvipng
 }