commit: a9b0b249a1ed19e6f3570d39353e9f783b5e861c Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Thu Oct 20 08:56:38 2022 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Thu Oct 20 09:01:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b0b249
app-text/a2ps: Fix function declaration Update to EAPI 8. Specify LICENSE more precisely. Closes: https://bugs.gentoo.org/870763 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> app-text/a2ps/a2ps-4.14-r8.ebuild | 146 ++++++++++++++++++++++ app-text/a2ps/files/a2ps-4.14-configure.ac.patch | 11 ++ app-text/a2ps/files/a2ps-4.14-function-decl.patch | 12 ++ 3 files changed, 169 insertions(+) diff --git a/app-text/a2ps/a2ps-4.14-r8.ebuild b/app-text/a2ps/a2ps-4.14-r8.ebuild new file mode 100644 index 000000000000..3424f0792726 --- /dev/null +++ b/app-text/a2ps/a2ps-4.14-r8.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic + +DESCRIPTION="Any to PostScript filter" +HOMEPAGE="https://www.gnu.org/software/a2ps/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz + cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )" +S="${WORKDIR}/${PN}-${PV:0:4}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="cjk emacs latex nls static-libs vanilla" + +RESTRICT="test" + +RDEPEND="app-text/ghostscript-gpl + app-text/libpaper:= + >=app-text/psutils-1.17 + app-text/wdiff + >=sys-apps/coreutils-6.10-r1 + emacs? ( >=app-editors/emacs-23.1:* ) + latex? ( virtual/latex-base ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/gperf-2.7.2 + virtual/yacc + nls? ( sys-devel/gettext )" + +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + default + + eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff + use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff + if use cjk; then + eapply "${WORKDIR}"/${P}-ja_nls.patch + # bug #335803 + eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch + else + eapply "${FILESDIR}"/${P}-cleanup.patch + fi + + # fix fnmatch replacement, bug #134546 + eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch + + # bug #122026 + eapply "${FILESDIR}"/${P}-psset.patch + + # fix emacs printing, bug #114627 + eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch + + # fix chmod error, #167670 + eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch + + # add configure check for mempcpy, bug 216588 + eapply "${FILESDIR}"/${P}-check-mempcpy.patch + + # fix compilation error due to invalid stpcpy() prototype, bug 216588 + eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch + + # fix compilation error due to obstack.h issue, bug 269638 + eapply "${FILESDIR}"/${P}-ptrdiff_t.patch + + # fix compilation error due to texinfo 5.x, bug 482748 + eapply "${FILESDIR}"/${P}-texinfo-5.x.patch + + # fix CVE-2014-0466, bug 506352 + eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch + + # fix CVE-2001-1593, bug 507024 + eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch + + # specify encoding explicitly, bug #695918 + eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch + + # fix function declaration, bug 870763 + eapply "${FILESDIR}"/${P}-function-decl.patch + + # update reference in man/Makefile.maint + eapply "${FILESDIR}"/${P}-configure.ac.patch + + # fix building with sys-devel/automake >= 1.12, bug 420503 + rm -f {.,ogonkify}/aclocal.m4 || die + sed -i \ + -e '/^AM_C_PROTOTYPES/d' \ + -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ + -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ + configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die + + eautoreconf +} + +src_configure() { + append-cppflags -DPROTOTYPES #420503 + + export LANG=C LC_ALL=C + + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + --sysconfdir="${EPREFIX}"/etc/a2ps \ + $(use_enable nls) \ + COM_netscape=no \ + COM_acroread=no \ + $(usev !latex COM_latex=no) \ + $(usev !emacs EMACS=no) +} + +src_compile() { + # parallel make b0rked + emake -j1 +} + +src_install() { + emake \ + DESTDIR="${D}" \ + lispdir="${EPREFIX}${SITELISP}"/${PN} \ + install + + newdoc "${ED}"/usr/share/a2ps/README README.a2ps + newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd + newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify + + rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die + + find "${ED}" -name '*.la' -delete || die + + use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE} + + dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/app-text/a2ps/files/a2ps-4.14-configure.ac.patch b/app-text/a2ps/files/a2ps-4.14-configure.ac.patch new file mode 100644 index 000000000000..58cbe4bca478 --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-configure.ac.patch @@ -0,0 +1,11 @@ +--- a2ps-4.14/man/Makefile.maint ++++ a2ps-4.14/man/Makefile.maint +@@ -4,7 +4,7 @@ + HELP2MAN-run = $(PERL) -w -- $(srcdir)/$(HELP2MAN) + + # Depend on configure.in to get version number changes. +-$(man_MANS): $(top_srcdir)/configure.in common.x ++$(man_MANS): $(top_srcdir)/configure.ac common.x + + # Depend on the source file containing the --help text. + # Filter out irregular cases. diff --git a/app-text/a2ps/files/a2ps-4.14-function-decl.patch b/app-text/a2ps/files/a2ps-4.14-function-decl.patch new file mode 100644 index 000000000000..1b330723e95b --- /dev/null +++ b/app-text/a2ps/files/a2ps-4.14-function-decl.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/870763 + +--- a2ps-4.14/lib/path-concat.c ++++ a2ps-4.14/lib/path-concat.c +@@ -26,6 +26,7 @@ + #endif + + #include <stdio.h> ++#include <stdlib.h> + #if HAVE_STRING_H + # include <string.h> + #endif
