gentoo resync : 12.03.2021

3 files changed, 2 insertions, 75 deletions

diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index fc9f8f5d0b56..90c0f9cac159 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -4,10 +4,7 @@ AUX fam-2.7.0-out-of-tree.patch 262 BLAKE2B 06a18408ce56a9502c6ff779ff48f884d77d
 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.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 1995 BLAKE2B f2b4379db8c20659dd0c73183c7dc1288ccee69f96fb133620cb11e2a09e1e54ab03d8330c8dcbc568263dbbbf29d9a9b0a5445f09563574f345adc5e281b625 SHA512 7a172de2846509f8c952a402c6189ac0b1426b7b14ad0ed891880a7ef68066676fe706b516ffb506b35c3baf2a763a775fab5dabcdbdbfab19f6bb78bd51a4bb
+EBUILD fam-2.7.0_p17_p3.ebuild 1997 BLAKE2B a94ee311c4186a1511992f6b164a85829e311a64aaa022c1e84de5c6f5fedb61186bfce0048c5c1254add268645950bcb03b34250dc7ae6e910c152e5e777baa SHA512 90044d9c17bd98ccf76df1e804cccb5712e6eb0ebb95c18c64a7f80406990e3ff96f1ca0dcece6be8e0adad91a6efa885695fffec7bea7502f6513d630b437aa
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/fam/fam-2.7.0_p17_p2.ebuild b/app-admin/fam/fam-2.7.0_p17_p2.ebuild
deleted file mode 100644
index 06a0ef2cf6f4..000000000000
--- a/app-admin/fam/fam-2.7.0_p17_p2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic ltprune 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="
-	ftp://oss.sgi.com/projects/fam/download/stable/${PN}-${FAM_PV}.tar.gz
-	mirror://debian/pool/main/f/${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}
-
-src_prepare() {
-	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
-
-	eapply "${FILESDIR}"/${PN}-${FAM_PV}-AM_CONFIG_HEADER.patch
-	eapply "${FILESDIR}"/${PN}-${FAM_PV}-out-of-tree.patch
-	eapply "${FILESDIR}"/${PN}-${FAM_PV}-sysmacros.patch #580702
-
-	eapply_user
-
-	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() {
-	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
index 6050c4509a3f..a461b7bfd6f2 100644
--- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -8,7 +8,7 @@ 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/"
+HOMEPAGE="https://tracker.debian.org/pkg/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