Update patches for the 1.1.0 ebuild. Thanks to Diego Elio Pettenò <flameeyes> for pointing this out

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

6 files changed, 66 insertions, 40 deletions

diff --git a/x11-misc/rednotebook/ChangeLog b/x11-misc/rednotebook/ChangeLog
index 529c401a0036..cd9b12c20f2d 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.36 2010/08/04 07:53:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.37 2010/08/05 21:04:15 hwoarang Exp $
+
+  05 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  -rednotebook-1.0.0.ebuild, rednotebook-1.1.0.ebuild,
+  +files/rednotebook-1.1.0-disable-spell.patch,
+  +files/rednotebook-1.1.0-disable-webkit.patch:
+  Update patches for the 1.1.0 ebuild. Thanks to Diego Elio Pettenò
+  <flameeyes> for pointing this out
 
 *rednotebook-1.1.0 (04 Aug 2010)
 
diff --git a/x11-misc/rednotebook/Manifest b/x11-misc/rednotebook/Manifest
index 281a453cb7cc..f30289caff0b 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -1,11 +1,11 @@
 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
 AUX rednotebook-0.9.3-disable-webkit.patch 548 RMD160 1707b14b32878ac2c71ea7ea83e5d9c149b85f21 SHA1 4fbccb8719ee6a62d2b187bcb9bcbd1d3e0ef741 SHA256 eddf1edcd91bdfa9076a113e4809611aeea142a853f237e1cddc9db2051ec06f
+AUX rednotebook-1.1.0-disable-spell.patch 979 RMD160 1c6d1f66ee69f28e91af7a928d541b6201ed2690 SHA1 c4949cca7e2c5b397d28e5998fda53041fa7ce7b SHA256 730eed5312042cb481a1ac10ab65a22dec8e7bc42c54634c6abbbc20a04ccb22
+AUX rednotebook-1.1.0-disable-webkit.patch 506 RMD160 1a73f091b3996e2d5c0f1d7a34715ed4843cd920 SHA1 665f0bfea502dd9769c1e614ce0c176ee7b35fa2 SHA256 1405fcbc3c7c8a7e7a645aa4555be4405265cd010274326a190d60e992a02a48
 DIST rednotebook-0.9.5.tar.gz 393927 RMD160 53f7d650d7190bf6c0b761f3e5a11b56b44b1339 SHA1 608026d9e08449f473a33b3b40159c75e31022ce SHA256 7a51f0c13cf43476acc87790e5e4e0d86a8c4ff312783404a5e5af8173b817e2
-DIST rednotebook-1.0.0.tar.gz 410470 RMD160 76e0627367579646e2b69c2d34afdb51ce747737 SHA1 8cd196c7a42583beeecce801f56ef2892645b70f SHA256 c4a6024d476c90cced17067b1b92a49fe159d237ae09ecaac0854e8a42cb3342
 DIST rednotebook-1.1.0.tar.gz 452298 RMD160 6757238613dcec18228bf7e8f24a47f9e1044149 SHA1 b53d29f9b7f226d6304208e851238ae9de564d33 SHA256 4c2ccfa880afaea3c580d3c85f4bd7501f1ad4594babaabc5f009ab0f11a095b
 EBUILD rednotebook-0.9.5.ebuild 936 RMD160 e6e17d83949430c3a927023e55615457ef282d52 SHA1 a1bb9ef02d5fc8b644dfde9ec9980a3ba6377795 SHA256 d22dbce11de331475a8ae15fdd8e222bccf1df35e938453f26fc7a4ec8e75253
-EBUILD rednotebook-1.0.0.ebuild 940 RMD160 a2b58da59815a01247401ba0e896421377bb18c2 SHA1 8b58f9b5763e0f815c291409166e361318a2068b SHA256 ae3cbd4006a1506b9ab506d89a8cf49943dc92de5b09822193b9a3a6db9a5c88
-EBUILD rednotebook-1.1.0.ebuild 940 RMD160 18e2b502d6bc5f35c819a2b5f711ca92a9c81f5a SHA1 a00a1df5e60f455d172bd6eb2c145cb0860cb237 SHA256 02f9e7a26849033ec3ecc2c752eace4725f55dd081e903ff2feaab7e0f8c5f92
-MISC ChangeLog 5942 RMD160 865f4e3df199f9cde475af90e8b096c4235cf358 SHA1 ead7a47addc4955b221a398ba28616ef57ffa85c SHA256 cbeb4ee7bb5fb7b2aaafb1e43a009efefff16390dee3eb864d1a3ab3c21373e2
+EBUILD rednotebook-1.1.0.ebuild 926 RMD160 ae6c56628403c8f9eb87b057eed2cc10e70b854e SHA1 f2634c8d14065d90b0989d5c63aea72017f8c9a9 SHA256 7427b72daa9bd0339f94e3318a921b1b4efcd0b7c801ba5ba1a9b57c48db641a
+MISC ChangeLog 6253 RMD160 48ad5f67859915f5cc396e0c8052ffbeee1bc7e3 SHA1 a141e87b7498532a14ba4d342f7f3ab8954430c3 SHA256 3a0c83116af719b3a3501021cb0c9a887bdc49b3a34032c511a028fe1e678d13
 MISC metadata.xml 567 RMD160 4ce53c6589c3d1c44b1dc7490cebfafe905694b5 SHA1 9c3aa6bb026fac7de3c072f413ef5f27063f790d SHA256 746556c0ca872a8a69efdb71b7bbf2f69d2d161d26d6f83d55550b0f199d0bc6
