bump; clean old python impls, add IUSE test, doc and all that goes with them, tidy, remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 61 insertions, 100 deletions

diff --git a/dev-python/peppercorn/ChangeLog b/dev-python/peppercorn/ChangeLog
index 485e5fedb4a6..79b1c0446157 100644
--- a/dev-python/peppercorn/ChangeLog
+++ b/dev-python/peppercorn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/peppercorn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/ChangeLog,v 1.5 2014/03/31 20:35:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/ChangeLog,v 1.6 2014/10/18 12:08:34 idella4 Exp $
+
+*peppercorn-0.5 (18 Oct 2014)
+
+  18 Oct 2014; Ian Delaney <idella4@gentoo.org> +peppercorn-0.5.ebuild,
+  -peppercorn-0.3.ebuild, -peppercorn-0.4.ebuild:
+  bump; clean old python impls, add IUSE test, doc and all that goes with them,
+  tidy, remove old
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> peppercorn-0.4-r1.ebuild:
   Add support for the new PyPy slotting.
diff --git a/dev-python/peppercorn/Manifest b/dev-python/peppercorn/Manifest
index 05f0417f9b9a..3c404bd4dc11 100644
--- a/dev-python/peppercorn/Manifest
+++ b/dev-python/peppercorn/Manifest
@@ -1,29 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST peppercorn-0.3.tar.gz 14489 SHA256 073f4d7a8f135835241bfba0eb326a0ec3087510a51d64d615d282cc20a98afd SHA512 5e7562bb2481a3bc89dea13167288ac48416f239a8727a6bbfcd79263ca1ee2d020909111bcd8df2fc9eba34f5aa8a78c058764a9e32f8193e9ec51e6ff3ad65 WHIRLPOOL 9b0a11fd76bec0a8f8a1cd058802dc3f323eb0692574bc15fa9ed56c57d86969034694bd0db5eb547324756ab4fb66134db9cd6d54dd76864c4e52f4630d485d
 DIST peppercorn-0.4.tar.gz 18349 SHA256 9a53edd7259a73256519a0d4b23fdc210ea3dfc415e0becdba1d2498cbf7e28a SHA512 b89d36e5c5887f8a21f6bc0d9da33ef0c57a19848dc61fad105bf076eb5214119fb2fa75beeefb936a95e6aa98da7c48ad60596f68da629383820111ef127100 WHIRLPOOL a76793182e65eff1b498f7a872222d427d27a17cae8985fcf1bbb7ab87732f5d4fb6357b94556dd1ac5ea4b4b2d152bfa9864e83e9efaa7879fbf7a01c3dee2a
-EBUILD peppercorn-0.3.ebuild 969 SHA256 0abecdf91b75e93151a378520286dee0c71d0f0b8b0fa4b147ce5a96c80e1e3c SHA512 5711feab9847613f84ae0f10b27647ab4520c0931e1637daaba059188383e8b0ee5e7bacf9470a23d4fe009ebc10ea9aadeac39afc5a206535ecd9a69a3762b6 WHIRLPOOL dac48763b97ef3bacdfbb82d4b83e6067958ddd32d85a6fe8035a86c7cf5a5bf2b4d77e429ced670a0e034fc57bbadd200d963f18d78a25c25bda2a8df84248a
+DIST peppercorn-0.5.tar.gz 19637 SHA256 921cba5d51fa211e6da0fbd2120b9a98d663422a80f5bb669ad81ffb0909774b SHA512 37f9df282872b0c664780f5e27caf81cc379b05009756cf6c79290b09893d88427f3619916688412dabf20e99f264da8832d959563943e2910b1fcac696edc31 WHIRLPOOL a104c3dca197c5bdd32a9a3f4fafb7c93459cbb8da13f8e581990962ac9afc56c22cdbb101d17271983b61fb0e83f4c0b25590a88d8f54c403110067ea3ba12f
 EBUILD peppercorn-0.4-r1.ebuild 1232 SHA256 d94d333f790cf1255f5e12a2646e93e2433ea2b62810a9be9b0afd9aee80f563 SHA512 d7d826d54cd7b1daae842cc92114add2545a01c5b19bc7104a3faf20c9dce3e94102ce1c60a99ca0d0edbd58e9ba85776a1f3265f9bf681e80135540c8bc33b5 WHIRLPOOL df7dd2670221594c8bae5e41ff6176a275e77579770bfd2bf156012b6139add524c5c90670177c6dcdb5e478b7bf3bad3d6b43a2d6b473e3693909073c1baa40
