app-editors/retext: Took package, drop old, Fix distutils-r1.eclass usage

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

8 files changed, 32 insertions, 228 deletions

diff --git a/app-editors/retext/ChangeLog b/app-editors/retext/ChangeLog
index 14292d23e0c0..c4a7742a0e0a 100644
--- a/app-editors/retext/ChangeLog
+++ b/app-editors/retext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/retext
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/ChangeLog,v 1.13 2014/11/14 01:19:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/ChangeLog,v 1.14 2014/11/14 07:35:41 jlec Exp $
+
+  14 Nov 2014; Justin Lecher <jlec@gentoo.org> -retext-4.0.1.ebuild,
+  -retext-4.0.1-r1.ebuild, -retext-4.1.0.ebuild, -retext-4.1.1.ebuild,
+  retext-4.1.3.ebuild, retext-9999.ebuild, metadata.xml:
+  Took package, drop old, Fix distutils-r1.eclass usage
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Maintainer needed.
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index 1470e032181b..4a00a64b40ae 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>jlec@gentoo.org</email>
   </maintainer>
 </pkgmetadata>
diff --git a/app-editors/retext/retext-4.0.1-r1.ebuild b/app-editors/retext/retext-4.0.1-r1.ebuild
deleted file mode 100644
index f1cf4d020419..000000000000
--- a/app-editors/retext/retext-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1-r1.ebuild,v 1.2 2013/06/29 15:43:37 tomwij Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_2 )
-PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
-HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+spell"
-
-RDEPEND+="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-
-	dosym /usr/bin/${PN}{.py,}
-}
-
-remove_locale() {
-	find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
diff --git a/app-editors/retext/retext-4.0.1.ebuild b/app-editors/retext/retext-4.0.1.ebuild
deleted file mode 100644
index 25bfbad80127..000000000000
--- a/app-editors/retext/retext-4.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1.ebuild,v 1.2 2013/06/29 15:43:37 tomwij Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_2 )
-
-inherit eutils qt4-r2 distutils-r1
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
-HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
-SRC_URI="mirror://sourceforge/${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/PyQt4[webkit,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	make_desktop_entry "${PN}.py" "${MY_PN} Editor" "${PN}" "Development;Utility;TextEditor"
-}
diff --git a/app-editors/retext/retext-4.1.0.ebuild b/app-editors/retext/retext-4.1.0.ebuild
deleted file mode 100644
index c34758de5032..000000000000
--- a/app-editors/retext/retext-4.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.0.ebuild,v 1.1 2013/10/26 23:48:57 tomwij Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_2 )
-PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
-HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+spell"
-
-RDEPEND+="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
-
-remove_locale() {
-	find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
diff --git a/app-editors/retext/retext-4.1.1.ebuild b/app-editors/retext/retext-4.1.1.ebuild
deleted file mode 100644
index d0c2fafa8cd7..000000000000
--- a/app-editors/retext/retext-4.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.1.ebuild,v 1.3 2014/07/01 06:37:36 jlec Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{3_2,3_3} )
-PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
-HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+spell"
-
-RDEPEND+="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-}
-
-remove_locale() {
-	find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
diff --git a/app-editors/retext/retext-4.1.3.ebuild b/app-editors/retext/retext-4.1.3.ebuild
index 3031c3beef24..92b86ef3f9b5 100644
--- a/app-editors/retext/retext-4.1.3.ebuild
+++ b/app-editors/retext/retext-4.1.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.3.ebuild,v 1.1 2014/07/18 15:24:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.1.3.ebuild,v 1.2 2014/11/14 07:35:41 jlec Exp $
 
-EAPI="5"
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
 
-PYTHON_COMPAT=( python3_3 )
 PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
 
 inherit distutils-r1 l10n
@@ -38,8 +39,12 @@ RDEPEND+="
 
 S="${WORKDIR}"/${MY_P}
 
-src_install() {
-	distutils-r1_src_install
+remove_locale() {
+	find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
 
 	newicon {icons/,}${PN}.png
 	newicon {icons/,}${PN}.svg
@@ -48,7 +53,3 @@ src_install() {
 
 	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
 }
-
-remove_locale() {
-	find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 228ebe609b6e..d3e81242cbd0 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-9999.ebuild,v 1.4 2014/07/18 15:24:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-9999.ebuild,v 1.5 2014/11/14 07:35:41 jlec Exp $
 
-EAPI="5"
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
 
-PYTHON_COMPAT=( python3_3 )
 PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
 
 inherit distutils-r1 l10n
@@ -32,14 +33,22 @@ RDEPEND+="
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
+	dev-python/PyQt5[webkit,${PYTHON_USEDEP}]
 	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
 "
 
 S="${WORKDIR}"/${MY_P}
 
-src_install() {
-	distutils-r1_src_install
+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
 
 	newicon {icons/,}${PN}.png
 	newicon {icons/,}${PN}.svg
@@ -48,7 +57,3 @@ src_install() {
 
 	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
 }
-
-remove_locale() {
-	find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}