gentoo resync : 29.06.2020

4 files changed, 95 insertions, 56 deletions

diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 1c7dc05e1a89..b5b376a0d63b 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -1,11 +1,13 @@
 AUX fam-2.7.0-AM_CONFIG_HEADER.patch 242 BLAKE2B dd0c34f6f4e1c7b9b1893001faf911f428dcf7949828f5ea1fa448aaadad98ea1e671ea49ef5e1e619396495f8a95c5e2874550e4aae5056e1fbf00ed600f5d8 SHA512 874c2242dd3b1300fd87da5e13674a25d426bba688fb4dc9d80914392f9934050a1c9f338cd5591c170bfb1fb30bcd12c85a5f75d1687fff61d41ba85b3ab5e2
+AUX fam-2.7.0-bindresvport.patch 233 BLAKE2B 24524a5c2ef0cf7464ea552725e8e4752dc5eb7a3a7c7ca14f07dc66d508d52b78fa33247d8e093086d234ee53c89a9181dd22428a1849d2436c69f3e795811c SHA512 d9bba85cb4874409feebf4047d748f34e4c6174883bad5a0d6bbf5b36d08ebf9b9a17d6a2fcca4081c32f787a410d52f062d3ca15fbba615d7dca24cbb2c5f47
 AUX fam-2.7.0-out-of-tree.patch 262 BLAKE2B 06a18408ce56a9502c6ff779ff48f884d77d4b33b4dbfc0e35fc4b2fbd41cb268f0bcb272dc2575c8acbccd4e426c5ad83ecb1c1bc4138c29c0314c4f8e8bfdb SHA512 20e92a60b67167aa29e699dd61731e5564a22243cbc0634903421545f6918033bce9849de2d3f665ecf3fd24406dd9fef98c98e3d49759b632293c773c4ac813
 AUX fam-2.7.0-patch-header.patch 3292 BLAKE2B f6e96ab2ac33ddfee2efb20fa32c010d1d554e83efe106191ace70001cdca9de80c0c845ad997cc1ee3efb007769032e2c7904c1acf18a3a56a75155f9898b22 SHA512 055ee28f30286f236436e84fde4b4c89736252216f3484d8f068c3b5f285adf9de78b87007c18f4d6752246b9595d9cf1d3e1ac4ab6cad6b96a3bb9e9f1ba334
 AUX fam-2.7.0-sysmacros.patch 343 BLAKE2B c4b1d4ff996517f9c7a9f17b3e4a7c12053fb4fde9af64e3dbf1a57e26db377951331fdd54fd46982776cad342c6836f09034292a8e198d814e6ed72b095850b SHA512 474ab9d24175d6b3a58d05bc463a53979dfafbd67cf92f892cbf0e9f9330cc8e4b5a34aff261c052fd1080c09c936c0195432404d608b669a824b455d243f3c3
 AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440ae2de5195179d0abc969ef11fb59cb2290d541518e36a983e98c735d36837ca0ae8e29 SHA512 ddad96e311a678c5907086b69a6478c5c6e735ff2614846585a2b26476a5049ab90f984d82eba5ba3f0175c3675d478e2abdf4ef2bf98c457a9e1304324979e1
 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
 DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
-DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
-EBUILD fam-2.7.0-r7.ebuild 1450 BLAKE2B 8a07222d9613854536c79a7e4414c5a39ec109f6e4f18357d55cf70a37e6cd6e7de6c9f25bd99a94466070ebe29cf0e98d5629aaa56f903cf6910aab7c5f3328 SHA512 3dae6e50db3341f49781c74f3fde0b1230c5d730008d1948b566ca9bf429e038b2b5688b5bcead621a224a09a8883e87b70bb2c4d9173f1a77753605ad78c6e2
+DIST fam_2.7.0-17.3.diff.gz 28847 BLAKE2B d46e0d60d438459b43e24d2757771f02f3b5eec1b297f16a0359b26d14fbfba9701ebdc63d9b4dbbe2247cc7b38b9670ed9900a896224a3c4d8affc1481a8a79 SHA512 67d339e1cd4409897b044aa9b4c755a43b939982ee70c0ab5d99afd807994ad1f571a52bf04125a633cc3a735e99ff9e156caf2fb4288f5c008121a4eb9379b6
+DIST fam_2.7.0.orig.tar.gz 301945 BLAKE2B 9219c15b998bbac49e76eeac86f2de666ac49dca773c82ff6220c11ee77f0381b93ddbeeb500a7775bff3cc29ad6e7008e12304f0b0e361cbcc951d9f995a229 SHA512 dae6e883ef10214b1506d342e32cb5c59d0b4b7b66c1b099daa836958651ff3b04d526b4e516abd96e51587a97a8950e9517d1b38c6f7e6637ee3e7d20243531
 EBUILD fam-2.7.0_p17_p2.ebuild 1768 BLAKE2B a913d5b761c70f175d9f7e5f9666881f2f054fda5dbea96fa613bd0841eeba15ef5cc2905bd139d96af479f813b985c7e2e27a2312434ff0e50d99625b0d9a2a SHA512 38dad20f2f0b2a822ca6bb1f6df5e8339657e562f1cf19db2454901e0b817ea6d6ae5166fa57e47574199b7e4939c9687d1f8b23648922206cbbf5101c20bcf9
