Fix PyQT4 dep, clean old versions

(Portage version: 2.2.10_p37/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x65E309F2189DB0B8)

5 files changed, 11 insertions, 154 deletions

diff --git a/app-portage/elogviewer/ChangeLog b/app-portage/elogviewer/ChangeLog
index cd5e9bf2472b..cd2262f0d9d7 100644
--- a/app-portage/elogviewer/ChangeLog
+++ b/app-portage/elogviewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/elogviewer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/ChangeLog,v 1.45 2014/06/16 11:03:36 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/ChangeLog,v 1.46 2014/06/22 17:31:36 dolsen Exp $
+
+*elogviewer-2.1-r1 (22 Jun 2014)
+
+  22 Jun 2014; Brian Dolbec <dolsen@gentoo.org> -elogviewer-0.6.1.ebuild,
+  -elogviewer-0.6.2.ebuild, -elogviewer-0.6.2-r2.ebuild,
+  -elogviewer-2.1.ebuild, +elogviewer-2.1-r1.ebuild:
+  Fix PyQT4 dep, add optional pyside dep fixes bug 514036, clean old versions.
 
   16 Jun 2014; Chema Alonso <nimiux@gentoo.org> elogviewer-2.1.ebuild:
   Stable for amd64 wrt bug #510560
diff --git a/app-portage/elogviewer/elogviewer-0.6.1.ebuild b/app-portage/elogviewer/elogviewer-0.6.1.ebuild
deleted file mode 100644
index c5c85643ec00..000000000000
--- a/app-portage/elogviewer/elogviewer-0.6.1.ebuild
+++ /dev/null
@@ -1,48 +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.6.1.ebuild,v 1.2 2011/09/24 17:36:05 zmedico Exp $
-
-EAPI=3
-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_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 "${ED}"
-}
-
-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-0.6.2-r2.ebuild b/app-portage/elogviewer/elogviewer-0.6.2-r2.ebuild
deleted file mode 100644
index ef611c81290f..000000000000
--- a/app-portage/elogviewer/elogviewer-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-0.6.2-r2.ebuild,v 1.1 2013/02/17 10:05:36 zmedico Exp $
-
-EAPI=3
-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_prepare() {
-	# Apply patch from Bug 349071 to restore missing newline
-	epatch "${FILESDIR}/${P}-missing_newline.patch"
-	# Fix bug #453016
-	sed -e 's|is not ""|!= ""|' -i elogviewer || die
-}
-
-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 "${ED}"
-}
-
-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-0.6.2.ebuild b/app-portage/elogviewer/elogviewer-0.6.2.ebuild
deleted file mode 100644
index 334623fc5ef4..000000000000
--- a/app-portage/elogviewer/elogviewer-0.6.2.ebuild
+++ /dev/null
@@ -1,48 +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.6.2.ebuild,v 1.2 2011/09/24 17:36:05 zmedico Exp $
-
-EAPI=3
-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_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 "${ED}"
-}
-
-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.1.ebuild b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
index 40841f6523e5..a2cdaccf251e 100644
--- a/app-portage/elogviewer/elogviewer-2.1.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1.ebuild,v 1.3 2014/06/16 11:03:36 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/elogviewer/elogviewer-2.1-r1.ebuild,v 1.1 2014/06/22 17:31:36 dolsen Exp $
 
 EAPI="5"
 PYTHON_COMPAT=(python{2_6,2_7,3_1,3_2,3_3})
@@ -17,7 +17,8 @@ KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
-		dev-python/PyQt4[${PYTHON_USEDEP}]
+		|| ( dev-python/PyQt4[${PYTHON_USEDEP},X]
+			dev-python/pyside[${PYTHON_USEDEP},X] )
 		>=sys-apps/portage-2.1
 		"
 DEPEND="${RDEPEND}