Bump, remove old versions. Drop ~sparc from the new 2.5 version until the enum34 dep is keyworded

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 0xD80F5F1E1245142E)

4 files changed, 14 insertions, 110 deletions

diff --git a/app-portage/elogviewer/ChangeLog b/app-portage/elogviewer/ChangeLog
index 4741fe0d2c3e..3c115c9fdada 100644
--- a/app-portage/elogviewer/ChangeLog
+++ b/app-portage/elogviewer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/elogviewer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/ChangeLog,v 1.60 2015/04/21 18:44:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/ChangeLog,v 1.61 2015/05/16 16:24:49 dolsen Exp $
+
+*elogviewer-2.5 (16 May 2015)
+
+  16 May 2015; Brian Dolbec <dolsen@gentoo.org> +elogviewer-2.5.ebuild,
+  -elogviewer-0.5.2-r2.ebuild, -elogviewer-2.3-r1.ebuild,
+  -elogviewer-2.3.ebuild:
+  Bump, remove old versions. Drop ~sparc from the new 2.5 version until the
+  enum34 dep is keyworded
 
   21 Apr 2015; Pacho Ramos <pacho@gentoo.org> elogviewer-2.1-r2.ebuild:
   ppc stable wrt bug #537934
diff --git a/app-portage/elogviewer/elogviewer-0.5.2-r2.ebuild b/app-portage/elogviewer/elogviewer-0.5.2-r2.ebuild
deleted file mode 100644
index 50d485cfd6c7..000000000000
--- a/app-portage/elogviewer/elogviewer-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-0.5.2-r2.ebuild,v 1.6 2011/09/24 17:36:05 zmedico Exp $
-
-PYTHON_DEPEND=2
-
-inherit eutils python
-
-DESCRIPTION="GTK+ based utility to parse the contents of elogs created by Portage"
-HOMEPAGE="http://sourceforge.net/projects/elogviewer/"
-
-SRC_URI="mirror://sourceforge/elogviewer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=sys-apps/portage-2.1
-	>=dev-python/pygtk-2.0"
-
-src_unpack() {
-	unpack ${A}
-	# Allow proper sorting by year, bug #207220
-	epatch "${FILESDIR}/${P}-timesort.patch"
-	# Add a warning if all files are about to be cleared, bug #218978
-	epatch "${FILESDIR}/${P}-clear_warning.patch"
-}
-
-src_install() {
-	dobin "${WORKDIR}"/elogviewer || die "dobin failed"
-	dodoc "${WORKDIR}"/CHANGELOG
-	doman "${WORKDIR}"/elogviewer.1
-	make_desktop_entry elogviewer Elogviewer "" "System" ||
-		die "Couldn't make desktop entry"
-	python_convert_shebangs -r 2 "${D}"
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one out of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /etc/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.3.ebuild b/app-portage/elogviewer/elogviewer-2.3.ebuild
deleted file mode 100644
index 6dea2df874d9..000000000000
--- a/app-portage/elogviewer/elogviewer-2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.3.ebuild,v 1.1 2015/02/03 23:18:03 dolsen Exp $
-
-EAPI="5"
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
-
-inherit distutils-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-		|| (
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-			dev-python/PyQt4[${PYTHON_USEDEP},X]
-			dev-python/pyside[${PYTHON_USEDEP},X] )
-		>=sys-apps/portage-2.1
-		"
-DEPEND="${RDEPEND}
-		dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	mv elogviewer.py elogviewer
-	dobin elogviewer
-	doman elogviewer.1
-	dodoc LICENSE.TXT
-}
-
-pkg_postinst() {
-	elog
-	elog "In order to use this software, you need to activate"
-	elog "Portage's elog features.  Required is"
-	elog "		 PORTAGE_ELOG_SYSTEM=\"save\" "
-	elog "and at least one of "
-	elog "		 PORTAGE_ELOG_CLASSES=\"warn error info log qa\""
-	elog "More information on the elog system can be found"
-	elog "in /etc/make.conf.example"
-	elog
-	elog "To operate properly this software needs the directory"
-	elog "${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage."
-	elog "To start the software as a user, add yourself to the portage"
-	elog "group."
-	elog
-}
diff --git a/app-portage/elogviewer/elogviewer-2.3-r1.ebuild b/app-portage/elogviewer/elogviewer-2.5.ebuild
index b33907d3304a..af2f1e90eabc 100644
--- a/app-portage/elogviewer/elogviewer-2.3-r1.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.3-r1.ebuild,v 1.1 2015/02/04 08:19:46 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.5.ebuild,v 1.1 2015/05/16 16:24:49 dolsen Exp $
 
 EAPI=5
 PYTHON_COMPAT=(python{2_7,3_3,3_4})
@@ -13,14 +13,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="|| (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 		dev-python/PyQt4[${PYTHON_USEDEP},X]
 		dev-python/pyside[${PYTHON_USEDEP},X] )
-	>=sys-apps/portage-2.1"
+	>=sys-apps/portage-2.1
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"