commit: 036aed2f544e4299a5d0943b3f2f726d41e8d8f8 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com> AuthorDate: Thu Jan 5 16:00:04 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jan 5 16:58:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036aed2f
app-text/linuxdoc-tools: remove old Closes: https://github.com/gentoo/gentoo/pull/3336 Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-text/linuxdoc-tools/Manifest | 1 - ...uxdoc-tools-0.9.71-fix-parallel-doc-build.patch | 195 --------------------- .../linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild | 88 ---------- 3 files changed, 284 deletions(-) diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest index 4acc654..061719f 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.72.tar.gz 614429 SHA256 664bfc4e580a5e7b8917104aa93b7f5021367e24ee22d67411a5f3f27fa81ba4 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408 WHIRLPOOL a9185f1666675d1ed398b9b96e798c7788e52d1ad57e39692fd9d06174f111b559c9e4f62a5762b0d0af3a7fc3d7d943b9e788d2d9df031f3d0cf4e2595587ee 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 deleted file mode 100644 index 2eb78f8..00000000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch +++ /dev/null @@ -1,195 +0,0 @@ -See https://gitlab.com/agmartin/linuxdoc-tools/issues/4 -and https://gitlab.com/agmartin/linuxdoc-tools/issues/6 - -diff --git a/Makefile.in b/Makefile.in -index adb85d0..f215678 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 - -@@ -174,7 +175,7 @@ ifneq ($(BUILDDOC_FORMATS),) - 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 -+ rm -f $(doc_ddir)/Makedoc.sh $(doc_ddir)/Makefile - find $(doc_ddir) -type d -print | xargs chmod 755 - find $(doc_ddir) -type f -print | xargs chmod 644 - 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 deleted file mode 100644 index 7cf4868..00000000 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 -# Source tarball has SHA1 of release in the name of the second topmost directory -GIT_SHA1="5a46c4ced4ef899b398bcedf8ccd29d6f2584100" - -inherit autotools-utils latex-package perl-module sgml-catalog toolchain-funcs - -DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files" -HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"; -SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=upstream/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-3+ MIT SGMLUG" -SLOT="0" -KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd" -IUSE="doc" - -RDEPEND=" - || ( app-text/openjade app-text/opensp ) - app-text/sgml-common - dev-lang/perl:= - || ( sys-apps/gawk sys-apps/mawk ) - sys-apps/groff -" -DEPEND="${RDEPEND} - sys-devel/flex - doc? ( - dev-texlive/texlive-fontsrecommended - virtual/latex-base - ) -" - -DOCS=( ChangeLog README ) - -PATCHES=( "${FILESDIR}/${P}-fix-parallel-doc-build.patch" ) - -S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}" - -src_prepare() { - # Use Gentoo doc install path. - sed -i \ - -e "s%/share/doc/${PN}%/share/doc/${PF}%" \ - Makefile.in || die - - autotools-utils_src_prepare -} - -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") - - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile -} - -src_install() { - # Prevent access violations from bitmap font files generation. - export VARTEXFONTS="${T}/fonts" - - 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 -} - -pkg_postrm() { - latex-package_pkg_postrm - sgml-catalog_pkg_postrm -}
