The 4.13 has bug which is workarounded in the 4.14, therefore removing the

older version.

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 14 insertions, 97 deletions

diff --git a/dev-python/pyro/ChangeLog b/dev-python/pyro/ChangeLog
index 6e5370e542ab..24305ab833e6 100644
--- a/dev-python/pyro/ChangeLog
+++ b/dev-python/pyro/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pyro
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.68 2012/06/01 13:16:04 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.69 2012/06/01 13:19:38 aidecoe Exp $
+
+  01 Jun 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -pyro-4.13.ebuild,
+  pyro-4.11.ebuild:
+  The 4.13 has bug which is workarounded in the 4.14, therefore removing the
+  older version.
 
 *pyro-4.14 (01 Jun 2012)
 
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 071fc74df774..59bc2b51c5ae 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -3,24 +3,22 @@ Hash: SHA1
 
 DIST Pyro-3.16.tar.gz 298769 RMD160 77b4a5f5c3755c9d0bb349201046713567c9c597 SHA1 650dbb7445a319ccf718efcc1dd3042f482353a2 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578
 DIST Pyro4-4.11.tar.gz 262099 RMD160 f3d28f4f96ddde36dbcc8461a66fc01d59e7ceaf SHA1 960b453482f86bb4989ce34e0122a896949b1d0f SHA256 d84ccfe85b14b3cb086f98d70dbf05671d6cb8498bd6f20f0041d6010dd320da
-DIST Pyro4-4.13.tar.gz 267086 RMD160 0818e6b151f222721f961de239ce147caae35490 SHA1 772399e72fc5c24079ef15b545c9efe1c7390e5e SHA256 afbc6964e593e7efed3fa5c91af45c4491cfdb994e7fdbe285cbb3719162cb90
 DIST Pyro4-4.14.tar.gz 269055 RMD160 6ed35353c78e0533cb96cdc723b1a030384b6a53 SHA1 8e705fc097acfe9a83ec735c5cd83b8b6e42b088 SHA256 90c4f84ae9932d66825c61af9cd67b0b2877b477c967812a5d6953d67f3b003d
 DIST Pyro4-4.8.tar.gz 211959 RMD160 5b51596360bbc8176f304f7bee432218644c212b SHA1 4d3771000963f08dede307fce5714ff48c50057c SHA256 825b8b7dcd4f502def2f7dadbceedf7b79be4b121a77d03c398378979cbc2203
 EBUILD pyro-3.16.ebuild 1036 RMD160 2ad66d99f983c3e8ab26f953e040cd5468be774b SHA1 f4e53220632704cf2338966cff2f9f219ca8dc73 SHA256 aa5d2c23c3c186cd2a656c877ac595ad6682aa6795b518b24c0c00dcd13a34f0
 EBUILD pyro-4.11.ebuild 1954 RMD160 270a3404438d1ab57bfba5f3c73b332fcd4e8830 SHA1 b0c2a8c3a455ad3b2338835eab9ec6783d659a64 SHA256 382ecb1a51bd652c3b0538564ef2e83548d946fe5f8dc4e8ce229551856d113a
-EBUILD pyro-4.13.ebuild 1954 RMD160 3e4f7fad0bb1fbd10b1fa6bf7308b6962b70e5f3 SHA1 6438658d612caa34ad31381a4764772d527cae87 SHA256 0326f839361ff8e3150c3dc8d720a915f0e4a32211a69eaa5cd4bd83d2e3059a
 EBUILD pyro-4.14.ebuild 2292 RMD160 01caa40960142efd15423ed25fc1add521613805 SHA1 67e34f0a7c1099b1e17cf574b3be27ec8ad6f36d SHA256 c01aa3e10cdeddb3fbb5e3297595ad1ea37f7b6ca9c500ec8807ee646f848874
 EBUILD pyro-4.8.ebuild 1949 RMD160 742bbb89aed6094d385a63ea26e68a2163e1f925 SHA1 eb38ec0872f7b3b614dd841d6b71336a631cafa9 SHA256 4f94927527f327c285654ad652c443aa6a623e3421f917717794ff7725223c6f
