1 |
commit: 4003b7fbcae5f52a5ad52d91d72799ace3a02336 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 1 09:34:59 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 1 09:43:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4003b7fb |
7 |
|
8 |
mail-filter/libmilter: tidy ebuild, move html docs |
9 |
|
10 |
Only simple changes for ebuild to be more consistent |
11 |
and easier to work with. |
12 |
|
13 |
Additionally moves html docs to html/, and add a note |
14 |
to bump together with sendmail. |
15 |
|
16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
17 |
|
18 |
mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild | 55 ++++++++++++---------- |
19 |
1 file changed, 30 insertions(+), 25 deletions(-) |
20 |
|
21 |
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild |
22 |
index b5b960cfe3a..6c2477f4e76 100644 |
23 |
--- a/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild |
24 |
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild |
25 |
@@ -3,6 +3,8 @@ |
26 |
|
27 |
EAPI=7 |
28 |
|
29 |
+# Note: please bump this together with mail-mta/sendmail |
30 |
+ |
31 |
inherit toolchain-funcs |
32 |
|
33 |
# This library is part of sendmail, but it does not share the version number with it. |
34 |
@@ -18,6 +20,7 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}" |
35 |
|
36 |
LICENSE="Sendmail" |
37 |
SLOT="0/${PV}" |
38 |
+# TODO: restore keywords soon for bug 730890 after testing |
39 |
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
40 |
IUSE="ipv6 poll" |
41 |
|
42 |
@@ -25,53 +28,55 @@ RDEPEND="!<mail-mta/sendmail-8.16.1" |
43 |
|
44 |
# build system patch copied from sendmail ebuild |
45 |
PATCHES=( |
46 |
- "${FILESDIR}/sendmail-8.16.1-build-system.patch" |
47 |
- "${FILESDIR}/${PN}-sharedlib.patch" |
48 |
+ "${FILESDIR}"/sendmail-8.16.1-build-system.patch |
49 |
+ "${FILESDIR}"/${PN}-sharedlib.patch |
50 |
) |
51 |
|
52 |
src_prepare() { |
53 |
default |
54 |
|
55 |
- local CC="$(tc-getCC)" |
56 |
local ENVDEF="-DNETUNIX -DNETINET -DHAS_GETHOSTBYNAME2=1" |
57 |
|
58 |
- use ipv6 && ENVDEF="${ENVDEF} -DNETINET6" |
59 |
- use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1" |
60 |
+ use ipv6 && ENVDEF+=" -DNETINET6" |
61 |
+ use poll && ENVDEF+=" -DSM_CONF_POLL=1" |
62 |
|
63 |
if use elibc_musl; then |
64 |
- use ipv6 && ENVDEF="${ENVDEF} -DNEEDSGETIPNODE" |
65 |
+ use ipv6 && ENVDEF+=" -DNEEDSGETIPNODE" |
66 |
|
67 |
- eapply "${FILESDIR}/${PN}-musl-stack-size.patch" |
68 |
- eapply "${FILESDIR}/${PN}-musl-disable-cdefs.patch" |
69 |
+ eapply "${FILESDIR}"/${PN}-musl-stack-size.patch |
70 |
+ eapply "${FILESDIR}"/${PN}-musl-disable-cdefs.patch |
71 |
fi |
72 |
|
73 |
- sed -e "s|@@CFLAGS@@|${CFLAGS}|" \ |
74 |
- -e "s|@@LDFLAGS@@|${LDFLAGS}|" \ |
75 |
- -e "s|@@CC@@|${CC}|" \ |
76 |
+ sed -e "s|@@CC@@|$(tc-getCC)|" \ |
77 |
+ -e "s|@@CFLAGS@@|${CFLAGS}|" \ |
78 |
-e "s|@@ENVDEF@@|${ENVDEF}|" \ |
79 |
- "${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \ |
80 |
+ -e "s|@@LDFLAGS@@|${LDFLAGS}|" \ |
81 |
+ "${FILESDIR}"/gentoo.config.m4 > devtools/Site/site.config.m4 \ |
82 |
|| die "failed to generate site.config.m4" |
83 |
} |
84 |
|
85 |
src_compile() { |
86 |
- pushd libmilter |
87 |
- emake -j1 AR="$(tc-getAR)" MILTER_SOVER=${PV} |
88 |
- popd |
89 |
+ emake -j1 -C libmilter AR="$(tc-getAR)" MILTER_SOVER=${PV} |
90 |
} |
91 |
|
92 |
src_install() { |
93 |
- local MY_LIBDIR=/usr/$(get_libdir) |
94 |
- dodir "${MY_LIBDIR}" |
95 |
- emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ |
96 |
- SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \ |
97 |
- LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \ |
98 |
- MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \ |
99 |
- MSPQOWN=root CFOWN=root CFGRP=0 \ |
100 |
- MILTER_SOVER=${PV} \ |
101 |
- install -C obj.*/libmilter |
102 |
+ dodir /usr/$(get_libdir) |
103 |
+ |
104 |
+ local emakeargs=( |
105 |
+ DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" |
106 |
+ MANROOT=/usr/share/man/man |
107 |
+ SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 |
108 |
+ LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 |
109 |
+ MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 |
110 |
+ MSPQOWN=root CFOWN=root CFGRP=0 |
111 |
+ MILTER_SOVER=${PV} |
112 |
+ ) |
113 |
+ emake -C obj.*/libmilter "${emakeargs[@]}" install |
114 |
|
115 |
dodoc libmilter/README |
116 |
- dodoc libmilter/docs/* |
117 |
+ |
118 |
+ docinto html |
119 |
+ dodoc -r libmilter/docs/. |
120 |
|
121 |
find "${ED}" -name '*.a' -delete || die |
122 |
} |