update to eapi5 and distutils-r1

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

5 files changed, 135 insertions, 41 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 81319794810f..07ecf765cb90 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/keystone
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.3 2012/12/31 13:50:34 xarthisius Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.4 2013/01/01 08:10:17 prometheanfire Exp $
+
+  01 Jan 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/keystone_test-requires.patch, keystone-2012.2.ebuild,
+  keystone-9999.ebuild:
+  update to eapi5 and distutils-r1
 
   31 Dec 2012; Kacper Kowalik <xarthisius@gentoo.org> keystone-9999.ebuild:
   Use EGIT_REPO_URI to point to git sources, rather than invalid in this case
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index b8e76d903736..a3f40f3910e9 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -3,25 +3,27 @@ Hash: SHA256
 
 AUX keystone.confd 67 SHA256 8faa32d3354df30b1d1c98cf481be162c27583b84e387f8da57611b689bc2448 SHA512 75b040eda6ef8701e8dac8f34b3dd3c96aedde3b005fac01f20592b3d8afb8bbce57fadc466cda69d7192f96460a5c704d941a16b96d02f3e80f1a3e264c2efe WHIRLPOOL 8e8cb4e8991ca8d8cf1e874bd2286900ca63379c73793bca906ecfc1318ee63a8af6d1f6090e9ef296bfbe5abf018368a5ad6430de1efdea0db626d8c697f3c4
 AUX keystone.initd 1177 SHA256 fcf7e532f2f3fad8413455f67d8e9c4c0522ff99e69bd95d4fff49d2dfa243ac SHA512 a0281f5fdd96963d9479a3463e6b5f1947a2c3c8694e464d4d293ef237392bed796ec7b8431e1add7b73334ed5e11158347f35ab562edda5f7aa7bdb9b05e51e WHIRLPOOL d819103e6f2bdd7ca4d5ab2f645f8ca168cc46567ff7c2d00cb2d536c08319aaa472b06b8f98cf2b6de940089f444e7aa752e4c9deeb849a834108394dfe1862
+AUX keystone_test-requires.patch 1082 SHA256 6c91814d1a6aea942f23767b13a9ad77fb08ae16255887d974abd9db852c563a SHA512 d6fc133b44555e50895b9d82f9240aff284e1668ef35823a3e82900ccf9e6a7e11a448f4998c1d8f0938f5d45ce1506bd27417f576ee99aa7738ae74424ec343 WHIRLPOOL 0689d244f94a5489c7ca4551c5fb7c436f6012a932b4fb0142a759c734d5ce24a1aa813c9c1a5356dc38f4b4b342c85703413656139085155f9c5ab89dd012c5
 DIST keystone-2012.2.tar.gz 547438 SHA256 1aed5911c00ebffea28cffbc4793921fb2a9c000e9bb967326b7db751c7281cc SHA512 bb6bb4499737474b49012fffffc4a7950a8427adb0b564f40d55bb7a43846e788266810d09ff54707709fba1db07a8b4b8d531e0547399490fe688e7b5d1fd32 WHIRLPOOL 825c9ac7357148cc0f9c732e946c6c07ccdf21ded3cf0f07d25c66615b991c6dcf72d48540c703c33addbf0e3c74c76a72709dd2ab4fe8b90c31addd92373912
