gentoo resync : 24.12.2018

4 files changed, 16 insertions, 186 deletions

diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index d68abf35fdcd..284eb9c68211 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,12 +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.66.tar.gz 2020216 BLAKE2B 7a2af3dca2ff72dd94c605c4fa89b0d3be1413643c781aa151483445e6a029db6021ed84df797b6d9aaac05fd791fe50e4bdc9f1682d252e80f083bf37a10602 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9
-DIST zim-0.67.tar.gz 2034747 BLAKE2B 47e49191e699f93727f566593d616ef0da5b826dccb2f952c6220627d67f295d40e57b9e00dec8395a933a0378c0b1b05c25db7a2cb30fd4509e6ee06269c831 SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94
-DIST zim-0.68-rc1.tar.gz 2602967 BLAKE2B 7a1eed33e8d7f27ea287c993f1dde5e8d89cc9435f909ede5696f80ceaee454a38d0ab903313d6a07375797bd43cf48925e81be725094d4a4ce188f750fcac9e SHA512 60c2c654f6b40edcf029efb8367e18a8c4cca7fde11339f4ab9b3724f07f4041aae5740cd7a42fe3b2f836537c699ad597cef0eaec0b0511cb7c65b40ea6e04e
 DIST zim-0.68.tar.gz 2044224 BLAKE2B 5c53c3197bc5de90c38059e7323366ed5b7600ebf0b3575d81e618d972d0360f67660da4637f1e6f1459549b21525ed17183e9c2f57f8ab0b27236e36bda9666 SHA512 4ab7f2b55e37ae917a7faa0018a36cbad2534bb43146f47810479155009eb2ccbf4f8ab185d8b4cd3ba7e22a4e2fc5eb08c4bae0688186c13d31dfcab23b0048
+DIST zim-0.69.tar.gz 2044631 BLAKE2B 447fa4fb2d11b1399668ec6b627e23150577b574afb1e5c33738cb690779f49adb2d60e0b01eb82d2cf0dfd4a430099c1ae4b52186b60a2564c501b93aa01822 SHA512 452b2119d63927765c3807dbbdfadea94be31ee7fd3eb9b8cf79e8699c57478ec9cd392299a6e1dc3690dbe520925cddf5fca4596db809a2cc296bb6669d12af
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
-EBUILD zim-0.66.ebuild 1779 BLAKE2B b3f4597786e61255a1cfc5990ea88354be0db3f86e0c1fab2472bbccf4e7384b596bd1e6ea795a5debe3a7fb8a5fe9d539f58cb269e7a170d5f81000bffebde2 SHA512 e2f1e3bc0f287beeb2e7b1fbabb0225fc06776682bdc832d6c874f8159a64a750bbaeb73461bc81ca40f03780f44d3a7f2dc2a26aa08b9102d808c200d39dd0e
-EBUILD zim-0.67.ebuild 1828 BLAKE2B b6fc04b1b8166a2c4e4539ce1533f41d9d40ba7798031886b508fefa34ee71b554135f8962bb6d4c7e075b13b219e6354ecc233c98b549804f65cebfc218ab16 SHA512 d735ebe9821d634fff6ee707b2694cc347b32a7d65b88a0f7a179171496088714ac4fb6cce5806c60881d5149971b41438c2707b52457e4daa8d08f0e4bd71d3
 EBUILD zim-0.68.ebuild 1847 BLAKE2B 12615ea89e434348ff24ed1f492a09c11944c54c1bc4931f8a555b04eed4bb909a205e7b980ae1a6e63054441cafb854c5b76b21b068ad2b62daa51a76e69238 SHA512 5fe0bd6aa83e1645b630a70c287fe50e16a60fc6bdb966fb768be2052d65bd4c484ee1896379fd6990d30614b4048834460813ffa15179ac57127946a51504d5
-EBUILD zim-0.68_rc1.ebuild 1871 BLAKE2B 9bcd6204f6e7c06face149cfa2b77fafcc90dc69c2e55359fe1b5df83ee0735368be03a527ca5d7bd811b0da242b2ecd740dc46d8a39526778420f226d6e807e SHA512 4d6f5ffd3247519248ee30c48f922b576526e954280ef76b954145bd368cbb10a2c8304d1dc9de12c526be1802a381cbe2f84ee0e080be0551ae94529da685f0
+EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.66.ebuild b/x11-misc/zim/zim-0.66.ebuild
deleted file mode 100644
index 700a474fba4d..000000000000
--- a/x11-misc/zim/zim-0.66.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-
-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.68_rc1.ebuild b/x11-misc/zim/zim-0.68_rc1.ebuild
deleted file mode 100644
index 5ab885f471df..000000000000
--- a/x11-misc/zim/zim-0.68_rc1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-MY_P=${P/_/-}
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="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 )"
-
-DOCS=( CHANGELOG.txt README.txt HACKING )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-
-S="${WORKDIR}"/${MY_P}
-
-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_test() {
-	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
-}
-
-python_install() {
-	distutils-r1_python_install --skip-xdg-cmd
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_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_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/zim/zim-0.67.ebuild b/x11-misc/zim/zim-0.69.ebuild
index 11ad63086c0f..ba87523f013c 100644
--- a/x11-misc/zim/zim-0.67.ebuild
+++ b/x11-misc/zim/zim-0.69.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
 
 DESCRIPTION="A desktop wiki"
 HOMEPAGE="http://zim-wiki.org/"
@@ -18,15 +16,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+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 )"
-
+		dev-vcs/mercurial
+	)
+"
 DOCS=( CHANGELOG.txt README.txt HACKING )
 PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
 
@@ -54,15 +56,12 @@ python_install() {
 	distutils-r1_python_install --skip-xdg-cmd
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
+	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
 	if ! has_version ${CATEGORY}/${PN}; then
-		einfo "Please emerge these packages for additional functionality"
+		einfo "Please install these packages for additional functionality"
 		einfo "    dev-lang/R"
 		einfo "    dev-python/gtkspell-python"
 		einfo "    dev-vcs/bzr"
@@ -76,6 +75,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }