commit: bc77f50643c03ed18615006c56a27d2f68b78465 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 22 17:40:06 2023 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Dec 22 17:40:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc77f506
dev-lang/ferite: treeclean Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-lang/ferite/Manifest | 2 - dev-lang/ferite/ferite-1.1.17-r1.ebuild | 71 -------------------------- dev-lang/ferite/files/ferite-1.1.17-bool.patch | 62 ---------------------- dev-lang/ferite/files/ferite-pcre.patch | 26 ---------- dev-lang/ferite/metadata.xml | 8 --- profiles/package.mask | 6 --- 6 files changed, 175 deletions(-) diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest deleted file mode 100644 index 1811669168f2..000000000000 --- a/dev-lang/ferite/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ferite-1.1.17-slibtool.patch.bz2 3945 BLAKE2B d816ccab7a58049e9c6048a5c5f4e162d8444a7c998eab1eadc76eb212cb08f9b0b68a96a2cc9003fbf923ab0bf8a7c25bae4d6ef08cdd21de054cd2ed910aa3 SHA512 772ad133016cef5c20905dd7ef589ced3d5bba7a327ddcca0db4ab8b7e59eb9a2d521372ed18c16594f418ec9c7195b711ac5d4dba6bc900b74e93d14f9ce36b -DIST ferite-1.1.17.tar.gz 2174774 BLAKE2B 5e55ed4101bc5a9c031afef0d9bfcafdc0c498c4ddc712eb17e3059ebd55b925e6b0343113853b946a31a428e5f71c17a2365e629447bb504453b6a7d61358d8 SHA512 475983b865fba492661e59b7470b7e46889f29ed8ba829b112354963fafcbed6ab4d4677579337c1c4ed730c6fe02897743f56edae335ceda6277da975d1098f diff --git a/dev-lang/ferite/ferite-1.1.17-r1.ebuild b/dev-lang/ferite/ferite-1.1.17-r1.ebuild deleted file mode 100644 index f3c2cbc6de5e..000000000000 --- a/dev-lang/ferite/ferite-1.1.17-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A clean, lightweight, object oriented scripting language" -HOMEPAGE="http://ferite.sourceforge.net/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-slibtool.patch.bz2"; - -LICENSE="BSD" -SLOT="1" -KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=" - dev-libs/boehm-gc[threads] - >=dev-libs/libpcre-5:3 - dev-libs/libxml2:2 -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-pcre.patch - "${FILESDIR}"/${P}-bool.patch - "${WORKDIR}"/${P}-slibtool.patch -) - -src_prepare() { - default - - # use docsdir variable, install to DESTDIR - sed \ - -e '/docsdir =/!s:$(prefix)/share/doc/ferite:$(DESTDIR)$(docsdir):' \ - -i docs/Makefile.am || die - - # Install docs to /usr/share/doc/${PF}, not .../${PN} - sed \ - -e "s:doc/ferite:doc/${PF}:" \ - -i Makefile.am \ - docs/Makefile.am \ - scripts/test/Makefile.am \ - scripts/test/rmi/Makefile.am || die - - # Make sure we install in $(get_libdir), not lib - sed -i -e "s|\$prefix/lib|\$prefix/$(get_libdir)|g" configure.ac || die - - # We copy feritedoc to ${T} in src_install, then patch it in-situ - # note that this doesn't actually work right, currently - it still tries - # to pull from / instead of ${D}, and I can't figure out how to fix that - sed -i -e 's:$(prefix)/bin/:${T}/:' docs/Makefile.am || die - - eautoreconf -} - -src_configure() { - econf --libdir="${EPREFIX}/usr/$(get_libdir)" --disable-static -} - -src_install() { - cp tools/doc/feritedoc "${T}" || die - sed -i -e '/^prefix/s:prefix:${T}:g' "${T}"/feritedoc || die - sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'/usr/bin/ferite:' "${T}"/feritedoc || die - sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc || die - - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}/usr/lib" - emake DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install - - find "${D}" -name '*.la' -delete || die -} diff --git a/dev-lang/ferite/files/ferite-1.1.17-bool.patch b/dev-lang/ferite/files/ferite-1.1.17-bool.patch deleted file mode 100644 index ef92a2b41517..000000000000 --- a/dev-lang/ferite/files/ferite-1.1.17-bool.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit 797ba18741a03c6a1ccd8070b5f2629bcd6cf87f -Author: orbea <[email protected]> -Date: Tue May 11 07:13:35 2021 -0700 - - modules/xml: Rename the bool variable. - - This fixes compilation failures under some environments. - - xml_XML_TreeParser.c: In function ‘ferite_xml_XML_TreeParser_keepBlanks_b’: - xml_XML_TreeParser.c:10:9: error: two or more data types in declaration specifiers - 10 | char bool = FE_FALSE; - | ^~~~ - xml_XML_TreeParser.c:10:14: error: expected identifier or ‘(’ before ‘=’ token - - Signed-off-by: orbea <[email protected]> - -diff --git a/modules/xml/xml_XML_TreeParser.c b/modules/xml/xml_XML_TreeParser.c -index 886a901..25a2105 100644 ---- a/modules/xml/xml_XML_TreeParser.c -+++ b/modules/xml/xml_XML_TreeParser.c -@@ -7,17 +7,17 @@ - - FE_NATIVE_FUNCTION( ferite_xml_XML_TreeParser_keepBlanks_b ) - { -- char bool = FE_FALSE; -+ char fe_bool = FE_FALSE; - FeriteObject *self = FE_CONTAINER_TO_OBJECT; - FeriteObject *super = FE_CONTAINER_TO_OBJECT; - -- ferite_get_parameters( params, 1, &bool ); -+ ferite_get_parameters( params, 1, &fe_bool ); - - { /* Main function body. */ - #line 417 "xml.fec" - - XMLDoc *tree = (XMLDoc*)self->odata; -- tree->keepBlanks = bool; -+ tree->keepBlanks = fe_bool; - - } - FE_RETURN_VOID; -@@ -151,17 +151,17 @@ FE_NATIVE_FUNCTION( ferite_xml_XML_TreeParser_saveToFile_s ) - - FE_NATIVE_FUNCTION( ferite_xml_XML_TreeParser_validation_b ) - { -- char bool = FE_FALSE; -+ char fe_bool = FE_FALSE; - FeriteObject *self = FE_CONTAINER_TO_OBJECT; - FeriteObject *super = FE_CONTAINER_TO_OBJECT; - -- ferite_get_parameters( params, 1, &bool ); -+ ferite_get_parameters( params, 1, &fe_bool ); - - { /* Main function body. */ - #line 403 "xml.fec" - - -- if( bool == FE_FALSE ) -+ if( fe_bool == FE_FALSE ) - xmlDoValidityCheckingDefaultValue = 0; - else - xmlDoValidityCheckingDefaultValue = 1; diff --git a/dev-lang/ferite/files/ferite-pcre.patch b/dev-lang/ferite/files/ferite-pcre.patch deleted file mode 100644 index 1e2e19ce4811..000000000000 --- a/dev-lang/ferite/files/ferite-pcre.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -pruN ferite-1.1.17.orig/modules/regexp/regexp.fec ferite-1.1.17/modules/regexp/regexp.fec ---- ferite-1.1.17.orig/modules/regexp/regexp.fec 2009-07-15 19:21:34.000000000 +0200 -+++ ferite-1.1.17/modules/regexp/regexp.fec 2013-02-01 02:33:40.438849775 +0100 -@@ -427,7 +427,8 @@ class Regexp { - } - - /* get the number of subparts */ -- captured_str_cnt = pcre_info( rgx->compiled_re, NULL, NULL ) + 1; -+ pcre_fullinfo( rgx->compiled_re, NULL, PCRE_INFO_CAPTURECOUNT, &captured_str_cnt ); -+ captured_str_cnt++; - /* create an offset array */ - size_offsets = (int)(captured_str_cnt * 3); - offsets = (int *)fmalloc(size_offsets * sizeof(int)); -diff -pruN ferite-1.1.17.orig/modules/regexp/regexp_Regexp.c ferite-1.1.17/modules/regexp/regexp_Regexp.c ---- ferite-1.1.17.orig/modules/regexp/regexp_Regexp.c 2009-07-17 08:59:19.000000000 +0200 -+++ ferite-1.1.17/modules/regexp/regexp_Regexp.c 2013-02-01 02:33:16.647875845 +0100 -@@ -88,7 +88,8 @@ FE_NATIVE_FUNCTION( ferite_regexp_Regexp - } - - /* get the number of subparts */ -- captured_str_cnt = pcre_info( rgx->compiled_re, NULL, NULL ) + 1; -+ pcre_fullinfo( rgx->compiled_re, NULL, PCRE_INFO_CAPTURECOUNT, &captured_str_cnt ); -+ captured_str_cnt++; - /* create an offset array */ - size_offsets = (int)(captured_str_cnt * 3); - offsets = (int *)fmalloc(size_offsets * sizeof(int)); diff --git a/dev-lang/ferite/metadata.xml b/dev-lang/ferite/metadata.xml deleted file mode 100644 index f66fab297c15..000000000000 --- a/dev-lang/ferite/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">ferite</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 0be801ee6c0e..4887620e3253 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -358,12 +358,6 @@ dev-haskell/terminfo # Performance regression. Bug #916713. =dev-db/mydumper-0.15.1.3 -# Michał Górny <[email protected]> (2023-10-26) -# An unmaintained programming language with last release in 2009. -# Multiple bugs reported. No revdeps. -# Removal on 2023-11-25. -dev-lang/ferite - # Michał Górny <[email protected]> (2023-10-26) # Not installable due to conflict with sys-apps/coreutils. # Removal on 2023-11-25. Bug #908406.