diff --git a/x11-misc/rednotebook/files/rednotebook-1.1.0-disable-spell.patch b/x11-misc/rednotebook/files/rednotebook-1.1.0-disable-spell.patch
new file mode 100644
index 000000000000..6ca6e3a66ff4
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-1.1.0-disable-spell.patch
@@ -0,0 +1,34 @@
+Index: rednotebook-1.1.0/rednotebook/gui/keepnote/gui/richtext/__init__.py
+===================================================================
+--- rednotebook-1.1.0.orig/rednotebook/gui/keepnote/gui/richtext/__init__.py
++++ rednotebook-1.1.0/rednotebook/gui/keepnote/gui/richtext/__init__.py
+@@ -17,11 +17,7 @@ pygtk.require('2.0')
+ import gtk, gobject, pango
+ from gtk import gdk
+ 
+-# try to import spell check
+-try:
+-    import gtkspell
+-except ImportError:
+-    gtkspell = None
++gtkspell = None
+ 
+ 
+ # textbuffer_tools imports
+Index: rednotebook-1.1.0/rednotebook/gui/main_window.py
+===================================================================
+--- rednotebook-1.1.0.orig/rednotebook/gui/main_window.py
++++ rednotebook-1.1.0/rednotebook/gui/main_window.py
+@@ -30,11 +30,7 @@ import gtk
+ import gobject
+ import pango
+ 
+-# try to import gtkspell
+-try:
+-    import gtkspell
+-except ImportError:
+-    gtkspell = None
++gtkspell = None
+ 
+ 
+ # Initialize the gtk thread engine
diff --git a/x11-misc/rednotebook/files/rednotebook-1.1.0-disable-webkit.patch b/x11-misc/rednotebook/files/rednotebook-1.1.0-disable-webkit.patch
new file mode 100644
index 000000000000..f5758ad105d4
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-1.1.0-disable-webkit.patch
@@ -0,0 +1,17 @@
+Index: rednotebook-1.1.0/rednotebook/gui/browser.py
+===================================================================
+--- rednotebook-1.1.0.orig/rednotebook/gui/browser.py
++++ rednotebook-1.1.0/rednotebook/gui/browser.py
+@@ -67,12 +67,6 @@ def windows_webkit_import():
+ 
+ if sys.platform == 'win32':
+ 	windows_webkit_import()
+-else:
+-	try:
+-		import webkit
+-	except ImportError:
+-		logging.info('webkit not found. For a nicer preview install python-webkit or pywebkitgtk')
+-	
+ 	
+ 	
+ def can_print_pdf():
diff --git a/x11-misc/rednotebook/rednotebook-1.0.0.ebuild b/x11-misc/rednotebook/rednotebook-1.0.0.ebuild
deleted file mode 100644
index ec81f6f80ad6..000000000000
--- a/x11-misc/rednotebook/rednotebook-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-1.0.0.ebuild,v 1.1 2010/06/23 21:12:50 hwoarang Exp $
-
-EAPI="2"
-
-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"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libyaml spell webkit"
-
-RDEPEND="dev-python/pyyaml[libyaml?]
-	>=dev-python/pygtk-2.13
-	spell? ( dev-python/gtkspell-python )
-	webkit? ( dev-python/pywebkitgtk )"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	! use webkit && epatch "${FILESDIR}/${PN}-0.9.3-disable-webkit.patch"
-	! use spell && epatch "${FILESDIR}/${PN}-0.8.9_disable_spell.patch"
-	distutils_src_prepare
-}
diff --git a/x11-misc/rednotebook/rednotebook-1.1.0.ebuild b/x11-misc/rednotebook/rednotebook-1.1.0.ebuild
index 37b59758406f..3d1add30abc2 100644
--- a/x11-misc/rednotebook/rednotebook-1.1.0.ebuild
+++ b/x11-misc/rednotebook/rednotebook-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # 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-1.1.0.ebuild,v 1.1 2010/08/04 07:53:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-1.1.0.ebuild,v 1.2 2010/08/05 21:04:15 hwoarang Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	! use webkit && epatch "${FILESDIR}/${PN}-0.9.3-disable-webkit.patch"
-	! use spell && epatch "${FILESDIR}/${PN}-0.8.9_disable_spell.patch"
+	! use webkit && epatch "${FILESDIR}/${P}-disable-webkit.patch"
+	! use spell && epatch "${FILESDIR}/${P}-disable-spell.patch"
 	distutils_src_prepare
 }