net-im/pyxmpp: version bump - port to EAPI 5 and distutils-r1

Package-Manager: portage-2.2.0_alpha184
Manifest-Sign-Key: 0x1F357D42

4 files changed, 56 insertions, 35 deletions

diff --git a/net-im/pyxmpp/ChangeLog b/net-im/pyxmpp/ChangeLog
index 17a747267..fb5620b2c 100644
--- a/net-im/pyxmpp/ChangeLog
+++ b/net-im/pyxmpp/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-im/pyxmpp
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pyxmpp-1.1.2 (11 Jul 2013)
+
+  11 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> -pyxmpp-1.0.0-r2.ebuild,
+  +pyxmpp-1.1.2.ebuild:
+  Version bump - port to EAPI 5 and distutils-r1
+
   19 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   pyxmpp-1.0.0-r2.ebuild:
   Forced move to EAPI-3 from distutils eclass
diff --git a/net-im/pyxmpp/Manifest b/net-im/pyxmpp/Manifest
index a6920ecc4..d80b4b689 100644
--- a/net-im/pyxmpp/Manifest
+++ b/net-im/pyxmpp/Manifest
@@ -1,4 +1,18 @@
-DIST pyxmpp-1.0.0.tar.gz 669021 RMD160 148d07c97ca715985a57984fdc6c228dbe1fb019 SHA1 6a8d88ed79153175698cd0ffc914ea37c3f526ce SHA256 924ba0cde1e630b53784623cdaab35f0da6e81e7b8a11e6927cd38420a781267
-EBUILD pyxmpp-1.0.0-r2.ebuild 656 RMD160 395ccbba1a2d800e97c0942d2bc1d6f6df838426 SHA1 814edca83ebd1c451afde604cfbf37f7197a749d SHA256 8b2d4ccef11dca30d3174384af0f151cb353c31987d23f598449192805910db1
-MISC ChangeLog 1276 RMD160 b90c7b4e310fea2be8b4c9d5836670947d4a08a2 SHA1 77a67060c97188d5c37dfb38cf192d1b2b647a2d SHA256 d400ef8c8e1414d1559823abadbeeb8fd69961eee355643fe21cac0c9ddfa032
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST pyxmpp-1.1.2.tar.gz 1110893 SHA256 f45365bae922a9e44226622cf086e3ffd3c681012f6c6b609d3306e4d0dfb33c SHA512 f09a7e6fe236e25d4f59e1806b94196e75a24a70ba606b9d5222ecda48b631acaab1155311dcb17d609a12cadda022242bbcd0e406e6dc3dd7e6c6d7994eef08 WHIRLPOOL 8251fd52af9711d794c63db91bd6d8699d5f2f11ffaba512e6dab374d19958715b1519d13fd5c1436b8c82d6e503a667d1b41b980dc6990a59f1244ff5458ef3
+EBUILD pyxmpp-1.1.2.ebuild 699 SHA256 cbfd8d81381d601352eeadefbbd2ed95917b88bb8c0b88dd9fe969b16c796c05 SHA512 9829c2780f16e8459cf7ba38066af6df0b2745478c8c5a05a6b53ddb3365281a8117e5cdda22ab1d9d8dad54f67778b9aad9c313863056200ae5d5a32e7c073e WHIRLPOOL 29937d0bf1c000479438146e0ddcbec289fc6e3e50a2610a105d253afc7ea4ac73073627183543357e8afe4763da7db675c66367d7b1949677492c590dd46ab6
+MISC ChangeLog 1454 SHA256 291cf9d4f663acff1a263248f0d08f1f6177f4383e585488191debae39ba2594 SHA512 c39a1fc1cfe534f8b4ab25bf049ac48dc8c6eac28095f0c5ef57835d28d33a9267f7bbf7d09e3b0bd38d1bfce70788f109c22cb2e1ace076c1be0cea94a507b2 WHIRLPOOL a4160fcff43be95cf0de89cc3a1a9e850b5dbec4a9c038d49e623f7ecd77e36d8e05cd16f0d11b31c32283f7fb04370682d7fe99ce1d18474b8142ede4e0a999
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR3mW7AAoJECo/aRed9267ddUH/jca/xYk4IQ1MCHGWZ5tHIx+
+SKCvngErAa3feDHJDUooS4GHmlsa74QUDvNQ1ZDbfZS87XgQrFqUXpbcMRcCOdEY
+rU769Z87uwhEAjx0mbkQFR4ir90kuKekPcDyK4YyTuX4JvC3l/L/zVzoNm76anH/
+J+Mo2tZZlZqNahRF0ZP66HzYSLt7UFoXwPp88dmBMBz5q9NhkfeJ1qshxekUuk7H
+1owvtGe2hJnKPXEc44mA7/3Zi9Hw7E/FpuqjE+VzyZgPguDHOAozAqQH8Uxvw8LA
+zVx00MtsVsxMCnxQ+tMn7HyLpM6QLCPXkOcmr1jkHBgcPd7aIz10GD9/QsoWUaI=
+=GNl2
+-----END PGP SIGNATURE-----
diff --git a/net-im/pyxmpp/pyxmpp-1.0.0-r2.ebuild b/net-im/pyxmpp/pyxmpp-1.0.0-r2.ebuild
deleted file mode 100644
index f0da1d55b..000000000
--- a/net-im/pyxmpp/pyxmpp-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils distutils
-
-DESCRIPTION="A Python XMPP (RFC 3920,3921) and Jabber implementation"
-HOMEPAGE="http://pyxmpp.jajcus.net/"
-SRC_URI="http://pyxmpp.jajcus.net/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.3
-	>=dev-libs/libxml2-2.6.23[python]"
-RDEPEND="${DEPEND}
-	>=dev-python/dnspython-1.3.2
-	>=dev-python/m2crypto-0.13.1"
-
-src_install() {
-	DOCS="CHANGES"
-	distutils_src_install
-	if use doc; then
-		dohtml -r doc/www/* || die "Dohtml failed"
-	fi
-}
diff --git a/net-im/pyxmpp/pyxmpp-1.1.2.ebuild b/net-im/pyxmpp/pyxmpp-1.1.2.ebuild
new file mode 100644
index 000000000..b02563519
--- /dev/null
+++ b/net-im/pyxmpp/pyxmpp-1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit eutils distutils-r1
+
+DESCRIPTION="Python XMPP (RFC 3920,3921) and Jabber implementation"
+HOMEPAGE="http://pyxmpp.jajcus.net/"
+SRC_URI="http://pyxmpp.jajcus.net/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/m2crypto[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGES ChangeLog README TODO )
+
+src_install() {
+	distutils-r1_src_install
+	if use doc; then
+		dohtml -r doc/www/*
+	fi
+}