Version bump to 4.1.0; dropped Python 2.7 support as it fails on it for now and that will need to be adapted to work again, can't support 3.3 yet due to PyEnchant dependency. Fixes bug #488104, reported by Helmut Jarausch.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 77 insertions, 10 deletions

diff --git a/app-editors/retext/ChangeLog b/app-editors/retext/ChangeLog
index 9fe21c6a2cbc..2b5d06c9609a 100644
--- a/app-editors/retext/ChangeLog
+++ b/app-editors/retext/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/retext
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/ChangeLog,v 1.6 2013/10/13 07:54:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/ChangeLog,v 1.7 2013/10/26 23:48:57 tomwij Exp $
+
+*retext-4.1.0 (26 Oct 2013)
+
+  26 Oct 2013; Tom Wijsman <TomWij@gentoo.org> +retext-4.1.0.ebuild,
+  retext-9999.ebuild:
+  Version bump to 4.1.0; dropped Python 2.7 support as it fails on it for now
+  and that will need to be adapted to work again, can't support 3.3 yet due to
+  PyEnchant dependency. Fixes bug #488104, reported by Helmut Jarausch.
 
   13 Oct 2013; Pacho Ramos <pacho@gentoo.org> retext-4.0.1-r2.ebuild:
   Also compatible with python3_3
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index c8f099a11832..78647f84c059 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -2,16 +2,22 @@
 Hash: SHA256
 
 DIST ReText-4.0.1.tar.gz 92892 SHA256 547f4d4cd6ca826963799a55e124ee22bbd2c1dc33fd11dc0d891cb66af8b77e SHA512 7055df357573ea87227bb169d9016e6d94fa7a299461019b12e56f8f1f15738f239dd6a1fbd2b37a84ea66abac4f85af6ae5d0b41e85323fbe10bbe8a6db4a81 WHIRLPOOL bf47d53870c3d3d913d09c3094a6451aa3b11f51126dd26c21e4f0d814fa876dbaba38adeb36c5660ad849742beb024bc567d49825c8f244941b761ff7eef471
+DIST ReText-4.1.0.tar.gz 125515 SHA256 7fb1207acbe8b6ef87eaeda2338a99214990b68d12c951d71ffaeb9527f08b29 SHA512 ab872dc2fcdd2fcf43ade28b04cf62887d3228f39ecca09778c3d9c29692faabcfe51a61a0e713f710b167aa82aa0e803e09b78492cf43c74aff6240804cab0d WHIRLPOOL 5152bfd47bb93493bb02d86b411bfe3ea64ccc3ed38bcf2f7adfe32907e002fb96b3c1b2b3f9fc2167becb912a4c9fc5e5d68fce5e15aaa8e74c74d1d2cc266a
 EBUILD retext-4.0.1-r1.ebuild 1401 SHA256 1d1631168d802bd116d003d1b62866f933ae22733cf7e43b693ede6f5c556bd0 SHA512 923466a26dd9a212b7c3c1d709dee2160b54fc8b90f5db0758993b6d8c142d9adefe5ba5c7d1ba45f62b4d0f85beec90d1a818954d2c8ffd1f4964c379f310b9 WHIRLPOOL 86c7d0132048c4f3511b3b3a1d8e213f410b651dd15702efbbf8cf0b7d8a38b576ca827d7fd1e792710f0213be5d032a4fb596cad510befff19a29bf95da4f4b
 EBUILD retext-4.0.1-r2.ebuild 1381 SHA256 73b525f9593e1ab78e026484eab8bd23be86f64c404dc6479a8e9f67175378cb SHA512 92dbf269b62235b7a0c7d191d8653388023bfaf8d5afd8fd2d1f164d3a8a2c808d2de1bfe9ff7c66fd39a1a12853703ecfd874b677f84986482de080f52115ee WHIRLPOOL e317d5674b59748356f7f12e9d5328b675e21b57c9ea07bf04d8d39129bc9907515ddf2ef7d5c8e9c67e78caca6ca40be74593575c4b22d3bb4564331d1873a0
 EBUILD retext-4.0.1.ebuild 1032 SHA256 96caaa8ec7849661fb65c69c15528741ce4b82cfc45905542bca10e488c278b5 SHA512 d03bf454e3027aa41355c0aff4d8c0465b8f28b22196eee856579d0128be15388450eec96141361e343ecab58c67e3e0aa83a48969a0651cbeef623b82a185ed WHIRLPOOL a7a3acb21df8be961b5bf6f5ef6a95fac2907b92f92fef8bb1fc10ac783f955f8be32b189f6d3e93f7e4b0e67cad63f0e7ced6688e31aa9ba89ae64d3fee2641
