gentoo resync : 28.11.2020

3 files changed, 80 insertions, 5 deletions

diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 5597f01f43d4..cb4b6ef3e1db 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2
 DIST zim-0.73.2.tar.gz 2611490 BLAKE2B 05fd020b3add3ac9c6fd860ca002a5c0755a1a1f1ee07c6e5027e16e3b8c64d9116971e96ed235b249b65b9097551b9fcdf46ed929a03a877c36a02a7d54e8fd SHA512 26c987906759436063f88863e90cf2643996913a2fae12ebc4ae623731ad97d488d37ad70e72153aba7aaac7fe2dff9bb6f9f06c4d899a0ac20e3bfbd20ff3db
 DIST zim-0.73.3.tar.gz 2648597 BLAKE2B c3709fc418317bfbd355f3715e5fceb346026393bfaec65ca8713fb2cd33243189dc3328b4be20b08452545704d4d1196f99f96df9445aaed5d0277b310d37f0 SHA512 880839495e3aa434267ac02abe2c1779c8cb3c9c7b73de91a19e962e7face2cd05399871789d719d89d0776d09fb9b339370f4fac8e4019be538e282accbe180
+DIST zim-0.73.4.tar.gz 2648686 BLAKE2B 47ac293494fb61808c80afccbc7b97c5539ceed050abdfd84048b5d0a6dd0667f8f23e1fd9cbd06aa77f8895787da76c3297e041e435ac45d0b5874fd8054fc4 SHA512 8205335e07d99ab340af4f75a429aeb3114446cc9ae2ccfbced4eb95b723c26b5d8c8624e94c5b38373a9368cf058c03f160a36730feb37d9c00abcd61b6d147
 EBUILD zim-0.73.1.ebuild 2004 BLAKE2B 860e5ec15639b229ccdbadb7af5120d22f05722744927d48788b18d9a8196b82f6bbe0c40ed7230da9549446cc8a9580b3128228a780a7f53b84ff60a8ae5359 SHA512 a615515f58178875db7195628162cf0ee1470da174dfb9fedc3af1f4c52e1d974fd0df423efeabfec8d64df17608ed8f6284db54c98cfd9b54c7481b94bf7e58
 EBUILD zim-0.73.2.ebuild 2006 BLAKE2B 38362eeedb27a545084c2d8225f2c19d2cc3f025abc6fb61aedb2d0389ca50a7ff458f84da0218ce34720591221f0561248a9684ff130990e4fbbe268ee9e3ee SHA512 4d87fe9e5a7023c7d6d747b5ebac4773a5ff4f63050ef0d079c8e120086259f60fe0c0d4fbe59c338e91b53f9e4160c501e43b668588731d225966a1d18f29fa
 EBUILD zim-0.73.3.ebuild 2006 BLAKE2B 38362eeedb27a545084c2d8225f2c19d2cc3f025abc6fb61aedb2d0389ca50a7ff458f84da0218ce34720591221f0561248a9684ff130990e4fbbe268ee9e3ee SHA512 4d87fe9e5a7023c7d6d747b5ebac4773a5ff4f63050ef0d079c8e120086259f60fe0c0d4fbe59c338e91b53f9e4160c501e43b668588731d225966a1d18f29fa
-MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
+EBUILD zim-0.73.4.ebuild 1838 BLAKE2B 2aa24b886272a59b5ffc87aa603814159538e72cb3884d24546e82ac5b40895ee9e09a9173f362a9729d575ee225f168c6961884044d96d8632583e048d5153f SHA512 5b5993d34edd77034273245fb74a8640013bab16727fd5d042a050cb11592a2f8091f954c2014e69bd2581cdb1f1d47fa1b7d530e974211919748cbf5df23472
+MISC metadata.xml 804 BLAKE2B 3b238d0a00d1ff9edc20e2b65b06aefa6b324e71c70e545372e3d05fb4020a67a2be45ade5065439f7974eaea6fa25ae8d65addc9e940d5c3762f7bd4c6ea1d1 SHA512 95e103028935e95fdb0d3ab00c1695db0f82a6f9cb33c0defd298edb50adf69ba5b00194ea2dbc6adb8b2da500fe45d17451e6354b6020ff9a75de837653244e
diff --git a/x11-misc/zim/metadata.xml b/x11-misc/zim/metadata.xml
index 0dc3b7b6c991..91a4bab5eeb7 100644
--- a/x11-misc/zim/metadata.xml
+++ b/x11-misc/zim/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>desktop-misc@gentoo.org</email>
-	<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
 <longdescription lang="en">
 Zim is a graphical text editor used to maintain a collection of wiki pages.
 Each page can contain links to other pages, simple formatting and images. Pages
diff --git a/x11-misc/zim/zim-0.73.4.ebuild b/x11-misc/zim/zim-0.73.4.ebuild
new file mode 100644
index 000000000000..1b2038fecc07
--- /dev/null
+++ b/x11-misc/zim/zim-0.73.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,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_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_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
+}