Version bump.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 49 insertions, 23 deletions

diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index 654ddee83cf1..c970494e2b6b 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/zim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.6 2009/06/03 01:50:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.7 2009/07/21 09:58:31 ssuominen Exp $
+
+*zim-0.28 (21 Jul 2009)
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +zim-0.28.ebuild,
+  +files/zim-0.28-disable-updates.patch:
+  Version bump.
 
   03 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> zim-0.27.ebuild:
   Missing virtual/perl-Module-Build depend wrt #253340.
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 6b63854dc1a7..4a92228dfaf9 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,5 +1,5 @@
-AUX zim-0.27-disable-updates.patch 604 RMD160 be61a4d5eceb6dbd3180bd455b1e8d538010c68c SHA1 a41ea5cfa913910e0c189460950766b9e6ce0365 SHA256 fe61e919ab8f76dcce7ae5032a3e0b1219e0171bc36a838358120e3cc8e8fce9
-DIST Zim-0.27.tar.gz 830516 RMD160 177a65b94a2bf74c2ca253e71595e6e59eab8de3 SHA1 ed8a75eae4295e0c1cf4b241027c4fc70f198cf3 SHA256 f427ebde44ed52a744de13fd4aa2fee32b2d9ac2315485bc607228d326909b14
-EBUILD zim-0.27.ebuild 1524 RMD160 6c7d9c81917f51ecbb0afd2366679237ba5616e8 SHA1 a04cccca96f18284681d4c41e63aa1737d7b5087 SHA256 f2eec4e46fdea58a5d7b9036e4809191e24dbfa907710a428da3fc3173daeb91
-MISC ChangeLog 1720 RMD160 313b6dfb649d1b3860c404ecf63ec816d0258128 SHA1 a294a96a558f55ab34846edadcf6f1b68ea90f8b SHA256 1130afae797b856b278b0cd47111d37816546df2ef6763f3a146435421cad391
+AUX zim-0.28-disable-updates.patch 1013 RMD160 a576cdaaeeb74092e93575c66e14a7cfacf84f92 SHA1 41cefbcc281695d1e49235b2d79af2bf9a825862 SHA256 857ba4fe2d01ae801bd9216ab394379617abc94eaaf4dbe14d793dd3889ade65
+DIST Zim-0.28.tar.gz 897945 RMD160 b6ecc7c6f094670754b4219e7506edefd00b2ca1 SHA1 c0d1d5ad956ee682f01ecbd89009eb9f0852f34c SHA256 de1f3b476a07b171d884c96fa02e4094cebe36b890c730e6a629f8062db0724c
+EBUILD zim-0.28.ebuild 1629 RMD160 46d17e52e45bbb0e7adabc83c5df7df778e99342 SHA1 000d0ffc2d2317840d78b3f12eaee3ba3f9be049 SHA256 85995f9dcfe817698d3d5045f8ee46c80d45bd4a101549b8c18daff037ac5cc1
+MISC ChangeLog 1875 RMD160 51effd89ae6c27f2453a00021f9029226544dbee SHA1 9213982ffe88b68c0aed0aa73fdf8d262f18041e SHA256 ae4c42df09fbff5ebd67e3f4cac081354e04d9aedcfd0ba2c03e76a207759e94
 MISC metadata.xml 813 RMD160 a35b3e3a805640795c34f0bce74ea458b21f94e2 SHA1 b9bd7c60ff23aa83d61efb24e2fd83fbcff6cd17 SHA256 d8b1a3f54c3aa3e256fec9d9a9db6459b530b3232d54d0db17439a24ce57b980
diff --git a/x11-misc/zim/files/zim-0.27-disable-updates.patch b/x11-misc/zim/files/zim-0.27-disable-updates.patch
deleted file mode 100644
index 6f59d1b2bbe1..000000000000
--- a/x11-misc/zim/files/zim-0.27-disable-updates.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur Zim-0.27.orig/Build.PL Zim-0.27/Build.PL
---- Zim-0.27.orig/Build.PL	2008-11-12 22:02:21.000000000 +0200
-+++ Zim-0.27/Build.PL	2008-11-29 22:31:42.000000000 +0200
-@@ -202,8 +202,8 @@
- 	my $mimedir = File::Spec->catdir($sharedir, 'mime');
- 	my $icon = File::Spec->catfile($sharedir, 'pixmaps', 'zim.png');
- 	for (
--		['update-desktop-database'],
--		['update-mime-database', $mimedir],
-+	#	['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},
diff --git a/x11-misc/zim/files/zim-0.28-disable-updates.patch b/x11-misc/zim/files/zim-0.28-disable-updates.patch
new file mode 100644
index 000000000000..7170e1345112
--- /dev/null
+++ b/x11-misc/zim/files/zim-0.28-disable-updates.patch
@@ -0,0 +1,30 @@
+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/zim-0.27.ebuild b/x11-misc/zim/zim-0.28.ebuild
index 0373ba8c4453..0e248e6ea144 100644
--- a/x11-misc/zim/zim-0.27.ebuild
+++ b/x11-misc/zim/zim-0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.27.ebuild,v 1.3 2009/06/03 01:50:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.28.ebuild,v 1.1 2009/07/21 09:58:31 ssuominen Exp $
 
 inherit eutils fdo-mime perl-module
 
@@ -13,12 +13,14 @@ SRC_URI="http://www.zim-wiki.org/downloads/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="latex screenshot spell"
+IUSE="latex screenshot spell test"
 
 COMMON_DEPEND=">=dev-lang/perl-5.8
 	>=x11-libs/gtk+-2.10
 	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
@@ -29,11 +31,13 @@ RDEPEND="${COMMON_DEPEND}
 	screenshot? ( media-gfx/scrot )
 	spell? ( dev-perl/gtk2-spell )"
 DEPEND="${COMMON_DEPEND}
-	virtual/perl-Module-Build"
+	dev-perl/extutils-pkgconfig
+	virtual/perl-Module-Build
+	test? ( perl-core/Test-Harness )"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}/${PN}-0.27-disable-updates.patch" )
+PATCHES=( "${FILESDIR}/${P}-disable-updates.patch" )
 
 src_install() {
 	doicon share/pixmaps/zim.png