Version bump, remove old.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

4 files changed, 44 insertions, 74 deletions

diff --git a/app-editors/tea/ChangeLog b/app-editors/tea/ChangeLog
index 555b5b4d1929..b736db34b3e8 100644
--- a/app-editors/tea/ChangeLog
+++ b/app-editors/tea/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2012/03/16 15:17:52 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/ChangeLog,v 1.54 2012/04/24 11:35:52 johu Exp $
+
+*tea-32.0.2 (24 Apr 2012)
+
+  24 Apr 2012; Johannes Huber <johu@gentoo.org> +tea-32.0.2.ebuild,
+  -tea-31.2.0.ebuild, -tea-32.0.0.ebuild:
+  Version bump, remove old.
 
 *tea-32.0.1 (16 Mar 2012)
 
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index 29035e6995d0..8e5e7f9367b5 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST tea-31.2.0.tar.bz2 262806 RMD160 11514eebed9d789ca56d8289e32e2639821cbee0 SHA1 78986b8447eab21be136dc18a2e1afca39a442bb SHA256 81bb3d02a776a4a02fdb94751562194a32e6f8794ccf981d11db422cc44f836b
-DIST tea-32.0.0.tar.bz2 308209 RMD160 1a78b08366fe66eee7952984b79be319b9bda820 SHA1 3bcc62337512cce9886cb696cbe49e447ece8af4 SHA256 e72475f830a7df76b629fe57855fd4febf8b13bf25546cabc104f4eaec7d7545
 DIST tea-32.0.1.tar.bz2 308616 RMD160 fe29f3bf97fdeccab2ddba873837ba285f636a18 SHA1 6152788dfa9f5a772bca484fe3946fafa870fcb4 SHA256 930cc05893b059170adc0b5bcc48d0f80bcb47b43789ba600ec086c853c93027
-EBUILD tea-31.2.0.ebuild 1099 RMD160 4c896511d645bc068cb1c33f1a697d1d760a00f5 SHA1 02fdb5ebd9f446d8b5e0ec75c86275f6029e19b7 SHA256 d1ca6b2f403ce42550eb6e9bbfe61802be0ec89090206ba2865b0c793b9e0db0
-EBUILD tea-32.0.0.ebuild 1102 RMD160 dc29c95ddaf87dd657d5390f65033b521ed435a8 SHA1 c1cdfb0c3774821382a5bf7b395b61705f515c0a SHA256 d52e1236f8f5d96548ab910538e8a16c779913a52ab68e8d6573fd1a98cc1016
+DIST tea-32.0.2.tar.bz2 308005 RMD160 06f1a08dccaa25fcb53aa1449e3fbdc0ec6700c8 SHA1 67d60c1d6e31efbe5d64551bee111be5d3d87120 SHA256 e6447af2978279cc4c1dba096ee5e42c7353702ef940897ad6e9631e09c48413
 EBUILD tea-32.0.1.ebuild 1389 RMD160 7069a833eadf65e49c5c53fbc28b63c7223b6e1d SHA1 81f80d527af9b04cbb684b7ded43eed54c5f4645 SHA256 d7ff8d918fea5076c02f3e3a8a818699a568eb8a78c4449b621cbc22a1ce55a3
-MISC ChangeLog 7462 RMD160 e9752ff7fda7029f1a453cf4de78f43c499a7b9a SHA1 e97035f23a89088fa911e521be1d88ff5d7a1fcf SHA256 0411256f00ad473a34c31b07aae544293bbebfaac6af97e102005a652f867032
+EBUILD tea-32.0.2.ebuild 1389 RMD160 5ef9591bfd3dcee9ea3ea8712fbdec2ee93ee93f SHA1 7e40182e7b69e1842da1dd2fcff9ff0de18080cf SHA256 8884f23e32b5ec361f7d3357f03461c150646edd7c75f71ea13c0c06742d3e52
+MISC ChangeLog 7628 RMD160 be2e7b253a3fece0db4f9f0d6e1193b4c4300591 SHA1 5e8170113e2716841356a650de8cd26c4f12e044 SHA256 c6e20ad41e8dcad341627a9240f96f12e5465b0492f32ff6a095493db5d38640
 MISC metadata.xml 598 RMD160 a999ae41c2f6a202803abf4b5330dfd081d136a8 SHA1 8b193ad619ed74c974dcd5baeb1a131d1177839e SHA256 83e452f90dd9c8d0343fd074e5c1ca7e3cb8d308774806a23b5379f6b3bf5ef0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPY1mpAAoJENXLsxwXqFxy+dEP/ih6/sNv1JHC8Q7CFPn6fl/G
