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

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 25 insertions, 36 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/Manifest b/x11-misc/rednotebook/Manifest
index bca0edbad19a..bd84c5e92356 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -6,28 +6,22 @@ AUX rednotebook-1.1.1-disable-webkit.patch 1263 SHA256 501814e19ce8765a52cedc3c0
 AUX rednotebook-1.1.2-disable-webkit.patch 483 SHA256 45671c12f7d673e029cc4a77aeb1073710bc79d2224560fb713661121823329a SHA512 90b7eb4f09945a6f7d14ba3bef2912dc01d864493b4a4117c324ae07efa031644739af0070d416df7e6ed1d92d2d09c33983b751f9bcced20a6b09178e2c1ac8 WHIRLPOOL 1a422cce5f14b6291975e1b9930f3a13484853122182e07ea0622f3571e9a8e64ea8b47eecc5c6d273e1e2041f535aeb2420e68051bfdc738feced081712998c
 AUX rednotebook-1.1.4-disable-webkit.patch 550 SHA256 a4edccd4a0ab9491ec1b012fb93b9e8affe768ccde28d68d0c4577e0249bb3fb SHA512 3e247b458116b24ad593da78f61167a3e8464221bf7e8a13fdbfc4b45e6c5fdbac57371d4c49133cda9cb479d9752f0ceb7581ab22142778bb4bbafc6849b087 WHIRLPOOL a8ad56445d7926f5bd67702346a1036a3149a1bfa46867b28a8dc5adc45f0d9f53bc6c0f2e46b066416d25d378298b050afdecd0253f26953798b6eec9cde8e6
 AUX rednotebook-1.2.0-disable-spell.patch 469 SHA256 db13324d803102d8af5facfa1de8a22292130feaef57275be5b1aa99e5bbd470 SHA512 747f21d327f2dac06a542d3dba135986b68c5377123bbef254c63213cbf3741642b1bdb8dc19043ef5d3bc3d78d6456bd7f38874f7247ef38cb2d691c8b7ed1d WHIRLPOOL 503aba0e71fe72e7c77adbe1cffb6e3327abb04091f70d412738b9666184f2a1d2ff7ac21872e3928d7386d2fd168dc4a6982dba18ce4d340f567255c5180f71
-DIST rednotebook-1.2.0.tar.gz 503863 SHA256 9e38b7d472141b6f4c45ab8ac00d7e7e9f138f97eaa54bfbd5e09bd97d3e8f16
-DIST rednotebook-1.4.0.tar.gz 449654 SHA256 ca68e39e5fa3182eef334d160ff9b389aad39c22abfe7caa560a5ff92eb038b0
+DIST rednotebook-1.2.0.tar.gz 503863 SHA256 9e38b7d472141b6f4c45ab8ac00d7e7e9f138f97eaa54bfbd5e09bd97d3e8f16 SHA512 82f8a89ab040523402e9eca5511548ae059ac956adf2a72bb724035310f581156d2779e94a545b15127b61c5399221bc911fd27877bd0b7ab0d3507040dd0948 WHIRLPOOL 7028fa21a8d09135273546757f3e756f2adb182958ba6663afead87235e54084e6588938e5181e56542ce2ec4982edc456138d8dad34f08bfd8d19704fd15053
+DIST rednotebook-1.4.0.tar.gz 449654 SHA256 ca68e39e5fa3182eef334d160ff9b389aad39c22abfe7caa560a5ff92eb038b0 SHA512 04ba842b4b2050de15ea080af509a95c573664f2947ca7acbd51c0987185dfcff18b65d53db1ca61dba586f6a9f3193c20782c225229268c647c2b5716fc318b WHIRLPOOL a5fcebfb249f38c1a2924b4f8cdfb7b4f691fce20d25a068424eca04f41c512ef4a16e197808a0a384784e182f9f0bc52dd2590ee162170748b9dbbe4a839470
 DIST rednotebook-1.5.0.tar.gz 446136 SHA256 5d18a01f6d72e1be0a89b96e57d05fe983572755d1636fab4be256501aa3dcf9 SHA512 3892ec1b2f8b9a2c837bbbdfb1176158ab640996031273e3a93136e6f40ded5e735776644ff9fc1990fd9f2a450bb7cb62255749a8a476cf057ba45defded8f0 WHIRLPOOL 3efdac3c695912d12631cb9ca473ce98728d9b8c30808484f7cff8dc896ba1e0e5d58ea928dd63b36ffe9545254cc9d8d03ea859ee123f329e5d2c1394b664c9
 EBUILD rednotebook-1.2.0.ebuild 861 SHA256 2bb3705ed946d5c4fee7abfa780e337206f6e2b06f721508388f71341da68322 SHA512 7d2f3963e27cf181989a95b4769e7665fbaf137a4c6e9d7d5c9ae7eb59c03a281b46eaa51648d44f806ac85fa1c27e70795930e8c9b5a00a003bffe94a8b4e9d WHIRLPOOL 54ddc2633f92f1a3b1a7fde5d75f5a0d6513e85082ed3386cdfcc1eabce0d808c060d9f9bf92edaa6777091c992243dc8132553f0b248d0a2f285cc1c3a60651
 EBUILD rednotebook-1.4.0.ebuild 1305 SHA256 1a1b321256d4ae9f86ba421823024a092072ec557e7823fa55d18f3f95c765fa SHA512 8ff21bc2fbfee63ba3a79df2d55a8e913f37a78d814180abf11666c54be805697257d81d044ad43ed5d25e85d4caa8d7a9632fa928a2d12078f67da8b0f8f443 WHIRLPOOL 5799fe487f22eab2199aa72cfb6898249c9a0a2e5d9c4cf0472830cfb4401c0427b338638dd4874dd13b007e4f3bfa138928b90b84a46bee309e0ac029d9b87e
