1 |
commit: e3813cd6207fd35886b17935ca8670629a519386 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 11 02:44:01 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 11 02:44:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3813cd6 |
7 |
|
8 |
app-misc/muttprint: port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/677206 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/muttprint-0.73-fix-number-of-pages.patch | 5 ++- |
15 |
.../muttprint/files/muttprint-0.73-manuals.patch | 5 ++- |
16 |
.../files/muttprint-0.73-pod-encoding.patch | 20 +++++------ |
17 |
.../muttprint/files/muttprint-0.73-warning.patch | 5 ++- |
18 |
app-misc/muttprint/muttprint-0.73-r4.ebuild | 40 ++++++++++++---------- |
19 |
5 files changed, 36 insertions(+), 39 deletions(-) |
20 |
|
21 |
diff --git a/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch b/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch |
22 |
index 0e7a4b4f94f..b4eff101863 100644 |
23 |
--- a/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch |
24 |
+++ b/app-misc/muttprint/files/muttprint-0.73-fix-number-of-pages.patch |
25 |
@@ -1,6 +1,5 @@ |
26 |
-diff -Nuar a/muttprint b/muttprint |
27 |
---- a/muttprint 2016-09-23 10:03:48.870030157 +0200 |
28 |
-+++ b/muttprint 2016-09-23 10:08:39.310036004 +0200 |
29 |
+--- a/muttprint |
30 |
++++ b/muttprint |
31 |
@@ -1635,7 +1635,7 @@ |
32 |
open (AUX, "$auxfile") or fatalError "Could not open $auxfile:\n$!"; |
33 |
|
34 |
|
35 |
diff --git a/app-misc/muttprint/files/muttprint-0.73-manuals.patch b/app-misc/muttprint/files/muttprint-0.73-manuals.patch |
36 |
index 57dd12dfa74..74619f38b26 100644 |
37 |
--- a/app-misc/muttprint/files/muttprint-0.73-manuals.patch |
38 |
+++ b/app-misc/muttprint/files/muttprint-0.73-manuals.patch |
39 |
@@ -1,6 +1,5 @@ |
40 |
-diff -u -r a/doc/manual/en/manual-en.sgml b/doc/manual/en/manual-en.sgml |
41 |
---- a/doc/manual/en/manual-en.sgml 2005-05-16 14:38:51.000000000 +0200 |
42 |
-+++ b/doc/manual/en/manual-en.sgml 2011-11-27 23:45:50.970890374 +0100 |
43 |
+--- a/doc/manual/en/manual-en.sgml |
44 |
++++ b/doc/manual/en/manual-en.sgml |
45 |
@@ -191,6 +191,7 @@ |
46 |
<para>As mentioned above, there must be a small C program compiled. If you use Perl |
47 |
5.8 and/or Linux, you could skip this step. For this, just execute |
48 |
|
49 |
diff --git a/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch |
50 |
index 1a939582c1b..f226a197c22 100644 |
51 |
--- a/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch |
52 |
+++ b/app-misc/muttprint/files/muttprint-0.73-pod-encoding.patch |
53 |
@@ -1,33 +1,29 @@ |
54 |
-diff -Nuar a/doc/manpages/de/muttprint.pod b/doc/manpages/de/muttprint.pod |
55 |
---- a/doc/manpages/de/muttprint.pod 2006-05-06 09:13:46.000000000 +0200 |
56 |
-+++ b/doc/manpages/de/muttprint.pod 2014-12-19 23:17:31.939783684 +0100 |
57 |
+--- a/doc/manpages/de/muttprint.pod |
58 |
++++ b/doc/manpages/de/muttprint.pod |
59 |
@@ -1,3 +1,5 @@ |
60 |
+=encoding latin1 |
61 |
+ |
62 |
=head1 NAME |
63 |
|
64 |
muttprint - schöner Ausdruck von Mails mit Mutt |
65 |
-diff -Nuar a/doc/manpages/en/muttprint.pod b/doc/manpages/en/muttprint.pod |
66 |
---- a/doc/manpages/en/muttprint.pod 2006-05-06 09:13:46.000000000 +0200 |
67 |
-+++ b/doc/manpages/en/muttprint.pod 2014-12-19 23:17:15.219783778 +0100 |
68 |
+--- a/doc/manpages/en/muttprint.pod |
69 |
++++ b/doc/manpages/en/muttprint.pod |
70 |
@@ -1,3 +1,5 @@ |
71 |
+=encoding latin1 |
72 |
+ |
73 |
=head1 NAME |
74 |
|
75 |
muttprint - pretty printing of mails with Mutt |
76 |
-diff -Nuar a/doc/manpages/es/muttprint.pod b/doc/manpages/es/muttprint.pod |
77 |
---- a/doc/manpages/es/muttprint.pod 2006-05-06 09:13:46.000000000 +0200 |
78 |
-+++ b/doc/manpages/es/muttprint.pod 2014-12-19 23:17:25.029783723 +0100 |
79 |
+--- a/doc/manpages/es/muttprint.pod |
80 |
++++ b/doc/manpages/es/muttprint.pod |
81 |
@@ -1,3 +1,5 @@ |
82 |
+=encoding latin1 |
83 |
+ |
84 |
=head1 NOMBRE |
85 |
|
86 |
muttprint - impresión elegante de mensajes de correo con Mutt |
87 |
-diff -Nuar a/doc/manpages/it/muttprint.pod b/doc/manpages/it/muttprint.pod |
88 |
---- a/doc/manpages/it/muttprint.pod 2006-05-06 09:13:46.000000000 +0200 |
89 |
-+++ b/doc/manpages/it/muttprint.pod 2014-12-19 23:17:39.779783640 +0100 |
90 |
+--- a/doc/manpages/it/muttprint.pod |
91 |
++++ b/doc/manpages/it/muttprint.pod |
92 |
@@ -1,3 +1,5 @@ |
93 |
+=encoding latin1 |
94 |
+ |
95 |
|
96 |
diff --git a/app-misc/muttprint/files/muttprint-0.73-warning.patch b/app-misc/muttprint/files/muttprint-0.73-warning.patch |
97 |
index e17f658732d..41f6630758e 100644 |
98 |
--- a/app-misc/muttprint/files/muttprint-0.73-warning.patch |
99 |
+++ b/app-misc/muttprint/files/muttprint-0.73-warning.patch |
100 |
@@ -1,6 +1,5 @@ |
101 |
-diff -Nur a/muttprint b/muttprint |
102 |
---- a/muttprint 2012-04-28 13:46:46.109925472 +0200 |
103 |
-+++ b/muttprint 2012-04-28 13:48:40.919924827 +0200 |
104 |
+--- a/muttprint |
105 |
++++ b/muttprint |
106 |
@@ -740,6 +740,8 @@ |
107 |
} |
108 |
} |
109 |
|
110 |
diff --git a/app-misc/muttprint/muttprint-0.73-r4.ebuild b/app-misc/muttprint/muttprint-0.73-r4.ebuild |
111 |
index 0c5c35c1767..3d9cae7c05f 100644 |
112 |
--- a/app-misc/muttprint/muttprint-0.73-r4.ebuild |
113 |
+++ b/app-misc/muttprint/muttprint-0.73-r4.ebuild |
114 |
@@ -1,9 +1,9 @@ |
115 |
-# Copyright 1999-2017 Gentoo Foundation |
116 |
+# Copyright 1999-2021 Gentoo Authors |
117 |
# Distributed under the terms of the GNU General Public License v2 |
118 |
|
119 |
-EAPI=5 |
120 |
+EAPI=7 |
121 |
|
122 |
-inherit autotools-utils eutils |
123 |
+inherit autotools |
124 |
|
125 |
DESCRIPTION="Script for pretty printing of your mails" |
126 |
HOMEPAGE="http://muttprint.sourceforge.net" |
127 |
@@ -14,20 +14,30 @@ LICENSE="GPL-2" |
128 |
KEYWORDS="amd64 ppc ppc64 x86" |
129 |
IUSE="doc" |
130 |
|
131 |
-DEPEND="dev-lang/perl |
132 |
- virtual/latex-base |
133 |
+DEPEND=" |
134 |
dev-texlive/texlive-fontsextra |
135 |
+ dev-lang/perl |
136 |
+ virtual/latex-base |
137 |
doc? ( |
138 |
app-text/dvipsk |
139 |
- app-text/docbook-sgml-utils[jadetex] )" |
140 |
+ app-text/docbook-sgml-utils[jadetex] |
141 |
+ ) |
142 |
+" |
143 |
|
144 |
-RDEPEND="dev-lang/perl |
145 |
+RDEPEND=" |
146 |
+ dev-texlive/texlive-latexextra |
147 |
+ dev-lang/perl |
148 |
dev-perl/TimeDate |
149 |
dev-perl/Text-Iconv |
150 |
virtual/latex-base |
151 |
- dev-texlive/texlive-latexextra" |
152 |
+" |
153 |
|
154 |
-AUTOTOOLS_IN_SOURCE_BUILD=1 |
155 |
+PATCHES=( |
156 |
+ "${FILESDIR}/${P}-warning.patch" |
157 |
+ "${FILESDIR}/${P}-manuals.patch" |
158 |
+ "${FILESDIR}/${P}-pod-encoding.patch" |
159 |
+ "${FILESDIR}/${P}-fix-number-of-pages.patch" |
160 |
+) |
161 |
|
162 |
patch_docs() { |
163 |
sed -i -e 's/db2pdf/docbook2pdf/' "${S}"/configure.ac || die |
164 |
@@ -42,10 +52,7 @@ patch_docs() { |
165 |
} |
166 |
|
167 |
src_prepare() { |
168 |
- epatch "${FILESDIR}/${P}-warning.patch" |
169 |
- epatch "${FILESDIR}/${P}-manuals.patch" |
170 |
- epatch "${FILESDIR}/${P}-pod-encoding.patch" |
171 |
- epatch "${FILESDIR}/${P}-fix-number-of-pages.patch" |
172 |
+ default |
173 |
|
174 |
if use doc ; then |
175 |
# Patch docbook and docdir |
176 |
@@ -54,7 +61,8 @@ src_prepare() { |
177 |
# Don't do manuals |
178 |
sed -i -e '/db2pdf/d' "${S}"/configure.ac || die |
179 |
fi |
180 |
- sed -i -e "/^docdir/s/$/-${PV}/" "${S}"/Makefile.am || die |
181 |
+ |
182 |
+ sed -i -e "/^docdir/s/$/-${PVR}/" "${S}"/Makefile.am || die |
183 |
|
184 |
# The distfile does not include the png files, nor penguin.jpg |
185 |
sed -i -e '/.*png /d' -e '/penguin.jpg /d' "${S}"/pics/Makefile.am || die |
186 |
@@ -62,10 +70,6 @@ src_prepare() { |
187 |
eautoreconf |
188 |
} |
189 |
|
190 |
-src_configure() { |
191 |
- econf --docdir="/usr/share/doc/${PF}" |
192 |
-} |
193 |
- |
194 |
src_compile() { |
195 |
# Parallel build does not work when USE="doc" |
196 |
emake -j1 |