-EBUILD keystone-2012.2.ebuild 1676 SHA256 c338195a64527889631af7ab5aec1806ea6e1e5b8155d747e30cf7c5e21feb1e SHA512 c7e233209069b610bbfaff4f34bb7008c9751499c5a5632b1d76db29fb9a67944a466efdb6dbcbc6d66b9e43abfbb44f38ce8a4cdacc6dbcda55ab0a6a5af8e5 WHIRLPOOL 54236f392e3bf538dfac5380af589002c9337eedfbf9d024ca053f482e11252e278e62ee8c3c2ce533717a16df400acbaf76661e574d924619ec3996030b8b0c
-EBUILD keystone-9999.ebuild 1651 SHA256 ef378cb04a1c38019d8f25be26a7396e4c6fa5e34a8ef3a257f20614e3661f6c SHA512 98c80ea8adf7d92fd3449493fb861423c7cb8019db745639b9cb0020f0b0773f3e0863217b64382a684f9a6c21d632b65534a00be4b2c1ef81371f91dd379fae WHIRLPOOL 0814088107f498315f3626da7306c7a85c93b83d0894aecf8905f1f483a50b0f255e96f488fc442163eb6f2a60fc17ed228ef16a629ab857b292b6c94e273b27
-MISC ChangeLog 739 SHA256 ffd9ad797c4761e5ea848b225c68dd0790a0b8b24b43342b8673ac4f68d04dc5 SHA512 9bf2ae8deb63e5831f69da2107c78c74a8281f5211f9c68f65e9a2600dd11f72ea7138cc22ed8e97d7957918dc5f5feb9292bbedd174ac6462a41fec32a25549 WHIRLPOOL 0e82e1c19cfffb19a008c3ae09e2e11d0f153fd3a2c6459dc11df6069cd1900862291821ff21d31c3580eb975f42d1d5e49f76b506d1c64bb69d04db1dfe4496
+DIST keystone.git 66085 SHA256 fec35efe4c73d16b78dcb4d274aece073b1e54c5ec8dbf1f93b95c4d0c92b3b4 SHA512 7ff877ade0ef0cd466ee6861cd0e15500ef1e7f3b889cabc9c5fedcb1007250f7c1928f6ce2d7ec15e54f6b08eb2307e28d83ab9e37880762ce221700b470654 WHIRLPOOL 676280e35f34879104c9aca26111c0327266c2545d6d6504053acc2f0ec8cde7c35535f5befadaff98b0258da8491318e5faa462b2cbca63faaea5e403cbe15c
+EBUILD keystone-2012.2.ebuild 2482 SHA256 535c4243c4f9ef80d41c73b46d5efb6a1f72e5fd87816e61c0fa020ff5db153e SHA512 1367a286eeba4768c0d2f0f1fcbcbbda2dfa193d50f171d246acb062b6bae53509aa30b093ea321afc23b308e6742535f2c386276069bd8b16a39c6252f91639 WHIRLPOOL 9bb6be7a488c8b57d26b7ff92823072a41a8a76ae7cb7f6bc6dfb5c020d4803fb5de19dddfb798ddaed4144fce3d950d66bcf555cb53fc891f0e57a613b0ea1d
+EBUILD keystone-9999.ebuild 2455 SHA256 9699d911f41bbfd68db04736b656c4f8c3723f4a16eefbb3f094060daceed6d4 SHA512 f9d561a989f31e768d64363c5f8503e307f3f4285147acd7ac578bdcaf81beb02fa76ff258bd53ebd87f0afb3f869434373bf0ebbf9699e976420e0cffa11cff WHIRLPOOL 3d92fec5194cd6737e5d5d70d41aa892b0834091138232ac7780ac4e5cb0ab2b6a4492f6dea78ca59cda71cb32258793a64ba25dae197e1e0041eca28d32fb24
+MISC ChangeLog 923 SHA256 0234c415f9cfd3e9ce4bc476814ef296cbba1a9e4f1074236f3d6f8e4bfab5ea SHA512 32e231db65202eb02849fdbe6248c938e7e0f6047f77c2e356a0df68271ba271c92bda0390fd66997d7c052a11b894fdb2223b9a716fceeda52b65aeb59d6bfc WHIRLPOOL cc48dd43633d78a1282a7752c3f4109e7d5775accd60934b1f12ec5f6691b946411ad2fff28d8fd553e1b47748b5c13acda0128ba0ed69cdc817596889f464d7
 MISC metadata.xml 399 SHA256 7f8946a43a8187a3901e53e0e3b4293e49bb2a1d1785c472b1d0ffd83e0ba2a8 SHA512 9448005b3be5621b302b4c71d190c621f245163a2c7aa8277a3af8132558543c774e9bb20b39bcb0ad896db5d2feac7649b107d7850f68e437f18214891ab16f WHIRLPOOL b46a5eadc17d5e38d23efed9620772e6d5e2cbd7733e1c0a8d15a506cacc8a31e9b26a354a1b749a7c64bff08722658b2feb651679a6a6054cd3b551839ddb38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4Zg2AAoJEF0huFKJUZL5Fa0QAIR9DWSgvjBqb+2Tl55rr4r5
