[gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/files/, app-text/linuxdoc-tools/
commit: 036aed2f544e4299a5d0943b3f2f726d41e8d8f8 Author: Ilya Tumaykin gmail com> AuthorDate: Thu Jan 5 16:00:04 2017 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 5 16:58:55 2017 + 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 a9185f175d1ed398b9b96e798c7788e52d1ad57e39692fd9d06174f111b559c9e4f62a5762b0d0af3a7fc3d7d943b9e788d2d9df031f3d0cf4e2595587ee 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.. --- 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" -
[gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/files/, app-text/linuxdoc-tools/
commit: fe50ac25f37ae0fab75240a1b3a412d06c51b881 Author: Ilya Tumaykin gmail com> AuthorDate: Thu May 5 00:40:18 2016 + Commit: Ian Delaney gentoo org> CommitDate: Mon May 9 12:21:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe50ac25 app-text/linuxdoc-tools: remove old Closes: https://github.com/gentoo/gentoo/pull/1437 Package-Manager: portage-2.2.28 Signed-off-by: Ian Delaney gentoo.org> ...oc-tools-0.9.71-fix-build-with-flex-2.6.1.patch | 35 ...-0.9.71-upgrade-deprecated-latex-commands.patch | 24 -- ...ols-0.9.71-upgrade-deprecated-perl-regexs.patch | 53 .../linuxdoc-tools/linuxdoc-tools-0.9.71-r2.ebuild | 93 -- 4 files changed, 205 deletions(-) diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-build-with-flex-2.6.1.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-build-with-flex-2.6.1.patch deleted file mode 100644 index 621c042..000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-build-with-flex-2.6.1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8ac62cf2aa07576763af2ae2dff1bebcd8a80083 Mon Sep 17 00:00:00 2001 -From: Ilya Tumaykin-Date: Mon, 11 Apr 2016 19:53:56 +0300 -Subject: Fix compilation with >=flex-2.6.1 - -flex devs reverted yyleng's type back to `int' in 2.6.1 [1]. -It was previously changed from `int' to `yy_size_t' in 2.5.36 [2,3]. - -Adjust the related guard accordingly. - -See also https://bugs.gentoo.org/show_bug.cgi?id=579490 - -[1]: https://github.com/westes/flex/commit/7a7c3dfe1bcb8230447ba1656f926b4b4cdfc457 -[2]: https://github.com/westes/flex/commit/9ba3187a537d6a58d345f2874d06087fd4050399 -[3]: https://gitlab.com/agmartin/linuxdoc-tools/commit/ada178bdcd05f57024934ea6a00cecfa95973509 - rtf-fix/rtf2rtf.l | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/rtf-fix/rtf2rtf.l b/rtf-fix/rtf2rtf.l -index d1f6a66..274b6ee 100644 a/rtf-fix/rtf2rtf.l -+++ b/rtf-fix/rtf2rtf.l -@@ -73,9 +73,8 @@ int skipnewline = 0; - - extern char *yytext; - --#if YY_FLEX_MAJOR_VERSION > 2 \ -- || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 5) \ -- || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) -+#if (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) \ -+ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 6 && YY_FLEX_SUBMINOR_VERSION == 0) - extern yy_size_t yyleng; - #else - extern int yyleng; diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-latex-commands.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-latex-commands.patch deleted file mode 100644 index 55cb3f4..000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-latex-commands.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b0665954791978c9fede736bc7e0c19efe21f9e9 Mon Sep 17 00:00:00 2001 -From: Agustin Martin Domingo -Date: Tue, 5 Apr 2016 18:46:24 +0200 -Subject: fmt_latex2e.pl: Upgrade deprecated latex2e commands: {\em } -> - \emph{} and {\tt } -> \texttt{} - -Signed-off-by: Agustin Martin Domingo - lib/fmt/fmt_latex2e.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/fmt/fmt_latex2e.pl b/lib/fmt/fmt_latex2e.pl -index 69d8e62..a9b3c00 100644 a/lib/fmt/fmt_latex2e.pl -+++ b/lib/fmt/fmt_latex2e.pl -@@ -288,7 +288,7 @@ $latex2e->{postASP} = sub - print $urlnum . ": " . $urlid . "\n" if ( $global->{debug} ); - - $urldef = latex2e_defnam($urlnum) . "url"; -- s/\\nameurl\{.*\}\{.*\}/{\\em $urlnam} {\\tt \\$urldef}/; -+ s/\\nameurl\{.*\}\{.*\}/\\emph{$urlnam} \\texttt{\\$urldef}/; - push @urlnames, $_; - push @urldefines, "\\urldef{\\$urldef} \\url{$urlid}\n"; - $urlnum++; diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-perl-regexs.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-perl-regexs.patch deleted file mode 100644 index 4686c82..000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-perl-regexs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cd05ec78c8374980362347a226d9c0cc5f6bb624 Mon Sep 17 00:00:00 2001 -From: Agustin Martin Domingo -Date: Tue, 5 Apr 2016 18:43:13 +0200 -Subject: fmt_latex2e.pl: Handle perl 5.22 deprecation of unescaped left brace - in regular expressions. - -This is to deal with new perl 5.22 warnings like - - Unescaped left brace in regex is deprecated, passed through in regex; - marked by <-- HERE in m/\\nameurl{ <-- HERE (.*)}{(.*)}/ - at /usr/share/linuxdoc-tools/fmt/fmt_latex2e.pl line 287. - -For consistency, right brackets are also escaped, although they -currently don't trigger any warning. - -Signed-off-by: Agustin Martin Domingo
[gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/files/, app-text/linuxdoc-tools/
commit: 85ba7b28c577b66e904ebdba23444b4e0c2eb434 Author: Ilya Tumaykin gmail com> AuthorDate: Mon Apr 11 23:08:22 2016 + Commit: Ian Delaney gentoo org> CommitDate: Tue Apr 12 11:17:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ba7b28 app-text/linuxdoc-tools: revbump to 0.9.71-r2 wrt bug 579490 Backport a couple of upstream fixes on the way. Closes: https://github.com/gentoo/gentoo/pull/1240 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=579490 Package-Manager: portage-2.2.28 Signed-off-by: Ian Delaney gentoo.org> ...oc-tools-0.9.71-fix-build-with-flex-2.6.1.patch | 35 ...uxdoc-tools-0.9.71-fix-parallel-doc-build.patch | 10 +-- ...-0.9.71-upgrade-deprecated-latex-commands.patch | 24 ++ ...ols-0.9.71-upgrade-deprecated-perl-regexs.patch | 53 .../linuxdoc-tools/linuxdoc-tools-0.9.71-r2.ebuild | 93 ++ 5 files changed, 210 insertions(+), 5 deletions(-) diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-build-with-flex-2.6.1.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-build-with-flex-2.6.1.patch new file mode 100644 index 000..621c042 --- /dev/null +++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-build-with-flex-2.6.1.patch @@ -0,0 +1,35 @@ +From 8ac62cf2aa07576763af2ae2dff1bebcd8a80083 Mon Sep 17 00:00:00 2001 +From: Ilya Tumaykin+Date: Mon, 11 Apr 2016 19:53:56 +0300 +Subject: Fix compilation with >=flex-2.6.1 + +flex devs reverted yyleng's type back to `int' in 2.6.1 [1]. +It was previously changed from `int' to `yy_size_t' in 2.5.36 [2,3]. + +Adjust the related guard accordingly. + +See also https://bugs.gentoo.org/show_bug.cgi?id=579490 + +[1]: https://github.com/westes/flex/commit/7a7c3dfe1bcb8230447ba1656f926b4b4cdfc457 +[2]: https://github.com/westes/flex/commit/9ba3187a537d6a58d345f2874d06087fd4050399 +[3]: https://gitlab.com/agmartin/linuxdoc-tools/commit/ada178bdcd05f57024934ea6a00cecfa95973509 +--- + rtf-fix/rtf2rtf.l | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/rtf-fix/rtf2rtf.l b/rtf-fix/rtf2rtf.l +index d1f6a66..274b6ee 100644 +--- a/rtf-fix/rtf2rtf.l b/rtf-fix/rtf2rtf.l +@@ -73,9 +73,8 @@ int skipnewline = 0; + + extern char *yytext; + +-#if YY_FLEX_MAJOR_VERSION > 2 \ +- || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 5) \ +- || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) ++#if (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) \ ++ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 6 && YY_FLEX_SUBMINOR_VERSION == 0) + extern yy_size_t yyleng; + #else + extern int yyleng; 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 index e0bd5ad..2eb78f8 100644 --- 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 @@ -22,7 +22,7 @@ index adb85d0..f215678 100644 + 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) @@ -55,7 +55,7 @@ index b7e2efb..da4be99 100644 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="" @@ -112,7 +112,7 @@ index b7e2efb..da4be99 100644 - --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 @@ -135,13 +135,13 @@ index b7e2efb..da4be99 100644 @@ -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 diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-latex-commands.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-latex-commands.patch new file mode 100644 index 000..55cb3f4 --- /dev/null +++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-upgrade-deprecated-latex-commands.patch @@ -0,0 +1,24 @@ +From b0665954791978c9fede736bc7e0c19efe21f9e9 Mon Sep 17 00:00:00 2001 +From: Agustin Martin Domingo +Date: Tue, 5 Apr 2016 18:46:24
[gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/files/, app-text/linuxdoc-tools/
commit: 3f4430b4044adc603b12af3c71c06b4c4bb524b7 Author: Patrice Clement gentoo org> AuthorDate: Tue Oct 6 16:09:59 2015 + Commit: Patrice Clement gentoo org> CommitDate: Tue Oct 6 16:09:59 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4430b4 app-text/linuxdoc-tools: Clean up old. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement gentoo.org> app-text/linuxdoc-tools/Manifest | 1 - .../files/linuxdoc-tools-0.9.21-malloc.patch | 13 .../files/linuxdoc-tools-0.9.68-compiler.patch | 38 --- .../files/linuxdoc-tools-0.9.68-letter.patch | 24 --- .../files/linuxdoc-tools-0.9.68-lex.patch | 11 .../linuxdoc-tools-0.9.69-disable-doc-build.patch | 28 .../linuxdoc-tools/linuxdoc-tools-0.9.68-r1.ebuild | 77 -- 7 files changed, 192 deletions(-) diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest index 1d8d55f..72d51ae 100644 --- a/app-text/linuxdoc-tools/Manifest +++ b/app-text/linuxdoc-tools/Manifest @@ -1,2 +1 @@ -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.21-malloc.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch deleted file mode 100644 index 2f5b3dc..000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.21-malloc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l -=== linuxdoc-tools-0.9.21.orig/rtf-fix/rtf2rtf.l -+++ linuxdoc-tools-0.9.21/rtf-fix/rtf2rtf.l -@@ -22,7 +22,7 @@ - - %{ - --#include -+#include - #include - #include - diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch deleted file mode 100644 index 9ba731b..000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-compiler.patch +++ /dev/null @@ -1,38 +0,0 @@ rtf-fix/Makefile.orig -+++ rtf-fix/Makefile -@@ -1,6 +1,4 @@ --CC=gcc - LEX=flex --CFLAGS=-O - - all: rtf2rtf - sgmls-1.1/Makefile.orig2013-03-20 13:40:43.674880678 +0400 -+++ sgmls-1.1/Makefile 2013-03-20 13:40:58.558881151 +0400 -@@ -15,14 +15,11 @@ - # 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= - Makefile.in.orig 2013-03-20 13:43:36.900886178 +0400 -+++ Makefile.in2013-03-20 13:43:49.783886587 +0400 -@@ -48,8 +48,6 @@ - OPTIMIZE = -O - DEBUG= - WARN = --CFLAGS = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE) --LDFLAGS = $(DEBUG) $(PROFILE) - - all: - ifeq ($(BUILD_SGMLSASP), true) diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch deleted file mode 100644 index 8e5048e..000 --- a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.68-letter.patch +++ /dev/null @@ -1,24 +0,0 @@ linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pm.letter Mon Nov 26 16:09:37 2001 -+++ linuxdoc-tools-0.9.68/perl5lib/LinuxDocTools.pmMon Nov 26 16:09:49 2001 -@@ -108,7 +108,7 @@ - { option => "pass", type => "s", short => "P" } - ]; - $global->{backend} = "linuxdoc"; -- $global->{papersize} = "a4"; -+ $global->{papersize} = "letter"; - $global->{language} = "en"; - $global->{charset} = "ascii"; - $global->{style} = ""; linuxdoc-tools-0.9.68/man/linuxdoc.1.letterMon Nov 26 16:10:04 2001 -+++ linuxdoc-tools-0.9.68/man/linuxdoc.1 Mon Nov 26 16:10:42 2001 -@@ -46,8 +46,8 @@ - format, but just output the usage of this suites. - Available formats are: html, info, latex, lyx, rtf, tex, check. - .IP "--papersize=\fIsize\fR, -p --Set the paper size. Default is ``a4'' (European 297x210mm paper). --You may also specify ``letter'' size. -+Set the paper size. Default is ``letter''. -+You may also specify ``a4'' size (European 297x210mm paper). - .IP
[gentoo-commits] repo/gentoo:master commit in: app-text/linuxdoc-tools/files/, app-text/linuxdoc-tools/
commit: 333ab91f8ad50666e86fe5f1ad914243c8321da7 Author: Ian Delaney idella4 AT gentoo DOT org AuthorDate: Wed Aug 26 14:58:17 2015 + Commit: Ian Delaney idella4 AT gentoo DOT org CommitDate: Wed Aug 26 14:59:41 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333ab91f 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 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| 86 ++ app-text/linuxdoc-tools/metadata.xml | 24 +++--- 5 files changed, 181 insertions(+), 10 deletions(-) diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest index e5c25c9..1d8d55f 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 000..d66bb0f --- /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 000..075eae6 --- /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