Also works with python-3.4. Remove old.

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

4 files changed, 7 insertions, 65 deletions

diff --git a/app-admin/pydf/ChangeLog b/app-admin/pydf/ChangeLog
index 03b8ffc00f15..0653f22e6f6d 100644
--- a/app-admin/pydf/ChangeLog
+++ b/app-admin/pydf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/pydf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/ChangeLog,v 1.48 2014/07/24 19:27:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/ChangeLog,v 1.49 2014/11/24 13:04:43 yngwin Exp $
+
+  24 Nov 2014; Ben de Groot <yngwin@gentoo.org> -pydf-10.ebuild, -pydf-9.ebuild,
+  pydf-10-r1.ebuild:
+  Also works with python-3.4. Remove old.
 
   24 Jul 2014; Markus Meier <maekke@gentoo.org> pydf-10-r1.ebuild:
   arm stable, bug #516650
diff --git a/app-admin/pydf/pydf-10-r1.ebuild b/app-admin/pydf/pydf-10-r1.ebuild
index 615ace83490d..779f04b15ff6 100644
--- a/app-admin/pydf/pydf-10-r1.ebuild
+++ b/app-admin/pydf/pydf-10-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-10-r1.ebuild,v 1.6 2014/07/24 19:27:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-10-r1.ebuild,v 1.7 2014/11/24 13:04:43 yngwin Exp $
 
 EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 inherit python-r1
 
 DESCRIPTION="Enhanced df with colors"
@@ -18,7 +16,6 @@ KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 
diff --git a/app-admin/pydf/pydf-10.ebuild b/app-admin/pydf/pydf-10.ebuild
deleted file mode 100644
index e4c23953b496..000000000000
--- a/app-admin/pydf/pydf-10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-10.ebuild,v 1.6 2012/10/16 21:59:28 maekke Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*"
-
-inherit python
-
-DESCRIPTION="Enhanced df with colors"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	sed -i -e "s:/etc/pydfrc:${EPREFIX}/etc/pydfrc:" pydf || die
-}
-
-src_install() {
-	dobin pydf
-	insinto /etc
-	doins pydfrc
-	doman pydf.1
-	dodoc README
-}
diff --git a/app-admin/pydf/pydf-9.ebuild b/app-admin/pydf/pydf-9.ebuild
deleted file mode 100644
index cdc486c3834a..000000000000
--- a/app-admin/pydf/pydf-9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-9.ebuild,v 1.7 2012/08/26 17:03:10 armin76 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="*"
-inherit eutils python
-
-DESCRIPTION="Enhanced df with colors"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	sed "s:/etc/pydfrc:${EPREFIX}/etc/pydfrc:g" -i ${PN} || die
-}
-
-src_install() {
-	dobin pydf || die
-	insinto /etc
-	doins pydfrc || die
-	doman pydf.1 || die
-	dodoc README || die
-}