Version bump by poncho (bug #447098).

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

3 files changed, 21 insertions, 78 deletions

diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index 9a321e57138f..fec57ee63b2c 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/zim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.20 2012/06/07 15:23:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.21 2012/12/13 16:49:49 jer Exp $
+
+*zim-0.57 (13 Dec 2012)
+
+  13 Dec 2012; Jeroen Roovers <jer@gentoo.org> -zim-0.54.ebuild,
+  -zim-0.55.ebuild, +zim-0.57.ebuild:
+  Version bump by poncho (bug #447098).
 
 *zim-0.56 (07 Jun 2012)
 
diff --git a/x11-misc/zim/zim-0.55.ebuild b/x11-misc/zim/zim-0.55.ebuild
deleted file mode 100644
index a01dc1768d3c..000000000000
--- a/x11-misc/zim/zim-0.55.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.55.ebuild,v 1.1 2012/06/04 21:21:16 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.54.ebuild b/x11-misc/zim/zim-0.57.ebuild
index b0a2bb07604f..cc038d29d22f 100644
--- a/x11-misc/zim/zim-0.54.ebuild
+++ b/x11-misc/zim/zim-0.57.ebuild
@@ -1,6 +1,6 @@
 # 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.54.ebuild,v 1.2 2012/04/13 19:51:48 ulm Exp $
+# $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
 
@@ -48,15 +48,19 @@ pkg_postinst() {
 	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"
+	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() {