Move to new python stuff, removed old

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

7 files changed, 37 insertions, 142 deletions

diff --git a/sys-apps/dstat/ChangeLog b/sys-apps/dstat/ChangeLog
index 924ceb575605..85fb60860eec 100644
--- a/sys-apps/dstat/ChangeLog
+++ b/sys-apps/dstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dstat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.33 2010/06/24 20:46:14 swegener Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.34 2011/03/06 10:42:45 jlec Exp $
+
+  06 Mar 2011; Justin Lecher <jlec@gentoo.org> -dstat-0.6.6.ebuild,
+  -dstat-0.6.7.ebuild, -dstat-0.6.9.ebuild, dstat-0.6.9-r1.ebuild,
+  dstat-0.7.2.ebuild:
+  Move to new python stuff, removed old
 
 *dstat-0.7.2 (24 Jun 2010)
 
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 6d51410a9c60..e265e440316c 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -2,21 +2,16 @@
 Hash: SHA1
 
 AUX dstat-0.6.9-CVE-2009-3894.patch 721 RMD160 54b21dc985dde85554c04404ce1e693fa26777c0 SHA1 534cbc712b24fe5d5aeaaae17ab6291dae425693 SHA256 74f067376ed3276ebdeb71439b1f5b805e0a7ae6e6149779b63e7234d4ff9f26
-DIST dstat-0.6.6.tar.bz2 52016 RMD160 eef89e5c9da3222b64bfe237680cd3c1b4c5818c SHA1 ead3427b49ba6256edc723903e49d0f152daebc5 SHA256 c2dac78231799571302456d24a7964f3636c2ddff962aa19a102d84bdc28b110
-DIST dstat-0.6.7.tar.bz2 71057 RMD160 ae7a6ca6a2fb7378b4ade6584082459765558084 SHA1 4abb07558d3280dcd83594fe689e1a2c018e7777 SHA256 7e0a2fe4645c49dec64deb5af5cb9ab9abf8523629bd4331e9a663239b0b0035
 DIST dstat-0.6.9.tar.bz2 74060 RMD160 e90757d3273127acead60b9ec2ff1448d87845a7 SHA1 296a46edcee28525c4f6e3dcd615aa268bfeec5d SHA256 edb2c17d081ee2b0b4fc2c57c2ed6dc36628853abd76c838026e99b3d1ea897c
 DIST dstat-0.7.2.tar.bz2 85870 RMD160 553312dd0cb4bf05f5865a78187594a0ffe9fa30 SHA1 10baf061e3d38e1234fb99182fc53509adf07269 SHA256 34a986d9d7c028bd9dcb6b2ef1c740f7220de5c9cf976870a2b62aca23b33bae
-EBUILD dstat-0.6.6.ebuild 1031 RMD160 c47f369c4c5a78355ef1f7f3f261bbda3e52f477 SHA1 730f6cd3d72764722e94a4e40dcb7df9a41926b9 SHA256 1f8275079787be801670293973d815a1c7c9aa50afd93a0815d02b7692c2cf38
-EBUILD dstat-0.6.7.ebuild 1051 RMD160 b253de9d4dcccc74d48a1790eb4317b8e51b46c6 SHA1 dcf8d9afc7dbe04793bdda4f9ea033f65152dee6 SHA256 38fa5aef9892a9354d0133c7c221da91d070ad9cd35f1e710e2b1ab76cddccc5
-EBUILD dstat-0.6.9-r1.ebuild 982 RMD160 686736921f7912625aed9883a8733018138018d0 SHA1 7b5bc81c00178c3c0820b61cb5cb1aab33673562 SHA256 ba9260515f2b99d8803a608990b50e2a6ee54b6673d2a790f990ddad75255cd5
-EBUILD dstat-0.6.9.ebuild 899 RMD160 24892bfa07a45279747319804aa94ed8932df5f4 SHA1 26c6307fa934697c12b7138d56a8c03cfb203035 SHA256 54aedacc2da4cca62e33f351ecb670db9201da430f57bbb35197dfd952f9023f
-EBUILD dstat-0.7.2.ebuild 939 RMD160 d6fe98f6bfcfdf06a9cc6837acb78ceb73c97117 SHA1 a0bd5249c5fd184a7a8366e0d46dc15ee2be0215 SHA256 9072fa2b14361c7809dd55dc196c21cac726f5b557461b5de816e60a3dc75572
-MISC ChangeLog 4333 RMD160 c8e42331e3e268d39b832aa6514ffa6296a86e2a SHA1 2c71834369506dca80fb9a88ce5d9a5f6b316bb1 SHA256 97326b6e21f8cd9cf603d6c82d8f95641cb064a1b42f1fd3b3365859486f77c0
+EBUILD dstat-0.6.9-r1.ebuild 1037 RMD160 38f426a900ccff385aee2c7be8c5c1ecabbbf861 SHA1 dc03686b7585cb848364f8cd0e3750fd2139935d SHA256 8232324e6ccd20b6da9baa24004b66d61a554a43ec4057628548fcd54b1bca6e
+EBUILD dstat-0.7.2.ebuild 988 RMD160 2c9977235d464800ae8482ec3e48d2863a2a5668 SHA1 8c86bf5bf9263406f52d4f98bb768b956f46d32e SHA256 93330e651479379643f1c912b11747f6f1abaee3cca324fbd78411d96a0bc6d0
+MISC ChangeLog 4527 RMD160 954b9d78a8c871e79e7c0ee7b86e28168941ef0a SHA1 062a8206f726b3bc5981dc0a94557c2f51cffc8f SHA256 9da74882792e1334b1edfce390dadc4214be978531f9ecd811a0715f39bf1cdc
 MISC metadata.xml 876 RMD160 31be4950d058c997eb8ff3bab460977e7384f54e SHA1 f1facdf454405eaf40e52b719ec63204a3e54bb0 SHA256 dcd7d24d198345862d5ff870ffa7dde3daf8b8d1d06f9c5350f9c6aad81e383f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkwjxB0ACgkQI1lqEGTUzyRS5gCeOh1uOWBvQ1lDQoA2T8xHzbgZ
