From 1bce1ecabecaba1b97ba4beabd9d0b568a2374fa Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 6 Nov 2022 11:37:53 +0100 Subject: app-text/opensp: Revert broken autoreconfing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the unnecessary autoreconf, as well as "configure" patch that modifies a macro that is never used. This is necessary as this package's build system is broken beyond repair, and autoreconf triggers the breakage. Closes: https://bugs.gentoo.org/880001 Signed-off-by: Michał Górny --- .../files/opensp-1.5.2-configure-clang16.patch | 13 ---- app-text/opensp/opensp-1.5.2-r8.ebuild | 88 ---------------------- app-text/opensp/opensp-1.5.2-r9.ebuild | 85 +++++++++++++++++++++ 3 files changed, 85 insertions(+), 101 deletions(-) delete mode 100644 app-text/opensp/files/opensp-1.5.2-configure-clang16.patch delete mode 100644 app-text/opensp/opensp-1.5.2-r8.ebuild create mode 100644 app-text/opensp/opensp-1.5.2-r9.ebuild diff --git a/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch b/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch deleted file mode 100644 index 468d0f1d306d..000000000000 --- a/app-text/opensp/files/opensp-1.5.2-configure-clang16.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -9,8 +9,9 @@ changequote([, ])dnl - AC_MSG_CHECKING(size of $1) - AC_CACHE_VAL(AC_CV_NAME, - [AC_TRY_RUN([#include -+#include - #include <$2> --main() -+int main(void) - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); diff --git a/app-text/opensp/opensp-1.5.2-r8.ebuild b/app-text/opensp/opensp-1.5.2-r8.ebuild deleted file mode 100644 index 743116acc69e..000000000000 --- a/app-text/opensp/opensp-1.5.2-r8.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -MY_P=${P/opensp/OpenSP} - -DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management" -HOMEPAGE="http://openjade.sourceforge.net/" -SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc nls static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext ) - doc? ( - app-text/xmlto - app-text/docbook-xml-dtd:4.1.2 - ) - test? ( - app-text/docbook-xml-dtd:4.5 - app-text/openjade - app-text/sgml-common - )" - -PATCHES=( - "${FILESDIR}"/${P}-fix-segfault.patch - "${FILESDIR}"/${P}-c11-using.patch - "${FILESDIR}"/${P}-configure-clang16.patch -) - -src_prepare() { - default - - # Needed for Clang 16 - eautoreconf -} - -src_configure() { - export CONFIG_SHELL=${BASH} # configure needs bash - - # The following filters are taken from openjade's ebuild. See bug #100828. - # Please note! Opts are disabled. If you know what you're doing - # feel free to remove this line. It may cause problems with - # docbook-sgml-utils among other things. - #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march" - strip-flags - - append-cxxflags -std=gnu++11 - - econf \ - --enable-http \ - --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \ - --enable-default-search-path="${EPREFIX}"/usr/share/sgml \ - --datadir="${EPREFIX}"/usr/share/sgml/${P} \ - $(use_enable nls) \ - $(use_enable doc doc-build) \ - $(use_enable static-libs static) -} - -src_compile() { - emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} -} - -src_test() { - # Skipping tests known not to work - emake SHOWSTOPPERS= check - SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \ - install - - find "${ED}" -name '*.la' -delete || die - - dodoc AUTHORS BUGS ChangeLog NEWS README -} diff --git a/app-text/opensp/opensp-1.5.2-r9.ebuild b/app-text/opensp/opensp-1.5.2-r9.ebuild new file mode 100644 index 000000000000..eab00d21392b --- /dev/null +++ b/app-text/opensp/opensp-1.5.2-r9.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +MY_P=${P/opensp/OpenSP} + +DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management" +HOMEPAGE="http://openjade.sourceforge.net/" +SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc nls static-libs test" +RESTRICT="!test? ( test )" + +RDEPEND="elibc_glibc? ( net-libs/libnsl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext ) + doc? ( + app-text/xmlto + app-text/docbook-xml-dtd:4.1.2 + ) + test? ( + app-text/docbook-xml-dtd:4.5 + app-text/openjade + app-text/sgml-common + )" + +PATCHES=( + "${FILESDIR}"/${P}-fix-segfault.patch + "${FILESDIR}"/${P}-c11-using.patch +) + +src_prepare() { + default + use prefix && eautoreconf +} + +src_configure() { + export CONFIG_SHELL=${BASH} # configure needs bash + + # The following filters are taken from openjade's ebuild. See bug #100828. + # Please note! Opts are disabled. If you know what you're doing + # feel free to remove this line. It may cause problems with + # docbook-sgml-utils among other things. + #ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march" + strip-flags + + append-cxxflags -std=gnu++11 + + econf \ + --enable-http \ + --enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \ + --enable-default-search-path="${EPREFIX}"/usr/share/sgml \ + --datadir="${EPREFIX}"/usr/share/sgml/${P} \ + $(use_enable nls) \ + $(use_enable doc doc-build) \ + $(use_enable static-libs static) +} + +src_compile() { + emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_test() { + # Skipping tests known not to work + emake SHOWSTOPPERS= check + SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \ + install + + find "${ED}" -name '*.la' -delete || die + + dodoc AUTHORS BUGS ChangeLog NEWS README +} -- cgit v1.2.3-65-gdbad