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

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

7 files changed, 33 insertions, 202 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/Manifest b/x11-misc/zim/Manifest
index a23f729d0451..7067a4ca623d 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,22 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX zim-0.28-disable-updates.patch 1013 RMD160 a576cdaaeeb74092e93575c66e14a7cfacf84f92 SHA1 41cefbcc281695d1e49235b2d79af2bf9a825862 SHA256 857ba4fe2d01ae801bd9216ab394379617abc94eaaf4dbe14d793dd3889ade65
-AUX zim-0.46-disable-updates.patch 826 RMD160 d3b28b81f4b16106ea59fcaa813f0fe7b7f7faab SHA1 22d46e43916cfecd60721eb512d8107caec9c866 SHA256 f5cc77aec143b3b3d71da0cf16dc8400ad50ef7bc460f601b93d57670e4b4642
-DIST Zim-0.28.tar.gz 897945 RMD160 b6ecc7c6f094670754b4219e7506edefd00b2ca1 SHA1 c0d1d5ad956ee682f01ecbd89009eb9f0852f34c SHA256 de1f3b476a07b171d884c96fa02e4094cebe36b890c730e6a629f8062db0724c
-DIST zim-0.46.tar.gz 669891 RMD160 8b10467cac9682438feba504a56b52aaf7c65273 SHA1 58591e0bbbb0fa9b6856356ad02f9b6b4ea20779 SHA256 8aaa1c890c1c09cae77e842d1427c5858c0b9c3b1c60e2434e0eda5a7eb312b1
-DIST zim-0.47.tar.gz 882667 RMD160 e6653703bb0f9c2f14026d8ae197aaa36891a60b SHA1 a59f55576f2c94edfb22af0418c29f489b91fe88 SHA256 04d1304df2b7a544a6b0ced8ce45e29cdb78d1505fc402823da6a44426a5246b
 DIST zim-0.52.tar.gz 1195768 RMD160 1b9f5f00a2a68964570e68db17d3773ac35267bf SHA1 493bc0380699e350ea481b1124389763e3f6504d SHA256 30fb65d5ff54c29d9d36fa499ffc93f277b0a2a575578226b8402c1c4ecbbbdb
-EBUILD zim-0.28.ebuild 1632 RMD160 a171c74ec777a31dcc19e7d561b6f06079873cd8 SHA1 05de257e33b947452e82151481ad23d6753a3820 SHA256 8715d7475e89e358d7744e2b56bbbc511f6139c62d389a1d8d06574d661c1c91
-EBUILD zim-0.46.ebuild 1684 RMD160 c131f376da1e44aee364d7fb83f936761b7391a4 SHA1 f3b8c417f21c99e28b2bb1dff729fc4988ba3ed7 SHA256 af640482fd13aad319ff731f26ce8e96562e574f64777512a5be7ce3296b1ce4
-EBUILD zim-0.47.ebuild 1574 RMD160 59b516d0778f640e01a05f63be6aeaba6bd26d28 SHA1 a5abb5b5f98193ca7b6b12d411541d4dc8699e29 SHA256 072fabe135df8ce7a56064926f59551fc5a74a329f7a12ba1fbaaa26a0e60fd5
+DIST zim-0.53.tar.gz 1293205 RMD160 27f585a7411fd772d55d0290342b7a54382e7c95 SHA1 f5007ca2c6dc8397c15b2ef2b1c33a742d44b959 SHA256 7dc0572abe8fafafb6ddc9837705aaaa9d50a38ec65277d58448d08cc2f17806
 EBUILD zim-0.52.ebuild 1569 RMD160 d231adb090df42f13e6af0a2e60d6b189f574ed1 SHA1 24e647c22659cf2b1b2b4392082b4b59f9652fb1 SHA256 612ec2d99dcea4e868fb660ef6cea4f165ca3628afad82a5545243256ceadbf2
-MISC ChangeLog 2885 RMD160 f92d9e49beab36f7ecc10976c6f6ca1074d16870 SHA1 c4db1ee0b821697b33d73d0c2dffbe8587d2c2e3 SHA256 5f795f23886a8789365462cfcecd085560f5613d14f78e4dcf86800856231861
+EBUILD zim-0.53.ebuild 1747 RMD160 40ce7864101dac1d865687ae6344b24f81b01576 SHA1 9ead5b1e37b3e83419f439efde419ee48775ca11 SHA256 c89e2fdc08689c0fa90c4ae94664a1f5699089932ea6c8ff911e107d41e3df4d
+MISC ChangeLog 3214 RMD160 433970e184945d8660ca8d3cfcf745d9e7d2bdeb SHA1 a138f8e7590ac8a7551cc7580a98603a5eb2dce7 SHA256 e5ad9f0a35cd15d8076bafb57f2fe4412972252e7d149b5b54997d460029df50
 MISC metadata.xml 813 RMD160 a35b3e3a805640795c34f0bce74ea458b21f94e2 SHA1 b9bd7c60ff23aa83d61efb24e2fd83fbcff6cd17 SHA256 d8b1a3f54c3aa3e256fec9d9a9db6459b530b3232d54d0db17439a24ce57b980
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6lCWcACgkQdjK8w9WeBnAXwAD+PsJhZnHZ2HNzpHexxzAzIEDS
-WVsZPeVsFyTC2Nl9jtAA/ivKjAQcBQx5Sl/Tv+9xrIXpK10h5N67Mioly/aLw+vS
-=VnJD
+iF4EAREIAAYFAk7FBm4ACgkQknrdDGLu8JCPHwEAmGljiTDRv1U2rS4ldUtbrInW
+o4CHW1so8ELVpTpgrs0A+gNQjzJ1jNRn6UMq9TSXHfPutsZkL11rGSjne6CVkvDS
+=WzRb
 -----END PGP SIGNATURE-----
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() {