Version bump, #407915 by Michael (kensington). Remove old.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

6 files changed, 102 insertions, 124 deletions

diff --git a/app-editors/tea/ChangeLog b/app-editors/tea/ChangeLog
index f4a19972d48e..555b5b4d1929 100644
--- a/app-editors/tea/ChangeLog
+++ b/app-editors/tea/ChangeLog
@@ -1,6 +1,13 @@
 # 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.52 2012/03/16 10:23:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/ChangeLog,v 1.53 2012/03/16 15:17:52 pesa Exp $
+
+*tea-32.0.1 (16 Mar 2012)
+
+  16 Mar 2012; Davide Pesavento <pesa@gentoo.org> +tea-32.0.1.ebuild,
+  -files/tea-17.5.4-forced-cflags-and-compiler-warnings.patch,
+  -tea-17.6.6.ebuild, metadata.xml:
+  Version bump, #407915 by Michael (kensington). Remove old.
 
 *tea-32.0.0 (16 Mar 2012)
 
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index 97bb8cfea6eb..29035e6995d0 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,9 +1,28 @@
-AUX tea-17.5.4-forced-cflags-and-compiler-warnings.patch 1341 RMD160 ca6c51158737d72fe9c89ba6ffab6aff3d145f28 SHA1 d15f57c4accb50353de170d0344f41234e8bc506 SHA256 5df31857b563b7a4c2e3e7205771c9bf464ec2293ad12b10d8e650211714fca3
+-----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 teagtk-17.6.6.tar.bz2 479197 RMD160 e8b6aabd7dfb86c43db88bceb7ebaec5f9738594 SHA1 17c3019c9dc6b53d87a9a3bc1cc02784d256f234 SHA256 e2583776fb38331f1e7989f7f8ea23bbae593af26f4c3cdeeae61a793b6bd752
-EBUILD tea-17.6.6.ebuild 1683 RMD160 33d072dc99f2c527e415dcf0195695cd5712891a SHA1 e71f5f0dcdd407b1ea3d285b004d3583f28a24be SHA256 f6e875e2a4d7f2e2dc28d776882e15356e923adc954cf353a380ed98fae8b43c
+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
-MISC ChangeLog 7207 RMD160 562ea71973a78c00621f51d850cc2837fecf3544 SHA1 8be7070980635fa1a93d75fe40f16ac807484ff3 SHA256 da1c213c56259545c2dbf30483058402941d2e4a71375f42071dcfe0e29fbe85
-MISC metadata.xml 682 RMD160 e3a6d76982bb82805f9b801a7ee26e01c9a0fd1e SHA1 82c27a382da01ad1f35577604cc9dc28d161adc6 SHA256 19d187eea0e1975af33dcfa4539c6debb579d86337207ceed60c12dc7803c09f
+EBUILD tea-32.0.1.ebuild 1389 RMD160 7069a833eadf65e49c5c53fbc28b63c7223b6e1d SHA1 81f80d527af9b04cbb684b7ded43eed54c5f4645 SHA256 d7ff8d918fea5076c02f3e3a8a818699a568eb8a78c4449b621cbc22a1ce55a3
+MISC ChangeLog 7462 RMD160 e9752ff7fda7029f1a453cf4de78f43c499a7b9a SHA1 e97035f23a89088fa911e521be1d88ff5d7a1fcf SHA256 0411256f00ad473a34c31b07aae544293bbebfaac6af97e102005a652f867032
+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
+-----END PGP SIGNATURE-----
diff --git a/app-editors/tea/files/tea-17.5.4-forced-cflags-and-compiler-warnings.patch b/app-editors/tea/files/tea-17.5.4-forced-cflags-and-compiler-warnings.patch
deleted file mode 100644
index 9a6d7a7b278e..000000000000
--- a/app-editors/tea/files/tea-17.5.4-forced-cflags-and-compiler-warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur tea-17.5.4.orig/configure.in tea-17.5.4/configure.in
---- tea-17.5.4.orig/configure.in	2008-01-12 15:20:33.000000000 +0200
-+++ tea-17.5.4/configure.in	2008-01-25 12:00:38.000000000 +0200
-@@ -55,9 +55,9 @@
- 	CFLAGS="$CFLAGS -DDARWIN -pipe"
- else
- if test -n "$enable_debug"; then
--   CFLAGS="$CFLAGS -w -pipe"
-+   CFLAGS="$CFLAGS -g"
- else
--    CFLAGS="$CFLAGS -w -s -pipe"
-+    CFLAGS="$CFLAGS"
- fi
- fi
- 
-diff -ur tea-17.5.4.orig/src/tea_options.c tea-17.5.4/src/tea_options.c
---- tea-17.5.4.orig/src/tea_options.c	2008-01-11 16:05:42.000000000 +0200
-+++ tea-17.5.4/src/tea_options.c	2008-01-25 11:32:36.000000000 +0200
-@@ -16,6 +16,8 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-diff -ur tea-17.5.4.orig/src/tea_spell.c tea-17.5.4/src/tea_spell.c
---- tea-17.5.4.orig/src/tea_spell.c	2007-10-12 13:42:57.000000000 +0300
-+++ tea-17.5.4/src/tea_spell.c	2008-01-25 11:32:17.000000000 +0200
-@@ -15,6 +15,8 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <string.h>
-+
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
index 49e454fcc744..79ad70798a5b 100644
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/metadata.xml
@@ -8,9 +8,7 @@
     It can also read lots of 'other' filetypes.
   </longdescription>
   <use>
