Move to new python stuff, removed old

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

6 files changed, 30 insertions, 130 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/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 \