1 |
commit: eb6ab9171bc7e9480fb6b19b1be3ff69a3bd2457 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 16 21:46:07 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 21:53:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6ab917 |
7 |
|
8 |
mail-filter/mapson: port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/476576 |
11 |
Closes: https://bugs.gentoo.org/513896 |
12 |
Closes: https://bugs.gentoo.org/741034 |
13 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
.../mapson/files/mapson-3.3-respect-AR.patch | 12 ++++++++ |
17 |
.../{mapson-3.3.ebuild => mapson-3.3-r1.ebuild} | 35 +++++++++++++++------- |
18 |
2 files changed, 36 insertions(+), 11 deletions(-) |
19 |
|
20 |
diff --git a/mail-filter/mapson/files/mapson-3.3-respect-AR.patch b/mail-filter/mapson/files/mapson-3.3-respect-AR.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..7a5ecaae5d3 |
23 |
--- /dev/null |
24 |
+++ b/mail-filter/mapson/files/mapson-3.3-respect-AR.patch |
25 |
@@ -0,0 +1,12 @@ |
26 |
+diff --git a/configure.ac b/configure.ac |
27 |
+index 8dc1878..3967624 100644 |
28 |
+--- a/configure.ac |
29 |
++++ b/configure.ac |
30 |
+@@ -25,6 +25,7 @@ AM_PROG_CC_C_O |
31 |
+ AC_PROG_CXX |
32 |
+ AC_PROG_RANLIB |
33 |
+ gl_INIT |
34 |
++AM_PROG_AR |
35 |
+ |
36 |
+ dnl Does the system have a working <getopt.h> include and |
37 |
+ dnl getopt_long() function? |
38 |
|
39 |
diff --git a/mail-filter/mapson/mapson-3.3.ebuild b/mail-filter/mapson/mapson-3.3-r1.ebuild |
40 |
similarity index 59% |
41 |
rename from mail-filter/mapson/mapson-3.3.ebuild |
42 |
rename to mail-filter/mapson/mapson-3.3-r1.ebuild |
43 |
index 5c6ce7bac66..9903dbb7f78 100644 |
44 |
--- a/mail-filter/mapson/mapson-3.3.ebuild |
45 |
+++ b/mail-filter/mapson/mapson-3.3-r1.ebuild |
46 |
@@ -1,8 +1,9 @@ |
47 |
-# Copyright 1999-2017 Gentoo Foundation |
48 |
+# Copyright 1999-2020 Gentoo Authors |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
|
51 |
-EAPI=4 |
52 |
-inherit eutils |
53 |
+EAPI=7 |
54 |
+ |
55 |
+inherit autotools |
56 |
|
57 |
DESCRIPTION="A challenge/response-based white-list spam filter" |
58 |
HOMEPAGE="http://mapson.sourceforge.net/" |
59 |
@@ -13,11 +14,20 @@ SLOT="0" |
60 |
KEYWORDS="amd64 ppc x86" |
61 |
IUSE="debug" |
62 |
|
63 |
-RDEPEND="virtual/mta" |
64 |
+RDEPEND=" |
65 |
+ acct-user/mail |
66 |
+ virtual/mta |
67 |
+" |
68 |
DEPEND="${RDEPEND}" |
69 |
|
70 |
+PATCHES=( |
71 |
+ "${FILESDIR}"/${PN}-3.3-gcc6.patch |
72 |
+ "${FILESDIR}"/${PN}-3.3-respect-AR.patch |
73 |
+) |
74 |
+ |
75 |
src_prepare() { |
76 |
- epatch "${FILESDIR}"/${P}-gcc6.patch |
77 |
+ default |
78 |
+ eautoreconf |
79 |
} |
80 |
|
81 |
src_configure() { |
82 |
@@ -25,17 +35,20 @@ src_configure() { |
83 |
} |
84 |
|
85 |
src_install() { |
86 |
- emake DESTDIR="${D}" install |
87 |
+ emake DESTDIR="${ED}" install |
88 |
|
89 |
dodoc AUTHORS INSTALL NEWS README |
90 |
doman doc/mapson.1 |
91 |
- dohtml doc/mapson.html |
92 |
- dodir /etc/mapson |
93 |
+ |
94 |
+ docinto html |
95 |
+ dodoc doc/mapson.html |
96 |
+ |
97 |
insinto /etc/mapson |
98 |
newins sample-config mapson.config |
99 |
- dodir /usr/share/mapson |
100 |
+ |
101 |
insinto /usr/share/mapson |
102 |
newins sample-challenge-template challenge-template |
103 |
- rm -f "${D}"/etc/sample-config |
104 |
- rm -f "${D}"/usr/share/{mapson.html,sample-challenge-template} |
105 |
+ |
106 |
+ rm -f "${ED}"/etc/sample-config || die |
107 |
+ rm -f "${ED}"/usr/share/{mapson.html,sample-challenge-template} || die |
108 |
} |