Fix bug #515766

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 34 insertions, 40 deletions

diff --git a/dev-python/pyptlib/ChangeLog b/dev-python/pyptlib/ChangeLog
index a287fee6572a..d1d8573dd57f 100644
--- a/dev-python/pyptlib/ChangeLog
+++ b/dev-python/pyptlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyptlib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyptlib/ChangeLog,v 1.2 2014/04/17 11:56:01 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyptlib/ChangeLog,v 1.3 2014/07/30 14:47:33 blueness Exp $
+
+  30 Jul 2014; Anthony G. Basile <blueness@gentoo.org> -pyptlib-0.0.5.ebuild,
+  pyptlib-0.0.6.ebuild:
+  Fix bug #515766
 
 *pyptlib-0.0.6 (17 Apr 2014)
 
diff --git a/dev-python/pyptlib/Manifest b/dev-python/pyptlib/Manifest
index b122c3676610..299aa41ffd1d 100644
--- a/dev-python/pyptlib/Manifest
+++ b/dev-python/pyptlib/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pyptlib-0.0.5.tar.gz 233333 SHA256 0b7154d0ec4277482aae3fe646452b8695983c2c00014e005c979281dbbda43f SHA512 041ecd4832db294db76fa6e829af8ec94f728fbdd2ee7b81e1ffc0bcd234240f6f4e99b57df2f9b955e73c1e32ad45ea2a71cb5088c6930372b2692cf3e353ec WHIRLPOOL 6afab66452ee7ee5d5770ee59d3354dbcff4904877ffe87756697fbd8882cc2743e9c7bae8c6c8a0cae83d7cfeb2236f82a304a54f71e16f77bc86f3bf7ff4d9
 DIST pyptlib-0.0.6.tar.gz 239316 SHA256 b98472e3d9e8f4689d3913ca8f89afa5e6cc5383dcd8686987606166f9dac607 SHA512 f54ee3ae51f2d6884b0157f8cec3e9af267f926e50728478b961551d069fc6c4a2840d59e74d5b0f93b4bb305d9f91f31b91fa4425d1931688ffc5783f6192f9 WHIRLPOOL 1144479085e6f9a762638e6b0adee886b7446362233e246a494523ef53afeb394f6d00db0d5cb425491ae1f2e2db60499c05d03a162079e6357deb224bb938ef
