From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 dev-python/markups/Manifest             |  4 +---
 dev-python/markups/markups-2.0.0.ebuild | 31 -------------------------------
 dev-python/markups/markups-3.0.0.ebuild | 21 +++++++++------------
 3 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100644 dev-python/markups/markups-2.0.0.ebuild

(limited to 'dev-python/markups')

diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 366785b90fd8..5cca4ae246e7 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,5 +1,3 @@
-DIST Markups-2.0.0.tar.gz 16772 BLAKE2B 88091cbdb6dc5c7289561e4ff8d585335f13ece27ff62951d7356bb89b35e09b8eeafb960583f9dd5faa5fbe9cdb6961523a5314bca8c78e2f0f80514f28595a SHA512 8ccd348efea68678bfb7f47bd13da2729f95a5b5a8d44f11239dbb86b8224867cb1197e46d875ab9a0ba914be004bdc9aa6848b1e6549dc53b12e06040faaaae
 DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
-EBUILD markups-2.0.0.ebuild 657 BLAKE2B 5d01cd9520c2f77d8d6026561a149aa3d0cecca342c0de47889f16f99cb84b4bdc8fb02a7794d5c0b0e9d0247c4ddd3220b9896a7bfe86c10d7fb7e727fcde71 SHA512 323282110f16cc70d8d96dc3367031b01c141bf6c720d58ca6bd31d134410bd01975a7f62a254c19b3a6dfee577607978fe7aa55341149bb993d3af0b1322f87
-EBUILD markups-3.0.0.ebuild 882 BLAKE2B 2085526868c50edfd368264b7cb73ecaa1cf55f241f7d18ff961c43764bb1adb907dab1c47e78d66d9e4d205c05d10932e9a54252934b9f94568e69690bad006 SHA512 6aa3f00bb7f9478d6a17bd1a0e87ca1bdf893cfd81eed9413d0def9a6e87dcba41ef55ef54afe3aa205a291c4e0e70e8e830fdc7c258da6f8c502850c375f938
+EBUILD markups-3.0.0.ebuild 798 BLAKE2B 89235cae6a1b11e2ed8378e77ed306d08257969b560ffe15d81912ee5d72fd45916c70756839e9fec5623fc824eb752e64aba130fba8df4446fdf249fd624755 SHA512 f1ee2a6b558d78d3767548a91631fc668eaedd113b7c42dd8210a6408b242fed35c7282dc68bbad8f30dfd7525c6c20991277b84fcc95b3657d1455f7b07043d
 MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
diff --git a/dev-python/markups/markups-2.0.0.ebuild b/dev-python/markups/markups-2.0.0.ebuild
deleted file mode 100644
index 978df7dd8401..000000000000
--- a/dev-python/markups/markups-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit distutils-r1
-
-MY_PN="Markups"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="
-	https://pythonhosted.org/Markups/
-	https://github.com/retext-project/pymarkups
-	https://pypi.org/project/Markups/"
-SRC_URI="mirror://pypi/M/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}"/${MY_P}
-
-DEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	${EPYTHON} -m unittest discover -s tests -v || die
-}
diff --git a/dev-python/markups/markups-3.0.0.ebuild b/dev-python/markups/markups-3.0.0.ebuild
index c9e1cf31d2c3..9795d43f9fd8 100644
--- a/dev-python/markups/markups-3.0.0.ebuild
+++ b/dev-python/markups/markups-3.0.0.ebuild
@@ -3,39 +3,36 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit distutils-r1
 
-MY_PN="Markups"
-MY_P=${MY_PN}-${PV}
+MY_P=${P^}
 
 DESCRIPTION="A wrapper around various text markups"
 HOMEPAGE="
 	https://pymarkups.readthedocs.io/en/latest/
 	https://github.com/retext-project/pymarkups
 	https://pypi.org/project/Markups/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/python-markdown-math[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		app-text/pytextile[${PYTHON_USEDEP}]
 		dev-python/docutils[${PYTHON_USEDEP}]
 	)
 "
 
-python_test() {
-	${EPYTHON} -m unittest discover -s tests -v || die
-}
+distutils_enable_tests unittest
+
+S="${WORKDIR}/${MY_P}"
-- 
cgit v1.2.3