Revision bump in order to fix static lib usage.

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

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 349f589ffc1a1eeb7bac94e12491a3bc0d60e7ed..342723db297b6f9f905266eae03dac230bff5935 100644 (file)
--- 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/Manifest b/app-text/hunspell/Manifest
index e1ddc8495486808cb6406619e97f6eb81f78d60a..ce1e443ef92d1ea23e8eb960f305bbc1f5fc8d7d 100644 (file)
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -5,18 +5,30 @@ AUX hunspell-1.2.11-renameexes.patch 4285 RMD160 9657ab71c70e5e4da6807bc80618f03
 AUX hunspell-1.2.12-renameexes.patch 4448 RMD160 cb46c1aa32c8b082e6dab592a2f536c9b5c99428 SHA1 f488a451f4dc6fec8a8119ff0c1f9bd460cfb62e SHA256 af667dc36f89437556b128f962f0373151f0132b871caebb50c083cac56afdab
 AUX hunspell-1.2.9-renameexes.patch 4285 RMD160 2d8700b2cd9afdd2e6f375562e98d1b5111dd7d2 SHA1 fb0d9f31ceaa075b19cd9a69449c6ff0336fa933 SHA256 d407dafede8c0b71b9bbab97a3dda5805d85f0920a95019ad4126f5cec8897a0
 AUX hunspell-1.3-renameexes.patch 5337 RMD160 ede4ade083311df655d2458ebaf9510c498d1559 SHA1 9c234b8835d669761753f000b4535b9ec7dda058 SHA256 4cbeae9c782a2114d09d7920b1dfe355f37711ecd895d800a6b460bb87184f89
+AUX hunspell-1.3.2-static-lib.patch 2003 RMD160 0839ab215a7ad448927d4bb4a8a68de70bd5db68 SHA1 e657e356a679caeb0ca0e887e39a878d19d7fa4a SHA256 c824ba4a8dda0bdd15c8fe7f0521912c206ccf1f2ba89a77f5aaa11523002536
 DIST hunspell-1.2.11.tar.gz 926658 RMD160 fa67a24131a8ba4d9cdfd5b4ecfb9c728f83fe23 SHA1 0af7cf93a9914790705b670464d2f95a4bea6341 SHA256 3f975c056e0e8883b38ebe75f04a32e3983ea9d951afa035181806b070d06e93
 DIST hunspell-1.2.12.tar.gz 969894 RMD160 43bdf7c06d06e8f983b7cce88e71df833c22cd13 SHA1 0a2ab4b1e15c3dad3f05f474d1ae15ee361c35f8 SHA256 5f592a7112df2114cec772574f2837cb9de499e6bf9d35df327a42ab3e820e69
 DIST hunspell-1.3.2.tar.gz 975917 RMD160 f193de180f9ac29cfb54824a45366ba57b27e5c4 SHA1 902c76d2b55a22610e2227abc4fd26cbe606a51c SHA256 b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd
 EBUILD hunspell-1.2.11.ebuild 2615 RMD160 28bdaebc816b9f9ac3be681c3da9873a958b34d6 SHA1 9deba2b51321a1f7004a2c1d293183fc3c4bcdc7 SHA256 088eac8cf44db3bfb276cc49a01f1575f190d68907ea4e46e15ee23152170a02
 EBUILD hunspell-1.2.12-r1.ebuild 2703 RMD160 7db6db5440c1b8b963f1e3b0ec8bc789d7cbec00 SHA1 58c122d5033a377611153847a0c9766e4e54a303 SHA256 e0d971af58b91413674d267543112143e24c3614fa11b443c09f646f4aa69cd7
 EBUILD hunspell-1.3.2-r1.ebuild 2791 RMD160 086f7bfc416e909f2103b899874218d7dbbd2c7a SHA1 f991483dc447ca6da30693718a29bb8ddc26f23c SHA256 ad6a2f8b6021c4ef8d9d34f10bdd86bc832312c4f0575f2ac20ca209a2100525
-MISC ChangeLog 12620 RMD160 a9b3d805e0d189309a649a46d1bcb84ff03dedb5 SHA1 1852ab1116423a6ce12cff2b8058c912a1a94b4c SHA256 944aceaf16fef043b8ac592929cfac90dcf9ab1d302a41f0d80bf2631bdef8d5
+EBUILD hunspell-1.3.2-r2.ebuild 2836 RMD160 8a59ff3c9cfdf1432ca825cf180ad196726ed0b3 SHA1 d6873006b44add46883e1a95cb948301b8e86395 SHA256 3b95b05b8d129f4d798dd4c98c33c8db1c565d5f7ec9232a4086b65ceb064ca5
+MISC ChangeLog 12829 RMD160 8a953400da7ea8e209177e39fb9fbb25547949a8 SHA1 e06a1398915e1cb4d4a1d225c65bb01e52cc8281 SHA256 1cbf787db8df84b7ffbe23841fc7604f3473bb9ee0a974a55740c4fdbf00475b
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5xR2MACgkQB6aLYPQCwOB4agCfWMQ2XOeNkK1nJwIRoualBDBt
-igYAoLlM0VRP7s8/JP29GaQjklU8HqvF
-=+4Z9
+iQIcBAEBAgAGBQJOcdPqAAoJEOSiRoyO7jvobqUP/RYF/lQbrJkrPzeZIzHMQ+Pc
+fIXTSAz+35GLXlr5yVTNbWj9FOtVrz9MLzelEn/RcOhHtGCE5mg4fMt2BjxV5CT2
+Tc01rkSbEMSjzZ6yZ+sHNLWznLeDJ4k7mjEzJCGyC9V/gq4SeJ/jhsU5DmAk4RuM
+p6HB4VNbxr9b3RF9VHC5bXOQmzHWA9WNYXVg/04xaxFPYG0EIEEls7gGfv7GzGWV
+P3OeYueg58WCv5hgtWxlHuo98OILw2JQu2u+T/UKGaWoMV12IDOIx3NE1xZy3hzR
+nfJ9b5WHv2NmKcfl3zwszY50vUOnX5fVMq7GrGfGuHNx5CtQDMgDfn4RjDeUmcj5
+mqOnjXCemXgba4D2Ev2TMz8DEaREi91O8pOkqVMdhsV4+10DihNnNwa+ZEabPbIU
+drlWn9Rcbe6AUOXS2j6YI7r/dckAoEnnA/VmVcXTI9MKEoo16x8jMaCUWIKmL2yI
+a38DqIkPpg2DiE9qvjWRX22e+4eRZiuBmUDX8dFdv+l9tClCtx9elsG3FWq9ph2F
+RVdLtPOpJoW+IFR5oSVEw60t518zEm1+QRUpYbW0kPwhoncsQi866oam7OqMw+zr
+247to/vbdqxP2ZPURKj2ImF4jdyLymKWfBEf+A/mBBVSVk0pVltOlyose34XFrin
+d1DaIQaQ1giG5usJDlF1
+=REAW
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..0b96fc1
--- /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 (file)
index 0000000..122fef6
--- /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>."
+}