Version bump (bug #522608), drop old.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!)

3 files changed, 11 insertions, 63 deletions

diff --git a/sys-apps/bleachbit/ChangeLog b/sys-apps/bleachbit/ChangeLog
index 8ed950bbfbdf..ec5eca03b042 100644
--- a/sys-apps/bleachbit/ChangeLog
+++ b/sys-apps/bleachbit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/bleachbit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/ChangeLog,v 1.18 2014/09/07 10:29:04 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/ChangeLog,v 1.19 2014/10/17 07:19:34 dev-zero Exp $
+
+*bleachbit-1.4 (17 Oct 2014)
+
+  17 Oct 2014; Tiziano Müller <dev-zero@gentoo.org> +bleachbit-1.4.ebuild,
+  -bleachbit-0.9.5.ebuild, -bleachbit-1.0.ebuild:
+  Version bump (bug #522608), drop old.
 
 *bleachbit-1.2 (07 Sep 2014)
 
diff --git a/sys-apps/bleachbit/bleachbit-0.9.5.ebuild b/sys-apps/bleachbit/bleachbit-0.9.5.ebuild
deleted file mode 100644
index 689deae8b5f7..000000000000
--- a/sys-apps/bleachbit/bleachbit-0.9.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.5.ebuild,v 1.5 2013/05/14 09:41:14 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 eutils
-
-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 )
-
-src_prepare() {
-	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
-	python_export_best
-	sed -i -e 's/python/$(PYTHON)/g' po/Makefile || die
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	use nls && emake -C po
-}
-
-src_install() {
-	distutils-r1_src_install
-	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
-}
diff --git a/sys-apps/bleachbit/bleachbit-1.0.ebuild b/sys-apps/bleachbit/bleachbit-1.4.ebuild
index dd9e3710e130..8006deca7c5a 100644
--- a/sys-apps/bleachbit/bleachbit-1.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/bleachbit-1.0.ebuild,v 1.1 2013/12/08 17:01:11 dastergon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/bleachbit-1.4.ebuild,v 1.1 2014/10/17 07:19:34 dev-zero Exp $
 
 EAPI=5
 
@@ -18,9 +18,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nls"
+IUSE="+gtk nls"
 
-RDEPEND="dev-python/pygtk:2[$PYTHON_USEDEP]"
+RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"