Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/files/
Date: Sun, 03 Sep 2017 21:34:33
Message-Id: 1504474449.013e029fbbd3a42dbb2c90512af276ab28754769.mjo@gentoo
1 commit: 013e029fbbd3a42dbb2c90512af276ab28754769
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 3 21:26:37 2017 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 3 21:34:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013e029f
7
8 app-text/htmldoc: remove unused patches.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-text/htmldoc/files/htmldoc-break.patch | 30 ---------
13 app-text/htmldoc/files/htmldoc-destdir.patch | 91 ----------------------------
14 2 files changed, 121 deletions(-)
15
16 diff --git a/app-text/htmldoc/files/htmldoc-break.patch b/app-text/htmldoc/files/htmldoc-break.patch
17 deleted file mode 100644
18 index 33c4aaef544..00000000000
19 --- a/app-text/htmldoc/files/htmldoc-break.patch
20 +++ /dev/null
21 @@ -1,30 +0,0 @@
22 -diff -Naur htmldoc-1.8.29b/Makefile.in htmldoc-1.8.29c/Makefile.in
23 ---- htmldoc-1.8.29b/Makefile.in 2016-04-13 17:02:29.706811414 +0000
24 -+++ htmldoc-1.8.29c/Makefile.in 2016-04-13 17:03:37.713630261 +0000
25 -@@ -39,7 +39,7 @@
26 - all: Makedefs Makefile config.h htmldoc.list
27 - for dir in $(DIRS); do\
28 - echo Making all in $$dir...;\
29 -- (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || break;\
30 -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS)) || exit 1;\
31 - done
32 -
33 -
34 -@@ -50,7 +50,7 @@
35 - clean:
36 - for dir in $(DIRS); do\
37 - echo Cleaning in $$dir...;\
38 -- (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || break;\
39 -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || exit 1;\
40 - done
41 - $(RM) *.bak
42 - $(RM) *.bck
43 -@@ -77,7 +77,7 @@
44 - $(MAKE) all
45 - for dir in $(INSTALLDIRS); do\
46 - echo Installing in $$dir...;\
47 -- (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || break;\
48 -+ (cd $$dir; $(MAKE) -$(MAKEFLAGS) install) || exit 1;\
49 - done
50 -
51 -
52
53 diff --git a/app-text/htmldoc/files/htmldoc-destdir.patch b/app-text/htmldoc/files/htmldoc-destdir.patch
54 deleted file mode 100644
55 index 488bb0beb31..00000000000
56 --- a/app-text/htmldoc/files/htmldoc-destdir.patch
57 +++ /dev/null
58 @@ -1,91 +0,0 @@
59 -diff -Naur htmldoc-1.8.29/data/Makefile htmldoc-1.8.29b/data/Makefile
60 ---- htmldoc-1.8.29/data/Makefile 2011-12-23 06:23:11.000000000 +0000
61 -+++ htmldoc-1.8.29b/data/Makefile 2016-04-13 16:59:35.074270457 +0000
62 -@@ -41,11 +41,11 @@
63 - #
64 -
65 - install:
66 -- if [ ! -d $(datadir)/htmldoc/data ]; then\
67 -- $(MKDIR) $(datadir)/htmldoc/data;\
68 -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/data ]; then\
69 -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/data;\
70 - fi
71 -- $(CP) $(FILES) $(datadir)/htmldoc/data
72 -- $(CHMOD) ugo+r $(datadir)/htmldoc/data/*
73 -+ $(CP) $(FILES) $(DESTDIR)$(datadir)/htmldoc/data
74 -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/data/*
75 -
76 -
77 - #
78 -diff -Naur htmldoc-1.8.29/doc/Makefile htmldoc-1.8.29b/doc/Makefile
79 ---- htmldoc-1.8.29/doc/Makefile 2016-01-02 22:58:41.000000000 +0000
80 -+++ htmldoc-1.8.29b/doc/Makefile 2016-04-13 16:57:46.628550948 +0000
81 -@@ -45,16 +45,16 @@
82 - #
83 -
84 - install: $(DOCUMENTS)
85 -- if test ! -d $(datadir)/doc/htmldoc; then\
86 -- $(MKDIR) $(datadir)/doc/htmldoc;\
87 -+ if test ! -d $(DESTDIR)$(datadir)/doc/htmldoc; then\
88 -+ $(MKDIR) $(DESTDIR)$(datadir)/doc/htmldoc;\
89 - fi
90 -- $(CP) $(DOCFILES) $(datadir)/doc/htmldoc
91 -- $(CHMOD) ugo+r $(datadir)/doc/htmldoc/*
92 -- if test ! -d $(mandir)/man1; then\
93 -- $(MKDIR) $(mandir)/man1;\
94 -+ $(CP) $(DOCFILES) $(DESTDIR)$(datadir)/doc/htmldoc
95 -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/doc/htmldoc/*
96 -+ if test ! -d $(DESTDIR)$(mandir)/man1; then\
97 -+ $(MKDIR) $(DESTDIR)$(mandir)/man1;\
98 - fi
99 -- $(CP) htmldoc.man $(mandir)/man1/htmldoc.1
100 -- $(CHMOD) ugo+r $(mandir)/man1/htmldoc.1
101 -+ $(CP) htmldoc.man $(DESTDIR)$(mandir)/man1/htmldoc.1
102 -+ $(CHMOD) ugo+r $(DESTDIR)$(mandir)/man1/htmldoc.1
103 -
104 -
105 - #
106 -diff -Naur htmldoc-1.8.29/fonts/Makefile htmldoc-1.8.29b/fonts/Makefile
107 ---- htmldoc-1.8.29/fonts/Makefile 2011-12-23 06:23:11.000000000 +0000
108 -+++ htmldoc-1.8.29b/fonts/Makefile 2016-04-13 16:56:35.317733427 +0000
109 -@@ -62,15 +62,15 @@
110 - #
111 -
112 - install:
113 -- echo "Installing font files in $(datadir)/htmldoc/fonts..."
114 -- if [ ! -d $(datadir)/htmldoc/fonts ]; then\
115 -- $(MKDIR) $(datadir)/htmldoc/fonts;\
116 -+ echo "Installing font files in $(DESTDIR)$(datadir)/htmldoc/fonts..."
117 -+ if [ ! -d $(DESTDIR)$(datadir)/htmldoc/fonts ]; then\
118 -+ $(MKDIR) $(DESTDIR)$(datadir)/htmldoc/fonts;\
119 - fi
120 - for font in $(FONTS); do \
121 -- $(CP) $$font.afm $(datadir)/htmldoc/fonts; \
122 -- $(CP) $$font.pfa $(datadir)/htmldoc/fonts; \
123 -+ $(CP) $$font.afm $(DESTDIR)$(datadir)/htmldoc/fonts; \
124 -+ $(CP) $$font.pfa $(DESTDIR)$(datadir)/htmldoc/fonts; \
125 - done
126 -- $(CHMOD) ugo+r $(datadir)/htmldoc/fonts/*
127 -+ $(CHMOD) ugo+r $(DESTDIR)$(datadir)/htmldoc/fonts/*
128 -
129 -
130 - #
131 -diff -Naur htmldoc-1.8.29/htmldoc/Makefile htmldoc-1.8.29b/htmldoc/Makefile
132 ---- htmldoc-1.8.29/htmldoc/Makefile 2016-01-02 21:46:20.000000000 +0000
133 -+++ htmldoc-1.8.29b/htmldoc/Makefile 2016-04-13 16:56:35.318733424 +0000
134 -@@ -38,11 +38,11 @@
135 - #
136 -
137 - install: all
138 -- if [ ! -d $(bindir) ]; then\
139 -- $(MKDIR) $(bindir);\
140 -+ if [ ! -d $(DESTDIR)$(bindir) ]; then\
141 -+ $(MKDIR) $(DESTDIR)$(bindir);\
142 - fi
143 -- cp htmldoc$(EXEEXT) $(bindir)
144 -- chmod ugo+rx $(bindir)/htmldoc$(EXEEXT)
145 -+ cp htmldoc$(EXEEXT) $(DESTDIR)$(bindir)
146 -+ chmod ugo+rx $(DESTDIR)$(bindir)/htmldoc$(EXEEXT)
147 -
148 -
149 - #