Version bump, wrt bug #475966. Some cleanups, utilize l10n eclass for proper locale support

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 84 insertions, 17 deletions

diff --git a/sys-apps/bleachbit/ChangeLog b/sys-apps/bleachbit/ChangeLog
index fc569a797fd6..04bba345a1f4 100644
--- a/sys-apps/bleachbit/ChangeLog
+++ b/sys-apps/bleachbit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/bleachbit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/ChangeLog,v 1.12 2013/05/14 09:41:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/ChangeLog,v 1.13 2013/08/03 09:45:17 pinkbyte Exp $
+
+*bleachbit-0.9.6 (03 Aug 2013)
+
+  03 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> +bleachbit-0.9.6.ebuild:
+  Version bump, wrt bug #475966. Some cleanups, utilize l10n eclass for proper
+  locale support
 
   14 May 2013; Agostino Sarubbo <ago@gentoo.org> bleachbit-0.9.5.ebuild:
   Stable for x86, wrt bug #469354
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index e048556ab002..30a4ba8b7db4 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST bleachbit-0.9.5.tar.bz2 338227 SHA256 dd8ecded6f078efb0e421c4d43a0481411e28ef6dac6d25653cd8e3cddf196f7 SHA512 c3c20437f729ba0a56a78936d7d03011adfa8b75eb75d064802092267f562028e2f693bb46b0eca3422d61fc27abaa13c5383e2b79505b8f0c251f57ea34b9c8 WHIRLPOOL 8122d0c280518c6641769981f5a650c28431af36dce095dd282c1db5792c48de200cdbfd049250deaddae5c7778adbc975e85abf2b0f3cb7ad71f5d4613d9586
+DIST bleachbit-0.9.6.tar.bz2 340541 SHA256 4edc08b73935fba2e1ae2426ccae5eeeff9b72a36952be4f66ffbb09eb40ed81 SHA512 3bd47c3f8e8f05d49a748f4dd64823cae887d1b8f825b4b828510bf8fad0c1d0902cb176c732ba70fe23a2be2615a63f66f0a3a743ef228a875209a2e01a8c54 WHIRLPOOL 6b7d763b2c0f3092281cd5a3dbb09c0c265b24f2b76502b63344d82b0c6f75d0c759ed78c244324c43e198e1fa023b6a07736bae38b7ba74090e6c95bce8a545
 EBUILD bleachbit-0.9.5.ebuild 1326 SHA256 d87ebebade11e7f01b37297a13c69b70ea4240c76bf5e93df6ae143e688abc82 SHA512 cd8de704fcd949dbe2b9c9c4030e47047f8bad2656494a8c5d3ebdeb246f5f90415c2d6636010c0ceb2af4bcae74a6ba0609fe12f47b83ceef16dd07e624f31a WHIRLPOOL e496a74bcd96082d4d2d8c3991e876575e6098b99cef85dd512f62f5d49570f033c24563a61d4b0a738a7667f5f86c84681729e747eea0945187d8ba2c9a57ec
