EAPI=5 and l10n.eclass; remove old.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 30 insertions, 90 deletions

diff --git a/app-editors/tea/ChangeLog b/app-editors/tea/ChangeLog
index 6183d249de1f..21036e82b26c 100644
--- a/app-editors/tea/ChangeLog
+++ b/app-editors/tea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/tea
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/ChangeLog,v 1.60 2012/09/18 08:31:17 pesa Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/ChangeLog,v 1.61 2013/01/04 10:35:22 pesa Exp $
+
+  04 Jan 2013; Davide Pesavento <pesa@gentoo.org> -tea-33.2.0.ebuild,
+  tea-33.3.0.ebuild:
+  EAPI=5 and l10n.eclass; remove old.
 
 *tea-33.3.0 (18 Sep 2012)
 
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index df737b80b154..0156a94b42eb 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST tea-33.2.0.tar.bz2 310270 SHA256 caa9f0896d2b8faeb7ebaa2f3ec4d9b9b8a177ac949260dea4afbc2824554369 SHA512 e8e5db38da4ed635932bc7f7d0d7650c9b61969dd1e27e7240ab216bbb92736ed3d1184602541b68a6e50635cc416dcb35ac29fda56b93ca631cc9e07aee66e5 WHIRLPOOL 7bb26fa49171efe1005f23a88a54acb641154265c0123659490a966d8cb36f12a4257f385e22485f9f41bc72a19c89d5c55f0ada86794ea56adb3b14f54db423
 DIST tea-33.3.0.tar.bz2 310901 SHA256 14d540cd6825b94bd22e655b2626458fd5c611e7c4cc3124fd7d9af3eb7f5ea8 SHA512 fab95bbb961b79e2b002f583a9a338fa4ad5e2952bd3b95a3a8158b7f79b73e2486d8971603db8463b8442ff4545cd82b09a46c096e4290b6ee629d2f6341e41 WHIRLPOOL 87fccb72f5a1c8c7de257919a09ccdb9320807808aa131f1f4cddd637e2003df2b508b8df9da6e71013290ccd31f6b8af5d77f35083549b1c5f211e6ee6bca15
-EBUILD tea-33.2.0.ebuild 1297 SHA256 4e5caa2b3da14b1ed4fb526b7512a97c80d588a459ce8e09ff2bf8e49cc7003a SHA512 bcbbcbe028abf98d41196f691b49b9309644acb65223432134aa53268d12df8f42218a5049398962a9e7bb79c29562c5beb8497e554fb8bc5a4ac358798b5ab4 WHIRLPOOL e14639ca8bc968e664bf1ff8374d3acafd13300be26a9bbc4c2fcbb3d18bc8ce95954d19aa616a53961c88347f15e541985905d638a69da01d4176fb4a432f5f
-EBUILD tea-33.3.0.ebuild 1297 SHA256 30e1329e969d2d411f3fe2e0aae8b42fada3248d2ab417c86fb78b5589494071 SHA512 181e1446a4adda95000e5dd0a91ad23917a974ab62e247f0923eb50fa31f9273a9b5a7564ee0fe97e8c3de485578f880d0c68764e7262d26e57aaa293d554b72 WHIRLPOOL cfcb27a0b57738cf604fd005508832650337cff645971e05a9885328bf91f3e07aded2f7f4a25100a42fe0635b87fa6bb90b536119930b75a5936c0231acaadb
-MISC ChangeLog 8399 SHA256 8ec5d16de40c95fa48772e76b6f18e022c8f4e8f3d8137a1dc6acafeb6247847 SHA512 3b3ce1e42909f58d5510b2463522cabb8a0bc8fe584a63e5293265927df2156c5ba6811d19b22483099cd1e8448bbfff39d6bada7e7077e87c9ae6d5f32c06a7 WHIRLPOOL 4117fd7803c72b11ef305b812bd4b3412dc381a7db9ea46c27b7c1c8cbaa39c80a62b233318f80c01167cc4e5771804182bf4bf19d1343daea712ffd9974d3c8
+EBUILD tea-33.3.0.ebuild 1282 SHA256 a3e912f7e3dbca826ee85c35de82bee38a5a5aa3ce516275a02ecc79fd89a24d SHA512 0868e6e9bbbddbb052b7582b2d3e70b4d3d5538d0f869e5d531a349e84ab9f7bdc129d22d575de7b6566feb492fc387549a8ed5fcdf33d0d88c62f4b457c0666 WHIRLPOOL a2a33163c3bc23cc11bebc412520a73381411af2c7840780a2057842a1fbfe270e64ed6b261d35180590823f7593a09df367f6ae870c91675808255ff2cf2e01
+MISC ChangeLog 8529 SHA256 cdbb5c69f6e7dfdc1ea94415be31d1d6d131a0e8bb192bc82b5c31c085289438 SHA512 87bbc771d3e7be76a0adca8f920d29124dbc7c9ce7e438a22b9007f39685596b9b4b165692aacec7322f870073ba466f510e34d482568ddb952a1eee799f96c3 WHIRLPOOL 532107d671c6ddb488f27ea75ce8e51d57d1af3fc635e413f74dc254ed9270e3d048f7f8ea245b683d7d0d8bc29123feac84ee174a832e7ab4fa000c51d63d85
 MISC metadata.xml 747 SHA256 a01f6a9dbccc141dfc630f7eb47a57d91ab2d0430dc9ba303325c2e0f25f3710 SHA512 bf73c7773fde9616190b27183304757bd15dccd2181ce8deca54c89bad3cd7342cf2e5dd7fc7e24418759f6d049ec468eeade66c578e30f7ef86e4df98ed50ed WHIRLPOOL 9f6e9054c237ff8ad668abee0049b45618c444d29a4a71805afdf47095d8850becd07b8f53afdc27a9b1307bdc1b223810dd45146d05c23cc9f0baf6ee7df82e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQWDFmAAoJENXLsxwXqFxyMzAP/1c5YCSeK8J8OAH3mbCbc+hy
