gentoo resync : 15.12.2019

3 files changed, 2 insertions, 59 deletions

diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 37e37488a1a6..37ff142bcf0e 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-2.2.tar.gz 1100913 BLAKE2B a16e63a2533f9d9c385d384e2fd65dbb32a8f064e769f99e8a8cab9c4069cc7b21e6896c5fa8d02d8204e8c93da8a5f66605601eb44ecc354d41f1a6d9fe2d0a SHA512 c7661cc64358a6420768c3ee1a6ec97d2fd4f0bf67b393be045ef79cef8b3f8cc273a51a5dd7c79d89b8a14cd1357f7714fc860addc9ae74af48bd8d427b3a5a
 DIST bleachbit-3.0.tar.bz2 562646 BLAKE2B 4acdd5469ac1b36ff149231ad0b1b2e4e85a54a81c24c7751ceeed569526b905c1cc6be5201c4fb6929eb48e0553f0b27016de2584ee2f702492cc3fe659c2f9 SHA512 0d61f0b183c0d453275913741020c54c2915be9df45be706203e2278b125f4a02c75865117a7a2d587a034caa9bf109b2f498a4d522cc103c3879cc4a5d4854d
-EBUILD bleachbit-2.2.ebuild 1192 BLAKE2B 0bfa92eccb8cd0a08b482870ebfc68bbe09c576d2cb6d2001ca57ed458ef7a3b8e6f9fea3cfd1db07a530363042d3db40bf96e96ad03fd08fc39ed18f6ac9116 SHA512 ce6a55df1b36909d55ef369b4ad61b5097cd3a86702dc9c5606b78386ddbdd90a8048a3d0aedf82955fc025907bc7698949fcf10b00e47ea65a40ea597b327e0
-EBUILD bleachbit-3.0.ebuild 1190 BLAKE2B 642f70fb6e5c6f5ea90cd5ae7436c9e0d804f87e074834e8afb61aec48327fb5a2b19cde9a83b60abc04cbcd306a52475cf7b5a038251d494a9e6262dd0e2091 SHA512 ca819060cb117596b026cd44c102b786964e54a9fbbd61933c98aed6d5e06ec6a9de53bdb86009aa4964a978fa8b550f692fdf3547a0fa992f97d0a559f720ad
+EBUILD bleachbit-3.0.ebuild 1188 BLAKE2B 80de495f6744ef7fe7f4003e095b5bc42909dc4e415702f95d49ebdec3296e8d3fe3238ae521938875e49f1bc2e3fcef0a39c1226a95ecffff0664c7c57ceb1c SHA512 d3dc01d9679e378cc4c4e4b4b782be0a367b67a19a6dc130944bdadcb6995a9244cf7eed9d180b7a9e9f32ab32996bc6f3a8326c22e5886431e9a22824aed846
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-2.2.ebuild b/sys-apps/bleachbit/bleachbit-2.2.ebuild
deleted file mode 100644
index 79c60771348a..000000000000
--- a/sys-apps/bleachbit/bleachbit-2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit desktop distutils-r1
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk"
-
-RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-BDEPEND="sys-devel/gettext"
-
-python_prepare_all() {
-	# choose correct Python implementation, bug #465254
-	sed -i 's/python/$(PYTHON)/g' po/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	# https://bugs.gentoo.org/388999
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
-
-pkg_postinst() {
-	elog "Bleachbit has optional notification support. To enable, please install:"
-	elog ""
-	elog "  dev-python/notify-python"
-}
diff --git a/sys-apps/bleachbit/bleachbit-3.0.ebuild b/sys-apps/bleachbit/bleachbit-3.0.ebuild
index 78e8425c75ed..6129e74e6df4 100644
--- a/sys-apps/bleachbit/bleachbit-3.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="