Fixed nls option handling, bug #228779, thank Arfrever Frehtes Taifersar Arahesis for report. Removed not to be stable ebuilds.

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 91 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 1f2430f80df1..46e73d3f9f18 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.40 2008/06/19 05:54:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.41 2008/06/22 12:43:38 pva Exp $
+
+*hunspell-1.2.4-r1 (22 Jun 2008)
+
+  22 Jun 2008; Peter Volkov <pva@gentoo.org> -hunspell-1.2.3.ebuild,
+  -hunspell-1.2.4.ebuild, +hunspell-1.2.4-r1.ebuild:
+  Fixed nls option handling, bug #228779, thank Arfrever Frehtes Taifersar
+  Arahesis for report. Removed not to be stable ebuilds.
 
 *hunspell-1.2.4 (19 Jun 2008)
 
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index eab7d56b8592..ea49ee71f97e 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -3,11 +3,9 @@ AUX hunspell-1.2.2-libtool-2.22.patch 334 RMD160 4c6ef9e82fa9b95372aace0ff63dc50
 AUX hunspell-1.2.2-renameexes.patch 3751 RMD160 2429424ecd90246c97e9414f2be7435f67705704 SHA1 a1e76bd5e6a4e21b3bf9c40bbd4ea2d51866fe43 SHA256 ff190919f954dd5314c2f5035d7a33796924316c775745df67c39d3bdfe2c5cc
 DIST hunspell-1.1.9.tar.gz 684426 RMD160 e49782df2ada58762036acc3c904a8ace6b19a0a SHA1 a881d9bc8bc6257c956c70c863e872514f8c44d4 SHA256 c36ed98189da373f3f24e7be97425454e6706cc3e0d07ff39f8c1bcd6689d543
 DIST hunspell-1.2.2.tar.gz 752046 RMD160 110c428f2b6734afefb8865dc3d63a4492594552 SHA1 521063ff64b2182e92e92f5355ae2cf396f39420 SHA256 8263a77b7cde9d853847ad040cf6c6857b0cf9bf4a0afebf3081935e0f58b49c
-DIST hunspell-1.2.3.tar.gz 758929 RMD160 1094b91232c81f33d65196d885fe3ccfefe12115 SHA1 1b15d0417bf7d898436192ac0989007231fbeadd SHA256 77466ef5ed18f810ca30814b6b7e40c3b08d30f3deb56157b5a78d960b16abea
 DIST hunspell-1.2.4.tar.gz 759049 RMD160 9e720a64344a3081b61b30cd5a5f79cdb60b3420 SHA1 5f088c49c13e63d123f4c082e3a3fad7b8f83e71 SHA256 59a4b62e7001aa9329929db89989e9a6312ed42b27d27cfab1413e83a335a6bf
 EBUILD hunspell-1.1.9.ebuild 2611 RMD160 395520b384a949c0ed99ec54912b76a92ba294bd SHA1 b5aab750bd2d88b17d72d40b7f2eb572a3f4adbf SHA256 98dc2d8fe81b576d670b52a94a09e56f2a8a809a89a308542257f25ea01e43d3
 EBUILD hunspell-1.2.2.ebuild 2675 RMD160 b0289d3881c23b005cb5192f15dac965e6ec4455 SHA1 83af421aa7fd1ffe03ebfb802773206b01836472 SHA256 b0d1b04300b4668ae9c9fed84d9f35f522ca54f292e531d1caa12273261ad449