-fyW9nRaTs6njKZgMyRrtBpnyeHjxNRbeC8KvQm5m0D0utMGC/LPMPKYH5OmIJD+w
-1vEJEHnHkov8RNjJGYuNYAE3sdkXO9JtKeTPebpKtl8FOJkWs86+0omqiBK/hqIX
-Y3gAOQLqbZib7+UCr/QFoYcrPswpxCyNyf25K7N8vGEQiR547OXKnRYc/eRH5OGz
-9vnTPOPOdrEn3UwcnSPnW/gJc3AmqgF4TMopq4C/6z8oFeZJ3hATuxeC5hjH1mD2
-O2SYlhLobxt/vu3srhcpzeGXVou/eTnaStyvE29/HX/8JMuCd6k3WuhwSrOh80Dt
-1U5G02NEjh3f41EQlQaIkVR9+hf5sluiMW/sxWBgUT89vSpsPPsn67OQrd508OAY
-gzDZG+LMQCpe2CL0O+9Iornakh9yIypCcXFZko8ULdn/p4/Pf/W91aYbUyjZ3H4f
-R0AthugJTPHxqiWBLK0f6NZORnPeCEbBiklJ62bZyT44CYEgI8g2xWWe2eu5TDLg
-FfL9YP3P7kPGE/b1ia2S/55TgN1j4tXTNa4yAY9sRT8Lalxg8X+6i5gvjiIydmTe
-3Jb2Z8XgTe43MuG6WOIX2yh5qYVoxFYJ+6s51LFIhtdQWpjtvJweJp83sA7CQtkI
-pL5qiurvzzCe+mHichmK
-=D0Lh
+iQIcBAEBCAAGBQJQ5rB3AAoJENXLsxwXqFxyQ4wP/RWQtkxIqbEwofmC0qGYIIf8
+XKbev7v08Mv6djYyOx+RWhzuyel+C16w4y/SIgdKITss0uW8NVi7UABkmwRgDKe9
+w8dmbDMlosTXqXeEMQBxznv5kx8VYrIEjnTRMCXxHvPp3u7QPK2qE/mtPZWsodRN
+xNV5XFiHqr2jWohDZ2Iv9l0eK6ENNDO2CDK6WwiwibY38Ri/feeLHZefdOKuL4I5
+osUAAojYFi3cNQVZ/JaI2yiOegflFwRv4PUfWoJzX8+/OamplcrN2ltnqt8xXEJF
+opDNorOh5h5EWvLuohcdfxYvEcumlp+ngQZ9XNxhFJIttbK/COjarWlCCPDJDDO5
+0u5Im+cZ+A+jkR0Yy+xvrw2Tn3kGItu6U3TKz9BIQhMU3ePzUK2HBvshdv1EOP7K
+1ddjyZqECJl9v08q/KxJ6T4ihTYR1+jALOZXSseYAD0v2yRWDoeRzX930YX1zW/K
+kfEcq/CQhupUhEj44X9tqNcdNblHCSyuffPuLPB34Pwyq44RStyMO+npugyp5mRx
+JEPPGOAsPhLsFwqNclk64d4aO6Q7dlKF43uLmz8ZqZFR7yAzkPGLf/Hb3oOPBHJb
+52dYq8gS0OZVvOHTL4TdZnb7s9znMgkBCu8FrSDSCXINZCKjH48Qoqyt5Z90Cqm6
+b6UqTHF1wP3+bEmnhtSa
+=99qR
 -----END PGP SIGNATURE-----
