Clean up the ebuild. Disable semi-interactive tests. Add Python team as a co-maintainer.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

4 files changed, 46 insertions, 36 deletions

diff --git a/dev-python/keyring/ChangeLog b/dev-python/keyring/ChangeLog
index 2fe1c2dd5b83..c5d1be9680df 100644
--- a/dev-python/keyring/ChangeLog
+++ b/dev-python/keyring/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/keyring
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.4 2013/01/06 19:36:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.5 2013/01/07 00:03:34 mgorny Exp $
+
+  07 Jan 2013; Michał Górny <mgorny@gentoo.org> keyring-1.0.ebuild,
+  metadata.xml:
+  Clean up the ebuild. Disable semi-interactive tests. Add Python team as a co-
+  maintainer.
 
   06 Jan 2013; Michał Górny <mgorny@gentoo.org> keyring-1.0.ebuild:
   Use virtual/python-unittest2.
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 7db454001320..3640c3775200 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -3,15 +3,15 @@ Hash: SHA256
 
 AUX setup-1.0.patch 866 SHA256 17b780756f442bd1e4cb8bb0100015921f15ad60ef499d1048b7cb50f2ae12bc SHA512 9c12013472dab8541454353cb68aca2dcf5d5624ec51f81d9d31245d5c156693de4d058ee90a32aaa8366e8eede806b1c43656d567bf8f8db3bccb7189453d8f WHIRLPOOL 1a6b999e9940f6d32b354ad10768bf45f01065c4fdf0023beeb39cf69c9d39cf8d052a768f6c9a0778dda27e573c28e05a25c38b8cbb14890b87d1a3d7916643
 DIST keyring-1.0.zip 61370 SHA256 628070bfb2daa080c98ddb3057a2f802cd1d15720ca40e54bdb2aa39d97485f9 SHA512 6b5002b06c5aa420786e4114c3fdaa75eb79ff72af460dcefba5909224bded2ccd9bd19a7a3847395403283f29d2108ba7679adbc97af5717a539c9f14439dd0 WHIRLPOOL 670e6420001defecbf17f1430fd62b48196d89d5ac4f5bf585c5116fec06bc028ca0c18f64fcf5d0c4dcc10e77674d17e75ce3ba29fb5e14877fa61c4f05ffd0