-EBUILD hunspell-1.2.3.ebuild 2739 RMD160 b1e2b627c99117e0cd3b2efc1c6bcc3eeb707c47 SHA1 2cbab3d10627314176c7e020901d972536ed1562 SHA256 21bb2f5be9c3d9eb14683b034b8efce0e05a5ffde311849524c4cdec8528503a
-EBUILD hunspell-1.2.4.ebuild 1826 RMD160 0b86b9206bc9ecb442b4780394dc9369c7b14f5a SHA1 28ec17a4f11ff0dcc828678cbb72ee6e96f7ec1f SHA256 a380c190fabcd14bd63c248704f2c3af713fe3e6515d75c43f7ddccbcaf4661f
-MISC ChangeLog 6298 RMD160 5b8ef52d9d47845fd3c41f53bd0247afa0a03665 SHA1 9d6a46af2a95ccfef6e1f38b66ca57884f070a1c SHA256 b99722eb7ac58d5250db25b17019562301116d71f40d4d02fe8f60fde5cfa22b
+EBUILD hunspell-1.2.4-r1.ebuild 1831 RMD160 314527716186ce3195d8c211d547debd68e7a437 SHA1 5066a939e2c5ce42ada6807594266664cc8292f3 SHA256 dc04fb5444b8511027a69ba9a2e2d8ea4d5ea896a3137d6d4f84bdbcf267c58e
+MISC ChangeLog 6587 RMD160 7b6619ac8cc2b5bb11bcf50262a42ed22ebc6188 SHA1 6ec197880aab238a04ed3c07fe256dba2de02593 SHA256 61bce8f4a5c76504332d8c45ee8622cdcdb02ba8f2898654194423d59170f82d
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
diff --git a/app-text/hunspell/hunspell-1.2.3.ebuild b/app-text/hunspell/hunspell-1.2.3.ebuild
deleted file mode 100644
index 5ced19a70719..000000000000
--- a/app-text/hunspell/hunspell-1.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.3.ebuild,v 1.2 2008/06/17 17:21:33 mr_bones_ Exp $
-
-inherit eutils multilib autotools
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo."
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-DEPEND="readline? ( sys-libs/readline )
-	ncurses? ( sys-libs/ncurses )
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Upstream package creates some executables which names are too generic
-	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
-	# It modifies a Makefile.am file, hence eautoreconf.
-	epatch "${FILESDIR}"/${PN}-1.2.2-renameexes.patch
-
-	eautoreconf
-}
-
-pkg_setup() {
-	# Workaround as it's impossible to build with readline but witout ncurses.
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1995842&group_id=143754&atid=756395
-	if use ncurses; then
-		myconf=$(use_with ncurses ui)
-		use readline && myconf="${myconf} $(use_with readline readline)"
-	else
-		if use readline; then
-			ewarn "readline USE flag has no effect without ncruses."
-		fi
-	fi
-}
-
-src_compile() {
-	# I wanted to put the include files in /usr/include/hunspell
-	# but this means the openoffice build won't find them.
-	econf ${myconf} \
-		$(use_with nls) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell || die "installing docs failed"
-	# hunspell is derived from myspell
-	dodoc AUTHORS.myspell README.myspell license.myspell || die "installing myspell docs failed"
-
-	# Upstream install has a few problems - rather than try to figure out
-	# what's broken in the build system, just fix things up manually.
-
-	# These are in the wrong place.
-	mv "${D}"/usr/include/munch.h "${D}"/usr/include/hunspell/munch.h
-	mv "${D}"/usr/include/unmunch.h "${D}"/usr/include/hunspell/unmunch.h
-
-	# Libraries include the version in their name, so make a sensible
-	# default symlink. They should probably be libhunspell.so.1.1 etc.
-	dodir /usr/$(get_libdir)
-	cd "${D}"/usr/$(get_libdir)
-	ln -s libhunspell-1.2.so.0.0.0 libhunspell.so
-}
-
-pkg_postinst() {
-	elog "To use this package you will also need a dictionary."
-	elog "Hunspell uses myspell format dictionaries; find them"
-	elog "in the app-dicts category as myspell-<LANG>."
-}
diff --git a/app-text/hunspell/hunspell-1.2.4.ebuild b/app-text/hunspell/hunspell-1.2.4-r1.ebuild
index 459414f40e50..ef92e36880b7 100644
--- a/app-text/hunspell/hunspell-1.2.4.ebuild
+++ b/app-text/hunspell/hunspell-1.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.4.ebuild,v 1.1 2008/06/19 05:54:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.4-r1.ebuild,v 1.1 2008/06/22 12:43:38 pva Exp $
 
 inherit eutils multilib autotools
 
@@ -38,7 +38,7 @@ src_compile() {
 	# I wanted to put the include files in /usr/include/hunspell
 	# but this means the openoffice build won't find them.
 	econf \
-		$(use_with nls) \
+		$(use_enable nls) \
 		$(use_with ncurses ui) \
 		$(use_with readline readline) \
 		|| die "econf failed"