+EBUILD fam-2.7.0_p17_p3.ebuild 2003 BLAKE2B ea0435726b29f434a9b909bf54e89d78f23cc069a4faa0bac9a2c659d549e25c3460f8265d4f447c8d991e4edcad29d271a789c0236a31be9843494ce04ce78f SHA512 a0f1cf4708563f3203fa014a9799c9dc75814779371c0e7b6646093dc622a79da2504c7db11758ca9fa51fbd3782885da0310ac303118517e2302ceb1ce02555
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
deleted file mode 100644
index e756b4eaec72..000000000000
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools ltprune multilib-minimal
-
-DEBIAN_PATCH="17"
-DESCRIPTION="FAM, the File Alteration Monitor"
-HOMEPAGE="http://oss.sgi.com/projects/fam/"
-SRC_URI="ftp://oss.sgi.com/projects/fam/download/stable/${P}.tar.gz
-	mirror://debian/pool/main/f/${PN}/${P/-/_}-${DEBIAN_PATCH}.diff.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="net-nds/rpcbind
-	!app-admin/gamin"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
-
-src_prepare() {
-	epatch "${WORKDIR}/${P/-/_}-${DEBIAN_PATCH}.diff"
-	edos2unix "${S}"/${P}/debian/patches/10_debianbug375967.patch
-	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches
-	sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-
-	epatch "${FILESDIR}"/${P}-out-of-tree.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580702
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-
-	# These are thrown away later
-	if ! multilib_is_native_abi ; then
-		sed -i -e 's/src conf man//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-
-	sed -i "${D}"/etc/fam.conf \
-		-e "s:local_only = false:local_only = true:g" \
-		|| die "sed fam.conf"
-
-	doinitd "${FILESDIR}/famd"
-}
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
new file mode 100644
index 000000000000..339c46f75395
--- /dev/null
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+FAM_PV="${PV/_p*/}"
+DEBIAN_PATCH="${PV#*_p}"
+DEBIAN_PATCH="${DEBIAN_PATCH/_p/.}"
+DESCRIPTION="FAM, the File Alteration Monitor"
+HOMEPAGE="http://oss.sgi.com/projects/fam/"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${FAM_PV}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff.gz
+"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	!app-admin/gamin
+	net-libs/libtirpc
+	net-nds/rpcbind
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO README )
+S=${WORKDIR}/${PN}-${FAM_PV}
+PATCHES=(
+	"${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch
+	"${FILESDIR}"/${PN}-${FAM_PV}-bindresvport.patch #729120
+	"${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch
+	"${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702
+)
+
+src_unpack() {
+	default
+	cd "${WORKDIR}" || die
+	tar xzf "${WORKDIR}"/${PN}-${FAM_PV}/${PN}-${FAM_PV}.tar.gz || die
+}
+
+src_prepare() {
+	find "${S}" -type f -exec chmod +w {} \; || die
+
+	eapply "${WORKDIR}"/${PN}_${FAM_PV}-${DEBIAN_PATCH}.diff
+	edos2unix debian/patches/10_debianbug375967.patch
+	eapply "${FILESDIR}"/${PN}-${FAM_PV}-patch-header.patch
+	eapply debian/patches/*patch
+
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+	append-cppflags $(${PKG_CONFIG} --cflags libtirpc)
+	append-libs $(${PKG_CONFIG} --libs libtirpc)
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+
+	# These are thrown away later
+	if ! multilib_is_native_abi ; then
+		sed -i -e 's/src conf man//' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+
+	einstalldocs
+
+	sed -i "${D}"/etc/fam.conf \
+		-e "s:local_only = false:local_only = true:g" \
+		|| die "sed fam.conf"
+
+	doinitd "${FILESDIR}/famd"
+}
diff --git a/app-admin/fam/files/fam-2.7.0-bindresvport.patch b/app-admin/fam/files/fam-2.7.0-bindresvport.patch
new file mode 100644
index 000000000000..1876ca0c235c
--- /dev/null
+++ b/app-admin/fam/files/fam-2.7.0-bindresvport.patch
@@ -0,0 +1,11 @@
+--- a/src/Listener.c++
++++ b/src/Listener.c++
+@@ -44,7 +44,7 @@
+ #include "Cred.h"
+ #include "BTree.h"
+ 
+-#if !(HAVE_BINDRESVPORT_PROTO)
++#if !(HAVE_BINDRESVPORT)
+ extern "C" int bindresvport(int sd, struct sockaddr_in *);
+ #endif
+