* [gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/, app-text/linuxdoc-tools/files/
@ 2015-11-26 10:07 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-11-26 10:07 UTC (permalink / raw
To: gentoo-commits
commit: d10298f46a9f35fe22b59be9b3a8370a5cce1e0a
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Thu Nov 26 01:22:23 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 01:25:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d10298f4
app-text/linuxdoc-tools: fix parallel doc build
Addresses QA warning when built with '+doc' USE. Minor ebuild cleanups.
...uxdoc-tools-0.9.71-fix-parallel-doc-build.patch | 185 +++++++++++++++++++++
.../linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild | 8 +-
2 files changed, 190 insertions(+), 3 deletions(-)
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch
new file mode 100644
index 0000000..76256da
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch
@@ -0,0 +1,185 @@
+See https://gitlab.com/agmartin/linuxdoc-tools/issues/4
+
+diff --git a/Makefile.in b/Makefile.in
+index adb85d0..7038d97 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -83,13 +83,14 @@ ifneq ($(BUILDDOC_FORMATS),)
+ # -- Build documentation
+ @echo "Building documentation ..."
+ (cd doc; \
++ MAKE="$(MAKE)" \
+ PREFIX=$(prefix) \
+ BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
+ BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
+- PKGPERL5LIB=$(CURDIR)/perl5lib \
+- PKGDATADIR=$(CURDIR)/lib \
++ PKGPERL5LIB=$(CURDIR)/perl5lib \
++ PKGDATADIR=$(CURDIR)/lib \
+ PKGENTITYMAPDIR=$(CURDIR)/entity-map \
+- BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
++ BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
+ sh Makedoc.sh)
+ endif
+
+diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
+index b7e2efb..da4be99 100644
+--- a/doc/Makedoc.sh
++++ b/doc/Makedoc.sh
+@@ -33,7 +33,7 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; then
+ # Create a modified EntityMap.pm with entity-map location in doc
+ # build temporary dir. Need to properly install entity-map there.
+ mkdir $TMPDIR/Text
+- make -C ../entity-map install DESTDIR="$TMPDIR"
++ ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
+ sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
+ -e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
+ -e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
+@@ -49,7 +49,7 @@ fi
+ if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
+ # --without-installed-iso-entities: Install iso-entities in
+ # "$TMPDIR/usr" and set it as iso-entities prefix.
+- make -C ../iso-entities install DESTDIR="$TMPDIR"
++ ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
+ ISOENTITIES_PREFIX="${TMPDIR}/usr"
+ else
+ # --with-installed-iso-entities: Use system prefix.
+@@ -88,45 +88,42 @@ fi
+
+ # Build actual documentation
+ echo "- Building documentation for formats: ${BUILDDOC_FORMATS}" >&2
++BUILDDOC_MAKE=""
+ for docformat in ${BUILDDOC_FORMATS}; do
+ case ${docformat} in
+ txt)
+- echo "- Building txt docs" >&2
+ if [ -n "`which groff`" ]; then
+- $TMPDIR/linuxdoc --backend=txt --filter --blanks=1 ./guide.sgml
++ echo "- Add to build list: guide.txt" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.txt"
+ else
+ echo "- ++ Warning: groff not available, cannot build \"${docformat}\" format." >&2
+ fi
+ ;;
+ pdf)
+- echo "- Building pdf docs" >&2
+- $TMPDIR/linuxdoc --backend=latex --output=pdf \
+- --pass="\usepackage{times}" ./guide.sgml
++ echo "- Add to build list: guide.pdf" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.pdf"
+ ;;
+ info)
+- echo "- Building info docs" >&2
+- $TMPDIR/linuxdoc --backend=info ./guide.sgml
++ echo "- Add to build list: guide.info" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.info"
+ ;;
+ lyx)
+- echo "- Building lyx docs" >&2
+- $TMPDIR/linuxdoc --backend=lyx ./guide.sgml
++ echo "- Add to build list: guide.lyx" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.lyx"
+ ;;
+ html)
+- echo "- Building html docs" >&2
+- $TMPDIR/linuxdoc --imagebuttons --backend=html ./guide.sgml \
+- && mv -f ./guide*.html ./html
++ echo "- Add to build list: guide.html" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} html/guide.html"
+ ;;
+ rtf)
+- echo "- Building rtf docs" >&2
+- $TMPDIR/linuxdoc --backend=rtf ./guide.sgml && if [ ! -d ./rtf ]; \
+- then mkdir -m 755 ./rtf; fi && mv -f ./guide*.rtf ./rtf
++ echo "- Add to build list: guide.rtf" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} rtf/guide.rtf"
+ ;;
+ dvi+ps)
+ echo "- Building latex docs" >&2
+ if [ -n "`which latex`" ]; then
+- echo "- Building dvi docs" >&2
+- $TMPDIR/linuxdoc --backend=latex --output=dvi \
+- --pass="\usepackage{times}" ./guide.sgml
++ echo "- Add to build list: guide.dvi" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.dvi"
+
+ if [ -n "`which dvips`" ]; then
+ echo " + dvips" >&2
+@@ -137,9 +134,13 @@ for docformat in ${BUILDDOC_FORMATS}; do
+ DVIPS_PAPER="letter"
+ fi
+ fi
+- dvips -t ${DVIPS_PAPER} -o ./guide.ps ./guide.dvi
+- if [ -n "`which gzip`" -a -f ./guide.ps ]; then
+- gzip -fn ./guide.ps
++
++ if [ -n "`which gzip`" ]; then
++ echo "- Add to build list: guide.ps.gz" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps.gz"
++ else
++ echo "- Add to build list: guide.ps" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps"
+ fi
+ else
+ echo "- ++ Warning: dvips not available, cannot build \"guide.ps\"." >&2
+@@ -156,7 +157,9 @@ for docformat in ${BUILDDOC_FORMATS}; do
+ esac
+ done
+
++${MAKE} TMPDIR="${TMPDIR}" DVIPS_PAPER="${DVIPS_PAPER}" ${BUILDDOC_MAKE}
++
+ # Remove temporary directory.
+-rm -rf $TMPDIR
++rm -rf "${TMPDIR}"
+
+ exit 0
+diff --git a/doc/Makefile b/doc/Makefile
+new file mode 100644
+index 0000000..79c5382
+--- /dev/null
++++ b/doc/Makefile
+@@ -0,0 +1,44 @@
++
++
++%.txt: %.sgml
++ @echo "- Building txt docs" >&2
++ $(TMPDIR)/linuxdoc --backend=txt --filter --blanks=1 $<
++
++%.pdf: %.sgml
++ @echo "- Building pdf docs" >&2
++ $(TMPDIR)/linuxdoc --backend=latex \
++ --output=pdf \
++ --pass="\usepackage{times}" $<
++
++%.info: %.sgml
++ @echo "- Building info docs" >&2
++ $(TMPDIR)/linuxdoc --backend=info $<
++
++%.lyx: %.sgml
++ @echo "- Building lyx docs" >&2
++ $(TMPDIR)/linuxdoc --backend=lyx $<
++
++html/%.html: %.sgml
++ @echo "- Building html docs" >&2
++ $(TMPDIR)/linuxdoc --imagebuttons --backend=html $<
++ mv -f ./guide*.html ./html
++
++rtf/%.rtf: %.sgml
++ @echo "- Building rtf docs" >&2
++ $(TMPDIR)/linuxdoc --backend=rtf $<
++ mkdir -m 755 -p ./rtf
++ mv -f ./guide*.rtf ./rtf
++
++%.dvi: %.sgml
++ @echo "- Building dvi docs" >&2
++ $(TMPDIR)/linuxdoc --backend=latex \
++ --output=dvi \
++ --pass="\usepackage{times}" $<
++
++%.ps: %.dvi
++ @echo "- Building ps docs" >&2
++ dvips -t $(DVIPS_PAPER) -o $@ $<
++
++%.ps.gz: %.ps
++ @echo "- Building ps.gz docs" >&2
++ gzip -fn $<
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
index b9883e7..5283862 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
@@ -37,14 +37,14 @@ DEPEND="${RDEPEND}
DOCS=( ChangeLog README )
-S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
+PATCHES=( "${FILESDIR}/${P}-fix-parallel-doc-build.patch" )
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
+S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
src_prepare() {
# Use Gentoo doc install path.
sed -i \
- -e "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
+ -e "s%/share/doc/${PN}%/share/doc/${PF}%" \
Makefile.in || die
autotools-utils_src_prepare
@@ -75,6 +75,8 @@ src_install() {
autotools-utils_src_install
}
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
+
pkg_postinst() {
latex-package_pkg_postinst
sgml-catalog_pkg_postinst
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/, app-text/linuxdoc-tools/files/
@ 2015-12-25 21:01 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2015-12-25 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 512b26ec2dd026045a10a8bcda3dcd8d711a945b
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Fri Dec 25 15:58:38 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 15:58:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512b26ec
app-text/linuxdoc-tools: remove old
Package-Manager: portage-2.2.24
app-text/linuxdoc-tools/Manifest | 1 -
.../files/linuxdoc-tools-0.9.69-compiler.patch | 52 -------------
.../linuxdoc-tools-0.9.69-disable-doc-build.patch | 28 -------
.../linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild | 87 ----------------------
4 files changed, 168 deletions(-)
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index 5ebcfb3..f9fab18 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,2 +1 @@
DIST linuxdoc-tools-0.9.71.tar.gz 613357 SHA256 1710b03d0e7151892c417363dd26c15d7f45d36411b6a341b0a4d3753519f476 SHA512 8383e5f08d58ca6395db1832c02e1af7b348c276187e8271564b229d811f5141128976924f110d6575fa94bb45d547a2f4c90acee523e78c849659cad592b7ae WHIRLPOOL d40660d2b3373e853adb3055d8053507c786e278906eedf1d9b9afb74a032bc464587fbd6e9320b7fa8aab3de334c12a899a2e8bf9f5addf0c13988bbdc0ced1
-DIST linuxdoc-tools_0.9.69.orig.tar.gz 604379 SHA256 7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101 SHA512 5e0ca7614acd5a4c67d4beadd12e9665540d664dc4796c361a25d26ccdc53ef9e0b58cd051d028659e07530e351b0773895f8e6d06e5d2c6ffaad0a1f0c4d41e WHIRLPOOL 0ee3492252f6607169a6404701e04030047f4a4d9237d213606a67c8f6b9ec019315a355e78318a2c57ac8cb2eb08b1ab4d6b81a7f05b77b257127b70cd8ae1d
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch
deleted file mode 100644
index d66bb0f..0000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Strip hardcoded CC, CFLAGS, LDFLAGS as linuxdoc-tools build system ignores
-systemd-wide values of these variables.
-
-diff --git a/Makefile.in b/Makefile.in
-index 359f14e..4af3ee3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -42,14 +42,6 @@ tex_ddir = $(DESTDIR)$(texdir)
-
- progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
-
--PROFILE =
--INCLUDE =
--OPTIMIZE = -O
--DEBUG =
--WARN =
--CFLAGS = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
--LDFLAGS = $(DEBUG) $(PROFILE)
--
- all:
- ifeq ($(BUILD_SGMLSASP), true)
- @echo "Compiling the SGML translator tools (in sgmls-1.1/)..."
-diff --git a/rtf-fix/Makefile b/rtf-fix/Makefile
-index 7b02427..c0628bf 100644
---- a/rtf-fix/Makefile
-+++ b/rtf-fix/Makefile
-@@ -1,6 +1,4 @@
--CC=gcc
- LEX=flex
--CFLAGS=-O
-
- all: rtf2rtf
-
-diff --git a/sgmls-1.1/Makefile b/sgmls-1.1/Makefile
-index 7a1cffa..6dc53ad 100644
---- a/sgmls-1.1/Makefile
-+++ b/sgmls-1.1/Makefile
-@@ -15,14 +15,7 @@ MANDIR=$(PREFIX)/man/man$(MANEXT)
- # Permissions mode to use for man pages.
- MANMODE=444
-
--CC=gcc
--PROFILE=
- INCLUDE=
--OPTIMIZE=-O
--DEBUG=
--WARN=
--CFLAGS=$(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE)
--LDFLAGS=$(DEBUG) $(PROFILE)
- # Additional libraries needed.
- # Ultrix needs -li
- LIBS=
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch
deleted file mode 100644
index 075eae6..0000000
--- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 359f14e..1649245 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -161,23 +161,6 @@ endif
- mkdir -m 755 -p $(tex_ddir)
- $(INSTALL_DATA) tex/* $(tex_ddir)
-
--# -- Build and install documentation
-- @echo "Installing documentation in $(doc_ddir) ..."
-- (cd doc; \
-- PATH=${PATH}:$(bin_ddir) \
-- PREFIX=$(DESTDIR)$(prefix) \
-- AUXBINDIR=$(auxbin_ddir) \
-- PKGPERL5LIB=$(perl5lib_ddir) \
-- PKGDATADIR=$(pkgdata_ddir) \
-- bash Makedoc.sh)
--
-- mkdir -m 755 -p $(doc_ddir)
-- # cp -r doc/* $(doc_ddir)
-- ( cd doc && tar --exclude='CVS' -cpf - . ) | ( cd $(doc_ddir) && tar -xpf - )
-- rm -f $(doc_ddir)/Makedoc.sh
-- find $(doc_ddir) -type d -print | xargs chmod 755
-- find $(doc_ddir) -type f -print | xargs chmod 644
--
- # what dirs do the targets clean and distclean need?
- DDIRS=
- MDIRS=
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
deleted file mode 100644
index ad31eca..0000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils perl-module sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://tracker.debian.org/pkg/linuxdoc-tools"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="
- || ( app-text/openjade app-text/opensp )
- app-text/sgml-common
- dev-lang/perl:=
- || ( sys-apps/gawk sys-apps/mawk )
- sys-apps/groff
- sys-devel/flex
- doc? (
- dev-texlive/texlive-fontsrecommended
- virtual/latex-base
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-compiler.patch" )
-
-DOCS=( ChangeLog README )
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \
- "/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
-
-src_prepare() {
- # Fix malloc include.
- sed -e \
- 's/#include <malloc.h>/#include <stdlib.h>/' \
- -i rtf-fix/rtf2rtf.l || die
-
- # Fix SGML catalog path.
- sed -e \
- 's%/iso-entities-8879.1986/iso-entities.cat%/sgml-iso-entities-8879.1986/catalog%' \
- -i perl5lib/LinuxDocTools.pm || die
-
- # Fix doc install path.
- sed -e \
- "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
- -i Makefile.in || die
-
- # Upstream developers unconditionally build docs during the install phase.
- # The only sane solution in this case is to patch things out from Makefile.
- # See Gentoo bug #558610 for more info.
- use doc || epatch "${FILESDIR}/${P}-disable-doc-build.patch"
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- perl_set_version
- tc-export CC
- local myeconfargs=(
- --with-texdir="/usr/share/texmf/tex/latex/misc"
- --with-perllibdir="${VENDOR_ARCH}"
- --with-installed-iso-entities
- )
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-}
-
-src_install() {
- # Prevent access violations from bitmap font files generation.
- export VARTEXFONTS="${T}/fonts"
-
- # Help linuxdoc-tools find sgml-iso-entities catalog again.
- export SGML_CATALOG_FILES="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"
-
- autotools-utils_src_install
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/, app-text/linuxdoc-tools/files/
@ 2022-12-06 9:03 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-06 9:03 UTC (permalink / raw
To: gentoo-commits
commit: 23e57ee0c2b556d37aa39cde1628eeab5ac44d20
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 09:02:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 09:02:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e57ee0
app-text/linuxdoc-tools: fix build w/ clang 16
Closes: https://bugs.gentoo.org/883203
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/linuxdoc-tools/Manifest | 1 +
.../linuxdoc-tools-0.9.82-configure-clang16.patch | 246 +++++++++++++++++++++
.../linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild | 95 ++++++++
3 files changed, 342 insertions(+)
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index e5c63c2ef18f..e5ce01ec717c 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1 +1,2 @@
DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
+DIST linuxdoc-tools-0.9.82.tar.bz2 550046 BLAKE2B 3bf9b9680659a3a6873e31116975fca7372167a701e630d762d37fcacf7acb9f1df4031558c4db24769e598a17b206e1c09607e341fc90f91497c15ff0cb05a1 SHA512 82560d9dc4db231e0a2c1fa3732d062bfd6af2cd3c5ffa0960939b2888533882437ddeeb54219e31acc7eaa10fdeee84ba206d32516cc5ed4f3fba2eab1ec0e4
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch
new file mode 100644
index 000000000000..941d7eac1dc6
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.82-configure-clang16.patch
@@ -0,0 +1,246 @@
+Patch emailed to upstream.
+
+From 216e770ced47ad0017cd43033ef213c2634fe87a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 6 Dec 2022 08:53:14 +0000
+Subject: [PATCH] sgmls-1.1: fix configure script with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result. In this case, it led to a build failure
+(see https://bugs.gentoo.org/883203).
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Bug: https://bugs.gentoo.org/883203
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sgmls-1.1/configure
++++ b/sgmls-1.1/configure
+@@ -110,13 +110,14 @@ cat >doit.c <<\EOF
+
+ #include <ctype.h>
+ #include <signal.h>
++#include <stdlib.h>
+
+-static int whoops()
++static void whoops(int signal)
+ {
+ _exit(1);
+ }
+
+-main()
++int main(void)
+ {
+ int c;
+ #ifdef isascii
+@@ -213,9 +214,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdio.h>
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ remove("foo");
+@@ -231,9 +232,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <unistd.h>
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ getopt(argc, argv, "v");
+@@ -249,9 +250,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <unistd.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ access("foo", 4);
+@@ -267,9 +268,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <unistd.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ vfork();
+@@ -285,9 +286,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++#include <sys/wait.h>
++int main(int argc, char **argv)
+ {
+
+ if (argc == 0) {
+@@ -306,10 +307,9 @@ else
+ fi
+
+ cat >doit.c <<\EOF
++#include <stdlib.h>
+ #include <string.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ strerror(0);
+@@ -326,9 +326,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <strings.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ bcopy((char *)0, (char *)0, 0);
+@@ -340,10 +339,9 @@ if $CC $CFLAGS -o doit doit.c $LIBS >/dev/null 2>&1 && ./doit 2>/dev/null
+ then
+ # Only use BSD_STRINGS if ANSI string functions don't work.
+ cat >doit.c <<\EOF
++#include <stdlib.h>
+ #include <string.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ memcpy((char *)0, (char *)0, 0);
+@@ -363,9 +361,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <signal.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0)
+ raise(SIGINT);
+@@ -382,9 +379,8 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <stdio.h>
+-main(argc, argv)
+-int argc;
+-char **argv;
++#include <stdlib.h>
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ fpos_t pos;
+@@ -404,12 +400,11 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ pid_t pid;
+@@ -436,14 +431,15 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <signal.h>
+
+-static int whoops()
++static void whoops(int signal)
+ {
+ _exit(1);
+ }
+
+-main()
++int main(void)
+ {
+ char buf[30];
+ #ifdef SIGSEGV
+@@ -469,10 +465,9 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <nl_types.h>
++#include <stdlib.h>
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ if (argc == 0) {
+ nl_catd d = catopen("foo", 0);
+@@ -492,12 +487,11 @@ fi
+
+ cat >doit.c <<\EOF
+ #include <limits.h>
++#include <stdlib.h>
+
+ char c = UCHAR_MAX;
+
+-main(argc, argv)
+-int argc;
+-char **argv;
++int main(int argc, char **argv)
+ {
+ #if CHAR_MIN < 0
+ exit(!(c < 0));
+@@ -512,7 +506,8 @@ then
+ char_signed=
+ else
+ cat >doit.c <<\EOF
+-main()
++#include <stdlib.h>
++int main(void)
+ {
+ int i;
+
+--
+2.38.1
+
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
new file mode 100644
index 000000000000..b4403ab283ff
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.82.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools latex-package perl-functions sgml-catalog-r1 toolchain-funcs
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="
+ || ( app-text/openjade app-text/opensp )
+ app-text/sgml-common
+ dev-lang/perl:=
+ sys-apps/groff
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-alternatives/awk
+ sys-devel/flex
+ doc? (
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.82-configure-clang16.patch
+)
+
+src_prepare() {
+ default
+
+ # Pregenerated configure scripts fail.
+ eautoreconf
+}
+
+src_configure() {
+ perl_set_version
+ tc-export CC
+ local myeconfargs=(
+ --disable-docs
+ --with-texdir="${TEXMF}/tex/latex/${PN}"
+ --with-perllibdir="${VENDOR_ARCH}"
+ --with-installed-iso-entities
+ )
+ use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ # Prevent access violations from bitmap font files generation.
+ use doc && export VARTEXFONTS="${T}/fonts"
+
+ default
+}
+
+src_install() {
+ # Makefile ignores docdir configuration option.
+ emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
+ dodoc ChangeLog README
+
+ insinto /etc/sgml
+ newins - linuxdoc.cat <<-EOF
+ CATALOG "${EPREFIX}/usr/share/linuxdoc-tools/linuxdoc-tools.catalog"
+ EOF
+}
+
+pkg_preinst() {
+ # work around sgml-catalog.eclass removing it
+ cp "${ED}"/etc/sgml/linuxdoc.cat "${T}" || die
+}
+
+pkg_postinst() {
+ local backup=${T}/linuxdoc.cat
+ local real=${EROOT}/etc/sgml/linuxdoc.cat
+ if ! cmp -s "${backup}" "${real}"; then
+ cp "${backup}" "${real}" || die
+ fi
+
+ latex-package_pkg_postinst
+ sgml-catalog-r1_pkg_postinst
+}
+
+pkg_postrm() {
+ latex-package_pkg_postrm
+ sgml-catalog-r1_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-06 9:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-06 9:03 [gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/, app-text/linuxdoc-tools/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2015-12-25 21:01 Patrice Clement
2015-11-26 10:07 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox