[gentoo-commits] repo/gentoo:master commit in: x11-misc/zim/

[Jeroen Roovers]

commit:     42a033b29f4ef3df793168719336a7e31754e702
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 06:41:24 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 06:41:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a033b2

x11-misc/zim: Version bump (bug #564356 by Jonas Stein).

Package-Manager: portage-2.2.23

 x11-misc/zim/Manifest                             |  3 +-
 x11-misc/zim/zim-0.61.ebuild                      | 70 -----------------------
 x11-misc/zim/{zim-0.62.ebuild => zim-0.64.ebuild} |  4 +-
 3 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 06fa239..44b772e 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,3 +1,2 @@
-DIST zim-0.61.tar.gz 1733251 SHA256 5843a9b2fb41f153b7b628732ac157889709b9937b4921c05099af81dceccc4a SHA512 381f1d740bedaecf52c4b7178e7ac17aac98971cc5292476396a28b965b93195a2e07e55f7872048b3577123cd6afb44c2a0e2dee220b02a84fed2a13fb67f61 WHIRLPOOL d0f9d8ce65e8970226f8878cc4e89d228c76e06f9772692d7bc3653b4fc85b4b9ed22d2b0aa91aa724384062a4b1b93859594089c9b1799c2eded313cea7deba
-DIST zim-0.62.tar.gz 1772246 SHA256 19d62aebd2c1a92d84d80720c6c1dcdb779c39a2120468fed01b7f252511bdc2 SHA512 53dc97052ee8ec57a61adf9d540f7721ee7e8d8d2500fc4d6ca7bc1b82dc07c5596b8b900c312d155bb1c06e7fbf661e667e0da391ac8f1e326caa2942f7cb1f WHIRLPOOL f1b44e27b49577868f5374b196fe5d59fd111664568141af1aa809fdcf916f830e385320f87c075242ad0ec7fa3db4d6d87fcbe7b70c850c1f1b3725abc66978
 DIST zim-0.63.tar.gz 1864169 SHA256 1584547150b6c96dacdb540c2b88e16d2cd673fa8026d9179aab4a082071fb1c SHA512 052f65c98badfcb1a6d9ed9d09eb84a01878384430affcb97d48d51ef5853478c8d489f9337600fc28b9949f8e1ff97e7e4070ed9a4f488f684a392ad2bff791 WHIRLPOOL 12c884fdaeac1c0c4766637d96e9699491cac1d3421368c073f852e78995a969303dd510172ef89b70c65226cfd1de794968b31313e1ee63aeb6e2f63d610451
+DIST zim-0.64.tar.gz 1896231 SHA256 d747d12803385468142a9f078623772d90fee6325d2acc618589aea63a0e9b1b SHA512 be16412e69f0ead6e5fe4418993fe5ef4e3a88bdfbe4aa09a6406e7bc70e1714862fb533172b7313c591b351e5dc44f49c826c3cff80df27fadc59e157b08991 WHIRLPOOL f16c77a9467d5783aa8eaebd8faae8357c4bff1cdc19629472ab8cfe44bc0d56a89079209534d742d19434913551418f3f4baae9f0851f165469f55a040190f1

diff --git a/x11-misc/zim/zim-0.61.ebuild b/x11-misc/zim/zim-0.61.ebuild
deleted file mode 100644
index 8d5163c..0000000
--- a/x11-misc/zim/zim-0.61.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils fdo-mime virtualx
-
-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}]"
-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
-	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() {
-	fdo-mime_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 "    gnome-extra/zeitgeist"
-		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() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/x11-misc/zim/zim-0.62.ebuild b/x11-misc/zim/zim-0.64.ebuild
similarity index 95%
rename from x11-misc/zim/zim-0.62.ebuild
rename to x11-misc/zim/zim-0.64.ebuild
index f9f9e5d..fb9808a 100644
--- a/x11-misc/zim/zim-0.62.ebuild
+++ b/x11-misc/zim/zim-0.64.ebuild
@@ -19,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	x11-misc/xdg-utils
 	test? (
@@ -29,7 +30,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch
-	"${FILESDIR}"/${P}-desktop.patch
 )
 
 python_prepare() {