Version bump

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

5 files changed, 41 insertions, 40 deletions

diff --git a/x11-misc/rednotebook/ChangeLog b/x11-misc/rednotebook/ChangeLog
index 73da4a6caa2a..7f67ff8dcd49 100644
--- a/x11-misc/rednotebook/ChangeLog
+++ b/x11-misc/rednotebook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/rednotebook
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.27 2010/02/17 20:41:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.28 2010/04/24 20:19:44 hwoarang Exp $
+
+*rednotebook-0.9.3 (24 Apr 2010)
+
+  24 Apr 2010; Markos Chandras <hwoarang@gentoo.org>
+  -rednotebook-0.7.5.ebuild, -rednotebook-0.8.9-r1.ebuild,
+  +rednotebook-0.9.3.ebuild, +files/rednotebook-0.9.3-disable-webkit.patch:
+  Version bump
 
   17 Feb 2010; Markus Meier <maekke@gentoo.org> rednotebook-0.9.0.ebuild:
   x86 stable, bug #302352
diff --git a/x11-misc/rednotebook/Manifest b/x11-misc/rednotebook/Manifest
index 25dfd96914ed..9cdf3a15baea 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX disable_webkit.patch 718 RMD160 49ff371756ee8715fa36201731e90afbe7402b21 SHA1 3baf0a772e21401b8c0ae24196a3b6668b1dc0a0 SHA256 44d22909eaaa3e11ad1e5b5cec2ec485cb4f807f061f08aa9938902f0e43405c
 AUX rednotebook-0.8.9_disable_spell.patch 948 RMD160 b762d24206902e16ffd0c5e7f8357e6556e0dace SHA1 905ce3dbe8d8f0f264007c39a7ab62d2fe83d17b SHA256 1fbd76d9221e02ff023c39e8ce5a0c9b32d46dae297561be528a5ed4e90c87c3
-DIST rednotebook-0.7.5.tar.gz 242949 RMD160 adda4af3efe936b062d189e5d1dfa6d7bb4bdfd3 SHA1 7e07ecc21f0b3406170418e7246ad553cfce055b SHA256 3c1ea162439a69ee18058d70edc325c01c9d3b980425a2b718f454759c47e8fa
-DIST rednotebook-0.8.9.tar.gz 325892 RMD160 8757cd7d83477159bde8b259943bb43ad7c371f3 SHA1 38959c2b5d3e0ed2e57454530bd520d853a8a3b0 SHA256 d5e0ce47336ca37468f4e6b9883b11429a0047a22d93df11268a716470f42e9d
+AUX rednotebook-0.9.3-disable-webkit.patch 548 RMD160 1707b14b32878ac2c71ea7ea83e5d9c149b85f21 SHA1 4fbccb8719ee6a62d2b187bcb9bcbd1d3e0ef741 SHA256 eddf1edcd91bdfa9076a113e4809611aeea142a853f237e1cddc9db2051ec06f
 DIST rednotebook-0.9.0.tar.gz 344157 RMD160 bc316396dc6c066b333f1fe3c0496fb7d12c84d1 SHA1 dc99dadf577f24945a48ea076525609f4590e577 SHA256 f87dbbd02f950a3724cd7a5526a190ac51351f84ecad2027b9d7c896df67063a
 DIST rednotebook-0.9.2.tar.gz 364422 RMD160 5c3a04489a4e0d27629a571c164b47c6d196b8d4 SHA1 f5fe23c16864226dfad1048cf1708c81cdd74526 SHA256 d01a24d599dbe8a0e0ec5fc7b5937514e23c014700bf3a9a0aa27ff6da118d8e
-EBUILD rednotebook-0.7.5.ebuild 581 RMD160 4af5862be354e02422cf7eec68f254d2d36ea9e3 SHA1 e4a6e16fb467c3227e09878aa3e3090abde6e1bc SHA256 b60eedd50f62e37ae884f7703d5a15764cf03dac3404e4c966884bdd332c7a23
-EBUILD rednotebook-0.8.9-r1.ebuild 764 RMD160 419a1265c10cea51034bccc2f216eff51f020290 SHA1 ecae015e4aefb11e7ae3e9fac62be51ad3ebbe4b SHA256 3c79e9327bfe445c045848a063e056d8eab885e16d4c98504af83783919dd978
+DIST rednotebook-0.9.3.tar.gz 379920 RMD160 5c7a79939d61b993e38855ba44b19b2c48684e17 SHA1 a50fffb5118943501e4bd1dadf7fc038999ef286 SHA256 609dd3bce35657f30c464ccddf2d31dfaf8a28a12796f0c188af258394907b35
 EBUILD rednotebook-0.9.0.ebuild 769 RMD160 56f591782a5a524740c59f073ffaded2675bfacf SHA1 7894413e29847aff4d48193e06704d54ed4f4cf1 SHA256 0f043ee0632e1721effe7902fad5210b89dcd997df21bc3d1222ba3fa5dff1fc
 EBUILD rednotebook-0.9.2.ebuild 875 RMD160 66927a645f4e06595769626e84ab95e9fc9cf0a0 SHA1 3ef552a795b9f7799ed0e06164f6db953776f3f7 SHA256 9d506f45f867bb906af493b304501fc03a312005e19360f03767a2415d218f4e
