diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2014-02-11 06:47:16 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2014-02-11 06:47:16 +0000 |
| commit | f6c238efb3d4fc27435548a32d0bd4dad1c49ce9 (patch) | |
| tree | d7958707026b3fec03c9bc2d865906e3b87ff4be /app-text/aspell | |
| parent | Added python-3.2 compat (diff) | |
| download | historical-f6c238efb3d4fc27435548a32d0bd4dad1c49ce9.tar.gz historical-f6c238efb3d4fc27435548a32d0bd4dad1c49ce9.tar.bz2 historical-f6c238efb3d4fc27435548a32d0bd4dad1c49ce9.zip | |
Added fixes for bug #467602 and ncurses link issue when USE=tinfo.
Package-Manager: portage-2.2.8/cvs/Linux x86_64
Diffstat (limited to 'app-text/aspell')
| -rw-r--r-- | app-text/aspell/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/aspell/Manifest | 14 | ||||
| -rw-r--r-- | app-text/aspell/aspell-0.60.6.1.ebuild | 21 |
3 files changed, 24 insertions, 16 deletions
diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog index f8c2217d0d0d..fd0db229d6f2 100644 --- a/app-text/aspell/ChangeLog +++ b/app-text/aspell/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/aspell # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.144 2014/01/05 11:33:24 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.145 2014/02/11 06:47:09 nerdboy Exp $ + + 11 Feb 2014; Steve Arnold <nerdboy@gentoo.org> aspell-0.60.6.1.ebuild: + Added fixes for bug #467602 and ncurses link issue when USE=tinfo. 05 Jan 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml: Cleanup due http://gentoo.2317880.n4.nabble.com/app-dicts-herd-is-empty- diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest index b9aeb9f350d1..1a06e6df8064 100644 --- a/app-text/aspell/Manifest +++ b/app-text/aspell/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX aspell-0.50.5-charcount.patch 2264 SHA256 8b8dff47288fbd3c4983a354215b000262e4d8aa803421313730c80a62cf87ec SHA512 93e6db39df7050f2ce384c1293fa17e962d899e101259a342d8eda9f4021405ecb62406fb874e0c90d8bfceacef6fe147207e79782e968ea43764b06eada01d3 WHIRLPOOL bcfd67999be0e3653a8aa18329af1fd892869963a963f67cc9393fe70a36da33758ad16299c912ccddb26584c66f44a046a813824eb5dfee61456b1532c8e1e2 AUX aspell-0.60.3-templateinstantiations.patch 274 SHA256 71ec6d58f4e5e629d82869bc7c8c3eb63663aedf1be3c38f87ab872835f90f2a SHA512 ce8f8fd77f78fe365c8908a0530ea522a098b096d090e174315eaa1502f3865cdbcf654f2f9cfa01a8ddd1aa7ac09324b11c78ddcd89159cf5e6eaa968b53f14 WHIRLPOOL 43b501b1a72ddc0415584593308a66d040e3c75639281b5fe728e4f6225431ad36120fb1b672710e7cf7a81c96a48cfd882c96012a88c74b25122e0395f70c00 AUX aspell-0.60.5-gcc-4.3.patch 5460 SHA256 349f092bb2cc2f18d3cd8fb3039774f7157bf44179a704c968dcf425b40ed08e SHA512 695b72f71179e734ab14d7330ee7cdd73b84deabb9f6df3fec0259bc2a48d4821d8bf4b776402926bc81a01c3230a963f7903541134268aaf617d6f0b4521b56 WHIRLPOOL d422b60c4ff1f589d414680591052280f889266c6acd67bdfa2556bf33b775d97c8dbc49b1431bb1409c3f6c28ef495d7780427fa6fa51db211ad9d4ac89f375 @@ -12,13 +9,6 @@ AUX aspell-quotechar-fix.patch 473 SHA256 3b5bc1a87613b396b080fb5a13003ac58b9fb4 DIST aspell-0.50.5.tar.gz 1016586 SHA256 e385d747d7423846760170476f16f12719cf2846a99e1b5acea13eeb948c1f4d SHA512 db8b900064801ea3b052126237307bfb434f28c0a3442c533c4b15b514fc8e8a392829b3f7c1cd16970069543e1ef497b1e7a4052056c31ddee7de4524927ca1 WHIRLPOOL 53dc5297f209074e4af62f1610e98c0093a8e8858a02186b6a9b42a91a1c9cd3d0422308233ebb523c7c14e1565fff18bcbbd3708beaae27fe6a5c2fde7e251b DIST aspell-0.60.6.1.tar.gz 1878163 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f WHIRLPOOL 0c77b95a29b598491c12cf22737d5ff758b2758b4f815356d2f52da398afe2b45209cd3b59f90e5b3c1976ee8a09e8cd553507bd93a0cd49043c8531f9a4990b EBUILD aspell-0.50.5-r4.ebuild 1916 SHA256 7395c7df9424eff516d7e6717b78110ed1ae937edf451ba2dacb2a6479d878f8 SHA512 5f0e9543457ede5696ec97d7ab27396b38967075a32e9770c02c5eedc5634b567c1deb5f96df0cfc4b2acda64bb01810c98c69d87e54c3228880d545bf1ba297 WHIRLPOOL dc486804b73358030daa61b9d054e07006145951dd2e94b2d2f888cbef4039b7c8e3d5a7db53ca035abed107e0b0818fd12e407dae74bff343f258022064e66d -EBUILD aspell-0.60.6.1.ebuild 2843 SHA256 0592028b0a389c48e046d584e8af02f3db49faf04276351d278c612d8b50ec09 SHA512 dd360b7fcefcd39b4d44c12145afc8939ffbd34a1bae080720c71af8df58d4094e143aee8ba2a53c8df0914a52194311b0d1632145d4ebe67f72f9778b4be055 WHIRLPOOL 18dea873514abb19d76afe7890e9786d9b3a33c370cc571a0bc8e173c6ed37e2dce256433521bbc6b5419b6c8335798f5b887a325326fbced40661bb8679d136 -MISC ChangeLog 21665 SHA256 8393e2c622ea9b5ec83e7d6a2958d159ab60219266a1a55fed4b6bd29f7975f1 SHA512 3f592ef4ebbda64db984aff988bd82e83291d31d8b0f2fc803940263fe294c69846af1f46fb89362c7b2fc5e9bf726f6456340bb80039764aa1e62ce8fa887da WHIRLPOOL 7091e803603da4f115f0f16d640038b1f8e27abcd7162a5d12ef593b2ab52e5129f8537275a9c905302b36020f8bb0863fd70884e34b1593f614acde37c8c7cc +EBUILD aspell-0.60.6.1.ebuild 3229 SHA256 63bb30f1b77570506f2928b547a123ed0e22ada6419a8c6703b4f2f833cde358 SHA512 c1611226892370c67dbcda45218e5c2783bb4a9bfdbcc50b4ef713aabef9f66966722608d03113023b656f8afa11476d111cf679fc3591838a03946177a96c29 WHIRLPOOL af35b681e59af028b698db8d547c32168bb9ccbde38512db901398ddc189692e778338039b11fbf7ac01f9d8f8685966b03ef3821b761d3cbc1355281ebf7653 +MISC ChangeLog 21810 SHA256 0f9ef7f73df80b64adf3f405f61c8ba9e21513f69859b0b451e5f5efc90e4c5a SHA512 b1030f3498a14c52011d02073834c11ce320494a6b6cbb10f7a9efb5b2f855cd27708758a9c2d9ddcdddfcf4fb847a7fc6bb772f1ae7516a1f5c03d40a2fd52e WHIRLPOOL 8dd02e7625109b806e74d0fa74ea71902add3dd6ff1c4daf13ed42593721e5c38bfd3ef4041ec803147b9ab815e86603fa2703dc948b4682591cec1ad848172e MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iEYEAREIAAYFAlLJQwUACgkQCaWpQKGI+9RyUQCfdq87wDdYL3aTGVHjCjazaWfQ -wx8An1RGn4tK8d90cgfxBAwhCmVAlEIp -=Ixnd ------END PGP SIGNATURE----- diff --git a/app-text/aspell/aspell-0.60.6.1.ebuild b/app-text/aspell/aspell-0.60.6.1.ebuild index 48db9c7672b7..22292d52df49 100644 --- a/app-text/aspell/aspell-0.60.6.1.ebuild +++ b/app-text/aspell/aspell-0.60.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.11 2014/01/02 18:06:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.12 2014/02/11 06:47:09 nerdboy Exp $ EAPI=4 @@ -44,7 +44,12 @@ RDEPEND="${COMMON_DEPEND} !=app-dicts/aspell-en-0.5*" src_prepare() { - #epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch" + # fix for bug #467602 + if has_version ">=sys-devel/automake-1.13" ; then + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \ + "${S}"/configure.ac || die "sed failed" + fi + epatch "${FILESDIR}/${PN}-0.60.5-nls.patch" epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch" epatch "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" @@ -58,10 +63,20 @@ src_prepare() { # This has to be after automake has run so that we don't clobber # the default target that automake creates for us. echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in + } src_configure() { - econf \ + # if ncurses is built with separate tinfo libs, then... + if built_with_use sys-libs/ncurses tinfo ; then + if built_with_use sys-libs/ncurses unicode ; then + CURSES_LIB="-lncursesw -ltinfow" + else + CURSES_LIB="-lncurses -ltinfo" + fi + fi + + CURSES_LIB="${CURSES_LIB}" econf \ $(use_enable nls) \ --disable-static \ --sysconfdir="${EPREFIX}"/etc/aspell \ |