Bug Fix 428452 - Ebuild/Pkg Locale Handling Conflict, Updated python dependencies and supported use flags.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 13 insertions, 18 deletions

diff --git a/x11-misc/rednotebook/ChangeLog b/x11-misc/rednotebook/ChangeLog
index 23c1bea152c1..cc2c4a12f8d3 100644
--- a/x11-misc/rednotebook/ChangeLog
+++ b/x11-misc/rednotebook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/rednotebook
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.63 2012/07/26 21:58:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/ChangeLog,v 1.64 2012/07/30 08:07:55 mattm Exp $
+
+*rednotebook-1.5.0-r1 (30 Jul 2012)
+
+  30 Jul 2012; Matthew Marlowe <mattm@gentoo.org> +rednotebook-1.5.0-r1.ebuild,
+  -rednotebook-1.5.0.ebuild, metadata.xml:
+  Bug Fix 428452 - Ebuild/Pkg Locale Handling Conflict, Updated python
+  dependencies and supported use flags.
 
 *rednotebook-1.5.0 (26 Jul 2012)
 
diff --git a/x11-misc/rednotebook/metadata.xml b/x11-misc/rednotebook/metadata.xml
index c9e96748e736..007d479e65e2 100644
--- a/x11-misc/rednotebook/metadata.xml
+++ b/x11-misc/rednotebook/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <use>
 	<flag name='libyaml'>enable libyaml support</flag>
-	<flag name='webkit'>enable previews using webkit engine</flag>
+	<flag name='spell'>enable gtk-spell support</flag>
 </use>
 <maintainer>
 <email>mattm@gentoo.org</email>
diff --git a/x11-misc/rednotebook/rednotebook-1.5.0.ebuild b/x11-misc/rednotebook/rednotebook-1.5.0-r1.ebuild
index 0205b96224d4..e41fdf9130fc 100644
--- a/x11-misc/rednotebook/rednotebook-1.5.0.ebuild
+++ b/x11-misc/rednotebook/rednotebook-1.5.0-r1.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-1.5.0.ebuild,v 1.1 2012/07/26 21:58:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rednotebook/rednotebook-1.5.0-r1.ebuild,v 1.1 2012/07/30 08:07:55 mattm Exp $
 
 EAPI="3"
 
-PYTHON_DEPEND="2"
-LANGS="ar ast be bg bs ca cs cy da de el en_GB eo es eu fi fo fr gl he hr hu hy
-id it ja ka kk ko lt mn ms nb nds nl nn oc pl pt pt_BR ro ru si sk sr sv ta te
-tl tr ug uk uz vi wa zh_CN zh_HK zh_TW"
+PYTHON_DEPEND="2:2.6"
 
 inherit python eutils distutils
 
@@ -19,13 +16,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libyaml spell"
-for x in ${LANGS}; do
-	IUSE="${IUSE} linguas_${x}"
-done
 
 RDEPEND="dev-python/pyyaml[libyaml?]
 	>=dev-python/pygtk-2.13
-	dev-python/pywebkitgtk
+	>=dev-python/pywebkitgtk-1.1.5
+	dev-python/chardet
 	spell? ( dev-python/gtkspell-python )"
 
 pkg_setup() {
@@ -35,12 +30,5 @@ pkg_setup() {
 
 src_prepare() {
 	! use spell && epatch "${FILESDIR}/${PN}-1.2.0-disable-spell.patch"
-	# rename wae file. I think this should be wa.po instead of wae.po
-	mv po/wae.po po/wa.po || die
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm po/${x}.po || die
-		fi
-	done
 	distutils_src_prepare
 }