-rJxFvrWL5ivrghfbs2wecdTAfy6sqkseQfg2r5df+yDs8rlLs0/SXdl8Ur7ihd3L
-LvOH8ts5MNQ7tlhspYc37vlTJms8LPh46VAHN7qEyTTyKyTr6SBSOLEfzUcfqapN
-fAzJO63DHphLsKtzsPakh1FcH4Bb32xuDSJ5nMYsORkpODFterJ36cuXfl4TQ0pn
-lWa9q190s9Se5cWisoO4GEb/e6xVqteL12uLUOdnJzr7uucG6vYmI5KeryYC1HSX
-YVcJIiOiCQg+eb3pKIUuACpjHcBoTjM7X3iIOCzErBut8enAX59MXiboWWhTDxMn
-RAAsJFMLglNQu0+gl+jkcyThVpcDonm4JU3Com6iGy6+dqy4k+oQeWYZT65PXOeI
-WqXohJJLSTYL/GXNysyOAC9AaUxgdlH0egNRkJa525oD6+skORwjfP9JAXo3mUaU
-bxwWDdyQLgpiBcyjb3njotdhQ6HcNh3IaTIawn0kPTkrlzL8B7yjItDgw6JFo/Co
-Bbd1lN9l46ughpRjQ6/lmkYW1ZfY9ttsYsY0T/ZFIFeStqCYWO9zIc0rBr72SLbt
-Nce9VeSNHwqoxtVwWmsc2g7Kr2vjNbZIbzflA4+4chHg/wMp/8FbyqufJcWx6xgX
-VzNuD9+Ru/hsKp+CwIg4
-=6hym
+iQIcBAEBCAAGBQJQ4pnxAAoJECRx6z5ArFrDMwQQAKPZ7c2ovLhi2knELdlN2vYc
+PJveQWOV/JRDoYkhXIpDspgeXAYKjP/ehu3Vc5WbTen+udON+coB5ftg6k8aQudJ
+tFZz+ElnOJC+hPfpwRmvjggACMozI/Pp4X+ZV4WYWAqGcHoyPZTfqcRFWiaN3inL
+Wff38sHeW7dQlh6KvEbhwtq6Za8QyRG6RplfF2aSSgAS+BvmU9AarmX0leoTzGxQ
+osqCx1/Dyhnnxp9gomevJERA34FcgCwU2e+UJzuoqySh9QxmP/COXUcXOX1seDy5
+6oszn8ctwFzXdnJI2Ptpjzwjw7m8H7ehx8l5Z8R3qNdqOTwrVJqbd5ZQoPDh11I0
+9IFzuKaWquVlFu+/m9GRZMr5+9+kW4bnAL/gjN5A26JnYHbwHMOY2k3QYcZP9Cq1
++ff3nRq3hZJXoBgkYRdP4l6EH2cB3LBrE6RFrgND3TAL9UHlVzcr8DwLuw9AIhnv
+cwZBNBg+TPkMAaUDUF17W7ZlHEgyLiDsSoNt/5QePgJVu/Fl8rJq+dX1s3o9ALuY
+LTzagfZNkIwOPFpVBouAz9WWpgZshWs/gJrIMdS7mnlqVYfDn8VClgvG0AEFwb55
+DoEOtYW63mBFzLREVv5IX3RtDo1NvPjXcJCZEEtiIf8mhbfG4Mi8SVyGZS8zA217
+O8Pt8f2a2JzQpFR7BKha
+=SC3x
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/files/keystone_test-requires.patch b/sys-auth/keystone/files/keystone_test-requires.patch
new file mode 100644
index 000000000000..7af7c1d41c52
--- /dev/null
+++ b/sys-auth/keystone/files/keystone_test-requires.patch
@@ -0,0 +1,33 @@
+diff -u tools.orig/test-requires tools/test-requires
+--- tools.orig/test-requires	2012-09-25 20:27:12.000000000 -0400
++++ tools/test-requires	2013-01-01 02:43:38.316340359 -0500
+@@ -2,7 +2,7 @@
+ python-memcached
+ 
+ # Optional backend: LDAP
+-python-ldap==2.3.13 # authenticate against an existing LDAP server
++python-ldap # authenticate against an existing LDAP server
+ 
+ # Testing
+ coverage # computes code coverage percentages
+@@ -12,15 +12,16 @@
+ openstack.nose_plugin
+ nosehtmloutput
+ pylint # static code analysis
+-pep8==1.3.3 # checks for PEP8 code style compliance
+-Sphinx>=1.1.2 # required to build documentation
++pep8 # checks for PEP8 code style compliance
++Sphinx # required to build documentation
+ unittest2 # backport of unittest lib in python 2.7
+ webtest # test wsgi apps without starting an http server
+-distribute>=0.6.24
++distribute
+ 
+ # for python-keystoneclient
+ httplib2
+-python-keystoneclient>=0.1,<0.2
++#python-keystoneclient>=0.1,<0.2
++python-keystoneclient
+ 
+ # swift_auth test dependencies
+ http://tarballs.openstack.org/swift/swift-master.tar.gz#egg=swift
diff --git a/sys-auth/keystone/keystone-2012.2.ebuild b/sys-auth/keystone/keystone-2012.2.ebuild
index 67e1aa7cc99a..30c90daabf7a 100644
--- a/sys-auth/keystone/keystone-2012.2.ebuild
+++ b/sys-auth/keystone/keystone-2012.2.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2012.2.ebuild,v 1.1 2012/11/28 21:59:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2012.2.ebuild,v 1.2 2013/01/01 08:10:17 prometheanfire Exp $
 
