Bump up to latest snapshot from upstream mercurial tree (latest release did not work). Approved by robbat2.

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

4 files changed, 90 insertions, 10 deletions

diff --git a/sys-block/seekwatcher/ChangeLog b/sys-block/seekwatcher/ChangeLog
index 668c1cafac09..72c7c5144e9c 100644
--- a/sys-block/seekwatcher/ChangeLog
+++ b/sys-block/seekwatcher/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-block/seekwatcher
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/seekwatcher/ChangeLog,v 1.7 2009/11/04 08:23:42 robbat2 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/seekwatcher/ChangeLog,v 1.8 2012/03/09 18:48:42 slyfox Exp $
+
+*seekwatcher-0.12_p20091015 (09 Mar 2012)
+
+  09 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/seekwatcher-0.12_p20091015-dash-fix.patch,
+  +seekwatcher-0.12_p20091015.ebuild:
+  Bump up to latest snapshot from upstream mercurial tree (latest release did
+  not work). Approved by robbat2.
 
 *seekwatcher-0.12 (04 Nov 2009)
 
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index 357616dc98a4..27f1fb9706df 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX seekwatcher-0.12_p20091015-dash-fix.patch 949 RMD160 4e75d1a70f61248cb53f43e88aacfe6febf6225f SHA1 eeece2db6521792b016ced82683ccf4e5740e927 SHA256 43a78a7b1a8b9bac1d835c4f05248d639fd5bdca44c3b19bb35ee31e2a20873e
 DIST seekwatcher-0.12.tar.bz2 16965 RMD160 6cfff0a63034cfb9f9688b28ad6411207ffb848f SHA1 a5f297f768a9d9ae62943bea5544aed78d115168 SHA256 fe8192fc0e5d63cc7ccbe68afbe85021d147a759464748507dababc4764116c5
+DIST seekwatcher-0.12_p20091015.tar.gz 105328 RMD160 914f6b6acc42b9257ce4700cc9eceb57b52d1b91 SHA1 45f7f7a0844c613f630bb38c76fc9290c9f37391 SHA256 e3e989ef1a978c1382d6762902813044a374598eb4c3288b634a3cf3784d4590
 DIST seekwatcher-0.6.tar.bz2 14464 RMD160 b18db5bfb0ed328eb046a7a581c61222286582e3 SHA1 1da606e002f6779f43e3f9e0bc7c93f1731a3b49 SHA256 51930792c4749886d807e2af5f6265e13fd8056656262d5a4da865c6a5435bf8
 DIST seekwatcher-0.9.tar.bz2 15909 RMD160 719ca1eb67ccad972e8e3477c13ad098e032a517 SHA1 114f7fa2293130590036fbe857a26d5d5962e29d SHA256 a46822d434193716aef366503b4897729148f11db4cec9412013a998cef3554f
 EBUILD seekwatcher-0.12.ebuild 909 RMD160 9c345a51a52edd8f9893213dc5e259fa5d77957e SHA1 f89b5bef0e4399d606bb63e23436d324af12c201 SHA256 329993fce6e93c5a1dd50266ba75853794fbe96d1f049919f1a9b46e44a190ed
+EBUILD seekwatcher-0.12_p20091015.ebuild 1212 RMD160 32757f4370d1fbf7e01dc15c77bdd1248812cda2 SHA1 b24476fa3ffaca4e9ba9c3bf13e6d74534d0e4f4 SHA256 398d7f6d53b8f4caa8c03de04253c867e23c975b0b53f8fc00fe96481ac6ebfa
 EBUILD seekwatcher-0.6.ebuild 905 RMD160 2d919fded0c3ef6e8a6bdc371ebd5c9d4391ce0e SHA1 cb817bbbb10ed49704a065903c3fe4b5c1a0d23c SHA256 8b63a46ecb9a666d32e68673fb383f4f52dea6e1830234b9cad7bdc1916aab56
 EBUILD seekwatcher-0.9.ebuild 908 RMD160 30b970b10ff69e07ca557b94fcce212ad8fe28f4 SHA1 c2fc636925fcb83779be05fe10a884ab897a39f1 SHA256 bb9043870adfe9e30984c85a78144c6e48cae53acd20f26a7f7b1b38fb6189d3