-EBUILD peppercorn-0.4.ebuild 1211 SHA256 697aa781b940b07717afeed0c70e837017ae16e8625e97544c3c3163680a0f82 SHA512 2186334de57c99107db1641bce820e05eb71df59bccdcebafddde8cfb15ef7e6926461c46a97cf96a8a114fef2a6aec221e1d6832588254e28da3fb660ea913d WHIRLPOOL f1f9318475003d677e6ade8705c3f66f65a95b3748e0e4b6012875d93360e249ffb0c227934b82e8dcd61407c9a7877f06a05a1a2c28059018d04477415cf89a
-MISC ChangeLog 944 SHA256 41e1c58571cba99976d842742c38d77398037a33586f6ce940a041e3facd578f SHA512 171a29e7f4932c9fa96ffc82e22221f4d7320fba854aa55447af95a64c727ebb892b6dda00a1cf89ad934f3518d951be39350b126e8349a50840faaeec183684 WHIRLPOOL 48b7b9ebcfc2d2dd1105137b11311fd8cd10c64fdbcd47a71f50e0c5bb76cf69ea6ccb13991cca76a43492518aabc43ebf4e1d0332cbce3550b3c1cf8f3ccd48
+EBUILD peppercorn-0.5.ebuild 1260 SHA256 82dbf067c2fa8ae1aa71e078bd71c047220632279e45f3fe12d0315e8d9b57b9 SHA512 e4bef91ee0ff8b43e257816978b1d6ec12d8361f908bd4c483d0a2abf7e65eb90bf5e6c01570e8dcd0ad8dc8428d21a7911d69e8eb3f41aa4daf771a1fb54b58 WHIRLPOOL 82335f7a9b31e7441c7de5dd1ac942d8a6762d0e52ab4e65060225f565599936de628f4e785d56f9841fa6e620c38e17a91d71cfe5f1932e9b117f2c3f3f5d3b
+MISC ChangeLog 1198 SHA256 78134a16f3344802668ac768594f3a42033422584799009a751fadd9b9f3b82e SHA512 6732bbb83a926081c6dfa4ad7f6684d13a3e5ed822dcba6c393469829824a18fae15eb054faee9f19e601e003ea55cd3ab373bcc4d8eb5296ba22e72e6b6fe0e WHIRLPOOL 4989c9e1e326ddba354e1964f888866b9d6df1dbbf39904b2da22ba0f436024e5a2f3c95552d1215520b1d7737c225c5b773c233cee98cb195ceea1f7d6533ab
 MISC metadata.xml 233 SHA256 90360afafb4eb8cf33f56a8ead3a778e8c4ddc07ccb3cd50fd6f4b346c7cb297 SHA512 d9f97ea69992f7dd05538c1707be85a49f911208bfeebd6b1551c235173c5dde96b13ccf2c6611ea900dc4d8e7362d271f1db60abedf264003aae4d03873921a WHIRLPOOL a08854149dfa17790c20bc5b2caed3e4d50501d33d08e7400063e5d6bf9150ead1bdcb7ea43b8709266f8230321a1d6755033e9243d17749b4040ab67a77bda4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTOdGaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOhHUP/jwAAPUuXO/yXA2EUXDJQZOK
