gentoo resync : 15.01.2020

5 files changed, 85 insertions, 91 deletions

diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 43831ddf3e7a..ba1e92e010c7 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,8 +1,8 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
-DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
-EBUILD zim-0.65.ebuild 1801 BLAKE2B 46fdc83458bf3f3ad8b21962b20431773390d24847407ca0f22ffa73ab015b6badd91da80eee16f628d7343095db563e2de047d002c7f8da8f4ce8fdeaf226b6 SHA512 56606b28d7ce853dca3509c93c95672b36a5bf760d0535bd1f37a19f41d7c59890ccfaadbe0eba770e0fdba6551bd63f6ed43203fe3ab76d57b827d48de4bf79
-EBUILD zim-0.71.1.ebuild 1912 BLAKE2B 453cfa5a308a9e00622a508b27aae0f0511b241a8f1ca9f3555964defec514617430e3b88e92c10b2814e2ce727c8f975e273315dfbbcb8759fc4d85e593a1dd SHA512 a6b3845fb5a20895e96027221e2fdc4a23958e2ee9a7cd8e220037c30294288bc7bc5a353ce6b9a5e46cc8a2c6cb9c1221382b3fafe4ae7a3d38db175a4777ac
-EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
+DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
+EBUILD zim-0.71.1.ebuild 1908 BLAKE2B 7f7ccbb6757d758096d682d813cdf26352042ff9b0025a288fd20fc555bc2e78a762cc5af1e5216d85240ae58ca722566443212d118563e27807f96737aa0305 SHA512 5401f6bff60e4518f5f5df667da340b8da29b7955b3095a94896d72f9a36c1589bdb7493bc91c9295b56ac65e781c797fddf64713e68de41ade1f2ec3a6a603d
+EBUILD zim-0.72.0.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
+EBUILD zim-0.72.1.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.65.ebuild b/x11-misc/zim/zim-0.65.ebuild
deleted file mode 100644
index 0c5e544634d3..000000000000
--- a/x11-misc/zim/zim-0.65.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? (
-		dev-vcs/bzr
-		dev-vcs/git
-		dev-vcs/mercurial )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
-)
-
-python_prepare() {
-	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
-}
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
-		einfo "    dev-lang/R"
-		einfo "    dev-python/gtkspell-python"
-		einfo "    dev-vcs/bzr"
-		einfo "    media-gfx/graphviz"
-		einfo "    media-gfx/imagemagick"
-		einfo "    media-gfx/scrot"
-		einfo "    media-sound/lilypond"
-		einfo "    sci-visualization/gnuplot"
-		einfo "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
index 99b03d91550e..17560f2d59f1 100644
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ b/x11-misc/zim/zim-0.71.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 gnome2-utils virtualx
diff --git a/x11-misc/zim/zim-0.72.0.ebuild b/x11-misc/zim/zim-0.72.0.ebuild
index 1dbe5acb22de..7d6ec427d216 100644
--- a/x11-misc/zim/zim-0.72.0.ebuild
+++ b/x11-misc/zim/zim-0.72.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 virtualx
diff --git a/x11-misc/zim/zim-0.72.1.ebuild b/x11-misc/zim/zim-0.72.1.ebuild
new file mode 100644
index 000000000000..7d6ec427d216
--- /dev/null
+++ b/x11-misc/zim/zim-0.72.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 virtualx
+
+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 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	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
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	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
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}