Version bump. Remove old. This release also fixes fix spell automagic.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 41 insertions, 75 deletions

diff --git a/app-editors/tea/ChangeLog b/app-editors/tea/ChangeLog
index 79ec37285b93..0b6d2436faac 100644
--- a/app-editors/tea/ChangeLog
+++ b/app-editors/tea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/tea
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/ChangeLog,v 1.45 2009/10/25 17:35:58 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/ChangeLog,v 1.46 2009/11/07 22:45:40 billie Exp $
+
+*tea-26.0.1 (07 Nov 2009)
+
+  07 Nov 2009; Pielmeier Daniel <billie@gentoo.org> -tea-22.0.1.ebuild,
+  -tea-23.2.0.ebuild, +tea-26.0.1.ebuild, metadata.xml:
+  Version bump. Remove old. This release also fixes fix spell automagic.
 
   25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove welp from metadata.xml (#141007)
diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest
index c15273731cfc..e63d63f2d6fd 100644
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tea-17.5.4-forced-cflags-and-compiler-warnings.patch 1341 RMD160 ca6c51158737d72fe9c89ba6ffab6aff3d145f28 SHA1 d15f57c4accb50353de170d0344f41234e8bc506 SHA256 5df31857b563b7a4c2e3e7205771c9bf464ec2293ad12b10d8e650211714fca3
-DIST tea-22.0.1.tar.bz2 126407 RMD160 a9cde00464d2c65ba58948d73ba53ab958415028 SHA1 e534df6c59bfb52731d4120ad4614f4d22551ce6 SHA256 52e73016f00b477c9bec9bcfd2d3f2af01706362a9005aff1a9189614c41d445
-DIST tea-23.2.0.tar.bz2 170982 RMD160 5d803e35dac6303537c2c6ddea4eb2f4d91ad62e SHA1 0f3378969470aa7beb86d7cb66177b72671ae590 SHA256 ccd78fb17604349e6ac528eecd78f9ade5d0fa5d3275a6f373ee7791d108eac3
+DIST tea-26.0.1.tar.bz2 182349 RMD160 730ca2e832e9c4844a8c66302ff95f55298a2a56 SHA1 9fbfbff960e6e948c068d99acaf26f07c74c794c SHA256 5af425a2f33407c0fedcd5fbdd4ea820154fb871dd6f4c79e9c0f8ece9873fe8
 DIST teagtk-17.6.3.tar.bz2 454818 RMD160 3b9e053f649ffee6a151786ed6a3fae5fb1440c2 SHA1 347c029c5349c8461f6725f0efe08c90e3136187 SHA256 a5381fb4bdc63580c9cc224e61171da2fef84257de48cb7cc647965ef4c63d7b
 DIST teagtk-17.6.6.tar.bz2 479197 RMD160 e8b6aabd7dfb86c43db88bceb7ebaec5f9738594 SHA1 17c3019c9dc6b53d87a9a3bc1cc02784d256f234 SHA256 e2583776fb38331f1e7989f7f8ea23bbae593af26f4c3cdeeae61a793b6bd752
 EBUILD tea-17.6.3.ebuild 1683 RMD160 40a8fd9d4be93680a432a4b5191fabec76fb204b SHA1 eb02341fe2f44f4ba06a1446377ffa59698f1dc0 SHA256 c3b375a8dac3c3b03b804981df8578b82f09d6da944de6785d693d37ec052a3d
 EBUILD tea-17.6.6.ebuild 1683 RMD160 33d072dc99f2c527e415dcf0195695cd5712891a SHA1 e71f5f0dcdd407b1ea3d285b004d3583f28a24be SHA256 f6e875e2a4d7f2e2dc28d776882e15356e923adc954cf353a380ed98fae8b43c
-EBUILD tea-22.0.1.ebuild 1077 RMD160 355fd4104808022c1f64fac0331cfad7d3fb5bb3 SHA1 76834c70ac18e212abaac2ecd869854ed4151d4b SHA256 d5a7aa3aa4d1310c9fe2f14fe2fd65e69c9499da6dad0a616fd35ee3c9a539e2
-EBUILD tea-23.2.0.ebuild 1040 RMD160 7ebc6dd4f12c7d4b5341f2c4ac279416f7ecd104 SHA1 7f67cfd9149ee4c6bd84a7540c3b1f96d88b0b19 SHA256 13a416bee72cba68573abea39a7b3bbb5d9fc299b3af3f15dcff92ac1779d1a8
-MISC ChangeLog 5969 RMD160 f317fa678caed956dbad97ac6fec29eecaba0867 SHA1 fa2d98a0b8222110ff34bf5130db40c93d495c41 SHA256 2dbfcb986ae1f951e486688ee7b2c9664d9e8af08dcaae1c274b47b3350edc98
-MISC metadata.xml 634 RMD160 23a4486b921bbf38d1f72f5c1f1f837ccbfdabce SHA1 da9ba7040d037e4e517774253ab50cffef7552db SHA256 5d09d32ab632b139bdab6b23c53ade3682848b2433aa3f4d8a46ac7ef65e4c97
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrkjIMACgkQV3J2n04Eauyf7gCgv4N6T6pQvl1mpRTKYJMBW5XB
-pWUAn038dB9a2GAaXdiXadtYYN/D/0DB
-=g2Zl
------END PGP SIGNATURE-----
+EBUILD tea-26.0.1.ebuild 1298 RMD160 157b8f8fb94038b5f4046d03fdced30a16faec4f SHA1 a0e21a02547d6ad3d135b730336b4488c48c8ae2 SHA256 7b93c51b2958616f5090323cc43f82186a928044d8f8a9dc2e4441b338601ada
+MISC ChangeLog 6200 RMD160 1be884062d49edd82f66b5f9afe8db3e61035efe SHA1 9183788253638a0818c78395ee70065581b5bdb8 SHA256 0d0bf8186ef15f023ca37c8978e6e99f593021e2a8c91f55dbc9fae4e8c52cd6
+MISC metadata.xml 770 RMD160 98695ec3182cd2ea7d38274fbd88424b2e0b036a SHA1 2931ad8cf5b2314a8129bebdcd7e22fa9aeea9ef SHA256 9c73ad67bfe72a1169a47561c21404cc34a0a68917937891d4e1d567be6a3c14
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
index 26f84019d831..f03903b4402c 100644
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/metadata.xml
@@ -4,14 +4,16 @@
   <herd>no-herd</herd>
   <maintainer>
     <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
-  <longdescription>
-    This is an very small GTK2 text editor. It has lots of extra features
-	including syntax hilighting and a built in file manager as well as a
-	built in image viewer. It can also read lots of 'other' filetypes.
+    </maintainer>
+    <longdescription>
+    A very small Qt text editor. It has lots of extra features including syntax
+    highlighting and a built in file manager as well as a built in image viewer.
+    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>
   </use>
 </pkgmetadata>
diff --git a/app-editors/tea/tea-22.0.1.ebuild b/app-editors/tea/tea-22.0.1.ebuild
deleted file mode 100644
index 48e1e7b448a0..000000000000
--- a/app-editors/tea/tea-22.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-22.0.1.ebuild,v 1.1 2009/03/07 15:39:20 patrick Exp $
-
-EAPI="1"
-inherit qt4
-
-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="spell"
-
-DEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-svg:4
-	x11-libs/qt-script"
-RDEPEND="${DEPEND}
-	spell? ( app-text/aspell )"
-
-#S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	eqmake4 src.pro
-	emake  DESTDIR="${D}" || die "emake failed"
-}
-
-src_install() {
-	dobin bin/tea || die "Couldn't install tea"
-	dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO
-	doicon icons/tea_icon_v2.png
-
-	make_desktop_entry tea Tea /usr/share/tea/pixmaps/tea_icon_v2.png Development
-}
-
-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-23.2.0.ebuild b/app-editors/tea/tea-26.0.1.ebuild
index 20c367b9dfea..a562c8da8343 100644
--- a/app-editors/tea/tea-23.2.0.ebuild
+++ b/app-editors/tea/tea-26.0.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-23.2.0.ebuild,v 1.1 2009/03/07 19:43:33 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/tea/tea-26.0.1.ebuild,v 1.1 2009/11/07 22:45:40 billie Exp $
+
+EAPI="2"
 
-EAPI="1"
 inherit eutils qt4
 
 DESCRIPTION="Small, lightweight Qt text editor"
@@ -12,18 +13,31 @@ SRC_URI="mirror://sourceforge/tea-editor/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE="spell"
+IUSE="aspell hunspell"
 
 DEPEND="x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-svg:4
 	x11-libs/qt-script:4"
 RDEPEND="${DEPEND}
-	spell? ( app-text/aspell )"
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )"
+
+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
 
-src_compile() {
-	eqmake4 src.pro
-	emake  DESTDIR="${D}" || die "emake failed"
+	eqmake4 src.pro PREFIX="/usr/bin" ${myopts}
 }
 
 src_install() {
@@ -31,11 +45,11 @@ src_install() {
 	dodoc AUTHORS ChangeLog NEWS NEWS-RU TODO
 	doicon icons/tea_icon_v2.png
 
-	make_desktop_entry tea Tea tea_icon_v2.png Development
+	make_desktop_entry tea Tea tea_icon_v2.png Utility
 }
 
 pkg_postinst() {
-	if use spell ; then
+	if use aspell || use hunspell ; then
 		elog "To get full spellchecking functuality, ensure that you install"
 		elog "the relevant language pack(s)"
 	fi