gentoo resync : 15.06.2021

2 files changed, 33 insertions, 26 deletions

diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest
index 47036ecbda1b..157e65eedcbd 100644
--- a/mail-filter/libmilter/Manifest
+++ b/mail-filter/libmilter/Manifest
@@ -10,6 +10,6 @@ DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fc
 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
 EBUILD libmilter-1.0.2.ebuild 1903 BLAKE2B 1623fdd49f8cbe33bfb2f197d3fb18b6e107734e6a2ddd8b5e8fe2795d5d199a6dd9afb7d9f89ec739f05c9504bd67082c90e7a3bf2c4039ceff9c7fc4d0fdfd SHA512 af0dd4f1051f90235abd91cbc7e39939c5079487c7ade83d82fb25b39e5d5f802e06c0be2fee82d7bf07bf44ff95ff17dd40d71935d6457fbdccb5cdacb032b0
-EBUILD libmilter-1.0.2_p1-r1.ebuild 2139 BLAKE2B a14e2a310a8f2661c5c1a6be95f0d1894ff98fd5d89b1e43acf180e318a18a3268707ea4e32ce49702a423e69207f0d53361353bfcd5a997cadbcd8f49cba64e SHA512 d48ebff4bd7564c479338d3c47685175e382c3a11536a05c9c7000d38af1859787ffa105bca4209c605b13c1b9caff9b3fff85fbc31bdaf0e2232cb83f4f2e2b
+EBUILD libmilter-1.0.2_p1-r2.ebuild 2275 BLAKE2B 5d22054cb7cc6af8596ddefcb61f19a01d1f52ed092ac2728b1f586606fc24dbe6b225d50433d60bfb2e739f510c9c2f82b40ed0e669d25b2c7ff933b58677ef SHA512 d5664b12dc006abcafd7a26b41ee80fa4355441f68e0b3a219ec36c85590cb1f5b4216469f0c538e3befe0e289ec5196cdeb4f15f7a47d2b29649d1029b0ce0d
 EBUILD libmilter-1.0.2_p1.ebuild 2214 BLAKE2B 8452d0976b146f92d7a8684986c5ef8e9dceecbc504806b3b53e2778d982d8a51bf4e440fbbe04dbd3392386fd5b1afdc62106e4e5d0faf3e863215a9b9622e8 SHA512 128027206c5978e49ccec7469ef14b1a67f977478b8182dec00a478671dafb0599a7a3a8338f2d8c2077ec806209faa6cc51070c6bfe70164d5fc344a4fc0013
 MISC metadata.xml 241 BLAKE2B 7e817e3e8547331152f2d3378fe5681d02cccc2ec04dfbe21833282edc6c826a93b9493110f5f0afd05edbbbb84a1a185db7e17d154399aabd1e70ab044c3ecd SHA512 bec8ce3a2140871a48e34ad88eeefd1bf05b2d6508e2a5ca4c406aa0ca2729b0b827ae02dd4fd707630894e1c8fc367cdb9840b791ad8ee596d067d40c36aa42
diff --git a/mail-filter/libmilter/libmilter-1.0.2_p1-r1.ebuild b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
index 46d223aaf2a0..6c2477f4e76b 100644
--- a/mail-filter/libmilter/libmilter-1.0.2_p1-r1.ebuild
+++ b/mail-filter/libmilter/libmilter-1.0.2_p1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+# Note: please bump this together with mail-mta/sendmail
+
 inherit toolchain-funcs
 
 # This library is part of sendmail, but it does not share the version number with it.
@@ -18,58 +20,63 @@ S="${WORKDIR}/sendmail-${SENDMAIL_VER}"
 
 LICENSE="Sendmail"
 SLOT="0/${PV}"
+# TODO: restore keywords soon for bug 730890 after testing
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 poll"
 
+RDEPEND="!<mail-mta/sendmail-8.16.1"
+
 # build system patch copied from sendmail ebuild
 PATCHES=(
-	"${FILESDIR}/sendmail-8.16.1-build-system.patch"
-	"${FILESDIR}/${PN}-sharedlib.patch"
+	"${FILESDIR}"/sendmail-8.16.1-build-system.patch
+	"${FILESDIR}"/${PN}-sharedlib.patch
 )
 
 src_prepare() {
 	default
 
-	local CC="$(tc-getCC)"
 	local ENVDEF="-DNETUNIX -DNETINET -DHAS_GETHOSTBYNAME2=1"
 
-	use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
-	use poll && ENVDEF="${ENVDEF} -DSM_CONF_POLL=1"
+	use ipv6 && ENVDEF+=" -DNETINET6"
+	use poll && ENVDEF+=" -DSM_CONF_POLL=1"
 
 	if use elibc_musl; then
-		use ipv6 && ENVDEF="${ENVDEF} -DNEEDSGETIPNODE"
+		use ipv6 && ENVDEF+=" -DNEEDSGETIPNODE"
 
-		eapply "${FILESDIR}/${PN}-musl-stack-size.patch"
-		eapply "${FILESDIR}/${PN}-musl-disable-cdefs.patch"
+		eapply "${FILESDIR}"/${PN}-musl-stack-size.patch
+		eapply "${FILESDIR}"/${PN}-musl-disable-cdefs.patch
 	fi
 
-	sed -e "s|@@CFLAGS@@|${CFLAGS}|" \
-		-e "s|@@LDFLAGS@@|${LDFLAGS}|" \
-		-e "s|@@CC@@|${CC}|" \
+	sed -e "s|@@CC@@|$(tc-getCC)|" \
+		-e "s|@@CFLAGS@@|${CFLAGS}|" \
 		-e "s|@@ENVDEF@@|${ENVDEF}|" \
-		"${FILESDIR}/gentoo.config.m4" > "${S}/devtools/Site/site.config.m4" \
+		-e "s|@@LDFLAGS@@|${LDFLAGS}|" \
+		"${FILESDIR}"/gentoo.config.m4 > devtools/Site/site.config.m4 \
 		|| die "failed to generate site.config.m4"
 }
 
 src_compile() {
-	pushd libmilter
-	emake -j1 MILTER_SOVER=${PV}
-	popd
+	emake -j1 -C libmilter AR="$(tc-getAR)" MILTER_SOVER=${PV}
 }
 
 src_install() {
-	local MY_LIBDIR=/usr/$(get_libdir)
-	dodir "${MY_LIBDIR}"
-	emake DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
-		SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0 \
-		LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0 \
-		MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \
-		MSPQOWN=root CFOWN=root CFGRP=0 \
-		MILTER_SOVER=${PV} \
-		install -C obj.*/libmilter
+	dodir /usr/$(get_libdir)
+
+	local emakeargs=(
+		DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)"
+		MANROOT=/usr/share/man/man
+		SBINOWN=root SBINGRP=0 UBINOWN=root UBINGRP=0
+		LIBOWN=root LIBGRP=0 GBINOWN=root GBINGRP=0
+		MANOWN=root MANGRP=0 INCOWN=root INCGRP=0
+		MSPQOWN=root CFOWN=root CFGRP=0
+		MILTER_SOVER=${PV}
+	)
+	emake -C obj.*/libmilter "${emakeargs[@]}" install
 
 	dodoc libmilter/README
-	dodoc libmilter/docs/*
+
+	docinto html
+	dodoc -r libmilter/docs/.
 
 	find "${ED}" -name '*.a' -delete || die
 }