Version bump (thanks to Alastair Murray for the report bug 390773), drop use flags, remove old versions.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

6 files changed, 26 insertions, 189 deletions

diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index c38dd06e2f13..2c49fc21d43f 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/zim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.14 2011/10/24 06:44:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.15 2011/11/17 13:04:40 xmw Exp $
+
+*zim-0.53 (17 Nov 2011)
+
+  17 Nov 2011; Michael Weber <xmw@gentoo.org> -zim-0.28.ebuild,
+  -files/zim-0.28-disable-updates.patch, -zim-0.46.ebuild,
+  -files/zim-0.46-disable-updates.patch, -zim-0.47.ebuild, +zim-0.53.ebuild:
+  Version bump (thanks to Alastair Murray for the report bug 390773), drop use
+  flags, remove old versions.
 
   24 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> zim-0.46.ebuild:
   Depend on correct slot of pygobject.
diff --git a/x11-misc/zim/files/zim-0.28-disable-updates.patch b/x11-misc/zim/files/zim-0.28-disable-updates.patch
deleted file mode 100644
index 7170e1345112..000000000000
--- a/x11-misc/zim/files/zim-0.28-disable-updates.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur Zim-0.28.orig/Build.PL Zim-0.28/Build.PL
---- Zim-0.28.orig/Build.PL	2009-02-19 19:32:54.000000000 +0200
-+++ Zim-0.28/Build.PL	2009-07-21 12:48:03.000000000 +0300
-@@ -233,17 +233,17 @@
- 	my $sharedir = $self->install_destination('share');
- 	my $mimedir = File::Spec->catdir($sharedir, 'mime');
- 	my $icon = File::Spec->catfile($sharedir, 'pixmaps', 'zim.png');
--	for (
--		['update-desktop-database'],
--		['update-mime-database', $mimedir],
-+	#for (
-+	#	['update-desktop-database'],
-+	#	['update-mime-database', $mimedir],
- 	#	[qw{xdg-icon-resource install --context apps --size 64},
- 	#		$icon],
--		[qw{xdg-icon-resource install --context mimetypes --size 64},
--			$icon, q{application-x-zim-notebook}],
--	) {
--		print "Trying: @$_\n";
--		print system(@$_) == 0 ? "Ok\n\n" : "Failed\n\n" ;
--	}
-+	#	[qw{xdg-icon-resource install --context mimetypes --size 64},
-+	#		$icon, q{application-x-zim-notebook}],
-+	#) {
-+	#	print "Trying: @$_\n";
-+	#	print system(@$_) == 0 ? "Ok\n\n" : "Failed\n\n" ;
-+	#}
- 
- }
- 
diff --git a/x11-misc/zim/files/zim-0.46-disable-updates.patch b/x11-misc/zim/files/zim-0.46-disable-updates.patch
deleted file mode 100644
index 2159265ee1ae..000000000000
--- a/x11-misc/zim/files/zim-0.46-disable-updates.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: zim-0.46/setup.py
-===================================================================
---- zim-0.46.orig/setup.py
-+++ zim-0.46/setup.py
-@@ -190,14 +190,6 @@ class zim_install_class(install_class):
- 		# Try XDG tools
- 		icon = os.path.join('data', 'zim.png')
- 		mimedir = os.path.join(self.install_data, 'share', 'mime')
--		for cmd in (
--			('update-desktop-database',),
--			('update-mime-database', mimedir),
--			#('xdg-icon-resource', 'install', '--context', 'apps', '--size', '64', icon, '--novendor'),
--			#('xdg-icon-resource', 'install', '--context', 'mimetypes',  '--size', '64', icon, 'application-x-zim-notebook'),
--		):
--			print 'Trying: ' + ' '.join(cmd)
--			subprocess.call(cmd)
- 
- 		# xdg-icon-resource installs:
- 		# /usr/local/share/icons/hicolor/64x64/mimetypes/gnome-mime-application-x-zim-notebook.png
diff --git a/x11-misc/zim/zim-0.28.ebuild b/x11-misc/zim/zim-0.28.ebuild
deleted file mode 100644
index 104a5cd7ab1f..000000000000
--- a/x11-misc/zim/zim-0.28.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.28.ebuild,v 1.3 2011/03/02 19:22:25 signals Exp $
-
-EAPI=2
-inherit eutils fdo-mime perl-module
-
-MY_P=${P/z/Z}
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="http://zim-wiki.org/"
-SRC_URI="http://www.zim-wiki.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex screenshot spell test"
-
-COMMON_DEPEND=">=dev-lang/perl-5.8
-	x11-libs/gtk+:2
-	virtual/perl-Storable
-	virtual/perl-IO
-	virtual/perl-File-Spec
-	virtual/perl-Test-Simple
-	>=dev-perl/File-BaseDir-0.03
-	>=dev-perl/File-MimeInfo-0.12
-	>=dev-perl/File-DesktopEntry-0.03
-	>=dev-perl/gtk2-perl-1.040
-	x11-misc/xdg-utils"
-RDEPEND="${COMMON_DEPEND}
-	latex? ( virtual/latex-base app-text/dvipng )
-	screenshot? ( media-gfx/scrot )
-	spell? ( dev-perl/gtk2-spell )"
-DEPEND="${COMMON_DEPEND}
-	dev-perl/extutils-pkgconfig
-	virtual/perl-Module-Build
-	test? ( virtual/perl-Test-Harness )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-disable-updates.patch" )
-
-src_install() {
-	doicon share/pixmaps/zim.png
-	perl-module_src_install
-}
-
-pkg_postinst() {
-	perl-module_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"
-}
-
-pkg_postrm() {
-	perl-module_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.46.ebuild b/x11-misc/zim/zim-0.46.ebuild
deleted file mode 100644
index a7426b6bdee7..000000000000
--- a/x11-misc/zim/zim-0.46.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.46.ebuild,v 1.5 2011/10/24 06:44:49 tetromino Exp $
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2:2.5"
-
-EAPI="3"
-
-inherit eutils virtualx fdo-mime distutils
-
-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="graphviz latex screenshot spell test"
-
-RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
-	dev-python/pygobject:2
-	dev-python/pygtk
-	x11-libs/gtk+:2
-	x11-misc/xdg-utils
-	graphviz? ( media-gfx/graphviz )
-	latex? ( virtual/latex-base app-text/dvipng )
-	screenshot? ( media-gfx/scrot )
-	spell? ( dev-python/gtkspell-python )"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-disable-updates.patch"
-	# remove unneeded variables
-	sed -i "/^assert/s:^:#:g" "${S}"/zim/__init__.py
-}
-
-src_test() {
-	VIRTUALX_COMMAND="$(PYTHON)" virtualmake test.py || die "src_test failed"
-}
-
-src_install () {
-	doicon data/${PN}.png || die "doicon failed"
-	distutils_src_install
-}
-
-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"
-}
-
-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.47.ebuild b/x11-misc/zim/zim-0.53.ebuild
index dc9e2b4fa7ba..c2e18f27cc48 100644
--- a/x11-misc/zim/zim-0.47.ebuild
+++ b/x11-misc/zim/zim-0.53.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.47.ebuild,v 1.2 2011/03/27 22:56:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.53.ebuild,v 1.1 2011/11/17 13:04:40 xmw Exp $
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="2:2.5"
@@ -16,16 +16,13 @@ SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="graphviz latex screenshot spell test"
+IUSE="test"
 
-RDEPEND="${DEPEND}
-	graphviz? ( media-gfx/graphviz )
-	latex? ( virtual/latex-base app-text/dvipng )
-	screenshot? ( media-gfx/scrot )
-	spell? ( dev-python/gtkspell-python )"
-DEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
-	dev-python/pygtk
-	x11-misc/xdg-utils"
+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
@@ -51,6 +48,15 @@ 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"
 }
 
 pkg_postrm() {