diff --git a/app-editors/tea/tea-33.2.0.ebuild b/app-editors/tea/tea-33.2.0.ebuild
deleted file mode 100644
index 804026a6d569..000000000000
--- a/app-editors/tea/tea-33.2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-33.2.0.ebuild,v 1.1 2012/08/02 23:04:55 pesa Exp $
-
-EAPI=4
-LANGS="de fr ru"
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Small, lightweight Qt text editor"
-HOMEPAGE="http://tea-editor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tea-editor/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE="aspell hunspell"
-
-RDEPEND="
-	sys-libs/zlib
-	x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-"
-DEPEND="${RDEPEND}
-	hunspell? ( virtual/pkgconfig )
-"
-
-DOCS="AUTHORS ChangeLog NEWS TODO"
-
-src_configure() {
-	eqmake4 src.pro \
-		PREFIX="${EPREFIX}/usr/bin" \
-		USE_ASPELL=$(use aspell && echo true || echo false) \
-		USE_HUNSPELL=$(use hunspell && echo true || echo false)
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	newicon icons/tea_icon_v2.png ${PN}.png
-	make_desktop_entry ${PN} Tea ${PN}
-
-	# translations
-	insinto /usr/share/qt4/translations
-	local lang
-	for lang in ${LANGS}; do
-		if use linguas_${lang}; then
-			doins translations/${PN}_${lang}.qm
-		fi
-	done
-
-	# docs
-	dohtml manuals/en.html
-	if use linguas_ru; then
-		dodoc NEWS-RU
-		dohtml manuals/ru.html
-	fi
-}
diff --git a/app-editors/tea/tea-33.3.0.ebuild b/app-editors/tea/tea-33.3.0.ebuild
index d26b4ae38419..9e2406c9ee3d 100644
--- a/app-editors/tea/tea-33.3.0.ebuild
+++ b/app-editors/tea/tea-33.3.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-33.3.0.ebuild,v 1.1 2012/09/18 08:31:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-33.3.0.ebuild,v 1.2 2013/01/04 10:35:22 pesa Exp $
 
-EAPI=4
-LANGS="de fr ru"
+EAPI=5
+PLOCALES="de fr ru"
 
-inherit eutils qt4-r2
+inherit eutils l10n qt4-r2
 
 DESCRIPTION="Small, lightweight Qt text editor"
 HOMEPAGE="http://tea-editor.sourceforge.net/"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	hunspell? ( virtual/pkgconfig )
 "
 
-DOCS="AUTHORS ChangeLog NEWS TODO"
+DOCS=(AUTHORS ChangeLog NEWS TODO)
 
 src_configure() {
 	eqmake4 src.pro \
@@ -40,15 +40,13 @@ src_install() {
 	qt4-r2_src_install
 
 	newicon icons/tea_icon_v2.png ${PN}.png
-	make_desktop_entry ${PN} Tea ${PN}
+	make_desktop_entry ${PN} 'Tea Editor'
 
 	# translations
 	insinto /usr/share/qt4/translations
 	local lang
-	for lang in ${LANGS}; do
-		if use linguas_${lang}; then
-			doins translations/${PN}_${lang}.qm
-		fi
+	for lang in $(l10n_get_locales); do
+		doins translations/${PN}_${lang}.qm
 	done
 
 	# docs