-EBUILD retext-9999.ebuild 1397 SHA256 639f30abcb6d856cdc4620bf5813922f1c8f7793882a80b8a4e6b68f31f0699d SHA512 9e90223ff258abd3e9e115992c43a92dfd6a5d0e5c18dc0dfad3edac82e54651e3c710562fe8b8f8428cd7ee23f86210d4feaf8bc86e830721b776eae1fff238 WHIRLPOOL 09bd0e0fc493029f377997e55ac5587efd4266cf69620b1d5f18b38fb3cbfac6b99342ec1e5fcf50f97213cc5ee26dc462ff9ddeb92e26f57c36ed2f24528ef0
-MISC ChangeLog 1552 SHA256 04fefa66c4c756254ae00603851249cd1cdc356c1bfb3fc4e9d5c1003735f70b SHA512 ec941ed33ed11d34b4264a4d264067ec0cb3eba474f844441445ccb65571fea3df563fe7094fd17b0adbb2c2ee1e7b3ba425ee0aefa0135a3375d8ebe0fc4f88 WHIRLPOOL 3a432e476fb0dcac807da8e1b553e16c0a596d8478ba61a83edd967b490e9d4403860348bcf03727203554c9fc5ad3a643ed52b10b4d49aec1b70e02c8684523
+EBUILD retext-4.1.0.ebuild 1359 SHA256 15f225f7dc8dd7e12eb9ca3d5bb061be9668a1ab1df2fba31fdc808c7193b5a2 SHA512 dd50d0ccfb95df51836b920b96f9c4be21cecda918200770ae9f0322866ec40928c479f6669185b78bfeae394f63467c34c1a9317d4151004a90f843f92c134b WHIRLPOOL a830c8c3525b9d3353941cfdb0c5d3835a753134fd27c67dd4a97473e681855625c87d4f98d3804b0570c11c9f5d2b4f5e90af03ba8a3a7bdd52658c3815ce19
+EBUILD retext-9999.ebuild 1358 SHA256 23a4cf9a396196ab9009ae4145456888698cfb12eaddea5c2a4adb0383fa5813 SHA512 a193cf1526ff28e9f7eebd3fb0665bd5140423aaac2083246729163e0b2c41df89e2974123525338e4bb6274932d6d413a58f78fd716f686571d3bb46ec27ff9 WHIRLPOOL 2c840fc77564c12530d7dc26b6f4e239624b4c5012478dfce3064e5ace4fd0b2a9b1145d9ae91094bff8bbb5ae71bf120f802a12dd154ccea636a89c3cef6605
+MISC ChangeLog 1903 SHA256 47c65b41d4a9c612e702648a61f7ee7bc9554c8fd92d320bead2607122047d25 SHA512 7348072fb87f0396145036958de1a9b26ba78aa463968307ffed040e04af841c55bbac1c050dfd441039c85633c1c4c79e2f2bd29b6cf9cee0bec70f9d7e5355 WHIRLPOOL a103ece12953498f1f88f619a8dbc505b60cca6a44d4849e904cf82ca50a9967477bbdae3b53fb165bb3965cd267c2a318e19b3ed0d8388138fed7571add25f5
 MISC metadata.xml 236 SHA256 104ec78f2e678b6b40f2995ebf7ec1e4a712a9dd1c4a59717c1a553660ec9758 SHA512 d7aed0a729c9750aa73f379b2dd5bbb84defc1a65ec083de2ae493c7d05de7706e3ace83c3372a6403dba1f5c8b0cf7c7ff5dd6600bc81aa49e73f1c3d49e721 WHIRLPOOL 6465959cdf3ed3b903efd861ce136a3f332c5ed55ca995892928408c66e236a255b103e2c924fa503461d8518ab2ed05ae435bb7f79aca9c2d1b653dd74a97f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJaUasACgkQCaWpQKGI+9S39gCcCWfkSROy/Fl4vndVP7mu5Jcw
-U5IAn0PQit7dvNHhLg3b1nREq0rVg0oA
-=mqag
+iQEcBAEBCAAGBQJSbFTYAAoJEJWyH81tNOV9OlEIAJiW3mUvwiSqtV/JcDfs2xGw
+EUP4gOkuyC6zK2EMkJzAdtZ6uDA2XmnEuxNRHq3y0/4FP/dNcWFs+SQPF2yHKVpj
+Tf46Bgi5sn8HJJwojdN2kFwZ9Lj9plVtHV/pzvA2p2ZrTA7dB0i1WwTMPy3ffnPq
+XE2Acc5FdE40xB2OcFX7pLagzUvXQGzpxeRVLJV0OuZJQI1RwnZ7L1shkRcYiMMH
+9IdJogrMXpBIQmXDFmUgqqDqRh+q77LDK//rl/AS0vKCt4wHlvjq+EUkfZayHsYi
+IZh1+2L7f6q9aSeN+ZscbEcBnc4c+wgs38qk1KqK3sRl+Rmmjxom12d152OgIus=
+=W6Lq
 -----END PGP SIGNATURE-----
diff --git a/app-editors/retext/retext-4.1.0.ebuild b/app-editors/retext/retext-4.1.0.ebuild
new file mode 100644
index 000000000000..c34758de5032
--- /dev/null
+++ b/app-editors/retext/retext-4.1.0.ebuild
@@ -0,0 +1,55 @@
+# 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-9999.ebuild b/app-editors/retext/retext-9999.ebuild
index 97074fa45ac0..680fcad50fc2 100644
--- a/app-editors/retext/retext-9999.ebuild
+++ b/app-editors/retext/retext-9999.ebuild
@@ -1,10 +1,10 @@
 # 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-9999.ebuild,v 1.2 2013/06/29 15:43:37 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-9999.ebuild,v 1.3 2013/10/26 23:48:57 tomwij Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_2 )
+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
@@ -48,8 +48,6 @@ src_install() {
 	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() {