-EBUILD rednotebook-1.5.0.ebuild 1312 SHA256 e6d5e610bfaedec49e7eaa872ccd49b5a0dde97f100b8d3e60d3e8466ed11031 SHA512 735ba2bc130093aa8857ab65333269ba5680de2da9294f2ec26f1da46375e6b637a007b8e926d8aecba647dd8ab14fa421344d587b29370272db594d8a504842 WHIRLPOOL d0f40d95666d72831ee05fcdda2795eb79607eb2388dafde6d40984a56f7de65459df240aabb7ec5f16357eaf095e44a2c979f41924e048cde522d9aadf78d7a
-MISC ChangeLog 10028 SHA256 2e9d56664e969cda133032a70e7431f4b4792e7c924c8339a4d9e3b3432fc0fd SHA512 6f6c2c3f9e3597bab04c024063138ca81bab9b2166a5a9c28450d69979cd790c081576de1304d967301c6a96eaa2ac6c33c41558d553cffa14ea1927a77cbebf WHIRLPOOL 0ac0fae4c75b8591ba89ca1c301c54b5f3787f07aa1ce7da54d448339ceb9759366632e7957ed48a607753cfc8e4500d7ea22ab9ec71cc0013cada9567eaf682
-MISC metadata.xml 501 SHA256 be24535e9aa9042dd34b08f6cb4bcf6efe1750fd309f7177cd31d6d1250193de SHA512 a5943caaa95f890601c42c4c6c6e7646026557c885ad405e4db894f0abdf3f8401db774fef36816ee14a0fa2bcec787c94df2bc5413a35bbc17e3a21878e12e4 WHIRLPOOL 9129174a47a56c33b4b9d14b6efa82af5ba37738bcad6a0ce7e2bd074d2ad33ac6189ba538e3fa24f2938de1e9909deaf4960f4ff37bf551705ac01090eb5371
+EBUILD rednotebook-1.5.0-r1.ebuild 901 SHA256 669179d17a65ff737bbbf88a3f55262c5557925434ef6fe0387496e6ff7e3799 SHA512 bca8a79bdbb74b07475484d9499b082df1fbf95543581959e41f16bddcf86e14d9fd3fc69d5bae00a63973f8fbf43c6eadb41c93c8e1c1c06a2b1634d64f4d7d WHIRLPOOL 1a7217db65e8c35233ff2bd4d1cadd2bc35d9b512fc6af990187c67778d1bb393854d3da9e227c172a5a6ec2c18f4e4588d46ccf3dbf64ddc86c643b1e14004b
+MISC ChangeLog 10297 SHA256 36689d3798b15814ab0f1a6c3dce56e7cc396cc5bbf897707083cc710b7b61fa SHA512 77d924cb51ba0d72e4b8aef408655291f1786b1031894a1450cf95762a7392fc08f7f0afa87ca50f02859fa6afd5cc0b32a463f7faef4aee50aa1f2419690ed9 WHIRLPOOL 1763203979e091b5327f2ec2a09979b52269f45e703b243ee66d52002b0fcf3f18a82988c897295765379f9707ce5fcc05851803d03d83cac52019935f6bc894
+MISC metadata.xml 489 SHA256 32ec2dcb773445b6ae609bc20917bdaa539547df5eab022bd8a85ea32ca4cab7 SHA512 adb6f4a0b842d6357e5e8071df3a822f8d13842a9cf9d245de3f748561ee2ae72606c18cdabbf46b4c2a60bb51ecb569a193c779737cac6cc5576e89f78090c7 WHIRLPOOL f58295995d86ce740e5622dbf0b1316b65caa7ae8468196c538e7af2093b84abda7f2b7455245c50cae517ce82373a35acc3a2a8242ca86203df525f3970de00
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQEb2VAAoJEPqDWhW0r/LCcB4QAIzuUKmr8NauVavNCRJEeumn
-bki37F3CALVE1zIsZj52nDYifTDsEXVdrUQKvhjBNZou1HJAUddcwUIe3XitiqVj
-6d2oJteR5wTtPV1udy+qgisrBZ3UQ8VYjpgBtIAsJBu/I3vkrIC5ztsKm8xNWAbJ
-c7NA3TKsVCmQCOLJSJZZBq5O0vU+IDu5rIT1lJ6/4hkro7Yzrpw8mIgrzQNoDQyc
-3Ciu4ZqcVJJTtMKTdwCS349K6sAsLOpWCe3s0t9aY6+1I/0961PfrgkptevmMAgG
-04WNemEl872vnbfHyZDPw/P5XnzuUmnouqOh7DFqwt7W9rTAU6WFgIlEu95oBdlw
-Vy3K/jY54fejY42W21B3FgnNNmIsoO9HZoSkeHZ5A5LkLicvyBIGt2E0qMloXZHC
-ze2RQVTn6FhdZT9pdTas6BBSBPzDBfh0Hy0i1yUQlb/Q6uvU0H2L2IcDjTuJQp+z
-OO5g7rI6zHm9P00yCoMbbRnz4QrcMlYiWZNKMa9/DN/MhqgYZRFInauBMirecwbD
-ZWe0NOXknmUUphqWP0NGpAmt8W2/KW0ZyMs72+HMxdQqVfadTcYvM4LhV6PLHyzQ
-TdDIKoiJ1jLA02PBZQYX0KK9V/0zzfh8DU3wXRThvo24qc/n4WsIga8ajb97Opdy
-aiXXFGYzNfQcnARhuUwG
-=4z5p
+iQEcBAEBCAAGBQJQFkDlAAoJEC1LWXx4YDenqzcIAKqgD+lJFP9742znNTGEEl+D
+FkI/bmJFiQb39gfwPaOh4Nlp69hRyaSUuA6lL7ikgYVZZ9jb4BVruLA0zstIoFRL
+apUKL4SuDqJxQqsJ+2FJuLTR47c8y9MVIN52IFX3D03qjClAkcBjZV/i5iA8eydv
+HNLdLgjUkc8KEkGNSx3hPG7IMykQ2rjIBkguU5otICkkauCKgeR19SKf7lhH0Hvt
+FgozoZF7BCQKY1tSUhqG+QzRLcwJ+5U1Ve5N0wzmKfT+ne+fxRPnFw58R06q41M2
+CFfdUy4rFbOs9IJJ5yV7pyCPBiCRvj0ZhJyz/AUyjeHSoIv6uhH9TlS0zCPHMPE=
+=1TZb
 -----END PGP SIGNATURE-----
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
 }