-EBUILD pyptlib-0.0.5.ebuild 565 SHA256 762811ebb255979a5c4e530f2f70e0fbc3143c593283cd70b68252ec90139e29 SHA512 8d40b2f5e07b81d9245f37f3ce3db417f6c22629ed12fecdf2a7d273792d8619f39c9252294ba82e4ae30c253981a25c0f883c1904fa34b124db70eeb8ca894f WHIRLPOOL 45e80779d7ee57b1ac7cb52a3816416379062fc5e2489b316199b51075c64f65553a800e7418fcec0418828ac1bc733ff2b3c432b8fde19597d099b8af986c68
-EBUILD pyptlib-0.0.6.ebuild 565 SHA256 dc4aad6ef72f5bf8e8f883f9380aa343ed7667881aa42c7f87bcc9fb522f76e4 SHA512 44429e2b30b63958883eba0c7ee4cd50f3c83d979dc6f249f90d98c00f4d43664e450830304c4d43c67d1eb3681f37a54b2c6d36631934095c93984f72e2d5a3 WHIRLPOOL 5b8b0d59e5acc9fad8607c9421cbdf97317f06d4b78d24261885022b068938b9a299a632cf99f847c011c98eddc5776bc09ad717b5c0c9c5fc7748f14c7ee639
-MISC ChangeLog 477 SHA256 4c3f42778d8c1fc4d42ac41f043780592842049eebace512c67d173d5d2cfcdc SHA512 83cfecad2e102e50300288facdaa186ce42d43adca0b27a9ad450665e091325acd274119ee2677617bb35c64493cafb38bac097d834018959956c5664bef84b8 WHIRLPOOL 3f6a7c679fe5115aead5cc5aa13b01d78b157e2920c163f1997703a3a2d65180342aa6c89ba6a2d5cc7a30fee344607a179b7099c85b6afd32efd05de850cf7a
+EBUILD pyptlib-0.0.6.ebuild 850 SHA256 691f2fae0275ec86779bd05f1aaf3d78abdac08d487f82999b78796e3ed0b4c4 SHA512 afaa4f2ef6dc77f16d20121eff3307ecec65528cb035ed0f55da3624fb7e260c17d3e088913915845fc6b430cbc25d6ffc7f80d8bd20d2fdef8220879d61e0af WHIRLPOOL a61eb147f53e38165eee07fefff51b366ee26e5d7c3108cbc87f2ce20b6c1080f81144983ebd47f2dd044041142d31f250e1704e42c6ae17e29ea387e413ff2e
+MISC ChangeLog 598 SHA256 cdc72ba977c496fd7222db53abe1dc2f20a164d17c4ca822e8ed95f9aa7537b0 SHA512 962726baad371a5171296243d0d049cdefc4989d4e20c625f8ec924dc7928406d0d87c7abc7e54f1e71ee3092eba12f0e21c25d6e79bca35a4922f20f4bb1022 WHIRLPOOL 84eba544f905d354f4a389968b1bad6addc5adf9094421deb82c30e5bbc4cbd40641a1e3f3b036db68bc23f275b373dd3b133aabf6a111e55c2a4b21920c93cd
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTT8JeAAoJEJOE+m71LUu66SkQAJ29g+AYG7o6ubeDZ5SGjwAF
-Pm8aF6WaGmWaHocXN+IiY9uD2ZyopRtQIpk0ZunxjJPK9JYd+KNhpu3lm74mYoIO
-mCC24qQ/SYy79ugk1HxbQnTYy9wkdo8m9UGEnymFwSCjMbyiIb6mpwdbSlyN0nYg
-5/e1aripKUGMiw/FmCxHORfpif2LWs+kfO0aeektwglS1pESGdL9Yd9s1kUfOEYC
-HnU3Y4jgDoYqIhEAejBo3JI/Dt5hEYH3BCZueZIMTpXa4LsfN4+Wt3jLvvUBR7cU
-Cc6CMuf6g8/I8y3M81Z2FArTspHQme3gASJrpT8IA5q377Z+O7yrKEWeoAcZlhH0
-bREuDiEbRdLWkZ4mHeLPiXb4NGSVaZmDfoJnxII9dtYLzjbX65ytVRcDjHhwog1a
-b45voNdmxwSrUOcUJXMOp+zGv+jmSuHdS6sb7AXTnJySS+aB7uaTtvxIN/kzO52U
-2n+8dYL1VVanuqd036bUXTOA9lzazmxL0ZXVw3RDiz9/uGV7p1PW/U0N2h+wG9ep
-5PZApethwDmaHn0bWW+ckhCqpkr8eBMQEF8fBzHZ1VaBMxrotMYmn/kt7zcZPklX
-dBrzmpNHdPL6K+S86V60nREtLYj0IkgZaoQjrCZYBT3lU9moInDZnv4M8SbPKriE
-AI8+BIrEi9MEobeOlDva
-=QqDA
+iQIcBAEBCAAGBQJT2QXmAAoJEJOE+m71LUu6ZIsP+QFMHqlXf/FX2ugkWCVrb1TV
+2rW3VOQlKr7O9zRwmpgfCNs/JNwI3opbABRgfIC5NnfJpm1KruaOJVKV6dUq0hOH
+wjxyC2zitX8pu6Ya9NDBE1nSiMMMvTvsEJnA8HXubySsDS/gxO+kEK6PVZn7DBOn
+2TpY+YsCROiUyi4o++XG8FUpjt0jFtCTp0IDYKxstZWPP6o6A8gTV1uPm6LHwVKx
+pmStGMIRyygZ3R68VM8A0Yl7ZpkYtpAnPMLggrFazbK4IzNKtW2iwAzrTC4TbcOo
+pZeaRRRgDTbgoQy5brgl4f95a3+rP36IRFPhN4FzpsREWgkHGemgqD1FoZFCN3pc
+VTEpo97NNHgRAUfzORj6E6jydgCdXog/rlDJl1u1/gpwlYce/mxE8M70jYooJNbv
+V/QeW9ZlAqc/nrblmcnf6EVCObEcaAyIeym8SvHsXKQ0TQFFWaYuGvA/TROc9x56
+0peD5vg+pyV1saaMr2UrvexOwguXHlQQZFcbAwjkzUl8oSRDJ96ysEKBaTMNsDEe
+p9NegnHt1uJJQZNl2j8RDk7AiiQ1V/jy8y+4Ed2VM7QV3TrZf+5FY/ikCIBwZ2EY
+Pd/OQNYy1g4/tiUQlwBYynFzzdqR5ASTDgeNgPWiaA9ihV1mzLXxSE/18pvRLXJO
+RMFAywKmwTcrb1SF6YFS
+=V83P
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyptlib/pyptlib-0.0.5.ebuild b/dev-python/pyptlib/pyptlib-0.0.5.ebuild
deleted file mode 100644
index 439f82b0a3ad..000000000000
--- a/dev-python/pyptlib/pyptlib-0.0.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyptlib/pyptlib-0.0.5.ebuild,v 1.1 2013/10/06 16:41:31 blueness Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for tor's pluggable transport managed-proxy protocol"
-HOMEPAGE="https://gitweb.torproject.org/pluggable-transports/pyptlib.git"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( README.rst TODO )
diff --git a/dev-python/pyptlib/pyptlib-0.0.6.ebuild b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
index 67dde2b1b376..8a18aba60fe8 100644
--- a/dev-python/pyptlib/pyptlib-0.0.6.ebuild
+++ b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyptlib/pyptlib-0.0.6.ebuild,v 1.1 2014/04/17 11:56:01 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyptlib/pyptlib-0.0.6.ebuild,v 1.2 2014/07/30 14:47:33 blueness Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -14,6 +14,17 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="doc examples"
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DOCS=( README.rst TODO )
+
+python_test() {
+	"${PYTHON}" -m unittest discover || die "tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}