9 files changed, 10 insertions, 138 deletions
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index 126cbeeb3b95..e0ef1870d7cc 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -1,3 +1,2 @@
 DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686
-DIST ReText-5.3.0.tar.gz 160163 SHA256 9ec0cee93e6731fbf00b86574cb47c3132f62291e762f5e47258a3171bfdd21d SHA512 d6ff8e61b1e13de72c5d1741795fddb3a1ba443b2aa6aba6ca933ae38e09c8dac38085bfd73e0c1773dec9a72df1f08d64ef22d2396694530bade6ff8a485223 WHIRLPOOL 98537b5244a583c04604a6b1626a3813b6506dfefda6d40c85aaae076b30c7e14a0b8a363e431d9bd5ceea41a31f07785663a018bbdae1dc897a29eec22c99c1
 DIST ReText-5.3.1.tar.gz 159669 SHA256 515b1aaa57615453f8933f997753072a5c4691793da2280e70d1b333b53904c6 SHA512 76c6f78c10129e4845de819fa6db3deff5441a25331fd3dadbdfeb766caa453f21214f82e6625c919cc8be2fcfdfada970cae32837bb8904c3702dda19890628 WHIRLPOOL 5c2db75c2b2f23419bc2803849f6b7a69f3540911c6e53f46a46baffd150a9a0db75d0343361963a53bcc1a6da4534eb72d99068a26c13c1551b6188ab81f67a
diff --git a/app-editors/retext/retext-4.1.3.ebuild b/app-editors/retext/retext-4.1.3.ebuild
index 501c5dd6876c..b49401454eb1 100644
--- a/app-editors/retext/retext-4.1.3.ebuild
+++ b/app-editors/retext/retext-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@ IUSE="+spell"
 RDEPEND+="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
+	<dev-python/markups-2[${PYTHON_USEDEP}]
 	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
