Revision bump again, after discussion rather do not make the libparsers shared but...

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

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index b815a91827b83b4f634dbc4e19580e8d2a44d5f6..2dfbafa2df5cff72df173ccefbd617996b56d741 100644 (file)
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,14 @@
 # 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.90 2011/09/16 12:32:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.91 2011/09/17 04:08:53 scarabeus Exp $
+
+*hunspell-1.3.2-r3 (17 Sep 2011)
+
+  17 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -hunspell-1.3.2-r1.ebuild, +hunspell-1.3.2-r3.ebuild,
+  files/hunspell-1.3.2-static-lib.patch:
+  Revision bump again, after discussion rather do not make the libparsers
+  shared but not installed.
 
   16 Sep 2011; Tony Vroon <chainsaw@gentoo.org> hunspell-1.3.2-r1.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 879bf759a20b8223d2949f4bbddde4e36a7833e0..75870cb85995cf5fa46bb5abaacc0fc24f32c9db 100644 (file)
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -5,20 +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
+AUX hunspell-1.3.2-static-lib.patch 451 RMD160 02e9a51844190512b5c79f53ce05f5645f85e480 SHA1 3e74b9357f6072c789aad29062a11f4545b9a7b4 SHA256 7259ea8f23a4d2717e85f62e3276cbcc23af292f6e77daddeb23bd93dbde0528
 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 2789 RMD160 03d66eb1ef26b263efddfab27d6c42d585ee1787 SHA1 78de3b426a7d817d05a44f45371438ca3bd8a7e5 SHA256 91cb99f7f30065714d84ebd92c12118fce71c2cc03b1b8e743a7458bc5a5e24f
 EBUILD hunspell-1.3.2-r2.ebuild 2700 RMD160 9c5dac2b6e8c87ec714f86911a04b2d594d71190 SHA1 35ec80ce68dbe2ef94ff7c143f11b02b93445a33 SHA256 58da476e7e9e3e7889553ab89fa82f890ee5636dd75635976437d9e88321a6a3
-MISC ChangeLog 13133 RMD160 4b86be5dd84118ac1ffb0b5f0a4851e0c05b3dd1 SHA1 4dd0ced5d14e11cfcaf5a47a1630945b2d9d655d SHA256 3973df871f54fcb43ca81363dc2001270df65c5401abfff448222db0432d1ff6
+EBUILD hunspell-1.3.2-r3.ebuild 2700 RMD160 2517a75b4ffd82d4865a02a4a50c3d40042573ab SHA1 17243463459affe9288682ac2d42bd4b4f5d19d2 SHA256 bcc60e76ab323c1e1c51c04326f4b2c70a925b14b1c387453fae072211f225cc
+MISC ChangeLog 13423 RMD160 71a7de7f64504ecec570b283d9d64a42a15a5d6a SHA1 1dc2718a1c6286f69de9755b403887622ea8d6c6 SHA256 e77645508e08db9fd4dfc794c68a6bda22fa06ace0ac12384e3e68a3c2c41d8d
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5zQdkACgkQp5vW4rUFj5qgpwCgqoq5oFGKOuNuJ2g9+Em8qw8c
-deQAn3Do4TMKg6VDQcOZYhuJX9t7/IGU
-=AV+U
+iQIcBAEBAgAGBQJOdB1sAAoJEOSiRoyO7jvo6vcP+wXLFMgdnORCiJvKMzRQpZTi
+Tnx35DaKVcloTUp+MkgwcWWnbbe3ZlUMt71x0Gkttc1kZ5T0ItUWpZIT/cU5R0qk
+gd+49h2GzUbmHyzWumyFvqK7+W8w1bihcTx2bM6PnBlQLfvr27s19Zn5yoKA2RvD
+qOQ3hBwEKp82g0ScRJh+fPSGHbdBaOyeEnLpGWyVOfJ78JnVMy6v4ev4Xt/cJWXT
+j2efRgvONNKEOImMRbAGGo3UZk0M9qWlJL22h4hKL0FPfqckHk5OyZva72zYSYvl
+YKmzLR6ApZJ0SuvotbUDtA+wKc0zMgev96ovCtJLAHx9PHAtYeIn2NTzwuXmZaZs
+Qve4BAEb6z0SLf/rL5xtBB99ZGOQZ8UeByf5Ono7TAE3ZsV+MVQIYlSyqg++Sd2M
+0Vnw8+ZUft0NR4gvTYX3bliQdcUdY8ud1QeA4RFJkqTa9PexRIsBiXrBbjzKZzIc
+Jn5gpKje9DyIo6fPW/qFPisSvYUHE9Bgixx6vTcIJJrYCYUrJqmFEQhT0RghRCo7
+q1wG4Tvjb5iZwMqWbeVBYUFBlGYhrlzBTAKTZtjF9BMzHqee6s9+VPHcqseREu2l
+WXxbxBdW5ZVu6WKIgcZWmDrZLz4YCpDvn7xZqsqmBF5k8ZR72ubbBryIZs/hzzeo
+JJ9TrtgtIpfdGYVvCsjJ
+=JQ2J
 -----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
index 0b96fc1b20413f44f0023556e090af41011ca7a5..b6cc92337c061362e96d32e154486da9a2c3629b 100644 (file)
--- a/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch
+++ b/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch
@@ -1,45 +1,9 @@
 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 @@
++++ hunspell-1.3.2/src/parsers/Makefile.am     2011-09-17 06:06:50.469615528 +0200
+@@ -1,4 +1,4 @@
 -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
- 
++noinst_LIBRARIES=libparsers.a
+ libparsers_a_SOURCES=firstparser.cxx htmlparser.cxx \
+                     latexparser.cxx  manparser.cxx \
+                     textparser.cxx 

diff --git a/app-text/hunspell/hunspell-1.3.2-r1.ebuild b/app-text/hunspell/hunspell-1.3.2-r3.ebuild
similarity index 87%
rename from app-text/hunspell/hunspell-1.3.2-r1.ebuild
rename to app-text/hunspell/hunspell-1.3.2-r3.ebuild
index bdf6265079b052d40f060e8713eb0d1ce1b46332..da6efe31f8a021acd0cd4fa2fca7b12ac35c5fe9 100644 (file)
--- a/app-text/hunspell/hunspell-1.3.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.5 2011/09/16 12:32:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.2-r3.ebuild,v 1.1 2011/09/17 04:08:53 scarabeus Exp $
 
 EAPI=4
 inherit eutils multilib autotools flag-o-matic versionator
@@ -14,7 +14,7 @@ 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"
+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
@@ -57,6 +57,7 @@ src_prepare() {
        # 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
 }
 
@@ -64,9 +65,6 @@ 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