Version bump. Fixes bug #304419

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

4 files changed, 98 insertions, 13 deletions

diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index eb9e2236d2f1..aaa5e14ec2ae 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2009/08/10 17:54:54 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.9 2010/05/28 20:42:14 hwoarang Exp $
+
+*zim-0.46 (28 May 2010)
+
+  28 May 2010; Markos Chandras <hwoarang@gentoo.org> +zim-0.46.ebuild,
+  +files/zim-0.46-disable-updates.patch:
+  Version bump. Fixes bug #304419. Thanks to Mat <jackdachef@gmail.com> for
+  the ebuild and to Arfrever for the ebuild review
 
   10 Aug 2009; Torsten Veller <tove@gentoo.org> zim-0.28.ebuild:
   Depend on the virtual of Test-Harness
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 46fc50b18bf6..3c5309ba4358 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 EBUILD zim-0.28.ebuild 1627 RMD160 23d967ef1577a043200df8b151431d6eafe2e68e SHA1 76295e266966b6c5d1b521e0887119c436c826d7 SHA256 f22d62c24b26492947602b70ce1cd1b7bee975d316381aab6080a822f199a64a
-MISC ChangeLog 1976 RMD160 1dd9af052f57fe8a4af692a66a6b93b759f3b60a SHA1 07c9a31d04a485d323abf4663581d3dbef015e02 SHA256 18f0788a499de047ca8337df80b10b9553d4d84d0dd0d9f2cdfc27070e377466
+EBUILD zim-0.46.ebuild 1646 RMD160 49bbc90f72a3880d58b8358b859ccc9707f03270 SHA1 2f2653ab952ae52bc1adb5d0dbbbae9b8efd9c2c SHA256 6e706102ac71153517902398c74a7e916b95f5dfdb4177c9cfe2b329b8848e0b
+MISC ChangeLog 2245 RMD160 8aaf1cdb544493a245608f2fda252aa071829f2d SHA1 01465202c4c5dd19566e8b0d1645f2e56bc231a1 SHA256 928792164b1902001be767b94b648a1fa4a0e7ea5e51d929ce642dd7b090bd4f
 MISC metadata.xml 813 RMD160 a35b3e3a805640795c34f0bce74ea458b21f94e2 SHA1 b9bd7c60ff23aa83d61efb24e2fd83fbcff6cd17 SHA256 d8b1a3f54c3aa3e256fec9d9a9db6459b530b3232d54d0db17439a24ce57b980
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqAXvMACgkQV3J2n04EauwOhgCgsAGtDGICS01qANxT0DPumn1j
-NbUAn3fOs0mrUYbc07n3evM4J8eDS02v
-=v5Sr
------END PGP SIGNATURE-----
diff --git a/x11-misc/zim/files/zim-0.46-disable-updates.patch b/x11-misc/zim/files/zim-0.46-disable-updates.patch
new file mode 100644
index 000000000000..2159265ee1ae
--- /dev/null
+++ b/x11-misc/zim/files/zim-0.46-disable-updates.patch
@@ -0,0 +1,19 @@
+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.46.ebuild b/x11-misc/zim/zim-0.46.ebuild
new file mode 100644
index 000000000000..09f39d1acc40
--- /dev/null
+++ b/x11-misc/zim/zim-0.46.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 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.1 2010/05/28 20:42:14 hwoarang Exp $
+
+PYTHON_USE_WITH="sqlite"
+PYTHON_DEPEND="2:2.5"
+
+EAPI="3"
+
+inherit eutils 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
+	dev-python/pygtk
+	>=x11-libs/gtk+-2.10
+	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() {
+	$(PYTHON) 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"
+}