gentoo resync : 20.03.2022

3 files changed, 2 insertions, 91 deletions

diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index 9fd79970d3f7..0dcbef143caf 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,6 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2604 BLAKE2B 3dbc1b236ca91e2e1c12980075127a4731bdbfb359e294ed30241188ab8724d265ab79b610b70f56d758942cde43995dbdd5a102535bbc2e7a6a5ab72f152966 SHA512 bdcf52435ec8b098f1437c236d14b06c2f485d753f492e9751de72bfbb3ba2d32dd45d618dea22492c65e07fee3f815907770b97f4228aafb32b1336a8033073
-EBUILD gam-server-0.1.10-r3.ebuild 2529 BLAKE2B 9099936eaebe61572df09fbea115a86bd9dff84227d23f1b10d95877a0c13e1802f4fe1eb6095cfdf2ddf56d63d9dd986571826f18304aae5f987b7440e41cd1 SHA512 a20989d3b4418f06e5c1eaad390587814a657fa54d9f3157e96aa7f17d7102323c2424d13a47f8d6da6e4285ae8f97a9cc5620fa846f41167fd09ad95229c693
+EBUILD gam-server-0.1.10-r3.ebuild 2522 BLAKE2B b783e2aca239c9a5b71a545dd0bf86e3a8750e6c4131ae850e24087dda8d0f6b7bbfb951bb0baa7d0d7f6f712a9c9c33e8a0a311bb9ad72d1d53c39f25bb5949 SHA512 1afbc287360425d85aab905f52e85f211ff99c465880223fe79e54170c44b6379714351a4ef410475bdf82b3dfce7af584d1253207fc7917cf6bd632c48b47df
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
deleted file mode 100644
index 66a45bfa5661..000000000000
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME_ORG_MODULE="gamin"
-GNOME_TARBALL_SUFFIX="bz2"
-inherit autotools epatch flag-o-matic multilib gnome.org
-
-DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2:2
-	>=dev-libs/libgamin-0.1.10
-	!app-admin/fam
-	!<app-admin/gamin-0.1.10"
-
-DEPEND="${RDEPEND}"
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	# Fix compile warnings; bug #188923
-	epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2"
-
-	# Fix file-collision due to shared library, upstream bug #530635
-	epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
-
-	# Fix compilation with latest glib, bug #382783
-	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
-
-	# Fix crosscompilation issues, bug #267604
-	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
-
-	# Enable linux specific features on armel, upstream bug #588338
-	epatch "${FILESDIR}/${P}-armel-features.patch"
-
-	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
-	epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.in || die #466948
-
-	# autoconf is required as the user-cflags patch modifies configure.in
-	# however, elibtoolize is also required, so when the above patch is
-	# removed, replace the following call with a call to elibtoolize
-	AT_M4DIR="${WORKDIR}" eautoreconf
-}
-
-src_configure() {
-	# fixes bug 225403
-	#append-flags "-D_GNU_SOURCE"
-
-	# Solaris' patchs adds this to configure, but it conflicts with
-	# Gentoo's FreeBSD patch.
-	[[ ${CHOST} == *-solaris* ]] && append-libs socket nsl
-
-	if ! has_version virtual/pkgconfig; then
-		export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
-		export DAEMON_LIBS="-lglib-2.0"
-	fi
-
-	econf \
-		--disable-debug \
-		--disable-libgamin \
-		--without-python \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable debug debug-api)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
index 99d0e57d1baa..41bd95f667fa 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2:2