-UzPs6ZQaPBjvOrxH6ROWqvVmQyZlJ/JFAj3RAfZx7Usjm2HcmhFhDBvTUGEdsMkB
-3VLSbJuxMGe1wX6i4TeZoKtlqAR72VACQ29d6TR3Z5i5jpC40DT3GsDfT3pOWoBt
-TcZPoDimZ/sFIgFoeY2HZHao+ngj6ubxZlN/THOpIpYino9SU/F2KduIzeOn3fO3
-/hnvIqC6L9JPUaQ5gNymo2dFN+kxQ+g+97k2sxnFDdQdHO8P7dT3aYgDd+mI/Li5
-ioHbsejAA3TnzSih8owDoBAIHOOqhxvC8kYj07g7k39Q7hzKI7f8s8B3c+YcFy63
-US6840qliBMVjhCaoYjZ0PhbnMK4Vb07OwUFpsFQMyFmF1spHwzY0cW6rm+ER+iE
-DZqwZLXV1SMGeyD+8OVHhxLnMogpQlWpXZUyt7ow4vhrw21hSC4yXRs1kP/HQmM+
-JnSQHe/P+dAucAJqIpd2oFqWBFj/i7U9NiqDyohtWiB61rBeEE2RZRw3aUp2VoFX
-zVHmfnOVWb7Oy/tweNKH86P/7Hv/V9JXAOIQSasrvzWkjysGm4Mr4PSCmjwCM/Jn
-p2lnet7F8MiX9kQWj94Mb8Q7euID5737HS1b8/xzxojJ/dwlsnlWr3t7xwbG91Ny
-9kZCqBMLFOZmYucsF2fu
-=J1r2
+iQEcBAEBCgAGBQJPlpBfAAoJEO+t9ga+3I3anWkIALicLGru0LI5SUS5UsLzjPOr
+L1uNTgP30l+7rOF0LmLD0dxhKvIpPywGv4t5VfsP7PBpGs++TDzBoUxFml4B1P1T
+TTD9DzYZVflArbsZYgCzWYcRnNyVciwBUdM5xIhF+EVMFEX9GncxL2t9ZO7GOiUs
+DQxn67EAgLuRTXC6yuhRCqok8xSgjfMV9jXacGi1ihrO8fusCkMuB8KE7PfqL1JJ
+IeCoGJlMaQTvf55UgnVJ32TCvrfFJv5bd1hOMuGVhLiq3f52mriO/4fU483op4ea
+1WQp1aISNxQK3Mtv9Y83yvE419YFFYiI5kPPl6C/7xkIGXbOtb7aCRqClS+Qs0A=
+=xh/t
 -----END PGP SIGNATURE-----
diff --git a/app-editors/tea/tea-32.0.0.ebuild b/app-editors/tea/tea-32.0.0.ebuild
deleted file mode 100644
index 0b327089d8b9..000000000000
--- a/app-editors/tea/tea-32.0.0.ebuild
+++ /dev/null
@@ -1,48 +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-32.0.0.ebuild,v 1.1 2012/03/16 10:23:30 patrick Exp $
-
-EAPI=4
-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? ( dev-util/pkgconfig )"
-
-src_configure() {
-	local myopts
-	if use aspell ; then
-		myopts="USE_ASPELL=true"
-	else
-		myopts="USE_ASPELL=false"
-	fi
-
-	if use hunspell ; then
-		myopts="${myopts} USE_HUNSPELL=true"
-	else
-		myopts="${myopts} USE_HUNSPELL=false"
-	fi
-
-	eqmake4 src.pro PREFIX="/usr/bin" ${myopts}
-}
-
-src_install() {
-	dobin bin/tea
-	dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO
-	doicon icons/tea_icon_v2.png
-
-	make_desktop_entry tea Tea tea_icon_v2 Utility
-}
diff --git a/app-editors/tea/tea-31.2.0.ebuild b/app-editors/tea/tea-32.0.2.ebuild
index 89d701898dd5..bcaeb81185a4 100644
--- a/app-editors/tea/tea-31.2.0.ebuild
+++ b/app-editors/tea/tea-32.0.2.ebuild
@@ -1,8 +1,10 @@
 # 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-31.2.0.ebuild,v 1.1 2012/01/21 22:08:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-32.0.2.ebuild,v 1.1 2012/04/24 11:35:52 johu Exp $
 
 EAPI=4
+LANGS="de fr ru"
+
 inherit eutils qt4-r2
 
 DESCRIPTION="Small, lightweight Qt text editor"
@@ -22,15 +24,18 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	hunspell? ( dev-util/pkgconfig )"
 
+DOCS="AUTHORS ChangeLog NEWS TODO"
+
 src_configure() {
 	local myopts
-	if use aspell ; then
+
+	if use aspell; then
 		myopts="USE_ASPELL=true"
 	else
 		myopts="USE_ASPELL=false"
 	fi
 
-	if use hunspell ; then
+	if use hunspell; then
 		myopts="${myopts} USE_HUNSPELL=true"
 	else
 		myopts="${myopts} USE_HUNSPELL=false"
@@ -40,9 +45,24 @@ src_configure() {
 }
 
 src_install() {
-	dobin bin/tea
-	dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO
-	doicon icons/tea_icon_v2.png
+	qt4-r2_src_install
 
-	make_desktop_entry tea Tea tea_icon_v2 Utility
+	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
 }