diff --git a/app-editors/retext/retext-5.3.0.ebuild b/app-editors/retext/retext-5.3.0.ebuild
deleted file mode 100644
index f033298566f5..000000000000
--- a/app-editors/retext/retext-5.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{3,4} )
-
-PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="Simple editor for Markdown and reStructuredText"
-HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+spell"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-remove_locale() {
-	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
diff --git a/app-editors/retext/retext-5.3.1.ebuild b/app-editors/retext/retext-5.3.1.ebuild
index 343b6d593a4a..33bec27003c6 100644
--- a/app-editors/retext/retext-5.3.1.ebuild
+++ b/app-editors/retext/retext-5.3.1.ebuild
@@ -25,7 +25,7 @@ IUSE="+spell"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
+	<dev-python/markups-2[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 487e3a146fb3..bf0f40d5c91a 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,7 +26,8 @@ IUSE="+spell"
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
+	>=dev-python/markups-2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.3[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index de693d82ddb8..5c2010a58bdd 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,5 +1,3 @@
 DIST Markups-0.2.4.tar.gz 8827 SHA256 0aab138698035e699fad1c88bebb3fa5e90a1876bc7d8fefb3491513fe13f16b SHA512 369eda02474f723d694bc0518324afde9f5baef02719448abb420a77d58cf1543939e6d38aa1db531d4214dc4cd4c47b29d79fa7a23b33b4ae74b45ad2ec52c7 WHIRLPOOL 1118723f5b9725b68d052e2496ccee414782bd6cceaedc49f9c2918c4055145fb95d49cf962c46eb669ab7a3a8659b86ed54fa5b99f6ac91266cebc4ecf01b10
-DIST Markups-0.6.1.tar.gz 19116 SHA256 1f3d6f7b85ac9ddcb936b8b2b6fa15a42ddc9dfc22a075d83d9160b5d59f6d84 SHA512 f1354af48aadb43459e8f0c2013d283c4f6170f608c4ca4a2dd21e77c6fc2383bd6a1631efc9a8878c4a0ba59249528222ba01d1a38ed3f02c6890d42c6afdb9 WHIRLPOOL 2db23d6cb9a282eb461a6ff49b21d1e1a57b6bc970739413efe4bbffdff6bc55d076db4546f0ff458c9cd8b66c389daa21e9cad7341d614109891c9a2b46acc2
-DIST Markups-0.6.3.tar.gz 19285 SHA256 e3ff5de2be018240c526e017972b37181cb3d5dfb7c96ad14eae6639140f58ef SHA512 61b3921595628f577d335c9eb7e405435c1547a6d5d06396e4181a0f3ac0bce8f5a72b5c51568ceeec96c86524ec4baa1cbcb807f545a630a87d807b9e12c97b WHIRLPOOL 9aad9486e57831fbca7124cb06dc84fd69df3036d7f08e8168b9969e83b58a32250cb82c90b70344f60d30c03fb3c7171f698fb8ba6ea23f5c296bb6d8b80ba2
-DIST Markups-1.0.0.tar.gz 14841 SHA256 4d618b2af5c37fa0e4ae2e0798a87505d1e94f9eb78d0db6b893df1f91c37ec2 SHA512 081eb12d30de6c88a6e8a985326e1135fa7346ed5d625364565c53010557ea73a0411ae29e6b9fa4223c5c93bd5abbdcc3ce8dfc36d5bff69a144f865d59b965 WHIRLPOOL c2b94bff742478d65c384891facefecb99527b32301aafb3c976e6cfef12d21bf014143f8254d2e302175336ff664d13e134c9448eb21eb101ba15726c3377a5
 DIST Markups-1.0.1.tar.gz 14894 SHA256 74464b7532aa355f6ed2767fd5cfb5eb5b484dd773b33bae4016a7fa9354b4ee SHA512 f57f712f84413ed35f53643533d392e2164de02742e170f85fc4556094041ffa16ed1ff6d902bcafe996d22a4410e4c2794e4c96246fc06afbf878d6be85cf31 WHIRLPOOL f5bf7700b76dcad18aba9ec5503ba9516e8e7f8a34577b55b423531c9f88ee547690a90e8043997651fe36516c9990a6de103f8268c4fcf768f4605d8982829f
+DIST Markups-2.0.0.tar.gz 16772 SHA256 5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721 SHA512 8ccd348efea68678bfb7f47bd13da2729f95a5b5a8d44f11239dbb86b8224867cb1197e46d875ab9a0ba914be004bdc9aa6848b1e6549dc53b12e06040faaaae WHIRLPOOL 0f47974c498e3088e6af022eeff9478f6602df0cc509c3f04935005fc61e6abd431bdb581f4442f7b06cd86366a96590d04c75642698bc6abbc86679b97768c3
diff --git a/dev-python/markups/markups-0.6.1.ebuild b/dev-python/markups/markups-0.6.1.ebuild
deleted file mode 100644
index f481e19dbabd..000000000000
--- a/dev-python/markups/markups-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-MY_PN="Markups"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="https://pypi.python.org/pypi/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() {
-	pushd tests > /dev/null
-		for test in test_*.py ; do
-			local testName="$(echo ${test} | sed 's/test_\(.*\).py/\1/g')"
-			if [[ ${testName} == "web" ]]; then
-				$(python_is_python3) || continue
-			fi
-			einfo "Running test '${testName}' with '${EPYTHON}'."
-			${EPYTHON} ${test} || die "Test '${testName}' with '${EPYTHON}' failed."
-		done
-	popd tests > /dev/null
-}
diff --git a/dev-python/markups/markups-0.6.3.ebuild b/dev-python/markups/markups-0.6.3.ebuild
deleted file mode 100644
index f481e19dbabd..000000000000
--- a/dev-python/markups/markups-0.6.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-
-inherit distutils-r1
-
-MY_PN="Markups"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A wrapper around various text markups"
-HOMEPAGE="https://pypi.python.org/pypi/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() {
-	pushd tests > /dev/null
-		for test in test_*.py ; do
-			local testName="$(echo ${test} | sed 's/test_\(.*\).py/\1/g')"
-			if [[ ${testName} == "web" ]]; then
-				$(python_is_python3) || continue
-			fi
-			einfo "Running test '${testName}' with '${EPYTHON}'."
-			${EPYTHON} ${test} || die "Test '${testName}' with '${EPYTHON}' failed."
-		done
-	popd tests > /dev/null
-}
diff --git a/dev-python/markups/markups-1.0.0.ebuild b/dev-python/markups/markups-2.0.0.ebuild
index 4ee77e1bc144..0aa4dba8e2ca 100644
--- a/dev-python/markups/markups-1.0.0.ebuild
+++ b/dev-python/markups/markups-2.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
 
 inherit distutils-r1