From caba8041dc81aa9b4557458e159ce3c5b0c32023 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 12 May 2008 22:40:28 +0000 Subject: Version bump, bug #219811, thank András for report. Fixed libtool-2.x breakage, bug #220114, reported by Alessandro Guido. Removed very old ebuild. (Portage version: 2.1.4.4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app-text/hunspell/ChangeLog | 12 ++- .../files/hunspell-1.2.2-libtool-2.22.patch | 16 +++ .../hunspell/files/hunspell-1.2.2-renameexes.patch | 115 +++++++++++++++++++++ app-text/hunspell/hunspell-1.1.3.ebuild | 55 ---------- app-text/hunspell/hunspell-1.2.2.ebuild | 80 ++++++++++++++ 5 files changed, 222 insertions(+), 56 deletions(-) create mode 100644 app-text/hunspell/files/hunspell-1.2.2-libtool-2.22.patch create mode 100644 app-text/hunspell/files/hunspell-1.2.2-renameexes.patch delete mode 100644 app-text/hunspell/hunspell-1.1.3.ebuild create mode 100644 app-text/hunspell/hunspell-1.2.2.ebuild (limited to 'app-text') diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog index 0231e14ecfb3..90712770fa36 100644 --- a/app-text/hunspell/ChangeLog +++ b/app-text/hunspell/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-text/hunspell # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.36 2008/03/12 12:51:52 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.37 2008/05/12 22:40:28 pva Exp $ + +*hunspell-1.2.2 (12 May 2008) + + 12 May 2008; Peter Volkov + +files/hunspell-1.2.2-libtool-2.22.patch, + +files/hunspell-1.2.2-renameexes.patch, -hunspell-1.1.3.ebuild, + +hunspell-1.2.2.ebuild: + Version bump, bug #219811, thank András for report. Fixed libtool-2.x + breakage, bug #220114, reported by Alessandro Guido. Removed very old + ebuild. 12 Mar 2008; Christian Heim metadata.xml: Removing Kevin Quinn (kevquinn, #93689) from metadata.xml. diff --git a/app-text/hunspell/files/hunspell-1.2.2-libtool-2.22.patch b/app-text/hunspell/files/hunspell-1.2.2-libtool-2.22.patch new file mode 100644 index 000000000000..f5c44b5728ae --- /dev/null +++ b/app-text/hunspell/files/hunspell-1.2.2-libtool-2.22.patch @@ -0,0 +1,16 @@ +=== modified file 'configure.ac' +--- configure.ac 2008-05-04 18:40:59 +0000 ++++ configure.ac 2008-05-04 18:41:05 +0000 +@@ -15,11 +15,6 @@ + AC_SUBST(HUNSPELL_VERSION_MAJOR) + AC_SUBST(HUNSPELL_VERSION_MINOR) + +-# library version +-LT_CURRENT=1 +-LT_REVISION=0 +-LT_AGE=0 +- + AC_CONFIG_SRCDIR([config.h.in]) + AC_CONFIG_HEADER([config.h]) + + diff --git a/app-text/hunspell/files/hunspell-1.2.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.2-renameexes.patch new file mode 100644 index 000000000000..17d65dc14232 --- /dev/null +++ b/app-text/hunspell/files/hunspell-1.2.2-renameexes.patch @@ -0,0 +1,115 @@ +=== modified file 'src/tools/Makefile.am' +--- src/tools/Makefile.am 2008-05-04 15:53:24 +0000 ++++ src/tools/Makefile.am 2008-05-04 15:55:45 +0000 +@@ -1,4 +1,4 @@ +-bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip ++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell-example hunspell hunspell-munch hunspell-unmunch hzip hunzip + + INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers + +@@ -6,23 +6,23 @@ + hunzip_SOURCES=hunzip.cxx + hunzip_LDADD = ../hunspell/libhunspell-1.2.la + +-munch_SOURCES=munch.c +-unmunch_SOURCES=unmunch.c ++hunspell_munch_SOURCES=munch.c ++hunspell_unmunch_SOURCES=unmunch.c + include_HEADERS=munch.h unmunch.h + +-example_SOURCES=example.cxx +-example_LDADD = ../hunspell/libhunspell-1.2.la ++hunspell_example_SOURCES=example.cxx ++hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la + + hunspell_SOURCES=hunspell.cxx + hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \ + ../parsers/libparsers.a @CURSESLIB@ @READLINELIB@ + +-analyze_SOURCES=analyze.cxx +-analyze_LDADD = ../hunspell/libhunspell-1.2.la +- +-chmorph_SOURCES=chmorph.cxx +-chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a +- +-noinst_PROGRAMS=example ++hunspell_analyze_SOURCES=analyze.cxx ++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la ++ ++hunspell_chmorph_SOURCES=chmorph.cxx ++hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a ++ ++noinst_PROGRAMS=hunspell-example + + EXTRA_DIST=makealias affixcompress + +=== modified file 'src/tools/example.cxx' +--- src/tools/example.cxx 2008-05-04 15:53:24 +0000 ++++ src/tools/example.cxx 2008-05-04 15:54:12 +0000 +@@ -17,8 +17,8 @@ + /* first parse the command line options */ + + if (argc < 4) { +- fprintf(stderr,"example (now it works with more dictionary files):\n"); +- fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n"); ++ fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n"); ++ fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n"); + exit(1); + } + + +=== modified file 'src/tools/munch.c' +--- src/tools/munch.c 2008-05-04 15:53:24 +0000 ++++ src/tools/munch.c 2008-05-04 15:56:18 +0000 +@@ -42,14 +42,14 @@ + wf = mystrdup(argv[1]); + } else { + fprintf(stderr,"correct syntax is:\n"); +- fprintf(stderr,"munch word_list_file affix_file\n"); ++ fprintf(stderr,"hunspell-munch word_list_file affix_file\n"); + exit(1); + } + if (argv[2]) { + af = mystrdup(argv[2]); + } else { + fprintf(stderr,"correct syntax is:\n"); +- fprintf(stderr,"munch word_list_file affix_file\n"); ++ fprintf(stderr,"hunspell-munch word_list_file affix_file\n"); + exit(1); + } + + +=== modified file 'src/tools/unmunch.c' +--- src/tools/unmunch.c 2008-05-04 15:53:24 +0000 ++++ src/tools/unmunch.c 2008-05-04 15:56:39 +0000 +@@ -39,14 +39,14 @@ + wf = mystrdup(argv[1]); + } else { + fprintf(stderr,"correct syntax is:\n"); +- fprintf(stderr,"unmunch dic_file affix_file\n"); ++ fprintf(stderr,"hunspell-unmunch dic_file affix_file\n"); + exit(1); + } + if (argv[2]) { + af = mystrdup(argv[2]); + } else { + fprintf(stderr,"correct syntax is:\n"); +- fprintf(stderr,"unmunch dic_file affix_file\n"); ++ fprintf(stderr,"hunspell-unmunch dic_file affix_file\n"); + exit(1); + } + + +=== modified file 'tests/test.sh' +--- tests/test.sh 2008-05-04 15:53:24 +0000 ++++ tests/test.sh 2008-05-04 15:57:07 +0000 +@@ -34,7 +34,7 @@ + shopt -s expand_aliases + + alias hunspell='../src/tools/hunspell' +-alias analyze='../src/tools/analyze' ++alias analyze='../src/tools/hunspell-analyze' + + if [ "$VALGRIND" != "" ]; then + rm -f $TEMPDIR/test.pid* + diff --git a/app-text/hunspell/hunspell-1.1.3.ebuild b/app-text/hunspell/hunspell-1.1.3.ebuild deleted file mode 100644 index aa6ac73c2ac6..000000000000 --- a/app-text/hunspell/hunspell-1.1.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.3.ebuild,v 1.2 2007/03/04 07:37:50 genone Exp $ - -inherit eutils multilib - -DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo." -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://hunspell.sourceforge.net/" - -SLOT="0" -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -IUSE="ncurses readline" -KEYWORDS="~x86" - -DEPEND="readline? ( sys-libs/readline ) - ncurses? ( sys-libs/ncurses ) - sys-devel/gettext" - -src_unpack() { - unpack ${A} - cd ${S} - sed -i -e 's:tail +:tail -n +:' ${S}/tests/test.sh ||\ - die "Failed to fix-up tail for POSIX compliance" - # Upstream package creates executables 'example', 'munch' - # and 'unmunch' which are too generic to be placed in - # /usr/bin - this patch prefixes them with 'hunspell-'. - # It modifies a Makefile.am file, hence autoreconf. - epatch ${FILESDIR}/hunspell-1.1.3-renameexes.patch - autoreconf -} - -src_compile() { - # I wanted to put the include files in /usr/include/hunspell - # but this means the openoffice build won't find them. - econf \ - $(use_with readline readline) \ - $(use_with ncurses ui) \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR=${D} install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - # hunspell is derived from myspell - dodoc AUTHORS.myspell README.myspell license.myspell -} - -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-." -} diff --git a/app-text/hunspell/hunspell-1.2.2.ebuild b/app-text/hunspell/hunspell-1.2.2.ebuild new file mode 100644 index 000000000000..6d5b9b614ad5 --- /dev/null +++ b/app-text/hunspell/hunspell-1.2.2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.2.ebuild,v 1.1 2008/05/12 22:40:28 pva Exp $ + +inherit eutils multilib autotools + +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 readline" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +DEPEND="readline? ( sys-libs/readline ) + ncurses? ( sys-libs/ncurses ) + sys-devel/gettext" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i -e 's:tail +:tail -n +:' "${S}"/tests/test.sh ||\ + die "Failed to fix-up tail for POSIX compliance" + + # 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}"/${P}-renameexes.patch + epatch "${FILESDIR}"/${P}-libtool-2.22.patch + + eautoreconf +} + +src_compile() { + # I wanted to put the include files in /usr/include/hunspell + # but this means the openoffice build won't find them. + econf \ + $(use_with readline readline) \ + $(use_with ncurses ui) \ + || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell || die "installing docs failed" + # hunspell is derived from myspell + dodoc AUTHORS.myspell README.myspell license.myspell || die "installing myspell docs failed" + + # Upstream install has a few problems - rather than try to figure out + # what's broken in the build system, just fix things up manually. + + # These are included by hunspell.hxx, but aren't installed by the install + # script. + insinto /usr/include/hunspell/ + doins license.myspell license.hunspell config.h + + # These are in the wrong place. + mv "${D}"/usr/include/munch.h "${D}"/usr/include/hunspell/munch.h + mv "${D}"/usr/include/unmunch.h "${D}"/usr/include/hunspell/unmunch.h + + # Libraries include the version in their name, so make a sensible + # default symlink. They should probably be libhunspell.so.1.1 etc. + dodir /usr/$(get_libdir) + cd "${D}"/usr/$(get_libdir) + ln -s libhunspell-1.2.so.0.0.0 libhunspell.so +} + +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-." +} -- cgit v1.2.3-65-gdbad