Revision bump in order to fix static lib usage.

(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)

3 files changed, 148 insertions, 1 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 349f589ffc1a..342723db297b 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.87 2011/09/14 16:32:48 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.88 2011/09/15 10:30:20 scarabeus Exp $
+
+*hunspell-1.3.2-r2 (15 Sep 2011)
+
+  15 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +hunspell-1.3.2-r2.ebuild, +files/hunspell-1.3.2-static-lib.patch:
+  Revision bump in order to fix static lib usage.
 
   15 Sep 2011; Andreas Schuerch <nativemad@gentoo.org>
   hunspell-1.3.2-r1.ebuild:
diff --git a/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch b/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch
new file mode 100644
index 000000000000..0b96fc1b2041
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch
@@ -0,0 +1,45 @@
+diff -urN hunspell-1.3.2.old/src/parsers/Makefile.am hunspell-1.3.2/src/parsers/Makefile.am
+--- hunspell-1.3.2.old/src/parsers/Makefile.am	2011-09-15 11:50:40.251441126 +0200
++++ hunspell-1.3.2/src/parsers/Makefile.am	2011-09-15 12:14:25.891424029 +0200
+@@ -1,10 +1,12 @@
+-lib_LIBRARIES=libparsers.a
+-libparsers_a_SOURCES=firstparser.cxx htmlparser.cxx \
+-		      latexparser.cxx  manparser.cxx \
+-		      textparser.cxx 
++lib_LTLIBRARIES=libparsers.la
++libparsers_la_SOURCES=firstparser.cxx firstparser.hxx \
++	htmlparser.cxx htmlparser.hxx \
++	latexparser.cxx latexparser.hxx \
++	manparser.cxx manparser.hxx \
++	textparser.cxx textparser.hxx
++libparsers_la_LIBADD=../hunspell/libhunspell-1.3.la
++libparsers_la_LDFLAGS=-no-undefined
+ 
+-noinst_PROGRAMS=testparser
+-testparser_SOURCES=firstparser.cxx firstparser.hxx htmlparser.cxx htmlparser.hxx latexparser.cxx latexparser.hxx manparser.cxx manparser.hxx testparser.cxx textparser.cxx textparser.hxx
+-
+-# need mystrdup()
+-LDADD = ../hunspell/libhunspell-1.3.la
++check_PROGRAMS=testparser
++testparser_SOURCES=testparser.cxx
++testparser_LDADD=libparsers.la ../hunspell/libhunspell-1.3.la
+diff -urN hunspell-1.3.2.old/src/tools/Makefile.am hunspell-1.3.2/src/tools/Makefile.am
+--- hunspell-1.3.2.old/src/tools/Makefile.am	2011-09-15 11:50:40.251441126 +0200
++++ hunspell-1.3.2/src/tools/Makefile.am	2011-09-15 12:08:46.081428111 +0200
+@@ -13,14 +13,14 @@
+ example_LDADD = ../hunspell/libhunspell-1.3.la
+ 
+ hunspell_SOURCES=hunspell.cxx
+-hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
++hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.la \
+ 	../hunspell/libhunspell-1.3.la @CURSESLIB@ @READLINELIB@
+ 
+ hunspell_analyze_SOURCES=analyze.cxx
+ hunspell_analyze_LDADD = ../hunspell/libhunspell-1.3.la
+ 
+ hunspell_chmorph_SOURCES=chmorph.cxx
+-hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
++hunspell_chmorph_LDADD = ../parsers/libparsers.la ../hunspell/libhunspell-1.3.la
+ 
+ noinst_PROGRAMS=example
+ 
diff --git a/app-text/hunspell/hunspell-1.3.2-r2.ebuild b/app-text/hunspell/hunspell-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..122fef6e1210
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.3.2-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.2-r2.ebuild,v 1.1 2011/09/15 10:30:20 scarabeus Exp $
+
+EAPI=4
+inherit eutils multilib autotools flag-o-matic versionator
+
+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 static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	sys-devel/gettext
+	ncurses? ( sys-libs/ncurses )
+	readline? ( sys-libs/readline )
+"
+RDEPEND="${DEPEND}"
+
+# TODO: Add proper desc for mi
+LANGS="af bg ca cs cy da de el en eo es et fo fr ga gl he hr hu ia id it ku lt
+lv mk ms nb nl nn pl pt ro ru sk sl sv sw tn uk zu"
+
+DICT_DEP="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+	if [[ ${lang} == de ]] ; then
+		DICT_DEP+=" linguas_de? (
+			|| (
+				app-dicts/myspell-de
+				app-dicts/myspell-de-alt
+			)
+		)"
+	else
+		DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
+	fi
+	IUSE+=" linguas_${lang}"
+done
+PDEPEND="${DICT_DEP}"
+
+unset lang LANGS DICT_DEP
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+	AUTHORS.myspell README.myspell license.myspell
+)
+
+src_prepare() {
+	# 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.3-renameexes.patch
+	epatch "${FILESDIR}"/${P}-static-lib.patch
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# FIXME: installs static library and buildsystem needs to be patched
+	# to use proper libtool approach converting it onto shared one.
+
+	# I wanted to put the include files in /usr/include/hunspell.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	econf \
+		$(use_enable nls) \
+		$(use_with ncurses ui) \
+		$(use_with readline readline) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
+	popd >/dev/null
+}
+
+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>."
+}