Version bump

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

4 files changed, 98 insertions, 2 deletions

diff --git a/x11-misc/rednotebook/ChangeLog b/x11-misc/rednotebook/ChangeLog
index cd9b12c20f2d..a892c2c2de02 100644
--- a/x11-misc/rednotebook/ChangeLog
+++ b/x11-misc/rednotebook/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2010/08/05 21:04:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.38 2010/08/22 12:42:49 hwoarang Exp $
+
+*rednotebook-1.1.1 (22 Aug 2010)
+
+  22 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +rednotebook-1.1.1.ebuild, +files/rednotebook-1.1.1-disable-webkit.patch:
+  Version bump
 
   05 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
   -rednotebook-1.0.0.ebuild, rednotebook-1.1.0.ebuild,
diff --git a/x11-misc/rednotebook/Manifest b/x11-misc/rednotebook/Manifest
index f30289caff0b..fad31b367683 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -1,11 +1,24 @@
+-----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
 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
+AUX rednotebook-1.1.1-disable-webkit.patch 1263 RMD160 6d64a9ea3d054e0ffc23c0b134a6d24fd124a57c SHA1 a0d6e058ee21391e05ae1fd50a120af0b481ba11 SHA256 501814e19ce8765a52cedc3c0f368ac3c53ea9658c7a9f233d9d710db90c82ff
 DIST rednotebook-0.9.5.tar.gz 393927 RMD160 53f7d650d7190bf6c0b761f3e5a11b56b44b1339 SHA1 608026d9e08449f473a33b3b40159c75e31022ce SHA256 7a51f0c13cf43476acc87790e5e4e0d86a8c4ff312783404a5e5af8173b817e2
 DIST rednotebook-1.1.0.tar.gz 452298 RMD160 6757238613dcec18228bf7e8f24a47f9e1044149 SHA1 b53d29f9b7f226d6304208e851238ae9de564d33 SHA256 4c2ccfa880afaea3c580d3c85f4bd7501f1ad4594babaabc5f009ab0f11a095b
+DIST rednotebook-1.1.1.tar.gz 417104 RMD160 4459ced0461fdb1e6ae64791486e177492581fad SHA1 0c80044b9a9463f3a98e9ebe3a8d36aa4f5f14ea SHA256 9d334dc3eb6bd3e420160c13d44d0039e3aaab30d0732212db35471289197e7d
 EBUILD rednotebook-0.9.5.ebuild 936 RMD160 e6e17d83949430c3a927023e55615457ef282d52 SHA1 a1bb9ef02d5fc8b644dfde9ec9980a3ba6377795 SHA256 d22dbce11de331475a8ae15fdd8e222bccf1df35e938453f26fc7a4ec8e75253
 EBUILD rednotebook-1.1.0.ebuild 926 RMD160 ae6c56628403c8f9eb87b057eed2cc10e70b854e SHA1 f2634c8d14065d90b0989d5c63aea72017f8c9a9 SHA256 7427b72daa9bd0339f94e3318a921b1b4efcd0b7c801ba5ba1a9b57c48db641a
-MISC ChangeLog 6253 RMD160 48ad5f67859915f5cc396e0c8052ffbeee1bc7e3 SHA1 a141e87b7498532a14ba4d342f7f3ab8954430c3 SHA256 3a0c83116af719b3a3501021cb0c9a887bdc49b3a34032c511a028fe1e678d13
+EBUILD rednotebook-1.1.1.ebuild 933 RMD160 ce233f8eacaeac1c7f5094790f8b6385ae045966 SHA1 9a336adac88c84c5f503eea334238c4e53a0e63c SHA256 c8c57128aca254d6eaa14f3b5a0a807ce1db9e558ef82fd48c3eae0487578942
+MISC ChangeLog 6432 RMD160 0bfa6d97ebbe3288b58e75607b66d2bae15ec0a0 SHA1 13fa8c2fd3251f091fdc2a13e99fa44458189242 SHA256 b555eb621e024497149ada367352d2b29b314b2f9d9f09d2d3da031777e32b10
 MISC metadata.xml 567 RMD160 4ce53c6589c3d1c44b1dc7490cebfafe905694b5 SHA1 9c3aa6bb026fac7de3c072f413ef5f27063f790d SHA256 746556c0ca872a8a69efdb71b7bbf2f69d2d161d26d6f83d55550b0f199d0bc6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxxHBgACgkQ9/cejkQaxBCbMACfUSgzu7FqOrOv0U9TOUNsYIiE
+hh8AoIEeW7NfMweWJwWdshQSQsKsGC5e
+=x0IB
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/rednotebook/files/rednotebook-1.1.1-disable-webkit.patch b/x11-misc/rednotebook/files/rednotebook-1.1.1-disable-webkit.patch
new file mode 100644
index 000000000000..10c601bf20b0
--- /dev/null
+++ b/x11-misc/rednotebook/files/rednotebook-1.1.1-disable-webkit.patch
@@ -0,0 +1,45 @@
+Index: rednotebook-1.1.1/rednotebook/gui/browser.py
+===================================================================
+--- rednotebook-1.1.1.orig/rednotebook/gui/browser.py
++++ rednotebook-1.1.1/rednotebook/gui/browser.py
+@@ -40,40 +40,6 @@ from rednotebook.util import filesystem
+ 
+ webkit = None
+ 
+-def windows_webkit_import():
+-    global webkit
+-    
+-    cwd = os.getcwd()
+-    
+-    if filesystem.main_is_frozen():
+-        gtk_bin_dir = filesystem.app_dir
+-    else:
+-        gtk_bin_dir = r'C:\GTK'
+-        
+-    try:
+-        # It seems the dlls are only found if we are in the bin dir
+-        # during import
+-        os.chdir(gtk_bin_dir)
+-    except WindowsError:
+-        logging.error('Changing dir to "%s" failed' % gtk_bin_dir)
+-        return
+-    
+-    try:
+-        import webkit
+-    except ImportError:
+-        logging.info('webkit not found. For a nicer preview install python-webkit or pywebkitgtk')
+-    os.chdir(cwd)
+-
+-if False and 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():
+     if not webkit:
+         return False
diff --git a/x11-misc/rednotebook/rednotebook-1.1.1.ebuild b/x11-misc/rednotebook/rednotebook-1.1.1.ebuild
new file mode 100644
index 000000000000..c3af3aabf52f
--- /dev/null
+++ b/x11-misc/rednotebook/rednotebook-1.1.1.ebuild
@@ -0,0 +1,32 @@
+# 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.1.ebuild,v 1.1 2010/08/22 12:42: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}/${P}-disable-webkit.patch"
+	! use spell && epatch "${FILESDIR}/${PN}-1.1.0-disable-spell.patch"
+	distutils_src_prepare
+}