amd64 stable wrt #227425

(Portage version: 2.1.5.5)

4 files changed, 9 insertions, 65 deletions

diff --git a/app-admin/pydf/ChangeLog b/app-admin/pydf/ChangeLog
index 223cf71b058a..eed6a29f0871 100644
--- a/app-admin/pydf/ChangeLog
+++ b/app-admin/pydf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/pydf
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/ChangeLog,v 1.19 2008/06/17 14:38:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/ChangeLog,v 1.20 2008/06/17 14:46:06 drac Exp $
+
+  17 Jun 2008; Samuli Suominen <drac@gentoo.org> pydf-6.ebuild:
+  amd64 stable wrt #227425
 
   17 Jun 2008; Raúl Porcel <armin76@gentoo.org> pydf-6.ebuild:
   sparc/x86 stable wrt #227425
diff --git a/app-admin/pydf/pydf-0.9.6.ebuild b/app-admin/pydf/pydf-0.9.6.ebuild
deleted file mode 100644
index 9584723ac19b..000000000000
--- a/app-admin/pydf/pydf-0.9.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-0.9.6.ebuild,v 1.13 2007/08/11 16:32:30 beandog Exp $
-
-MY_P="${P/-/_}"
-DESCRIPTION="Enhanced df with colors"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/old/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/python"
-
-src_compile() { return 0; }
-
-src_install() {
-	dobin pydf || die
-	dodoc INSTALL README
-	doman pydf.1
-	insinto /etc
-	doins pydfrc
-}
-
-pkg_postinst() {
-	ewarn "Please edit /etc/pydfrc to suit your needs"
-}
diff --git a/app-admin/pydf/pydf-5.ebuild b/app-admin/pydf/pydf-5.ebuild
deleted file mode 100644
index d5f276aec289..000000000000
--- a/app-admin/pydf/pydf-5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-5.ebuild,v 1.5 2008/03/28 15:51:52 nixnut Exp $
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Enhanced df with colors"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/python"
-
-src_compile() { return 0; }
-
-src_install() {
-	dobin pydf || die
-	dodoc README
-	doman pydf.1
-	insinto /etc
-	doins pydfrc
-}
-
-pkg_postinst() {
-	ewarn "Please edit /etc/pydfrc to suit your needs"
-}
diff --git a/app-admin/pydf/pydf-6.ebuild b/app-admin/pydf/pydf-6.ebuild
index 5adc33287a9b..eb75e3defee0 100644
--- a/app-admin/pydf/pydf-6.ebuild
+++ b/app-admin/pydf/pydf-6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-6.ebuild,v 1.3 2008/06/17 14:38:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pydf/pydf-6.ebuild,v 1.4 2008/06/17 14:46:06 drac Exp $
 
 MY_P=${P/-/_}
 
@@ -10,17 +10,17 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/python"
 
-src_compile() { return 0; }
+src_compile() { :; }
 
 src_install() {
 	dobin pydf || die "dobin failed."
+	insinto /etc
+	doins pydfrc || die "doins failed."
 	doman pydf.1
 	dodoc README
-	insinto /etc
-	doins pydfrc
 }