From: Michał Górny <mgorny@gentoo.org>
Date: Mon, 27 Jan 2020 07:18:02 +0000 (+0100)
Subject: dev-python/pastedeploy: Combine both revisions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a760f5cf0cebb2937ce9698d2247c49b5e54df6b;p=gentoo.git

dev-python/pastedeploy: Combine both revisions

There were no major changes in -r1, so just copy stable keywords over
and remove old.

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---

diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
index c0cab0d1ae9a..cf1492eec8ed 100644
--- a/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
deleted file mode 100644
index 32725a8d99e1..000000000000
--- a/dev-python/pastedeploy/pastedeploy-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN="PasteDeploy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
-# pypi tarball does not include tests
-SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc docs/*.txt
-	find "${D}" -name '*.pth' -delete || die
-}