From cce287a2bbe26db004bed3d2ac1db6b27267c8fb Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 21 Mar 2015 08:48:52 +0000 Subject: [PATCH] Bump EAPI; use pkg-config for ncurses lib detection; use dobin and prune_libtool_files Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- app-text/aspell/ChangeLog | 11 ++- app-text/aspell/Manifest | 27 +++++- app-text/aspell/aspell-0.60.6.1-r1.ebuild | 108 ++++++++++++++++++++++ app-text/aspell/metadata.xml | 4 +- 4 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 app-text/aspell/aspell-0.60.6.1-r1.ebuild diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog index 7dcdf69fcfae..8f2439e12708 100644 --- a/app-text/aspell/ChangeLog +++ b/app-text/aspell/ChangeLog @@ -1,6 +1,13 @@ # 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.147 2014/02/11 18:00:40 mr_bones_ Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.148 2015/03/21 08:48:48 jlec Exp $ + +*aspell-0.60.6.1-r1 (21 Mar 2015) + + 21 Mar 2015; Justin Lecher +aspell-0.60.6.1-r1.ebuild, + metadata.xml: + Bump EAPI; use pkg-config for ncurses lib detection; use dobin and + prune_libtool_files 11 Feb 2014; Michael Sterrett -aspell-0.50.5-r4.ebuild, -files/aspell-0.50.5-charcount.patch, diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest index 397853b43f8d..54792c6656fb 100644 --- a/app-text/aspell/Manifest +++ b/app-text/aspell/Manifest @@ -1,7 +1,30 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX aspell-0.60.5-nls.patch 443 SHA256 9c8a619f97ffcbb6a90bb5d5f0531d0890ca0033dcfae5b0fc70cb635df7b39c SHA512 579de3e40e6036701b02e0936cbe7a0aebfe09f5fef35241827d9a64eea024148d530cb1cd435d5c9307358940c1704309511cd633e45307546e7f5d30d97120 WHIRLPOOL be989a88515e94e00529d078301431b67bb07b9934c846c2856b6f386f41ce2ff58c86f218caa23df2f3824f5865b1e42b158c197500ad4aaab07c320c3d6ead AUX aspell-0.60.5-solaris.patch 534 SHA256 e0d4f52e7cdfcf0ae727dbfd1fa967b9e6b7ad41bb56926108c2bff16ea232ad SHA512 9f7fd9c71a63cb2d726b41639ab915f6ced10ae25bd6a9ace4835b6b0644d9ecd7dc84238a59bbf3bb37719174f6acee253e34d06477ed0bce11bf720026f651 WHIRLPOOL e137bab903743e40aae59ddb974bdf71551c9d4a2caf50eec8aca62f092408b4453d47e5f085f957e5eeb73a3f9049f3272a310b1cd9574059f343a992faf228 AUX aspell-0.60.6-darwin-bundles.patch 963 SHA256 033707a54885b63cc321b69d78255d5db19b10de4b6dde264d07a6a56de4c64b SHA512 31d4b42f984413990d90ba7dc0e89bab7f7d2d6bf53a6c8a3c3c5b4ff57be6f7029765404cfb5c5bf4f267bd1601c959feec6207e28b85f274f249e6dfc7f8b8 WHIRLPOOL 486ecdc740c3ac12f0a10b2522807fa498dd2b711d6e4b7f05f0967e6d31836fc799b716f5c203d3bd0dde53bb1e85b9e238d987ba7d5a998c4ffe2313ce92fa DIST aspell-0.60.6.1.tar.gz 1878163 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f WHIRLPOOL 0c77b95a29b598491c12cf22737d5ff758b2758b4f815356d2f52da398afe2b45209cd3b59f90e5b3c1976ee8a09e8cd553507bd93a0cd49043c8531f9a4990b +EBUILD aspell-0.60.6.1-r1.ebuild 3159 SHA256 4fc4cb0006eb01c6a17ea497ee910d7c6a3cf3674b5ab338ad7e4b8c7d2524ca SHA512 8cbb85016adfce04006a1ac73b2af578ba30e271ec704cb02fa4009ada6ddc2f2df7dbecda8b0244dd50a678864b6fcc6b4f5c86b0bb9716c83678c801fa37f3 WHIRLPOOL 92918bca81412003ccb9434bb6797ca0fd7a7edefa847055535445df66e89824e2e893811e515bead7357a32e43f08cece47c5007f53e3f119f23a4401966706 EBUILD aspell-0.60.6.1.ebuild 3220 SHA256 9f5f9c816bf0c5d298d73aa3c9b840cc02c046dd6387421c9e304fc66734acce SHA512 24a1888b119bf3afae8bc98a5df8c3514285f3ff883e5062568969bb2dedf9daf1c17729bc6754c009e49da14966f73a711d80b7ce77c2f854867440c6a3428c WHIRLPOOL 6058b082c99f13663836dc391e23a53095669b48b99648ea701009e92e6ea2185069125e96e8fd11e5b609e19b6967c1c6e1df1ec577689ee6fc4cd5d3e36a3a -MISC ChangeLog 22232 SHA256 bc8eab4724b021907107c1ee1371cee2f82b96928164764fb4477bdc18eb96c3 SHA512 19d5b7e11c821ef7f02f1d905cfe2ed67329e899c7940fd59ed311f219d37b2a8d62e1ef34c6978507fbbb8fec3b89f1b2bc290b3e26be15b33b566d6cc11e30 WHIRLPOOL 36426af737548e3a9339050034f8c2b94c63ff96257863ca6dca3f6e48138d5c60b992bdb16a49e62008249d4ee56bdc683620c83c8455fa4c48b2f4be3a6ac7 -MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 +MISC ChangeLog 22445 SHA256 274317fb5fd01f2c78dd4229b46f4762c794f95fdfcaf3f1f326744e5e6a6252 SHA512 fd54d25dbe9702be457d99e51a2f5887835833d00227c301ffe39b5506ca1a2c9183921d36c03b60078c23b08fd12089c068c63545d2d56316a2a521a832ef95 WHIRLPOOL 9415100a66038d59990ea863a1f1ca9d40a1ee7332b768e066b7ce517fc256e7ae6ccc7930afdbe173e2fdcd50b78422919e69a9842b0da8d0a8ba875444c2e2 +MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0 + +iQJ8BAEBCgBmBQJVDTB0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirv04P/3s+TfaJSdn55UhVtdIuAArd +XW34690h+k2S6ejVUbHNupaTBDa0oiQPWumQu6nd3u+pWrVUodYZSZlVoUzCkeag +YzNoIM7zRMK/EWy5Wt2KuYK2Uv26gg9ygWSJRaOAkP3WqBNS7Z0N2lJhyekbosm6 +p8gXr35ZwIEfE8WxlhXy3g4HPBfKmSCd7scksK5ecKTiO/nRjWt6CYcoTi7jjGku +A+RL33zBqfar4brJJ/6ozVEREFAp6vqLPVg+hxYlBrxtW/hnkFPf6jZRaAnI7P3J +oXFmtU+ZpwR1u7lJhy3WNPc2rWmpg8hRN51eMzfvNlhEoZSSH6/yUVo06ufbmuI3 +z3q72B2Kxd7xWxYgYJ+0rcD2jTFDidgwAyHOPtSKihLSGhKEr9srzkwesPFmjm+s +qTblUizEvG/kLpOsipe/KY6GzzcESUWdNgYMbBYBUDY68XHJylEeWqt7B52fQXim +YLFJDNSh8CUN6LTF9Wb8oy82+QYn0sJzLnhgUBubIXbsCyeIhjwaBD+HOv22E5K1 +nVHFv7HA212J8xr6kRYXVxi0QEPOHUjOh6HIDvpAk8QuLpXKvrzEESnGxDzi46yi +OoukYr3nWgrc/5qyw23C/OpUK1Hppeea61GURDlTjsHqM4eOCFwRj4XlY0nATiPP +mATYmDJCClv2McmCh+BN +=2ZBY +-----END PGP SIGNATURE----- diff --git a/app-text/aspell/aspell-0.60.6.1-r1.ebuild b/app-text/aspell/aspell-0.60.6.1-r1.ebuild new file mode 100644 index 000000000000..83b12515ac74 --- /dev/null +++ b/app-text/aspell/aspell-0.60.6.1-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2015 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-r1.ebuild,v 1.1 2015/03/21 08:48:48 jlec Exp $ + +EAPI=5 + +inherit autotools eutils flag-o-matic libtool toolchain-funcs + +DESCRIPTION="A spell checker replacement for ispell" +HOMEPAGE="http://aspell.net/" +SRC_URI="mirror://gnu/aspell/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="nls" + +PDEPEND="app-dicts/aspell-en" +LANGS="af be bg br ca cs cy da de el en eo es et fi fo fr ga gl he hr is it la +lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi" +for lang in ${LANGS}; do + dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )" + if [[ ${lang} == de ]] ; then + dep="linguas_${lang}? ( + || ( + app-dicts/aspell-${lang} + app-dicts/aspell-${lang}-alt + ) + )" + fi + PDEPEND+=" ${dep}" + IUSE+=" linguas_${lang}" +done +unset dep + +COMMON_DEPEND=" + >=sys-libs/ncurses-5.2 + nls? ( virtual/libintl )" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +# English dictionary 0.5 is incompatible with aspell-0.6 +RDEPEND="${COMMON_DEPEND} + !=app-dicts/aspell-en-0.5*" + +src_prepare() { + # 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 + fi + + epatch \ + "${FILESDIR}/${PN}-0.60.5-nls.patch" \ + "${FILESDIR}/${PN}-0.60.5-solaris.patch" \ + "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" + + rm m4/lt* m4/libtool.m4 + eautoreconf + elibtoolize --reverse-deps + + # Parallel install of libtool libraries doesn't always work. + # https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html + # 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 || die + +} + +src_configure() { + if has_version "sys-libs/ncurses[unicode]" ; then + CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)" + else + CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncurses)" + fi + + CURSES_LIB="${CURSES_LIB}" econf \ + $(use_enable nls) \ + --disable-static \ + --sysconfdir="${EPREFIX}"/etc/aspell \ + --enable-docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_install() { + default + + dodoc README* TODO + dohtml -r manual/aspell{,-dev}.html + docinto examples + dodoc "${S}"/examples/*.c + + # install ispell/aspell compatibility scripts + newbin scripts/ispell ispell-aspell + newbin scripts/spell spell-aspell + + prune_libtool_files +} + +pkg_postinst() { + elog "In case LINGUAS was not set correctly you may need to install" + elog "dictionaries now. Please choose an aspell- dictionary or" + elog "set LINGUAS correctly and let aspell pull in required packages." + elog "After installing an aspell dictionary for your language(s)," + elog "You may use the aspell-import utility to import your personal" + elog "dictionaries from ispell, pspell and the older aspell" +} diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml index 4538a68724a6..1470e032181b 100644 --- a/app-text/aspell/metadata.xml +++ b/app-text/aspell/metadata.xml @@ -1,5 +1,7 @@ -maintainer-needed@gentoo.org + + maintainer-needed@gentoo.org + -- 2.26.2