From f83057027a4ea60fd6b7e17281c1592c3f0095c5 Mon Sep 17 00:00:00 2001 From: "Kevin F. Quinn" Date: Thu, 30 Nov 2006 20:16:51 +0000 Subject: [PATCH] Set aspell-0.6 to block aspell-en-0.5 - bug #96794 Package-Manager: portage-2.1.2_rc2-r1 --- app-text/aspell/ChangeLog | 14 ++- app-text/aspell/Manifest | 28 ++++-- app-text/aspell/aspell-0.60.3-r1.ebuild | 71 +++++++++++++++ app-text/aspell/aspell-0.60.4-r1.ebuild | 86 +++++++++++++++++++ app-text/aspell/files/digest-aspell-0.60.3-r1 | 3 + app-text/aspell/files/digest-aspell-0.60.4-r1 | 3 + 6 files changed, 197 insertions(+), 8 deletions(-) create mode 100644 app-text/aspell/aspell-0.60.3-r1.ebuild create mode 100644 app-text/aspell/aspell-0.60.4-r1.ebuild create mode 100644 app-text/aspell/files/digest-aspell-0.60.3-r1 create mode 100644 app-text/aspell/files/digest-aspell-0.60.4-r1 diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog index c51b7f520592..767b836b2667 100644 --- a/app-text/aspell/ChangeLog +++ b/app-text/aspell/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for app-text/aspell # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.80 2006/04/28 01:58:33 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.81 2006/11/30 20:16:51 kevquinn Exp $ + +*aspell-0.60.4-r1 (30 Nov 2006) +*aspell-0.60.3-r1 (30 Nov 2006) + + 30 Nov 2006; Kevin F. Quinn + +aspell-0.60.3-r1.ebuild, +aspell-0.60.4-r1.ebuild: + Add blocker on aspell-en-0.5 - bumped so that any existing users with + aspell-en-0.5 installed will be prompted to deal with it. Bug #96794 + + 30 Nov 2006; Kevin F. Quinn aspell-0.60.4.ebuild: + Set WANT_AUTOMAKE to get correct dependencies for autotools, + for bug #156654 28 Apr 2006; Luca Barbato aspell-0.60.4.ebuild: Make absolutely sure altivec is disable diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest index 545ed2c0e98d..9b15f6880b80 100644 --- a/app-text/aspell/Manifest +++ b/app-text/aspell/Manifest @@ -40,18 +40,26 @@ EBUILD aspell-0.50.5-r4.ebuild 1963 RMD160 a380ed5e43290de2111133c2b93e8b21dbe3a MD5 ed7b5fe9822c09787e46ac71d6059a9c aspell-0.50.5-r4.ebuild 1963 RMD160 a380ed5e43290de2111133c2b93e8b21dbe3abc8 aspell-0.50.5-r4.ebuild 1963 SHA256 150ce057e454303c2736b0c007485c54b8df06e64e35871e3a0c99185578b30e aspell-0.50.5-r4.ebuild 1963 +EBUILD aspell-0.60.3-r1.ebuild 2005 RMD160 4e1e614cf239d0f85b3713cb369230ad45753e59 SHA1 3685cf3d788f55502ce1466834b647b0b78cab41 SHA256 0297c5d5a5225f9716c80f7f38b00f1a747a0827c1ef8b7b9a8de35ecf8fad6a +MD5 82fdb535b33b4b7694762408f2b3f72e aspell-0.60.3-r1.ebuild 2005 +RMD160 4e1e614cf239d0f85b3713cb369230ad45753e59 aspell-0.60.3-r1.ebuild 2005 +SHA256 0297c5d5a5225f9716c80f7f38b00f1a747a0827c1ef8b7b9a8de35ecf8fad6a aspell-0.60.3-r1.ebuild 2005 EBUILD aspell-0.60.3.ebuild 1835 RMD160 ab543eea853ee615b89e73fbf52f1751b4ee68b8 SHA1 b0a18c7e46d73a29f341b2fecc02a9a201a9d162 SHA256 0af7133bf797ea755653cfdfa08ba767929d56a2bd90f7426c0a4448a3e45e96 MD5 e67f599d5793e4b71209409651b42464 aspell-0.60.3.ebuild 1835 RMD160 ab543eea853ee615b89e73fbf52f1751b4ee68b8 aspell-0.60.3.ebuild 1835 SHA256 0af7133bf797ea755653cfdfa08ba767929d56a2bd90f7426c0a4448a3e45e96 aspell-0.60.3.ebuild 1835 +EBUILD aspell-0.60.4-r1.ebuild 2393 RMD160 555b1b461dc35703a634cfd386e17b8f86b831db SHA1 44e27efc4c0eca203bef2cdbb05ec3df20befd53 SHA256 6f33ed4e8367ceef3136cff0e838ff43adcb2e1564901f83b7a4bc43866cec57 +MD5 db73a1912c28d69ff6d59d3f43f4b770 aspell-0.60.4-r1.ebuild 2393 +RMD160 555b1b461dc35703a634cfd386e17b8f86b831db aspell-0.60.4-r1.ebuild 2393 +SHA256 6f33ed4e8367ceef3136cff0e838ff43adcb2e1564901f83b7a4bc43866cec57 aspell-0.60.4-r1.ebuild 2393 EBUILD aspell-0.60.4.ebuild 2225 RMD160 6ec904b6610b04724573eb55d04be3d454c5ba8e SHA1 3922d6d332ff6a474e22a3387376d764e06d461b SHA256 66f1c76690ceac9e0bc3c47888d1816bf0fcdd4e4289ed6b9e1b3e7b6b654ef9 MD5 6cd90446d124ec3313b710df78aa3e97 aspell-0.60.4.ebuild 2225 RMD160 6ec904b6610b04724573eb55d04be3d454c5ba8e aspell-0.60.4.ebuild 2225 SHA256 66f1c76690ceac9e0bc3c47888d1816bf0fcdd4e4289ed6b9e1b3e7b6b654ef9 aspell-0.60.4.ebuild 2225 -MISC ChangeLog 12679 RMD160 968dca4043a59105a16754e4fdd338f87701f9f1 SHA1 da6fc6e680cf04bc13f746f4e733adbf9c722c50 SHA256 9cfd727e1b6dccb635201a3ae4f98677ab4e130430aafd455c12ff4cff55aa3a -MD5 c0ba43b5dc55c4c5b34298fd47507732 ChangeLog 12679 -RMD160 968dca4043a59105a16754e4fdd338f87701f9f1 ChangeLog 12679 -SHA256 9cfd727e1b6dccb635201a3ae4f98677ab4e130430aafd455c12ff4cff55aa3a ChangeLog 12679 +MISC ChangeLog 13151 RMD160 b1206910b56821bc329cebd1213dd505450019da SHA1 5726f9679a576e7dd41d3190164a04bc5f77c6c3 SHA256 11a66b7acce619a193612fdb17b5cd4c24a1ee46b3af2ce0298e758d1669da14 +MD5 514a312f279017666bf460acc8a425ab ChangeLog 13151 +RMD160 b1206910b56821bc329cebd1213dd505450019da ChangeLog 13151 +SHA256 11a66b7acce619a193612fdb17b5cd4c24a1ee46b3af2ce0298e758d1669da14 ChangeLog 13151 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162 @@ -62,13 +70,19 @@ SHA256 0dddbdd293f12296619ab96259dddf175dc0a6314a010b43cab8ac005ee78970 files/di MD5 151a99e1bb850fd21a22040f28896a65 files/digest-aspell-0.60.3 244 RMD160 08daabb41d3eb0244f74f700249db7a703870de7 files/digest-aspell-0.60.3 244 SHA256 9ef8e677e98980fb13ab0045f7ab0212619665c93f09d2e30d97bb53b3a1ea59 files/digest-aspell-0.60.3 244 +MD5 151a99e1bb850fd21a22040f28896a65 files/digest-aspell-0.60.3-r1 244 +RMD160 08daabb41d3eb0244f74f700249db7a703870de7 files/digest-aspell-0.60.3-r1 244 +SHA256 9ef8e677e98980fb13ab0045f7ab0212619665c93f09d2e30d97bb53b3a1ea59 files/digest-aspell-0.60.3-r1 244 MD5 742b66b2d53df76b2e76c9fa9937f838 files/digest-aspell-0.60.4 244 RMD160 28b6eeece11d0a579b09665992b8b68fadd22028 files/digest-aspell-0.60.4 244 SHA256 0222993b12f226559c09ef722ec79db18ba949895656e1e7f0cd481ee1b62796 files/digest-aspell-0.60.4 244 +MD5 742b66b2d53df76b2e76c9fa9937f838 files/digest-aspell-0.60.4-r1 244 +RMD160 28b6eeece11d0a579b09665992b8b68fadd22028 files/digest-aspell-0.60.4-r1 244 +SHA256 0222993b12f226559c09ef722ec79db18ba949895656e1e7f0cd481ee1b62796 files/digest-aspell-0.60.4-r1 244 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFbytpZfNLSOUrp0sRAlniAJ4iWeL1ycuAQ6h3Tliyl6DMH3CVCQCgj4io -sOXycyfpl5/PAx2qfyMjfPI= -=MM35 +iD8DBQFFbzyYZfNLSOUrp0sRAn6fAKCDPI/r/0pCA6e92wJyWSPdDAmgdgCgy3XX +0l+FvB2GUrHd0Zj5n08VWsk= +=TvRP -----END PGP SIGNATURE----- diff --git a/app-text/aspell/aspell-0.60.3-r1.ebuild b/app-text/aspell/aspell-0.60.3-r1.ebuild new file mode 100644 index 000000000000..9dffc34d874e --- /dev/null +++ b/app-text/aspell/aspell-0.60.3-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3-r1.ebuild,v 1.1 2006/11/30 20:16:51 kevquinn Exp $ + +inherit libtool eutils flag-o-matic + +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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sh ~sparc ~x86" +IUSE="gpm" +# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together + +DEPEND=">=sys-libs/ncurses-5.2 + gpm? ( sys-libs/gpm ) + !=app-dicts/aspell-en-0.5*" +# English dictionary 0.5 is incompatible with aspell-0.6 + +src_unpack() { + unpack ${A}; cd ${S} + epatch ${FILESDIR}/${P}-templateinstantiations.patch +} + +src_compile() { + [ "${ARCH}" == "ppc" ] && append-flags -O2 -fsigned-char + use gpm && append-ldflags -lgpm + filter-flags -fno-rtti + filter-flags -fvisibility=hidden #77109 + elibtoolize --reverse-deps + + econf \ + --disable-static \ + --sysconfdir=/etc/aspell \ + --enable-docdir=/usr/share/doc/${PF} || die + + emake || die +} + +src_install() { + dodoc README* TODO + + make DESTDIR="${D}" install || die + mv ${D}/usr/share/doc/${PF}/man-html ${D}/usr/share/doc/${PF}/html + mv ${D}/usr/share/doc/${PF}/man-text ${D}/usr/share/doc/${PF}/text + + # install ispell/aspell compatibility scripts + exeinto /usr/bin + newexe scripts/ispell ispell-aspell + newexe scripts/spell spell-aspell + + cd examples + make clean || die + docinto examples + dodoc ${S}/examples/* +} + +pkg_postinst() { + einfo "You will need to install a dictionary now. Please choose an" + einfo "aspell- dictionary from the app-dicts category" + einfo "After installing an aspell dictionary for your language(s)," + einfo "You may use the aspell-import utility to import your personal" + einfo "dictionaries from ispell, pspell and the older aspell" + + ewarn "" + ewarn "Please re-emerge ALL your aspell-LANG dictionaries" + ewarn "" + ebeep 5 +} diff --git a/app-text/aspell/aspell-0.60.4-r1.ebuild b/app-text/aspell/aspell-0.60.4-r1.ebuild new file mode 100644 index 000000000000..398a5eb099de --- /dev/null +++ b/app-text/aspell/aspell-0.60.4-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.4-r1.ebuild,v 1.1 2006/11/30 20:16:51 kevquinn Exp $ + +# N.B. This is before inherit of autotools, as autotools.eclass adds the +# relevant dependencies to DEPEND. +WANT_AUTOMAKE="1.9" + +inherit libtool eutils flag-o-matic autotools + +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="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="gpm nls" +# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together + +RDEPEND=">=sys-libs/ncurses-5.2 + gpm? ( sys-libs/gpm ) + nls? ( virtual/libintl ) + !=app-dicts/aspell-en-0.5*" +# English dictionary 0.5 is incompatible with aspell-0.6 + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/aspell-0.60.3-templateinstantiations.patch + epatch "${FILESDIR}"/aspell-0.60.4-gcc-4.1-fix.patch + epatch "${FILESDIR}/${P}-nls.patch" + + eautomake + elibtoolize --reverse-deps +} + +src_compile() { + use gpm && append-ldflags -lgpm + filter-flags -fno-rtti + filter-flags -fvisibility=hidden #77109 + filter-flags -maltivec -mabi=altivec + use ppc && append-flags -mno-altivec + + econf \ + $(use_enable nls) \ + --disable-static \ + --sysconfdir=/etc/aspell \ + --enable-docdir=/usr/share/doc/${PF} || die + + emake || die +} + +src_install() { + dodoc README* TODO + + make DESTDIR="${D}" install || die + mv "${D}"/usr/share/doc/${PF}/man-html "${D}"/usr/share/doc/${PF}/html + mv "${D}"/usr/share/doc/${PF}/man-text "${D}"/usr/share/doc/${PF}/text + + # install ispell/aspell compatibility scripts + exeinto /usr/bin + newexe scripts/ispell ispell-aspell + newexe scripts/spell spell-aspell + + cd examples + make clean || die + docinto examples + dodoc ${S}/examples/* +} + +pkg_postinst() { + einfo "You will need to install a dictionary now. Please choose an" + einfo "aspell- dictionary from the app-dicts category" + einfo "After installing an aspell dictionary for your language(s)," + einfo "You may use the aspell-import utility to import your personal" + einfo "dictionaries from ispell, pspell and the older aspell" + + ewarn "" + ewarn "Please re-emerge ALL your aspell-LANG dictionaries" + ewarn "" + ebeep 5 +} diff --git a/app-text/aspell/files/digest-aspell-0.60.3-r1 b/app-text/aspell/files/digest-aspell-0.60.3-r1 new file mode 100644 index 000000000000..6d2305a29844 --- /dev/null +++ b/app-text/aspell/files/digest-aspell-0.60.3-r1 @@ -0,0 +1,3 @@ +MD5 ca44ac2fcfdc7213e03d3b5610ce141a aspell-0.60.3.tar.gz 1635824 +RMD160 92e0dd8e271a48f73407e23c2d0246f2827e1789 aspell-0.60.3.tar.gz 1635824 +SHA256 0403ee33f680325aacf200a967062010a959bfd0c35ab55e0049dfec57e9d21c aspell-0.60.3.tar.gz 1635824 diff --git a/app-text/aspell/files/digest-aspell-0.60.4-r1 b/app-text/aspell/files/digest-aspell-0.60.4-r1 new file mode 100644 index 000000000000..b06cd5ec9fa6 --- /dev/null +++ b/app-text/aspell/files/digest-aspell-0.60.4-r1 @@ -0,0 +1,3 @@ +MD5 4f1737e726d66476b9c7388831305510 aspell-0.60.4.tar.gz 1676825 +RMD160 e0408acd4f3304c957aeea0b17a28d0c44e11064 aspell-0.60.4.tar.gz 1676825 +SHA256 8931d8644da9a71fdd970cafe9d6c20d796ad1d8ef2aaf89a801171104e426e4 aspell-0.60.4.tar.gz 1676825 -- 2.26.2