gentoo resync : 07.04.2018

4 files changed, 4 insertions, 69 deletions

diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 9aa4d92071dc..588dc98a0a5f 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-1.12.tar.bz2 396838 BLAKE2B 1784b5bc6602e5599b29ffbd0ad0f27f05ffe3aaab25756e3e07fff56c72517493b551063975c943a0e16efc2ecb30fdf69878577b8a5b27eccfdfb3bdd59c40 SHA512 b9c13a75b86eebbedaf928394714ac4d7847b8d53d345a4884acee68cd9c46ff1d5f4108479d7695109bad03c0fcdbb6f89e77d8794a60697fd5c6acdb34530c
 DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
-EBUILD bleachbit-1.12.ebuild 1497 BLAKE2B 2f9511605fc483f3f853c1d7b19e1b7884fb075002843b9dba66b1f21b5849c7ba21e1219d5513b92e0a1477eca63c06d6d9383329af9fb10f172ad1119cdeed SHA512 4083aa52a3ae8091bb2532496ad1aa8c7aa48c68c371e8d681fb85c6e6d3745d76ccdb5181f15c61d8a4b07d3ea6220dde37f66848fe2753597da921841ef4fd
-EBUILD bleachbit-2.0.ebuild 1208 BLAKE2B 1359b21e86449a987681f2058c972f5b392122944346b18c901b82fa8b51c34032fdeddb6cb38390bfc3a38606e0e93373c12ca71fac58f524cdb0767cc3c59c SHA512 7ade695a7630cfb39a7d9d652f617c8236fce594fe9cbc8e96faffb9ba34babaa8ae7175dc901f3f122827a3b8ba7a5a14816831bbb0e69f2f8b64e9d303dd3b
-MISC metadata.xml 571 BLAKE2B dfb5414d647ae661fa1aaab2e5a301ce80a5306f1c658ce2448368fa2dc4b0f3f49d0084de0b5f0bf9e0f00f1abe4c6a441f68d5abe0a610ac13a4392a0343f5 SHA512 59eaf4a789189b5f02fbf945a26cddc46c3ca22ce0aeb5b0311768bf8af21bb80081bc31f859add067a32a6a7840343af43d0680913c0422161efb0784b09a8f
+EBUILD bleachbit-2.0.ebuild 1207 BLAKE2B 101fac851806c9de4e20ef8290ff65d5d446f1400bd2f4025d65398d186683df19783bc72f8eece15962dc6f2ecc97375686304d8c187614653aa865f75f7b02 SHA512 d52074b5842dc0fb44610b7fff374ec25855a4e19bfa58f1b8dc709b0b514bd497ea39e7713c2e3f42db8efbb1975ac8f7c763eda0b78e2f01ffa51d63700882
+MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-1.12.ebuild b/sys-apps/bleachbit/bleachbit-1.12.ebuild
deleted file mode 100644
index 927359b5e594..000000000000
--- a/sys-apps/bleachbit/bleachbit-1.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast be bg bn bs ca cs da de el en_AU en_CA en_GB eo es et eu fa fi fo fr gl he hi hr hu hy ia id it ja ko ku ky lt lv
-ms my nb nds nl nn 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="https://www.bleachbit.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk nls"
-
-RDEPEND="
-	dev-python/notify-python[$PYTHON_USEDEP]
-	gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=( README.md )
-
-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
-
-	# 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
-
-	# https://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
-}
diff --git a/sys-apps/bleachbit/bleachbit-2.0.ebuild b/sys-apps/bleachbit/bleachbit-2.0.ebuild
index a3c40b185337..480ea80045ac 100644
--- a/sys-apps/bleachbit/bleachbit-2.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
diff --git a/sys-apps/bleachbit/metadata.xml b/sys-apps/bleachbit/metadata.xml
index 1ba6f1e4b71b..b025f5f8290e 100644
--- a/sys-apps/bleachbit/metadata.xml
+++ b/sys-apps/bleachbit/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">bleachbit/bleachbit</remote-id>
-		<bugs-to>https://bugs.launchpad.net/bleachbit</bugs-to>
-		<remote-id type="sourceforge">bleachbit</remote-id>
+		<bugs-to>https://github.com/bleachbit/bleachbit/issues</bugs-to>
 	</upstream>
 </pkgmetadata>