From 74656a76316554c942acd3c37cae96dd2517fcd4 Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Tue, 4 May 2021 08:41:30 +0200 Subject: ispell freesci ipe libspiro kccmp avidemux: Bumps, gcc-11, fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Väth --- app-text/ispell/Manifest | 2 - .../ispell/files/ispell-3.3.02-glibc-2.10.patch | 48 ----------------- app-text/ispell/ispell-3.3.02-r1.ebuild | 54 ------------------- app-text/ispell/ispell-3.4.00-r1.ebuild | 62 ++++++++++++++++++++++ app-text/ispell/ispell-3.4.00.ebuild | 55 ------------------- app-text/ispell/metadata.xml | 3 ++ 6 files changed, 65 insertions(+), 159 deletions(-) delete mode 100644 app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch delete mode 100644 app-text/ispell/ispell-3.3.02-r1.ebuild create mode 100644 app-text/ispell/ispell-3.4.00-r1.ebuild delete mode 100644 app-text/ispell/ispell-3.4.00.ebuild (limited to 'app-text/ispell') diff --git a/app-text/ispell/Manifest b/app-text/ispell/Manifest index d4f2733e..46b01419 100644 --- a/app-text/ispell/Manifest +++ b/app-text/ispell/Manifest @@ -1,3 +1 @@ -DIST ispell-3.3.02-gentoo-0.3.diff.bz2 5912 SHA512 839285c4b24788761d41712a15eb5a78fe3b590ff4462bf7ca64b785a4de59887ee4264c2b909ec3047a446ea04b3aaeb2cb8d141811f7f02354ac9fbc577ab2 -DIST ispell-3.3.02.tar.gz 619813 SHA512 d1614cf21bc09becb729bc476ea839877cce7f7a9cb36f2ae862acf2e15dd758f1477615878539ff3685e125583e431f647fca0ec3466e81efc21651eecad940 DIST ispell-3.4.00.tar.gz 638770 SHA512 790475e7e296554221679b59856f256889a7193ab39e7314174f92364eaf4b658cc7e6b4f4b7892fa8f3cf0c022d933fc0c995c5e414987cbdcde27723e3da31 diff --git a/app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch b/app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch deleted file mode 100644 index 8ccd5cc7..00000000 --- a/app-text/ispell/files/ispell-3.3.02-glibc-2.10.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur ispell-3.3.02.orig/correct.c ispell-3.3.02/correct.c ---- ispell-3.3.02.orig/correct.c 2009-08-06 18:28:32.000000000 +0300 -+++ ispell-3.3.02/correct.c 2009-08-06 18:28:57.000000000 +0300 -@@ -247,7 +247,7 @@ - struct flagent * sufent, - ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], - int * nsaved)); --static char * getline P ((char * buf, int bufsize)); -+static char * get_line P ((char * buf, int bufsize)); - void askmode P ((void)); - void copyout P ((unsigned char ** cc, int cnt)); - static void lookharder P ((unsigned char * string)); -@@ -573,7 +573,7 @@ - - imove (li - 1, 0); - (void) putchar ('!'); -- if (getline ((char *) buf, sizeof buf) == NULL) -+ if (get_line ((char *) buf, sizeof buf) == NULL) - { - (void) putchar (7); - ierase (); -@@ -598,7 +598,7 @@ - (void) printf ("%s ", CORR_C_READONLY); - } - (void) printf (CORR_C_REPLACE_WITH); -- if (getline ((char *) ctok, ctokl) == NULL) -+ if (get_line ((char *) ctok, ctokl) == NULL) - { - (void) putchar (7); - /* Put it back */ -@@ -666,7 +666,7 @@ - unsigned char buf[100]; - imove (li - 1, 0); - (void) printf (CORR_C_LOOKUP_PROMPT); -- if (getline ((char *) buf, sizeof buf) == NULL) -+ if (get_line ((char *) buf, sizeof buf) == NULL) - { - (void) putchar (7); - ierase (); -@@ -1585,7 +1585,7 @@ - return; - } - --static char * getline (s, len) -+static char * get_line (s, len) - register char * s; - register int len; - { diff --git a/app-text/ispell/ispell-3.3.02-r1.ebuild b/app-text/ispell/ispell-3.3.02-r1.ebuild deleted file mode 100644 index 8f4b40ed..00000000 --- a/app-text/ispell/ispell-3.3.02-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors and Martin V\"ath -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -RESTRICT="mirror" -inherit toolchain-funcs - -PATCH_VER="0.3" - -DESCRIPTION="fast screen-oriented spelling checker" -HOMEPAGE="https://fmg-www.cs.ucla.edu/geoff/ispell.html" -SRC_URI="https://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz - mirror://gentoo/${P}-gentoo-${PATCH_VER}.diff.bz2" - -LICENSE="HPND" -SLOT="0/3.3.02" -KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - sys-apps/miscfiles - sys-libs/ncurses:0= -" -DEPEND="${RDEPEND}" - -src_prepare() { - eapply "${FILESDIR}"/${P}-glibc-2.10.patch - eapply -p0 "${WORKDIR}"/${P}-gentoo-${PATCH_VER}.diff - sed -e "s:GENTOO_LIBDIR:$(get_libdir):" -i local.h || die - sed -e "s:\(^#define CC\).*:\1 \"$(tc-getCC)\":" -i local.h || die - sed -e "s:\(^#define CFLAGS\).*:\1 \"${CFLAGS}\":" -i config.X || die - default -} - -src_configure() { - # Prepare config.sh for installation phase to avoid twice rebuild - emake -j1 config.sh - sed \ - -e "s:^\(BINDIR='\)\(.*\):\1${ED}\2:" \ - -e "s:^\(LIBDIR='\)\(.*\):\1${ED}\2:" \ - -e "s:^\(MAN1DIR='\)\(.*\):\1${ED}\2:" \ - -e "s:^\(MAN45DIR='\)\(.*\):\1${ED}\2:" \ - < config.sh > config.sh.install -} - -src_compile() { - emake -j1 -} - -src_install() { - mv config.sh.install config.sh - emake -j1 install - dodoc CHANGES Contributors README WISHES -} diff --git a/app-text/ispell/ispell-3.4.00-r1.ebuild b/app-text/ispell/ispell-3.4.00-r1.ebuild new file mode 100644 index 00000000..4e9bcae0 --- /dev/null +++ b/app-text/ispell/ispell-3.4.00-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors and Martin V\"ath +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +RESTRICT="mirror" +inherit toolchain-funcs + +DESCRIPTION="fast screen-oriented spelling checker" +HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html" +SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz" + +LICENSE="HPND" +SLOT="0/3.4.00" +KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="+tinfo" + +RDEPEND=" + sys-apps/miscfiles + sys-libs/ncurses:0=[tinfo=] +" +DEPEND="${RDEPEND}" + +src_prepare() { + local tinfo + if use tinfo ; then + tinfo='s:\(^#define TERMLIB\).*:\1 "-ltinfo":' + else + tinfo= + fi + sed -i \ + -e 's:\(^#define CC\).*:\1 "'"$(tc-getCC)"'":' \ + -e 's:\(^#define CFLAGS\).*:\1 "'"${CFLAGS}"'":' \ + ${tinfo:+-e "${tinfo}"} \ + -- "${S}"/config.X || die + sed -i \ + -e 's:/usr/local/man:'"${EPREFIX}"'/usr/share/man:' \ + -e 's:/usr/local/lib:'"${EPREFIX}"'/usr/'"$(get_libdir)/${PN}:" \ + -e 's:/usr/local:'"${EPREFIX}"'/usr:' \ + -- "${S}"/local.h.* || die + default +} + +src_configure() { + # Prepare config.sh for installation phase to avoid twice rebuild + emake -j1 config.sh + sed \ + -e "s:^\(BINDIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ + -e "s:^\(LIBDIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ + -e "s:^\(MAN1DIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ + -e "s:^\(MAN45DIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ + < config.sh > config.sh.install +} + +src_compile() { + emake -j1 +} + +src_install() { + mv config.sh.install config.sh + emake -j1 install + dodoc CHANGES Contributors README WISHES +} diff --git a/app-text/ispell/ispell-3.4.00.ebuild b/app-text/ispell/ispell-3.4.00.ebuild deleted file mode 100644 index 2e7bcf01..00000000 --- a/app-text/ispell/ispell-3.4.00.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors and Martin V\"ath -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -RESTRICT="mirror" -inherit toolchain-funcs - -DESCRIPTION="fast screen-oriented spelling checker" -HOMEPAGE="http://fmg-www.cs.ucla.edu/geoff/ispell.html" -SRC_URI="http://fmg-www.cs.ucla.edu/geoff/tars/${P}.tar.gz" - -LICENSE="HPND" -SLOT="0/3.4.00" -KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - sys-apps/miscfiles - sys-libs/ncurses:0= -" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i \ - -e 's:/usr/local/man:'"${EPREFIX}"'/usr/share/man:' \ - -e 's:/usr/local/lib:'"${EPREFIX}"'/usr/'"$(get_libdir)/${PN}:" \ - -e 's:/usr/local:'"${EPREFIX}"'/usr:' \ - -- "${S}"/local.h.* || die - sed -i \ - -e 's:\(^#define CC\).*:\1 "'"$(tc-getCC)"'":' \ - -e 's:\(^#define CFLAGS\).*:\1 "'"${CFLAGS}"'":' \ - -- "${S}"/config.X || die - default -} - -src_configure() { - # Prepare config.sh for installation phase to avoid twice rebuild - emake -j1 config.sh - sed \ - -e "s:^\(BINDIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ - -e "s:^\(LIBDIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ - -e "s:^\(MAN1DIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ - -e "s:^\(MAN45DIR='\)${EPREFIX}\(/usr.*\):\1${ED}\2:" \ - < config.sh > config.sh.install -} - -src_compile() { - emake -j1 -} - -src_install() { - mv config.sh.install config.sh - emake -j1 install - dodoc CHANGES Contributors README WISHES -} diff --git a/app-text/ispell/metadata.xml b/app-text/ispell/metadata.xml index 097975e3..c389fb06 100644 --- a/app-text/ispell/metadata.xml +++ b/app-text/ispell/metadata.xml @@ -1,4 +1,7 @@ + + Whether to support (and require) sys-libs/ncurses[tinfo]. + -- cgit v1.2.3-65-gdbad