-    <flag name='aspell'>Enable spell checking using aspell</flag>
-    <flag name='enchant'>Enable spell checking using enchant</flag>
-    <flag name='hacking'>Enable hacking support</flag>
-    <flag name='hunspell'>Enable spellchecking using hunspell</flag>
+    <flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+    <flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/app-editors/tea/tea-17.6.6.ebuild b/app-editors/tea/tea-17.6.6.ebuild
deleted file mode 100644
index f7f16454c5fd..000000000000
--- a/app-editors/tea/tea-17.6.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-17.6.6.ebuild,v 1.2 2008/11/14 12:26:43 armin76 Exp $
-
-EAPI="1"
-inherit autotools eutils
-
-MY_P=${P/tea/teagtk}
-
-DESCRIPTION="Small, lightweight GTK+ text editor"
-HOMEPAGE="http://tea-editor.sourceforge.net"
-SRC_URI="mirror://sourceforge/tea-editor/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 x86 ~x86-fbsd"
-IUSE="enchant gnome hacking ipv6 spell"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	gnome? ( x11-libs/gtksourceview:2.0
-		gnome-base/gnome-vfs )"
-DEPEND="${RDEPEND}
-	net-misc/curl
-	spell? ( app-text/aspell )
-	enchant? ( app-text/enchant )
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-17.5.4-forced-cflags-and-compiler-warnings.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-
-	if use hacking; then
-		myconf="${myconf} --enable-hacking"
-	fi
-	if ! use gnome; then
-		myconf="${myconf} --enable-legacy"
-	fi
-	if use enchant; then
-		myconf="${myconf} --enable-enchant"
-	fi
-
-	econf \
-	$(use_enable ipv6) \
-	${myconf} || die "econf failed!"
-
-	emake || die "emake failed!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed!"
-
-	make_desktop_entry teagtk Tea /usr/share/tea/pixmaps/tea_icon_v2.png Development
-
-#	insinto /usr/share/doc/tea/
-#	doins AUTHORS COPYING NEWS README TODO ChangeLog doc/*
-
-#	insinto /usr/share/pixmaps/
-#	doins pixmaps/*
-}
-
-pkg_postinst() {
-	if use spell ; then
-		elog "To get full spellchecking functuality, ensure that you install"
-		elog "the relevant language pack(s)"
-	fi
-}
diff --git a/app-editors/tea/tea-32.0.1.ebuild b/app-editors/tea/tea-32.0.1.ebuild
new file mode 100644
index 000000000000..b6a165c6485a
--- /dev/null
+++ b/app-editors/tea/tea-32.0.1.ebuild
@@ -0,0 +1,68 @@
+# 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.1.ebuild,v 1.1 2012/03/16 15:17:52 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? ( dev-util/pkgconfig )"
+
+DOCS="AUTHORS ChangeLog NEWS TODO"
+
+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() {
+	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
+}