-MISC ChangeLog 8809 RMD160 999743b94cf786370a32017704a7d622bb217cc7 SHA1 ef25665d36a1359c7cf939878eab25b20ad417aa SHA256 1d4fc15d12500764cb5fbef852b7d04f573a2deb4cd44bcb183855e8598b738d
+MISC ChangeLog 9000 RMD160 fd91bad443ebb0a4b1174efa47cbe2ddf2ab4d51 SHA1 d3060838c320902fd45ee1e7f1fba6c9b09d68f5 SHA256 14affc02e516d93eea5ff31909809e1736715695e32a1953d7c68185493698fa
 MISC metadata.xml 328 RMD160 cd729ef37376e009cb9f82f5949d65bd756d119e SHA1 b893b6ff4ea31c2b0567893df1d43b32c4c4feb9 SHA256 63019eb7ef265fa89abf2782a2358cc9b34787e3cf6c492e0af05d9793b8efe7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPyMCaAAoJEPATRTHh2/q1bz4H/RCHyborXzQEFguxfMbzHXkk
-+JXLnwK1RoXv32KroFd3z6A6XMlDUhW+zYhXV7bOrYH872VrQ+9uyj//ygCrwNXf
-pChyfRLSpAHbwnPM8qdJyINb9OkibypYMmnFJbOQPRelcwdDL9cilrom3d99jSdo
-kED8WeDXgMXpxIrm/+gNoTCxvh04Nokh5wjhEBoRkSPS6ZkZX1hgL8y2YzxPpBSF
-IjLpCWLjJdfHKNK/P/y3RzT6YG3CJRONFX1n0o0Gt0kbYT+OMF4UCcIIx8jsNmhf
-63jCAu0Ng+ww1mwcCrtjY10LdOwudhQbELEbeIoKVuJNxF3y6nwUG3rkRm6ScU8=
-=RMhc
+iQEcBAEBAgAGBQJPyMFwAAoJEPATRTHh2/q1bPMH/0Wf0GkeKBgvzvFeThHGnHXW
+GRaVxKh0V/5hs9dwPdnL/CkifodfoghBSrgxkSzdUlItkoSJHOxi5UvXdi0nHHL3
+3qEBjeKaCZCIxCU8ZUfL6dHlY+mCaTliO7IZwzRiSy+oTbe+lTvfwpTpaga8Zh/o
+j8uPgEGeg3hZotXNsKKHBWTT16LSyOLYRSbPM9DCXQYrt9/HknWZFI/DK3z0jeT9
+1NogQvzTAjuJgWnf2PpelDDnJMKrEl0fHkqqSGHMhOp1KWbdAmvgdsrE/K3v9fQv
+r/ak08sX8elvaW7FRNATIrFTtZGPoQIgAPGQQ/UnnyPe6dxP7rMK25y8fXmS2fM=
+=bq0P
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyro/pyro-4.13.ebuild b/dev-python/pyro/pyro-4.13.ebuild
deleted file mode 100644
index be728cf118ec..000000000000
--- a/dev-python/pyro/pyro-4.13.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-4.13.ebuild,v 1.1 2012/04/19 09:04:18 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45]"
-
-inherit distutils
-
-MY_PN="Pyro4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Advanced and powerful Distributed Object Technology system written entirely in Python"
-HOMEPAGE="http://www.xs4all.nl/~irmen/pyro/ http://pypi.python.org/pypi/Pyro4"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="!dev-python/pyro:0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? (
-		dev-python/coverage
-		dev-python/nose
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="Pyro4"
-
-src_prepare() {
-	distutils_src_prepare
-
-	sed -e '/sys.path.insert/a sys.path.insert(1,"PyroTests")' -i tests/run_suite.py
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/testBCstart/_&/" \
-		-e "s/testDaemonPyroObj/_&/" \
-		-e "s/testLookupAndRegister/_&/" \
-		-e "s/testMulti/_&/" \
-		-e "s/testRefuseDottedNames/_&/" \
-		-e "s/testResolve/_&/" \
-		-i tests/PyroTests/test_naming.py
-	sed \
-		-e "s/testOwnloopBasics/_&/" \
-		-e "s/testStartNSfunc/_&/" \
-		-i tests/PyroTests/test_naming2.py
-
-	sed \
-		-e "s/testServerConnections/_&/" \
-	    -e "s/testServerParallelism/_&/" \
-		-i tests/PyroTests/test_server.py
-
-	sed \
-		-e "s/testBroadcast/_&/" \
-		-e "s/testGetIP/_&/" \
-		-i tests/PyroTests/test_socket.py
-}
-
-src_test() {
-	cd tests
-
-	testing() {
-		"$(PYTHON)" run_suite.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Installation of examples failed"
-	fi
-}