-+oYAnjAs2GCK5kZHu4m1bjFpTJmBbSO4
-=QH7z
+iEYEARECAAYFAk1zZTMACgkQgAnW8HDreRY33QCeKJu/dCOeuw7noJp/sQYiAisf
+jk0An1vSsx61brqhoXatD7PKMljHq1w2
+=RCm6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dstat/dstat-0.6.6.ebuild b/sys-apps/dstat/dstat-0.6.6.ebuild
deleted file mode 100644
index 150bf30becf0..000000000000
--- a/sys-apps/dstat/dstat-0.6.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.6.ebuild,v 1.3 2007/09/01 11:30:13 angelos Exp $
-
-inherit python
-
-DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="virtual/python"
-DEPEND=""
-
-src_compile() {
-	true
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	dodoc \
-		AUTHORS ChangeLog README TODO dstat.conf \
-		examples/{mstat,read}.py docs/*.txt \
-		|| die "dodoc failed"
-	dohtml docs/*.html || die "dohtml failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/dstat
-
-	einfo
-	einfo "See the included dstat.conf in the doc directory for"
-	einfo "an example on how to setup a custom /etc/dstat.conf"
-	einfo
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/dstat
-}
diff --git a/sys-apps/dstat/dstat-0.6.7.ebuild b/sys-apps/dstat/dstat-0.6.7.ebuild
deleted file mode 100644
index fb5f85fda028..000000000000
--- a/sys-apps/dstat/dstat-0.6.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.7.ebuild,v 1.6 2009/01/31 16:44:41 jer Exp $
-
-inherit python
-
-DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~ia64 ~mips ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="virtual/python"
-DEPEND=""
-
-src_compile() {
-	true
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	dodoc \
-		AUTHORS ChangeLog README TODO dstat.conf \
-		examples/{mstat,read}.py docs/*.txt \
-		|| die "dodoc failed"
-	dohtml docs/*.html || die "dohtml failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/dstat
-
-	einfo
-	einfo "See the included dstat.conf in the doc directory for"
-	einfo "an example on how to setup a custom /etc/dstat.conf"
-	einfo
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/dstat
-}
diff --git a/sys-apps/dstat/dstat-0.6.9-r1.ebuild b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
index ceb97e2be1a4..9ea5dde44ba8 100644
--- a/sys-apps/dstat/dstat-0.6.9-r1.ebuild
+++ b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
@@ -1,27 +1,35 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.9-r1.ebuild,v 1.1 2009/11/25 13:43:09 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.9-r1.ebuild,v 1.2 2011/03/06 10:42:45 jlec Exp $
 
 EAPI=2
+
+PYTHON_DEPEND="2"
+
 inherit python eutils
 
 DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
 HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
 SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="virtual/python"
+RDEPEND=""
 DEPEND=""
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-CVE-2009-3894.patch # 293497
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}" || die "make install failed"
 
 	dodoc \
 		AUTHORS ChangeLog README TODO \
diff --git a/sys-apps/dstat/dstat-0.6.9.ebuild b/sys-apps/dstat/dstat-0.6.9.ebuild
deleted file mode 100644
index 14a3d94bcf2a..000000000000
--- a/sys-apps/dstat/dstat-0.6.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.9.ebuild,v 1.3 2009/06/28 14:06:58 klausman Exp $
-
-inherit python
-
-DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
-HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
-SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/python"
-DEPEND=""
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
-	dodoc \
-		AUTHORS ChangeLog README TODO \
-		examples/{mstat,read}.py docs/*.txt \
-		|| die "dodoc failed"
-	dohtml docs/*.html || die "dohtml failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/dstat
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/dstat
-}
diff --git a/sys-apps/dstat/dstat-0.7.2.ebuild b/sys-apps/dstat/dstat-0.7.2.ebuild
index fde02ccdbeea..225bc282d891 100644
--- a/sys-apps/dstat/dstat-0.7.2.ebuild
+++ b/sys-apps/dstat/dstat-0.7.2.ebuild
@@ -1,28 +1,35 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2.ebuild,v 1.1 2010/06/24 20:46:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2.ebuild,v 1.2 2011/03/06 10:42:45 jlec Exp $
 
 EAPI=2
 
+PYTHON_DEPEND="2"
+
 inherit python eutils
 
 DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
 HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
 SRC_URI="http://dag.wieers.com/home-made/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="virtual/python"
+RDEPEND=""
 DEPEND=""
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_compile() {
 	true
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
+	emake install DESTDIR="${D}" || die "make install failed"
 
 	dodoc \
 		AUTHORS ChangeLog README TODO \