correction to sed statement, rm disused patch, tx marienz for the prompt

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 12 insertions, 20 deletions

diff --git a/dev-python/storm/ChangeLog b/dev-python/storm/ChangeLog
index aceb90641dc8..c42a8b84cdeb 100644
--- a/dev-python/storm/ChangeLog
+++ b/dev-python/storm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/storm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/ChangeLog,v 1.18 2015/02/20 11:30:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/ChangeLog,v 1.19 2015/02/21 09:21:42 idella4 Exp $
+
+  21 Feb 2015; Ian Delaney <idella4@gentoo.org>
+  -files/storm-0.20-exclude-tests.patch, storm-0.20-r1.ebuild:
+  correction to sed statement, rm disused patch, tx marienz for the prompt
 
 *storm-0.20-r1 (20 Feb 2015)
 
diff --git a/dev-python/storm/Manifest b/dev-python/storm/Manifest
index 5bb4509f5a07..7a68455179ce 100644
--- a/dev-python/storm/Manifest
+++ b/dev-python/storm/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX storm-0.20-exclude-tests.patch 358 SHA256 551c11afb5fa3985f01ea92df34a434a4662a52e3926929999c02a3401b8ef3c SHA512 cc621b324f747c984ee2f684a52be24e4ff26cc432f9ae0427d920a11e3201b3215061269dfc8277eea4707114a19fb70049b43917118a110cb9883a7c7f1a90 WHIRLPOOL d7c226b98e08b873347c2bd8eb9e49b6d52452248d060bf41d474df162a374b2b7d6696fb6693fb34fbfcbb8327c7c7351b7a1c35c25cff74ee1f40cbc3501ca
 DIST storm-0.20.tar.bz2 213069 SHA256 1fe016c9ec40520eafc3cf359f1ec2b7fa86be91e45c9279bfb0ea3b06390a82 SHA512 7a22c6a6fa45f7bbeeb5c6f934d6f889a6d90d78a6d3e3b9c6a6825485ec35301f573d08c619693a2587e795582db633254631c0be7cd8f1fee6b03a88378a8d WHIRLPOOL e18fb39e127eedd0f7691fc9b3c043b79da02beaab8088dc1f461cfdd23c91034ae6dbf3450a778ea2e06b93239463d5813015f5b6b6901f775da38b4188d2b1
-EBUILD storm-0.20-r1.ebuild 2046 SHA256 05a6e0e0ad2ed4e85733bc32afc964426a19e12043b253db149d1dac30c8751d SHA512 0559d702b4bdb9053d0c2a7d94dd139df70f2c922c343e3811520c4a69c1bc2cab22a4d3336c997475b21cff3879a91ffe2357702f39552727127c91028f810e WHIRLPOOL 798d3e8f2d7b9d1e517f943fc7e77d6904e7fe8afad31c56ef70cd5a563bf2a5b4fdfb4de12518af62b3013db5952ffdac7ab1cf356d837676f408c34e8f4e2b
-MISC ChangeLog 2668 SHA256 0f376f57d1dec51ea4c0ebde8454efd128049475552286a07cf4effc6021b839 SHA512 6693e3055c8faa161c8089aba888a11794c232ed167abb8091c385c728b1a178335e0f46a341bdc86044f25489a7f1bd43093aac622eab94fae58d92ddc31bdd WHIRLPOOL 9fcc4576e4226ceece677f68bae4c635a0f2fd76aec1d2c2ff726b2ba9bd6a29d4b924b818ffb7a20804d52f4ba7c1b7250610162b4bb284ec198555e465b54e
+EBUILD storm-0.20-r1.ebuild 2048 SHA256 6935b0a5ebd7cfb2384214a165f8ae4bcefe63833d772117f230cb4ab94c0741 SHA512 ec5a44108a706fffc4bd446fb52d7b0fb1f103cef0a9c5e00c883ef0140d883a3cefb71d76c63274027f9ec22953dc6782af4ab26e7cebe7e09a4dafc09fdbef WHIRLPOOL 6096f267e002a4d712d174c6a4782cf5f591037dcabd9034dbadd145e33a25d75ae1c7d37da2d3ed5d3ce785103961f88596585b8af8e3635a52991f45768514
+MISC ChangeLog 2855 SHA256 abeb3fe4d6838ef49110cd86197b2e3c6f90e3093a0cf0eaa83123b006b47576 SHA512 eeeed80e2d075c45e97cfa174aea0c2fcb8aa260a8df53f3a5ecd4dcfbe60b97233d1a042742f35442844f2ca24d5b852ededbb9aeb9661caf0fba2c9915e8cb WHIRLPOOL 4f2688e90994a35eaffe8e1877f568c576d6912c593336d74e46a1d308c2f97995c8eb8178d13fe8b2f4ce0a8a0b7e8954c05fe47dadd0a54e31e99a62492951
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTnGuoACgkQso7CE7gHKw3RrACgrlyZtgZcScBGqPwPDSUeMgzQ
-W8YAnAtfvgpk69Z8Q88fpRdPL0ASnEdU
-=7gv1
+iEYEAREIAAYFAlToTjQACgkQso7CE7gHKw1OGgCffAPMn5u0opCzClqtp6WTvA0z
+rQwAoKVMEPalE5u6jLNpCsUm+EogaJXD
+=LM9P
 -----END PGP SIGNATURE-----
diff --git a/dev-python/storm/files/storm-0.20-exclude-tests.patch b/dev-python/storm/files/storm-0.20-exclude-tests.patch
deleted file mode 100644
index f3be491947d0..000000000000
--- a/dev-python/storm/files/storm-0.20-exclude-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@
-     license="LGPL",
-     url="https://storm.canonical.com",
-     download_url="https://launchpad.net/storm/+download",
--    packages=find_packages(),
-+    packages=find_packages(exclude=['tests']),
-     package_data={"": ["*.zcml"]},
-     classifiers=[
-         "Development Status :: 5 - Production/Stable",
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r1.ebuild
index 9f05c02be4a9..eba764b7a6f7 100644
--- a/dev-python/storm/storm-0.20-r1.ebuild
+++ b/dev-python/storm/storm-0.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.20-r1.ebuild,v 1.1 2015/02/20 11:30:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.20-r1.ebuild,v 1.2 2015/02/21 09:21:42 idella4 Exp $
 
 EAPI=5
 
@@ -33,7 +33,7 @@ pkg_setup() {
 }
 
 python_prepare_all() {
-	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" \
+	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
 		-i setup.py || die
 
 	# delete rogue errors in setting exceptions