-Qj3Ftp3Fzbtcssf5/t58m1UBAypgWyh8/jY0P+nKMyTu/iGVSbp5F57O1BYB3WfH
-NiDXyIMkn1Ak1IbcDZAkvEHZknHTvmnBJPXwAFVMUPy8KRBoaw2bo6kekibZCn9G
-F6oO9LgEJzQoZpXxWbT58HE3YUkIXgr2V2YaehGDi5qD0zKQaLJs7BpqWGJgvYl4
-BVSooORSdugly6ID9+CeodkKD/RBXe4mY+AhTwW243QWq54TXVmFT1nAMQvod3pR
-VR/A2hW9W0NZEfAvAW8Nxu/NkObY34FiWDDNdoWcLUcPrDNXROgvr8HLp9vCfhhU
-tJI3oyXqSyuhJTvccYrg8XfESVu1OcYVYmOb2Cf4JBizwqYh3duiMmsc4neR8v8/
-+8a0MGbDg6h0QLIy7d7Q8aEoQuA7/QzXIsumZaScyJTfPa+JnkL0WYPVjDtaGaOk
-vbqTHGdpVhE+fAJ9wcqq224973LJChyzzmKsXid4rqpzB8A2WbIyNEwgJ8GvyxKu
-OUCS9UCjncCP06a/nz5OGr16OCBnXXRWWYScewCpbjEbpQZhFwSoaYNbHNdAKd7Q
-RnaPXL9Nk5BxOTqMxK0HBSod4vYSiv+lSJYBiwbYEIkNpAlNAi4FUKC+yMn7mpbz
-4HtPJ0e5FkDOtOb8mb/I
-=tLMW
+iEYEAREIAAYFAlRCWFUACgkQso7CE7gHKw0tdgCg2srQUoIsTM3DDddfiCiQ8uUw
+hJQAoLMEzEBPxjzVEph0QQMp/z7X6B5t
+=CYWU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/peppercorn/peppercorn-0.3.ebuild b/dev-python/peppercorn/peppercorn-0.3.ebuild
deleted file mode 100644
index 471d7ac42738..000000000000
--- a/dev-python/peppercorn/peppercorn-0.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/peppercorn-0.3.ebuild,v 1.1 2011/07/30 01:57:57 rafaelmartins Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
-HOMEPAGE="http://docs.repoze.org/peppercorn http://pypi.python.org/pypi/peppercorn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-RDEPEND=""
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		(cd docs && emake html) || die "make html failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/.build/html/* || die "dohtml failed"
-	fi
-}
diff --git a/dev-python/peppercorn/peppercorn-0.4.ebuild b/dev-python/peppercorn/peppercorn-0.4.ebuild
deleted file mode 100644
index 18d0a4deb586..000000000000
--- a/dev-python/peppercorn/peppercorn-0.4.ebuild
+++ /dev/null
@@ -1,39 +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/peppercorn/peppercorn-0.4.ebuild,v 1.1 2012/02/22 23:56:14 marienz Exp $
-
-EAPI=3
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2 3:3.2"
-RESTRICT_PYTHON_ABIS="2.4 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
-HOMEPAGE="https://github.com/Pylons/peppercorn http://pypi.python.org/pypi/peppercorn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt README.txt COPYRIGHT.txt"
-
-src_install() {
-	distutils_src_install
-
-	# Install only the .rst source, as sphinx processing requires a
-	# theme only available from git that contains hardcoded references
-	# to files on https://static.pylonsproject.org/ (so the docs would
-	# not actually work offline). Install into a "docs" subdirectory
-	# so the reference in the README remains correct.
-	docinto docs
-	dodoc docs/*.rst
-}
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
new file mode 100644
index 000000000000..4852246dd36c
--- /dev/null
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/peppercorn/peppercorn-0.5.ebuild,v 1.1 2014/10/18 12:08:34 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting a token stream into a data structure for use in web form posts"
+HOMEPAGE="https://github.com/Pylons/peppercorn http://pypi.python.org/pypi/peppercorn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+# Include COPYRIGHT.txt because the license seems to require it
+DOCS=( CHANGES.txt README.txt COPYRIGHT.txt )
+
+python_prepare_all() {
+	# Fix Sphinx theme. courtesy of Arfrever
+	sed -e "/# Add and use Pylons theme/,+36d" -i docs/conf.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}