amd64 stable wrt #227425

Package-Manager: portage-2.1.5.5

5 files changed, 11 insertions, 71 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/Manifest b/app-admin/pydf/Manifest
index fb6dbc735eb3..965c279db834 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,8 +1,4 @@
-DIST pydf_0.9.6.tar.gz 7736 RMD160 e44c579c9a2c62970b86ddee8ec801a240d91bb9 SHA1 6c9840351ef11d8b7b57a1631cb8e720caa6ed50 SHA256 f290d74c8c1e30591ce02f3e814965ec19d361edb9d7711a5fb1b8b90ff2a2ba
-DIST pydf_5.tar.gz 11901 RMD160 285d88efaf6a9127da19211112882d76b75fcb01 SHA1 1d7f8aabd968a01ba2703c10a62e1595a9ce6121 SHA256 d9a845ce7f0f446fb3a426e7b9c6c7b6ea333e740dc558d132f814257e5d1d43
 DIST pydf_6.tar.gz 12140 RMD160 ba4dce086ccd3d3abb63ee5dc374007db54ce4e6 SHA1 5205ab67cc0783ff8c24e1f087ec37def98b429b SHA256 4202b4cbbd631b40f6e2fbd73bf0a6397899e6acf148e84864731a92cfa5cb80
-EBUILD pydf-0.9.6.ebuild 727 RMD160 ad63be1e41819d151254145e00a96c0fa781c72b SHA1 231d3c753dda898e4e88625e053a65928d639173 SHA256 afba1aa25ce5c2f910a31f174a7aad83f283fb8e91ba4e42bf3f6b31a2501e8c
-EBUILD pydf-5.ebuild 716 RMD160 aae2bc95b514090e3e4600f240fc1d4d24fc10c0 SHA1 1c63196a665870606a3ee9d43363e262407c75e4 SHA256 6916babbdd8acf025266eeeccbba9f479b72fbb608a7c2bcdb520d0b428a61eb
-EBUILD pydf-6.ebuild 662 RMD160 654418b12a3eadc5cc8c25e661da29fd8a2c27be SHA1 c98cdddedd299c06b15ea2a7595e68c45251f1cb SHA256 5292c49dee2ae3cc5a8042ca7ff6b696543cd783880a7312c691f13e839334d0
-MISC ChangeLog 1973 RMD160 d3b48479b90c861d179dacdc854f7e8ba3c98058 SHA1 4e0b8aa1fcbb823be11cac34cdbc54abf4e2abb7 SHA256 b2b81033af1f8bc62e8e702eaa68308b9f86ec727dc3da4c9ce6aece08ecc353
+EBUILD pydf-6.ebuild 674 RMD160 7e7b5ce0eb7ddccca12e21c8c703263b3d1574e9 SHA1 96584a0ac2e874bacf53bd389b886fcaf02f02c5 SHA256 93b0cf3f6bd53b177eced9db4ee0134f6040bf58187614428fc4b71e32764088
+MISC ChangeLog 2062 RMD160 760b68bcb1807c2b7bcab38be467a230035c8b77 SHA1 dfa5ee288b2d3d99e061aab795fd47fb1e16bc6a SHA256 5cf4464b86698f66ba8be3a51a8000409b58031819f12dd1c2945e59a6855c24
 MISC metadata.xml 333 RMD160 5b1b7e6204b9d6c575ac773e296eb8e404ea46b4 SHA1 bac44e7b85f752cef8d2435122cfa4479ccf7607 SHA256 c978ec0749cbc9f94e011e0d773393887ce91f905948b038e612bf41f4a4c334
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
 }