Dropped empty *DEPENDS, added support for wifi, keyworded for linux prefix, #333383

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

diff --git a/sys-apps/dstat/ChangeLog b/sys-apps/dstat/ChangeLog
index 100775d7164abc63983a98e9ceb4d49f63451d5e..bebab4853e859c7082ae550584f9393ac709925b 100644 (file)
--- a/sys-apps/dstat/ChangeLog
+++ b/sys-apps/dstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dstat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.37 2011/12/27 23:43:38 neurogeek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/ChangeLog,v 1.38 2012/01/02 13:58:28 jlec Exp $
+
+  02 Jan 2012; Justin Lecher <jlec@gentoo.org> dstat-0.6.9-r1.ebuild,
+  -dstat-0.7.2.ebuild, dstat-0.7.2-r1.ebuild, metadata.xml:
+  Dropped empty *DEPENDS, added support for wifi, keyworded for linux prefix,
+  #333383
 
   27 Dec 2011; Jesus Rivero <neurogeek@gentoo.org> dstat-0.7.2-r1.ebuild:
   Removed die from python_convert_shebangs. Patch by Arfrever

diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 262c35157ac191867fdff573702411cad387385e..f048548a9cded3703426058377b9e6707882e1e1 100644 (file)
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX dstat-0.6.9-CVE-2009-3894.patch 721 RMD160 54b21dc985dde85554c04404ce1e693fa26777c0 SHA1 534cbc712b24fe5d5aeaaae17ab6291dae425693 SHA256 74f067376ed3276ebdeb71439b1f5b805e0a7ae6e6149779b63e7234d4ff9f26
 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.9-r1.ebuild 1037 RMD160 38f426a900ccff385aee2c7be8c5c1ecabbbf861 SHA1 dc03686b7585cb848364f8cd0e3750fd2139935d SHA256 8232324e6ccd20b6da9baa24004b66d61a554a43ec4057628548fcd54b1bca6e
-EBUILD dstat-0.7.2-r1.ebuild 1044 RMD160 7e8ef6422848bdcb8a6a5c9d193fd1264144b2ca SHA1 bdd4926a6465eba39a9935b272196622731a2a88 SHA256 495f799de0a984453f2f389ef88c7f15514d2d4d681e82aa33189bced2c3e6ed
-EBUILD dstat-0.7.2.ebuild 988 RMD160 2c9977235d464800ae8482ec3e48d2863a2a5668 SHA1 8c86bf5bf9263406f52d4f98bb768b956f46d32e SHA256 93330e651479379643f1c912b11747f6f1abaee3cca324fbd78411d96a0bc6d0
-MISC ChangeLog 4909 RMD160 29b4bf48522e007782944e1893c4abc1c3c6e632 SHA1 5ae987642d5fbc2a8d1dc7fd22fcd4c73e53082e SHA256 c76792d7c45b39c53f27b6f4064dcaf6395eff7d4275e71f4fc6e627ed16fbad
-MISC metadata.xml 854 RMD160 2b600960c89790bdda527c056d963c4b8c01ceed SHA1 493ff91b1bd52a439fb45c75c7f35bd7b11bbb38 SHA256 031974e2cbebb5d452acae56b05e49c29bb64eb79e435cb615af64f236e7fc73
+EBUILD dstat-0.6.9-r1.ebuild 1004 RMD160 7af970e34519700973e4dbeab618c44791b543f3 SHA1 f8d232ae71168c47d0ed64b00eb570ad39e6d89d SHA256 056d2e4b214e09d95c964ff6e8d47351d1e3c2278552acd04f407dd626a3a25d
+EBUILD dstat-0.7.2-r1.ebuild 1091 RMD160 cba4e1917cf1725ae1bac7d8a292360eaa4a63e0 SHA1 64fec29d67a612fd4e103e04c2ba27832dc0eb1c SHA256 f37c69395b571e3405bf3974a4266085c59a24b7e17062746dd96fe75c39e5c3
+MISC ChangeLog 5123 RMD160 749b9426cb0989510038a9371149744e0e9f1303 SHA1 b9762e8877925a5ab48cb6e1a6485604501bf889 SHA256 ce5138954d2db6d653d5185e87aba45c6bd20b8f9b47d45d0723146379fbb7f3
+MISC metadata.xml 930 RMD160 adb19e0711d586019e15047612c6a74fccaea47e SHA1 e2f3f0a4a4c4c9f0aed26a9037ff59b340a43bd0 SHA256 abf91fbd7022ce5ba28daf37dc4bc86988c0d2932195bb81fb79c937298aad3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk76WGgACgkQdIssYB9vBoPFdgCdHh2fj3pv0yOAzR9rCqjhEqYa
-6IMAn2WofvXp1vmLNAxigUt+YF82rX/y
-=/Rr/
+iEYEAREKAAYFAk8BuBAACgkQgAnW8HDreRYW8QCgldr57s9M1eFFYkarmYQ8er+Z
+gEgAoKtoix5pt7UI5cFK+Mm0XjJZMJDf
+=Odar
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/dstat/dstat-0.6.9-r1.ebuild b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
index 9ea5dde44ba8373edb3fca7108d5ab97d4c41b03..bd1fae78293c01465472fa5558c81e4e5393c9d5 100644 (file)
--- a/sys-apps/dstat/dstat-0.6.9-r1.ebuild
+++ b/sys-apps/dstat/dstat-0.6.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2 2011/03/06 10:42:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.6.9-r1.ebuild,v 1.3 2012/01/02 13:58:28 jlec Exp $
 
 EAPI=2
 
