Version bump.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 80 insertions, 142 deletions

diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index f8db040d39e8..e2c694015583 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/zim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.22 2013/05/31 15:22:57 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.23 2014/08/28 09:55:22 jer Exp $
+
+*zim-0.61 (28 Aug 2014)
+
+  28 Aug 2014; Jeroen Roovers <jer@gentoo.org> -zim-0.56.ebuild,
+  -zim-0.57.ebuild, +zim-0.61.ebuild, files/zim-0.60-remove-ubuntu-theme.patch:
+  Version bump.
 
 *zim-0.60 (31 May 2013)
 
diff --git a/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch b/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch
index ba70ab5b8f89..8c2d19599893 100644
--- a/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch
+++ b/x11-misc/zim/files/zim-0.60-remove-ubuntu-theme.patch
@@ -1,8 +1,8 @@
 # don't install /usr/share/icons/ubuntu-mono-{dark,light}
 # it's only used in conjunction with appindicator
 # and clutters the icon-themes menu in gnome
---- zim-0.60/setup.py
-+++ zim-0.60/setup.py
+--- a/setup.py
++++ b/setup.py
 @@ -94,12 +94,6 @@
  			files = [os.path.join(dir, f) for f in files]
  			data_files.append((target, files))
diff --git a/x11-misc/zim/zim-0.56.ebuild b/x11-misc/zim/zim-0.56.ebuild
deleted file mode 100644
index cfae69ff1cb6..000000000000
--- a/x11-misc/zim/zim-0.56.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.56.ebuild,v 1.1 2012/06/07 15:23:51 xmw Exp $
-
-EAPI=3
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils eutils fdo-mime virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
-	dev-python/pygtk"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? ( dev-vcs/bzr )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-}
-
-src_test() {
-	VIRTUALX_COMMAND="$(PYTHON)" virtualmake test.py || die
-}
-
-src_install () {
-	doicon data/${PN}.png || die "doicon failed"
-	distutils_src_install --skip-xdg-cmd
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	xdg-icon-resource install --context mimetypes --size 64 \
-		"${ROOT}/usr/share/pixmaps/zim.png" \
-		application-x-zim-notebook || die "xdg-icon-resource install failed"
-	ewarn "Please emerge these packages for additional functionality"
-	ewarn "    dev-lang/R"
-	ewarn "    dev-python/gtkspell-python"
-	ewarn "    dev-vcs/bzr"
-	ewarn "    media-gfx/graphviz"
-	ewarn "    media-gfx/imagemagick"
-	ewarn "    media-gfx/scrot"
-	ewarn "    sci-visualization/gnuplot"
-	ewarn "    virtual/latex-base app-text/dvipng"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-	xdg-icon-resource uninstall --context mimetypes --size 64 \
-		application-x-zim-notebook || die "xdg-icon-resource uninstall failed"
-}
diff --git a/x11-misc/zim/zim-0.57.ebuild b/x11-misc/zim/zim-0.57.ebuild
deleted file mode 100644
index cc038d29d22f..000000000000
--- a/x11-misc/zim/zim-0.57.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.57.ebuild,v 1.1 2012/12/13 16:49:49 jer Exp $
-
-EAPI=3
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils eutils fdo-mime virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
-	dev-python/pygtk"
-DEPEND="${RDEPEND}
-	x11-misc/xdg-utils
-	test? ( dev-vcs/bzr )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-}
-
-src_test() {
-	VIRTUALX_COMMAND="$(PYTHON)" virtualmake test.py || die
-}
-
-src_install () {
-	doicon data/${PN}.png || die "doicon failed"
-	distutils_src_install --skip-xdg-cmd
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	xdg-icon-resource install --context mimetypes --size 64 \
-		"${ROOT}/usr/share/pixmaps/zim.png" \
-		application-x-zim-notebook || die "xdg-icon-resource install failed"
-	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() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-	xdg-icon-resource uninstall --context mimetypes --size 64 \
-		application-x-zim-notebook || die "xdg-icon-resource uninstall failed"
-}
diff --git a/x11-misc/zim/zim-0.61.ebuild b/x11-misc/zim/zim-0.61.ebuild
new file mode 100644
index 000000000000..26b59100f591
--- /dev/null
+++ b/x11-misc/zim/zim-0.61.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.61.ebuild,v 1.1 2014/08/28 09:55:22 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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="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
+}