-EBUILD keyring-1.0.ebuild 1073 SHA256 063227b7bc1c759cd2b205d7f253a924336c5ab7568519254b2250d391fc7365 SHA512 f1eccf55f0a5ae61e22769ced7699d3e3287db56a9dc8697ea3aa40ded51ecc4a06f1acb1b4e960bf7a134a3b51b0e3aff5e91a77aedef8062f0e44e64e14903 WHIRLPOOL 307dea55104f3bbd06b936c4cc28f36eb3186ce8d2a300ddd45e023cd2dbc0cf67b89b524b10d07190dafba84f8eff723d96cb2ef6df200287c1ee4336ae8ace
-MISC ChangeLog 715 SHA256 ce5adf67c49cc97595102cd58846bad4ff2d06a0c4107a6d93c93ec05f7aaeeb SHA512 934f47ce3785e3ff4ff4e5b63a4cb721a1956229160dab6f0edb2a9d2f2730f49ecceefa11bc796331cfb055c9043faf6696bff5dc85e3cc42550bed912dfd21 WHIRLPOOL c6956933faaf5198ed94d7726efd9bcc025277358144d63b140f3620349b17b9ad019dea8ef2a49b1f9d426e220fe7a0030f43d9d0285d69befaee19665f04f5
-MISC metadata.xml 818 SHA256 26e48739ec45104788c764f494c012611307ec0885e53fe8c481398e4edf47be SHA512 0d0caa868c0c398228a1af7496c6d5fdcc81bc9382a5f401aa15e31e1e320635939e4b00ed1c981a06ec2e670ae1cf69662782305d568f90ca41fabca549973f WHIRLPOOL d263c499eeac15898c134a16d118f0d7af46a4883c668a96fffe900f0422bce7df44cce6199b7b25d92cdc4ec0ef91d130576b708f84b491c46c792d33bdbc3a
+EBUILD keyring-1.0.ebuild 999 SHA256 9c9c6adbfabb70f2fd3e87f8ac0ab8a562368cdbded038573eaaf32344ad8162 SHA512 495b2d753df0fdfaf39ef82dbf47f47caeccd768f904fdf0f849191b73c94f6aee92a8ce49de81fc8d4131dbdf2e5c431860c062c1683c6efa170655d96e3c18 WHIRLPOOL d09e559094d1b798b0ae7368bbba0f3e2fab2d7ed7ea09e69ace5a64dc4bfc8df1d2bc1971603a9ff6865b501edf3a437acb47d7aecba86947cbc8323eb77cd7
+MISC ChangeLog 896 SHA256 5ed511ffb35b482a86cd44c9c53be5cabeaafb941b901f36d0eebfbcb7e23340 SHA512 1e61ced4947492723cde24cf1d9b1e732807bf26d8142b036a70b23132b3821a9c40a3686d3ff05ffe2d043aa2b17dad00c83892078a864f82765c3ec390ab71 WHIRLPOOL dad2d9c00d42570fba4b7163f3386c10006fe9218280afe8b76c552c33fdeb160a92d378090c42261f3dafa2ef1fa819b175c4e38f03d9b68913d9668790a16b
+MISC metadata.xml 382 SHA256 fabeeed7537fb45e833ab273087db751c3076a2342b0a16a9692b4d3685386e6 SHA512 8b64ea0c876a34562c32de716ead73689f24c71fdd4f22aef1219199959e53b771e4bb385c9dba0ee523155d1b94594b412ac5e4e8b589bbccdd2c287d8f3581 WHIRLPOOL 7a978384857e0646f5e3c7c02d169b437447319127b20e120deb93d48143c6a52389cb0cdce60e7d19c652cd75143b39638e0a38c22fedac1ce0a79dc8f6d66a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDp0mQACgkQfXuS5UK5QB0wmgP+PvM905shSuUTqAY8JpbFGvSr
-IDcHRP9KTjRzDvAa4nTmHjyu89b9NnBLTo9eTkpKfbSlvVuVS2Yg4LAUx09HFC8Z
-OP9qTRdgaCq5K9ls7xwi+a5ukaYdjAo56WLE2frEOF5RhxFvb+p/H0Oia6j6lV+D
-sAjCIFGaHLGmsAPNmq4=
-=FMOL
+iJwEAQEIAAYFAlDqEPEACgkQfXuS5UK5QB0xsAP9E+zYF6UqZb9C8Lh1w29xpoEm
+WVsgDhoiyqNz9A2cZEpUu2GS4KvnUO8iKxX/iUbXI+wmZBth6JtRpKZJbIKJP3Aj
+t+A3LbFEFxVv+vDAYYIdnUd4Jd+wLhOG4f9DzfapRXg/vRKIoF0uIOfOlKjTVjXA
+6ozicpCtQmJK27vsm4Q=
+=tu/k
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keyring/keyring-1.0.ebuild b/dev-python/keyring/keyring-1.0.ebuild
index 0fd3cb2da428..2c00193843bb 100644
--- a/dev-python/keyring/keyring-1.0.ebuild
+++ b/dev-python/keyring/keyring-1.0.ebuild
@@ -1,33 +1,37 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.4 2013/01/06 19:36:42 mgorny Exp $
-# Ebuild generated by g-pypi 0.2.2 (rev. 214)
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.5 2013/01/07 00:03:34 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
-MY_PN=${PN#python-}
-S="${WORKDIR}/${MY_PN}-${PV}"
-DESCRIPTION="Provides a easy way to access the system keyring service from
-python."
+DESCRIPTION="Provides access to the system keyring service"
 HOMEPAGE="https://bitbucket.org/kang/python-keyring-lib"
-SRC_URI="mirror://pypi/k/${MY_PN}/${MY_PN}-${PV}.zip"
+SRC_URI="mirror://pypi/k/${PN}/${P}.zip"
+
 LICENSE="PSF-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
+
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/pytest
-				dev-python/pytest-runner
-				virtual/python-unittest2[${PYTHON_USEDEP}] )"
+	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
 RDEPEND=""
-PATCHES=( "${FILESDIR}/setup-1.0.patch" )
+
+PATCHES=(
+	"${FILESDIR}/setup-1.0.patch"
+)
 
 python_test() {
-	"${PYTHON}" keyring/tests/test_util.py || die
-	"${PYTHON}" keyring/tests/test_backend.py || die
-	"${PYTHON}" keyring/tests/test_core.py || die
-	"${PYTHON}" keyring/tests/test_cli.py || die
+	# test_backend.py and test_core.py access keyring backends
+	# which may spawn password prompts and do other damage.
+
+	# XXX: leave out the harmless tests (dummy backends?)
+
+	for t in test_{cli,util}.py; do
+		"${PYTHON}" "${BUILD_DIR}"/lib/${PN}/tests/${t} \
+			|| die "${t} fails with ${EPYTHON}"
+	done
 }
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index a6e19e94b17a..9baa9a2364bb 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>                                          
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">          
-<pkgmetadata>                                                                   
-  <maintainer>                                                                  
-    <email>prometheanfire@gentoo.org</email>                                    
-    <name>Matthew Thode</name>                                                  
-  </maintainer>                                                                 
-  <longdescription lang="en">                                                   
-    Provides a easy way to access the system keyring service from python.
-  </longdescription>                                                            
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Provides a easy way to access the system keyring service from python.
+	</longdescription>
 </pkgmetadata>