-EAPI=4
+EAPI=5
+#test restricted becaues of bad requirements given (old webob for instance)
+RESTRICT="test"
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Keystone is the Openstack authentication, authorization, and
 service catalog written in Python."
@@ -19,9 +18,10 @@ LICENSE="Apache-2.0"
 SLOT="folsom"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sqlite mysql postgres ldap"
+#IUSE="+sqlite mysql postgres ldap test"
 
 #todo, seperate out rdepend via use flags
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/eventlet
 	dev-python/greenlet
@@ -47,9 +47,36 @@ RDEPEND="${DEPEND}
 		sys-auth/keystone[ldap]
 		) )
 	"
+#	test? ( dev-python/Babel
+#			dev-python/decorator
+#			dev-python/eventlet
+#			dev-python/greenlet
+#			dev-python/httplib2
+#			dev-python/iso8601
+#			dev-python/lxml
+#			dev-python/netifaces
+#			dev-python/nose
+#			dev-python/nosexcover
+#			dev-python/passlib
+#			dev-python/paste
+#			dev-python/pastedeploy
+#			dev-python/python-pam
+#			dev-python/repoze-lru
+#			dev-python/routes
+#			dev-python/sphinx
+#			>=dev-python/sqlalchemy-migrate-0.7
+#			dev-python/tempita
+#			>=dev-python/webob-1.0.8
+#			dev-python/webtest
+#			)
+#PATCHES=( "${FILESDIR}"/keystone_test-requires.patch )
+#
+#python_test() {
+#	"${PYTHON}" setup.py nosetests || die
+#}
 
-src_install() {
-	distutils_src_install
+python_install() {
+	distutils-r1_python_install
 	newconfd "${FILESDIR}/keystone.confd" keystone
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
index 5bb02b2b0389..b8ce770a7748 100644
--- a/sys-auth/keystone/keystone-9999.ebuild
+++ b/sys-auth/keystone/keystone-9999.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.2 2012/12/31 13:50:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.3 2013/01/01 08:10:17 prometheanfire Exp $
 
-EAPI=4
+EAPI=5
+#test restricted becaues of bad requirements given (old webob for instance)
+RESTRICT="test"
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit git-2 distutils
+inherit git-2 distutils-r1
 
 DESCRIPTION="Keystone is the Openstack authentication, authorization, and
 service catalog written in Python."
 HOMEPAGE="https://launchpad.net/keystone"
-EGIT_REPO_URI="https://github.com/openstack/keystone.git"
+SRC_URI="https://github.com/openstack/keystone.git"
 
 LICENSE="Apache-2.0"
 SLOT="folsom"
 KEYWORDS=""
 IUSE="+sqlite mysql postgres ldap"
+#IUSE="+sqlite mysql postgres ldap test"
 
 #todo, seperate out rdepend via use flags
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/eventlet
 	dev-python/greenlet
@@ -47,9 +47,36 @@ RDEPEND="${DEPEND}
 		sys-auth/keystone[ldap]
 		) )
 	"
+#	test? ( dev-python/Babel
+#			dev-python/decorator
+#			dev-python/eventlet
+#			dev-python/greenlet
+#			dev-python/httplib2
+#			dev-python/iso8601
+#			dev-python/lxml
+#			dev-python/netifaces
+#			dev-python/nose
+#			dev-python/nosexcover
+#			dev-python/passlib
+#			dev-python/paste
+#			dev-python/pastedeploy
+#			dev-python/python-pam
+#			dev-python/repoze-lru
+#			dev-python/routes
+#			dev-python/sphinx
+#			>=dev-python/sqlalchemy-migrate-0.7
+#			dev-python/tempita
+#			>=dev-python/webob-1.0.8
+#			dev-python/webtest
+#			)
+#PATCHES=( "${FILESDIR}"/keystone_test-requires.patch )
+#
+#python_test() {
+#	"${PYTHON}" setup.py nosetests || die
+#}
 
-src_install() {
-	distutils_src_install
+python_install() {
+	distutils-r1_python_install
 	newconfd "${FILESDIR}/keystone.confd" keystone
 	newinitd "${FILESDIR}/keystone.initd" keystone