From: Ian Delaney Date: Wed, 26 Aug 2015 14:58:17 +0000 (+0800) Subject: app-text/linuxdoc-tools: bump; major rewrite with new patches X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=333ab91f8ad50666e86fe5f1ad914243c8321da7;p=gentoo.git app-text/linuxdoc-tools: bump; major rewrite with new patches Add new proxy user maintainer to metadata requested via bug #558610, all patches and ebuild submitted, discussed and run tested by Coacher, patching to build and install to manage non standard doc build, closes the bug #558610 Package-Manager: portage-2.2.20 --- diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest index e5c25c948f36..1d8d55feee3c 100644 --- a/app-text/linuxdoc-tools/Manifest +++ b/app-text/linuxdoc-tools/Manifest @@ -1 +1,2 @@ DIST linuxdoc-tools_0.9.68.tar.gz 619242 SHA256 3b8611683d61480a60cdd2497132f15ca15fb583c9fe5543f6750d187a5dee67 SHA512 a78c662f4bf69b68530af0176fb6b35328c004a80cc73e7ed1151d46da3a7868e4a8a61094f8c4081a686f1ed0c58bd19c2c5ad5a2b6677ddc7c686e67a71df7 WHIRLPOOL 966e47e081bf5eb35de546f7cd0522396aba306d8afbeeba55afb91f360c196b196c3271b84ae8a98d7f9a4d0460558986a8a32a824940b0340236c705490676 +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 new file mode 100644 index 000000000000..d66bb0fce101 --- /dev/null +++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-compiler.patch @@ -0,0 +1,52 @@ +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 new file mode 100644 index 000000000000..075eae6526a7 --- /dev/null +++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.69-disable-doc-build.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 000000000000..7728bbba395c --- /dev/null +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild @@ -0,0 +1,86 @@ +# 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 + 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 /#include /' \ + -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 + + # 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 +} diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml index a1ff68285e07..33008381f698 100644 --- a/app-text/linuxdoc-tools/metadata.xml +++ b/app-text/linuxdoc-tools/metadata.xml @@ -1,14 +1,18 @@ -maintainer-needed@gentoo.org - - Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9, and - is a toolset for processing LinuxDoc DTD SGML files. This system - is tailored for LinuxDoc DTD sgml files, and other DTDs are not - supported. If you need the tool for DocBook DTD (which is now a - more popular DTD than LinuxDoc in writing technical software - documentation), then you should check other packages such as - SGMLTools-Lite and OpenJade. - + proxy-maintainers + + itumaykin@gmail.com + Coacher + + + Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9, and + is a toolset for processing LinuxDoc DTD SGML files. This system + is tailored for LinuxDoc DTD sgml files, and other DTDs are not + supported. If you need the tool for DocBook DTD (which is now a + more popular DTD than LinuxDoc in writing technical software + documentation), then you should check other packages such as + SGMLTools-Lite and OpenJade. +