Fix gtkspell-python automagic dependency ( bug #293765 )

(Portage version: 2.2_rc50/cvs/Linux x86_64)

5 files changed, 52 insertions, 44 deletions

diff --git a/x11-misc/rednotebook/ChangeLog b/x11-misc/rednotebook/ChangeLog
index 413360a0b728..061ed321e232 100644
--- a/x11-misc/rednotebook/ChangeLog
+++ b/x11-misc/rednotebook/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/rednotebook
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.19 2009/11/09 20:01:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.20 2009/11/20 18:44:40 hwoarang Exp $
+
+*rednotebook-0.8.9-r1 (20 Nov 2009)
+
+  20 Nov 2009; Markos Chandras <hwoarang@gentoo.org>
+  -rednotebook-0.8.6.ebuild, -rednotebook-0.8.7.ebuild,
+  -rednotebook-0.8.9.ebuild, +rednotebook-0.8.9-r1.ebuild,
+  +files/rednotebook-0.8.9_disable_spell.patch:
+  Fix gtkspell-python automagic dependency ( bug #293765 ). Remove old
+  ebuilds
 
 *rednotebook-0.8.9 (09 Nov 2009)
 
diff --git a/x11-misc/rednotebook/files/rednotebook-0.8.9_disable_spell.patch b/x11-misc/rednotebook/files/rednotebook-0.8.9_disable_spell.patch
new file mode 100644
index 000000000000..dd60a4b9424e
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-0.8.9_disable_spell.patch
@@ -0,0 +1,33 @@
+Index: rednotebook-0.8.9/rednotebook/gui/keepnote/gui/richtext/__init__.py
+===================================================================
+--- rednotebook-0.8.9.orig/rednotebook/gui/keepnote/gui/richtext/__init__.py
++++ rednotebook-0.8.9/rednotebook/gui/keepnote/gui/richtext/__init__.py
+@@ -18,10 +18,7 @@ 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-0.8.9/rednotebook/gui/mainWindow.py
+===================================================================
+--- rednotebook-0.8.9.orig/rednotebook/gui/mainWindow.py
++++ rednotebook-0.8.9/rednotebook/gui/mainWindow.py
+@@ -31,11 +31,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/rednotebook-0.8.7.ebuild b/x11-misc/rednotebook/rednotebook-0.8.7.ebuild
deleted file mode 100644
index 02d56a07e751..000000000000
--- a/x11-misc/rednotebook/rednotebook-0.8.7.ebuild
+++ /dev/null
@@ -1,20 +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.8.7.ebuild,v 1.1 2009/10/03 18:29:26 hwoarang Exp $
-
-EAPI="2"
-
-NEED_PYTHON="2.6"
-inherit distutils
-
-DESCRIPTION="A graphical journal with calendar, templates, tags, keyword searching, and export functionality"
-HOMEPAGE="http://digitaldump.wordpress.com/projects/rednotebook/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libyaml"
-
-RDEPEND="dev-python/pyyaml[libyaml?]
-	>=dev-python/pygtk-2.13"
diff --git a/x11-misc/rednotebook/rednotebook-0.8.6.ebuild b/x11-misc/rednotebook/rednotebook-0.8.9-r1.ebuild
index da48974c61c8..0d45246ff4c8 100644
--- a/x11-misc/rednotebook/rednotebook-0.8.6.ebuild
+++ b/x11-misc/rednotebook/rednotebook-0.8.9-r1.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/rednotebook/rednotebook-0.8.6.ebuild,v 1.1 2009/09/13 16:13:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-0.8.9-r1.ebuild,v 1.1 2009/11/20 18:44:40 hwoarang Exp $
 
 EAPI="2"
 
@@ -14,7 +14,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libyaml"
+IUSE="libyaml spell"
 
 RDEPEND="dev-python/pyyaml[libyaml?]
-	>=dev-python/pygtk-2.13"
+	>=dev-python/pygtk-2.13
+	spell? ( dev-python/gtkspell-python )"
+
+src_prepare() {
+	! use spell && epatch "${FILESDIR}/${P}_disable_spell.patch"
+	distutils_src_prepare
+}
diff --git a/x11-misc/rednotebook/rednotebook-0.8.9.ebuild b/x11-misc/rednotebook/rednotebook-0.8.9.ebuild
deleted file mode 100644
index 507ec5765026..000000000000
--- a/x11-misc/rednotebook/rednotebook-0.8.9.ebuild
+++ /dev/null
@@ -1,20 +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.8.9.ebuild,v 1.1 2009/11/09 20:01:22 hwoarang Exp $
-
-EAPI="2"
-
-NEED_PYTHON="2.6"
-inherit distutils
-
-DESCRIPTION="A graphical journal with calendar, templates, tags, keyword searching, and export functionality"
-HOMEPAGE="http://digitaldump.wordpress.com/projects/rednotebook/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libyaml"
-
-RDEPEND="dev-python/pyyaml[libyaml?]
-	>=dev-python/pygtk-2.13"