updated license and fixed bug 448730

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 73 insertions, 22 deletions

diff --git a/dev-python/keyring/ChangeLog b/dev-python/keyring/ChangeLog
index 23babc357e25..d88e3d61a9be 100644
--- a/dev-python/keyring/ChangeLog
+++ b/dev-python/keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/keyring
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.1 2012/12/19 20:47:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.2 2012/12/28 05:34:57 prometheanfire Exp $
+
+  28 Dec 2012; Matthew Thode <prometheanfire@gentoo.org> keyring-1.0.ebuild,
+  +files/setup-1.0.patch:
+  updating for license update and to fix bug 448730
 
 *keyring-1.0 (19 Dec 2012)
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 97e81903b17e..49d8eba4bdba 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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 676 SHA256 0c53385d42ee71d57a3c9b074d0fa425d5927b86d69b40c6e4c83cb17eabe0e6 SHA512 93fb8a6f7f13595274080465868805563205571eaf7fa4a5c9191445f644b39fae2d985544dcb5667f3d363b8f484bebfcb2c6be3f67ff56af4678f6e7caa3b2 WHIRLPOOL 56186d7a36e0ef6bd567401f2b43bd27c2bd54054e50d247a89fe89ed5fe55d28cb334817cd6d869cf54b242bab5bdf08abb01c8cfe6146aaa5d511df37ee069
-MISC ChangeLog 352 SHA256 0403f6ace7c781bfe34b12bd7182fc3b405090f3d33355119762c1b6bfed8947 SHA512 bd311f44124c893c5cdff1c36817ba687951d6f4fbd37d33759ffe6938572bf8eb5269918702e3aefcd4449ca571ee033159d91e070d4260e2b70a0ddc3fb183 WHIRLPOOL 749982245771f9ee93f8c955c8956f41367ff9193f4ff4263574ca942ece26f53c427db26fe5facc917b2fc21dffec2127c4c509a13fc47705367b8e106a05b7
+EBUILD keyring-1.0.ebuild 1108 SHA256 9bc3e7f733eb971778d0cf3cb8fe0d692238430da0284fba5891525c4ac7d0c7 SHA512 310ed3d090e7a836464e813e8aeab804bfac623760597907a0b95ac745f698b6b98a1e5fd5be42342cae639e9a7344bfbd36edc46e52f4c09d06ea9d8de6d74d WHIRLPOOL 475e233eabfcd2de22997d44944b36ac91b98dab4e0d0e5511f13ecd3cc39f17e539bfcde1efd17638c94a13a7a6de90666319b6768239fad8dc5573a2743db3
+MISC ChangeLog 508 SHA256 75f8668716d70d9fcdfeb76c04f0bae5b0fcf4f1a12ece603c5dc3925c62cb70 SHA512 5e99be1a2ec05a238dcabd117fbc468242fc2d156997b005d5a36dd38e74927045c6da89f2cdd9a76f1b94e5e9ebcb288fb62109d07e012564a9ce50fde2be9b WHIRLPOOL cb91993b1ec915e3c5fd78c5aad35285bef70a3303d3e7f278553d2c329a74dcc0fcf10398743da269b2f0538a91f21b4613c0391482dc0f54c0b28bd9313ad1
 MISC metadata.xml 818 SHA256 26e48739ec45104788c764f494c012611307ec0885e53fe8c481398e4edf47be SHA512 0d0caa868c0c398228a1af7496c6d5fdcc81bc9382a5f401aa15e31e1e320635939e4b00ed1c981a06ec2e670ae1cf69662782305d568f90ca41fabca549973f WHIRLPOOL d263c499eeac15898c134a16d118f0d7af46a4883c668a96fffe900f0422bce7df44cce6199b7b25d92cdc4ec0ef91d130576b708f84b491c46c792d33bdbc3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ0igFAAoJECRx6z5ArFrD1rMQAIZbSFSqGHrwwxmwKZqXEdK5