-MISC ChangeLog 1185 RMD160 d08531772482a5b77d04d447ad70e3754a0471a8 SHA1 69372de4d0f925902cd6a36e741a7620b963c09f SHA256 93c0299d21212c3354ac4b404c3286d1ed5a118f4d754fb85d8b47c8fed1e688
+MISC ChangeLog 1484 RMD160 3020849f2fcd0d30462e35f6e20a49d28f7b7b60 SHA1 9d75fdd1ad471a8482ca5bdd3fe9f4675973f2f8 SHA256 328bd073a4cdf8a29af3e30a5a6a1fd3181242c203678eeea876526bfddf5d5e
 MISC metadata.xml 202 RMD160 ca69c6e7044d6681415f1e86a1c084f890ff08ef SHA1 62ab18bf0e1da311494ca0912e5a79daeceb46ad SHA256 76dbb4a720140d78f0ddfb2b2782c03852169c201c1f507eb17ef4d2a82f212a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59si0ACgkQfXuS5UK5QB2dLgQAkbKC7Ip2ID0g3d/i04N0D3H/
-YpvdwWesm7AZRFC3LjIW7bUh/VnHnZIxl1x7xJ7n85NOcy06xZqokjoSaWELlwN9
-x5MjXTwbzaN4YrjLUgEZFfsJvZYeEII/hMSyInDCZOI/975fka0/jtgHK5givUIO
-4Zy38n3FmHYOhdouuhU=
-=0si5
+iEYEARECAAYFAk9aUakACgkQcaHudmEf86qtFACeKstN8lYjCWSo2jomPZarfBVk
+MDYAniW0BzzNy2Ofie48+i5KRkLOd1uF
+=/5Wv
 -----END PGP SIGNATURE-----
diff --git a/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch b/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch
new file mode 100644
index 000000000000..0742fb9d5dff
--- /dev/null
+++ b/sys-block/seekwatcher/files/seekwatcher-0.12_p20091015-dash-fix.patch
@@ -0,0 +1,26 @@
+commit e594df5c73ab550fb76895f75f71109eb3640c41
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Thu Feb 23 22:28:28 2012 +0300
+
+    seekwatcher: fix failure when /bin/sh points to dash
+    
+    Before the patch:
+    $ ./seekwatcher -t test.trace -o test.png -p 'sleep 5' -d /dev/sda2
+    > using tracefile ./test.trace
+    > sh: Syntax error: Bad fd number
+    > Empty blktrace run found, exiting
+
+Upstream status: sent, not applied yet
+diff --git a/cmd/seekwatcher b/cmd/seekwatcher
+index 7e96bd2..23cba1c 100755
+--- a/cmd/seekwatcher
++++ b/cmd/seekwatcher
+@@ -610,7 +610,7 @@ def run_blkparse(trace):
+         print "using tracefile %s" % os.path.join(trace_dir, x)
+         fh = tempfile.NamedTemporaryFile(dir=".")
+         os.system('blkparse -q -D ' + trace_dir + ' -i ' + x +
+-                ' -d ' + fh.name + ' -O >& /dev/null')
++                ' -d ' + fh.name + ' -O > /dev/null 2>&1')
+         loaddata(fh, rd)
+     return rd
+ 
diff --git a/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild b/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild
new file mode 100644
index 000000000000..e0c840f088bb
--- /dev/null
+++ b/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/seekwatcher/seekwatcher-0.12_p20091015.ebuild,v 1.1 2012/03/09 18:48:42 slyfox Exp $
+
+EAPI=4
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+DESCRIPTION="Seekwatcher generates graphs from blktrace runs to help visualize IO patterns and performance."
+HOMEPAGE="http://oss.oracle.com/~mason/seekwatcher/"
+#SRC_URI="http://oss.oracle.com/~mason/seekwatcher/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~slyfox/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/pyrex"
+RDEPEND="dev-python/matplotlib
+		dev-python/numpy
+		>=sys-block/btrace-0.0.20070730162628"
+
+S=${WORKDIR}/${PN}-b392aeaf693b # hg snapshot
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dash-fix.patch
+
+	distutils_src_prepare
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "If you want to generate IO-movies from captured data, you must"
+	elog "install at least one of the following packages:"
+	elog "- media-video/mplayer with USE=encode"
+	elog "- media-libs/libtheora with USE=examples"
+}