-MISC ChangeLog 4657 RMD160 2f8be234396a4f39b9fff6ac96d5c2379586e1eb SHA1 8414b43efa8f99d5d31ccce82a890db9d8da0755 SHA256 d9cd2da8715cc7e26cc14de462748b9b130ee1b8a4de5cc8bc5e17cdbc69b595
+EBUILD rednotebook-0.9.3.ebuild 933 RMD160 b11b15185dae9b11bf9a0599d4da4b78864e6a92 SHA1 7c0a14c073ddc42eedfa0532c462b03427ea2389 SHA256 f8e97ad9ceb442209d084be25a5ea427054f6d07405c8cd1a88c476a7fcf1e1f
+MISC ChangeLog 4897 RMD160 38977bd97325ffaed32792d1e721d821e1b373a9 SHA1 3cbf6de0c1580401fa72c10206dbd67bef69e2b2 SHA256 587e6b0e8cd8447cba036465fa981a79596a7e34e367568759b50ffbaab0efc2
 MISC metadata.xml 562 RMD160 8910e3175966c5d0e8a86a33ce20253771adab7f SHA1 544cddd6c181d4a3392d82aad598e3bc57e16b11 SHA256 46f61bb583ed63fd586eae78340198971a18e46c0fe652abb09197f72469a4ad
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkt8VF8ACgkQkKaRLQcq0GJQUQCffR7q+GbFe1dxzCXjv12u0BL/
-EQYAniZK+DRARgXtmS97bBZGjxMDHiqe
-=dpHq
------END PGP SIGNATURE-----
diff --git a/x11-misc/rednotebook/files/rednotebook-0.9.3-disable-webkit.patch b/x11-misc/rednotebook/files/rednotebook-0.9.3-disable-webkit.patch
new file mode 100644
index 000000000000..ccc3ed9b44eb
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-0.9.3-disable-webkit.patch
@@ -0,0 +1,17 @@
+Index: rednotebook-0.9.3/rednotebook/gui/browser.py
+===================================================================
+--- rednotebook-0.9.3.orig/rednotebook/gui/browser.py
++++ rednotebook-0.9.3/rednotebook/gui/browser.py
+@@ -36,11 +36,7 @@ if __name__ == '__main__':
+ 	gobject.threads_init() # also initializes the gdk threads
+ 	
+ 
+-try:
+-	import webkit
+-except ImportError:
+-	logging.info('webkit not found. For a nicer preview install python-webkit or pywebkitgtk')
+-	webkit = None
++webkit = None
+ 	
+ from rednotebook.util import filesystem
+ 	
diff --git a/x11-misc/rednotebook/rednotebook-0.7.5.ebuild b/x11-misc/rednotebook/rednotebook-0.7.5.ebuild
deleted file mode 100644
index 9d37cbb22566..000000000000
--- a/x11-misc/rednotebook/rednotebook-0.7.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-0.7.5.ebuild,v 1.6 2009/11/21 04:52:55 hwoarang Exp $
-
-NEED_PYTHON="2.5"
-inherit distutils
-
-DESCRIPTION="A graphical journal with calendar, templates, tags, keyword searching, and export functionality"
-HOMEPAGE="http://rednotebook.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pyyaml
-	>=dev-python/pygtk-2.13"
diff --git a/x11-misc/rednotebook/rednotebook-0.8.9-r1.ebuild b/x11-misc/rednotebook/rednotebook-0.9.3.ebuild
index 2920d413ceda..9b85c4f45436 100644
--- a/x11-misc/rednotebook/rednotebook-0.8.9-r1.ebuild
+++ b/x11-misc/rednotebook/rednotebook-0.9.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-0.8.9-r1.ebuild,v 1.3 2010/02/08 08:54:03 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-0.9.3.ebuild,v 1.1 2010/04/24 20:19:44 hwoarang Exp $
 
 EAPI="2"
 
-NEED_PYTHON="2.6"
-inherit eutils distutils
+PYTHON_DEPEND="2"
+inherit python eutils distutils
 
 DESCRIPTION="A graphical journal with calendar, templates, tags, keyword searching, and export functionality"
 HOMEPAGE="http://rednotebook.sourceforge.net"
@@ -14,13 +14,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libyaml spell"
+IUSE="libyaml spell webkit"
 
 RDEPEND="dev-python/pyyaml[libyaml?]
 	>=dev-python/pygtk-2.13
-	spell? ( dev-python/gtkspell-python )"
+	spell? ( dev-python/gtkspell-python )
+	webkit? ( dev-python/pywebkitgtk )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
 
 src_prepare() {
-	! use spell && epatch "${FILESDIR}/${P}_disable_spell.patch"
+	! use webkit && epatch "${FILESDIR}/${P}-disable-webkit.patch"
+	! use spell && epatch "${FILESDIR}/${PN}-0.8.9_disable_spell.patch"
 	distutils_src_prepare
 }