-VndHrDVfaKrdqNe+bSqwHtoP6G1HZFQVlGH3Tv1c6ro2tU9WMCs6VdoBsOhpJ9UR
-MugmyV8vAWEm5Wg46i4S4ix5TW1um2APe1pWHVppndhe0O9EyTZN+1tNEbFVR6RB
-cPxBfC3B870uh3dT1f570o4i9uwFLGhtTp+P6byUQ3OV0JvwPeKk2haToD9hghxw
-eAL2rfAaMCFAqN4uxjkCaXq/WaEOpoMv0aKaoWXYdIkj1K/0e9sGHDmSbdpveM3U
-g1SYa3cUCm2rV7nTDhFnvRJ+55ymHV8wylhPrjM4cmbZnLuaTkY2RnYtTcr114AG
-Fk/SXNH8Ds/f1BtkNj4quf21jd+oF3mAIrf0HMdbC6Nw3lLnRJTPPc7AX+wc+VoQ
-o7xvn0pvPFSLSRJq3mbTnbPvVnV9ZHimptHcWEj8EVpq+foshv+4C/iSw0kcy2kf
-vv06lXkhmO/A2mkH6SsEjvpap5fH1t/dkUaG0DVKrE4aqy7kS9Wi51StNQ0B+loD
-HG6q6LVpsg46lFwfJkgmW3e27VHY8X6fYEo+aTzZGuDcGhtE/xljTr74U2Zga6pu
-kd8uPlWHTV2SsWugM+WVUvY4URj5gg5eqf/YPFnJTMdSnbKVFy5wVdG7AfxqprxP
-b4dB/sqg0QeV+lK4SodH
-=S5L7
+iQIcBAEBCAAGBQJQ3S+IAAoJECRx6z5ArFrDLdsP/3Z9DoxFxJsl0AmsLep6d8eg
+9WXnWGRBHpgFW/J0Q9LjFvxSH22tbUGNHqom33ARS2+x4FIcutm5zEpG/bgQwiGG
+QZ4kHmlftANBOo0udQBMTIhFQvqP7ndgRJjUIcItGP0unYobvpFI/juL8QFOIWuE
+IK6P0dgQ1Ko0buZ6A/mddM/WrNagBEXwma2vk+KI4oL37T2I8DaF3Obzml/xPP8F
+DidknPvG/4PcVxbIVnuiL/mHENeLtbLAVi0DdJ0GlnX5dO+ofZrZyRC8YW40h9p8
+oyVodJqtozT0SrI84j6uYL4WJGhuRv/Dl/YOLQxh3ZJq8Vw9M0BFWl4UcYEwWrYd
+GFBGjLdc6jHBjwGYwMw2vxO1j1nhp3Wvi1ZPHBF7cqG1ZK4WmJBWcWqtI8VvcTZ+
+mMqmZRUF1TH4zdG7khrqu8d1sYdXpf8Xb8lxmDvwCrrYxqPINLF4FSMiYqMX4Dxv
+/tAQKwuFcNIR2xyOLMc/ZTqVValq6RShjZJ0uyszcN5GhG43i9dkPV6+G0mRFxs9
+mjCyQlN2Rnd7mg+bagV1DEXFEglc233rVrT0heV5CRnUPm7qCJhwpolwCAwpBxYK
+kIqwWRGJH3pH5LHegB3p5x5gyvDVRIx9/Qv80XWQvFuqOqb759/JPUYQibggspNY
+uS50M8Eig6tWDchaulA4
+=Eub6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/keyring/files/setup-1.0.patch b/dev-python/keyring/files/setup-1.0.patch
new file mode 100644
index 000000000000..d510c6376aaf
--- /dev/null
+++ b/dev-python/keyring/files/setup-1.0.patch
@@ -0,0 +1,32 @@
+--- setup.py	2012-11-29 11:01:22.000000000 -0500
++++ setup.py.wanted	2012-12-27 23:55:56.679344322 -0500
+@@ -39,17 +39,6 @@
+     return True
+ 
+ 
+-test_requirements = [
+-    'pytest',
+-]
+-"dependencies for running tests"
+-
+-if sys.version_info < (2, 7) or (
+-        sys.version_info >= (3, 0) and sys.version_info < (3, 1)):
+-    # Require unittest2 for Python which doesn't contain the new unittest
+-    # module (appears in Python 2.7 and Python 3.1)
+-    test_requirements.append('unittest2')
+-
+ setup_params = dict(
+     name = 'keyring',
+     version = "1.0",
+@@ -74,11 +63,6 @@
+     platforms = ["Many"],
+     packages = ['keyring', 'keyring.tests', 'keyring.util',
+                 'keyring.backends'],
+-    extras_require = {'test': test_requirements},
+-    tests_require = test_requirements,
+-    setup_requires = [
+-        'pytest-runner',
+-    ],
+ )
+ 
+ 
diff --git a/dev-python/keyring/keyring-1.0.ebuild b/dev-python/keyring/keyring-1.0.ebuild
index aad8d7af0f10..fc0664696f0b 100644
--- a/dev-python/keyring/keyring-1.0.ebuild
+++ b/dev-python/keyring/keyring-1.0.ebuild
@@ -1,25 +1,39 @@
 # Copyright 1999-2012 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.1 2012/12/19 20:47:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.2 2012/12/28 05:34:57 prometheanfire Exp $
 # Ebuild generated by g-pypi 0.2.2 (rev. 214)
 
 EAPI=4
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN=${PN#python-}
 S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="Provides a easy way to access the system keyring service from
 python."
-HOMEPAGE="http://pypi.python.org/pypi/keyring"
+HOMEPAGE="https://bitbucket.org/kang/python-keyring-lib"
 SRC_URI="mirror://pypi/k/${MY_PN}/${MY_PN}-${PV}.zip"
-LICENSE="BSD-2"
+LICENSE="PSF-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE=""
-DEPEND="dev-python/setuptools"
+IUSE="test"
+DEPEND="dev-python/setuptools
+		test? ( dev-python/pytest
+				dev-python/pytest-runner
+				dev-python/unittest2 )"
 RDEPEND=""
 
+src_prepare() {
+	epatch "${FILESDIR}/setup-1.0.patch"
+}
+
+src_test() {
+	PYTHONPATH="build/lib" "$(PYTHON)" keyring/tests/test_util.py
+	PYTHONPATH="build/lib" "$(PYTHON)" keyring/tests/test_backend.py
+	PYTHONPATH="build/lib" "$(PYTHON)" keyring/tests/test_core.py
+	PYTHONPATH="build/lib" "$(PYTHON)" keyring/tests/test_cli.py
+}
+
 src_install() {
 	distutils_src_install
 }