Fix gtkspell-python automagic dependency ( bug #293765 )

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

6 files changed, 55 insertions, 50 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/Manifest b/x11-misc/rednotebook/Manifest
index 68e7e1dc4bf3..e94fd733582b 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -1,10 +1,7 @@
+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.6.tar.gz 278491 RMD160 3492ed13f0e04bc9898fe3607d4e3f931f2c320c SHA1 f5e405e063f7fd77315a3957315f9411b7beef27 SHA256 9420d27a73f47ed3ca5f5656c0c3fefab5ae13cf4ebcdaaa6c53bfb5404dd98f
-DIST rednotebook-0.8.7.tar.gz 268919 RMD160 e082d8050a5f2627c0d242c92a95cf40063be86c SHA1 94a99ad32ece4bedfe2f077bd005971697c6466c SHA256 40d95353c831fea12958cb138a713a6fa76c426ee8c0b183877b8ead9966bd48
 DIST rednotebook-0.8.9.tar.gz 325892 RMD160 8757cd7d83477159bde8b259943bb43ad7c371f3 SHA1 38959c2b5d3e0ed2e57454530bd520d853a8a3b0 SHA256 d5e0ce47336ca37468f4e6b9883b11429a0047a22d93df11268a716470f42e9d
 EBUILD rednotebook-0.7.5.ebuild 601 RMD160 88f35c7639582df301466dad6cb7b9de0273a55b SHA1 5e08506042e59ebae1e2e650a0df4641267b3bc9 SHA256 3be74f42a568e884a90914da9efd149b3735e011ef011ca435a008b3fac3422f
-EBUILD rednotebook-0.8.6.ebuild 627 RMD160 e6187618915b11c0b4dc9f4bdf02eae376818100 SHA1 19725c67fc2f0b2baceb6f6a74a55c3eef41a820 SHA256 d2e1b0b8e8f8d437c27e56ca998940a188ee6d3565c0a93c7f25ab40d7308c22
-EBUILD rednotebook-0.8.7.ebuild 630 RMD160 358331eb9b3930afb7adc91d6deea21a2dca0190 SHA1 9d06100a45f51f2a51e1d634049451521a13c147 SHA256 da894b96374499eca401c4cfebabb8d8b69238818f040ef92662e3e30bc6c115
-EBUILD rednotebook-0.8.9.ebuild 630 RMD160 031d73ea49eab53eef35a42fa4ab6c41e61ba4bd SHA1 67923c54ba9a745eddf53eb74ef1214c40550b12 SHA256 b4d708d48390b6a159bedc8b3bb8ceb7072884a17d266a00d1934e1eb25320f9
-MISC ChangeLog 3433 RMD160 d1825b5b6896b7c91cd2e10b6ca39d086f6120d3 SHA1 96f1c0c194a12dac1aeac7e287af0bb885ab0ef9 SHA256 24a12c920d7c7258ba1f60956270194368faa99fe7a7897378d75e5537037d02
+EBUILD rednotebook-0.8.9-r1.ebuild 782 RMD160 f9f1b8cccb9b1c356e0398dea287de205a1e9c6d SHA1 552ff70b517565fdec850a56a33c718b8224a642 SHA256 d3a69b2bcfbcd5d5a4ea5032763f347be4599bf6115c37e28019fb947fe4238a
+MISC ChangeLog 3768 RMD160 14cfcc570a6ccb7702cda40488851a75d3a04744 SHA1 39b66f8d4604250a56c288f3de3811b4035be8a0 SHA256 2486af25c1bddae8305dd8791dac1dfabb4bd92897ae517f1a656658379b1bad
 MISC metadata.xml 498 RMD160 da159e97d5705dc83a6bbf141c4fef87ae4e1794 SHA1 e42221002212743ec211614bf3e7a8e9dd6392b9 SHA256 c1d2b446557d3c653567ae65757eedf8e0dc7a5084b908eca1cba28a94b885ab
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"