-MISC ChangeLog 2989 SHA256 4ac37481cdc0245aacbcbadb0a6e404f1e59070ecaf4f306cf742b699167f7e7 SHA512 564ee9c4434ef71143fd98f9017220a4c5fe685dff2c2145c9c22d2db1bbec782003782a8750a7538e5e4ee18e3b6438dfdda5dff4d14663ef24175fc847149a WHIRLPOOL 74f6bef92298117492e845190e131fb7f75e739ebd12ea6f6a9d4f10d025009ee4ba5302e84dd479e6939d3751905b4d150abdbd82dbc7cff3d7a510b2995d97
+EBUILD bleachbit-0.9.6.ebuild 1698 SHA256 48f880a47d8ca06c2cf59219c830d6e55b17d33d0dd6b722e357db9565e2c5d9 SHA512 7fdf05f6eb79f924590b7c463b2bfd84de8af8c9a14dec109df5ea25c3486632c772b8815c364896db97ec77612bc3e63cad5ffd3fcd0cb6c3695b7e3848fb2b WHIRLPOOL 0a622d3b56df43574712ca37fcd986095a95059cc9cfb38d5f4178f413bed9af3d0ccd7ccae2fbc627fa3490c2252f74f4c368c77739e14c9067679bc25b3616
+MISC ChangeLog 3198 SHA256 ebf075089b4dd812aad76c5f4220327cce1d32a70c86f2c1ce8edeeff325a159 SHA512 348f176155b4768bfb8f70cea328eb1ff77480e84a1a53e3790dd02abbb81f4befa4ab30735e855d68019dfc3a1deba31fc81308868acd12b9bc97c6708e5606 WHIRLPOOL 30e71d83f420308452b8d87363cb7c4ad892b56daccee93b3cc87acc24bd23a05dbce494681067dcd2882f6e8bb134d23b324e2bc7e8f1239a080e2c99be38dc
 MISC metadata.xml 350 SHA256 df3dd3112a9e5752512540bc1974ef4a859df39996bd894cbfb3bd36a0150e31 SHA512 ab127ffbb5e1a2aeb7a70a83ac944f386756747761b7370219c12f7aff3530ed259d21fd81926aebfd382a3b1a6348f4eeb379d6839550ba70b4a946b07e1c0f WHIRLPOOL 9f2d73bbaa52b0b0215cc21ac6146c771122859d859111655ecfa80d8f9d4463f838a6d628a4cd9ced7820496b50232cebe9f1711e05da3e1156163390295f28
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRkgazAAoJELp701BxlEWfCekQAK8/4irlj0v5psuonQ6LzpG1
-Euz7Vy4OqUxpVWONqfjXmDlQgFuoKXDRQ76/gLEmR5pSCo2pRmbScVuAo5yfMWhz
-Pt1bWw4sd37gy51hAzKd/RbtoDqVkoKFQQ977cr/g0Fy6Byje2ECLHqLJqmOe12F
-CF4xYlXRGd+j0jbayvjjnPB+WxAxAjBI93y2g7KDi9rVIxsqfeVQ35fvEvpHgLDG
-ol1Crx8XeS3DmVXktCCxf/lVGrRzgjp/LSgwKjLruwS/ecw9zT+06KjbaRlNx5Z1
-mZJSGUsK7dTlvtZN/dzQXELDxsGtfu1lRYuktnYvxE5rT4ajDG2VF31ctfpVd5Qc
-rVr0oq2krglS5yV2DKt5xgQsH04veziNimrsbwatb5h2wD9kRv3oA+Qysd6FCcPs
-a2owW85Vx0SsmiVb8A/Tl4Si5LQJfhqCYskdgjfeGXaIyFaNM/xFceuJXcM+0Wi8
-q1l8LALE99cb0kUaOn0TYZWDf8A4QUnM3Pj94UNlFpBAqKKr2FWCL8GXWhVKG2E1
-/wgKT9PgYdNBMhD56I0bcKUzuMifCzRHET43ABwZMxWgc+jefyLVDv7xwLjaij6X
-+6/e597yg8uSbBDZlNb5CRgiRl5OfmDJRJOmmGCOCzw9Rky8DUcbsA0oiI9Ajvbo
-hgexVKDBKuzM35vObFfY
-=fhH4
+iQEcBAEBCAAGBQJR/NEuAAoJECo/aRed9267QIoIAL5psj0gg6ejkF5Ej1/1rNy0
+wbH5IflR5LeiJD7T0nAAV0HBHQxUNbLGPOz7ZaDqkgaT5+ujfR3KiDW0/GMl3fpn
+2johEPTLIITX8z/O6ZvV6w3bGRd+bLwuZlVHw20c9EQ3MHhAhk7x6BPeHlBnyYWO
+WetTEGw0f8OiM0R4cqMcWvwyWY9sMAtIVDSEJZDbTJQgQBYmjH/UdW/yOw2E9aZn
+vrU3S1hqK8jJ/rm+9Pf8noebnfc8fNSV4Wt7zZ26tyywmisKRC30kn7ZTxbYA7xO
+HQzsL9LPSvHCH2B7sWOXsXYOn5F0qGm/CgKAfkosNgKb1u+pbEWQCJWD64huCMU=
+=IJK1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/bleachbit/bleachbit-0.9.6.ebuild b/sys-apps/bleachbit/bleachbit-0.9.6.ebuild
new file mode 100644
index 000000000000..ff4b2d57ee6e
--- /dev/null
+++ b/sys-apps/bleachbit/bleachbit-0.9.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/bleachbit-0.9.6.ebuild,v 1.1 2013/08/03 09:45:17 pinkbyte Exp $
+
+EAPI=5
+
+PLOCALES="ar ast be bg bn bs ca cs da de el en_AU en_GB eo es et eu fa fi fo fr gl he hi hr hu hy ia id it ja ko ku ky lt ms
+my nb nds nl pl pt_BR pt ro ru se si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 eutils l10n
+
+DESCRIPTION="Clean junk to free disk space and to maintain privacy"
+HOMEPAGE="http://bleachbit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="dev-python/pygtk:2[$PYTHON_USEDEP]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+DOCS=( README )
+
+python_prepare_all() {
+	rem_locale() {
+		rm "po/${1}.po" || die "removing of ${1}.po failed"
+	}
+
+	l10n_find_plocales_changes po "" ".po"
+	l10n_for_each_disabled_locale_do rem_locale
+
+	addpredict /root/.gnome2 #401981
+
+	# warning: key "Encoding" in group "Desktop Entry" is deprecated
+	sed -i -e '/Encoding/d' ${PN}.desktop || die
+
+	# choose correct Python implementation, bug #465254
+	sed -i -e 's/python/$(PYTHON)/g' po/Makefile || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use nls && emake -C po
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use nls && emake -C po DESTDIR="${D}" install
+
+	# http://bugs.gentoo.org/388999
+	insinto /usr/share/${PN}/cleaners
+	doins cleaners/*.xml
+
+	newbin ${PN}.py ${PN}
+	python_replicate_script "${D}/usr/bin/${PN}"
+
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+}