@@ -8,7 +8,7 @@ PYTHON_DEPEND="2"
 
 inherit python eutils
 
-DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
+DESCRIPTION="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"
 
@@ -17,9 +17,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND=""
-
 pkg_setup() {
        python_set_active_version 2
 }
@@ -29,7 +26,7 @@ src_prepare() {
 }
 
 src_install() {
-       emake install DESTDIR="${D}" || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
 
        dodoc \
                AUTHORS ChangeLog README TODO \

diff --git a/sys-apps/dstat/dstat-0.7.2-r1.ebuild b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
index 4781bbf8f78cef9721ee5b6cc4b24c8ef89ac025..377359fe7970fe2d1bd289ceedf245e5ef4f33af 100644 (file)
--- a/sys-apps/dstat/dstat-0.7.2-r1.ebuild
+++ b/sys-apps/dstat/dstat-0.7.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-r1.ebuild,v 1.3 2011/12/27 23:43:38 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dstat/dstat-0.7.2-r1.ebuild,v 1.4 2012/01/02 13:58:28 jlec Exp $
 
 EAPI=3
 
@@ -8,16 +8,16 @@ PYTHON_DEPEND="2"
 
 inherit python eutils
 
-DESCRIPTION="Dstat is a versatile replacement for vmstat, iostat and ifstat"
+DESCRIPTION="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=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="wifi"
 
-RDEPEND=""
+RDEPEND="wifi? ( net-wireless/python-wifi )"
 DEPEND=""
 
 pkg_setup() {
@@ -29,7 +29,7 @@ src_compile() {
 }
 
 src_install() {
-       emake install DESTDIR="${D}" || die "make install failed"
+       emake DESTDIR="${ED}" install || die "make install failed"
        python_convert_shebangs 2 "${ED}usr/bin/dstat"
 
        dodoc \

diff --git a/sys-apps/dstat/dstat-0.7.2.ebuild b/sys-apps/dstat/dstat-0.7.2.ebuild
deleted file mode 100644 (file)
index 225bc28..0000000
--- a/sys-apps/dstat/dstat-0.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.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=""
-DEPEND=""
-
-pkg_setup() {
-       python_set_active_version 2
-}
-
-src_compile() {
-       true
-}
-
-src_install() {
-       emake 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/metadata.xml b/sys-apps/dstat/metadata.xml
index 7af1f3d544a86b7cf6d4808479ba1145d85da674..54ea4ba08a5b655cd6165bbbdc91ba7e65c1abfa 100644 (file)
--- a/sys-apps/dstat/metadata.xml
+++ b/sys-apps/dstat/metadata.xml
@@ -20,4 +20,7 @@ compare disk usage in combination with interrupts from your IDE controller, or
 compare the network bandwidth numbers directly with the disk throughput (in the
 same interval).
        </longdescription>
+       <use>
+               <flag name="wifi">Enable wireless network functions</flag>
+       </use>
 </pkgmetadata>