gentoo resync : 05.12.2021

3 files changed, 90 insertions, 3 deletions

diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index 2f3878f0af5d..26a54c50587d 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -1,10 +1,11 @@
 AUX gam-server-0.1.10-G_CONST_RETURN-removal.patch 2470 BLAKE2B d4676b57dc28efba8be335a50a0e8d27c65da0998f6a533cbe89f7cc166eb4a6aee2375b181fdc7596ce60677b675a8597cf177cab0b3655d425a7282f7db849 SHA512 56cf8439d64c3856cc768a0d6aa67e00e82579b0db60b1f25b195024eec1628f61013718f3139910735eafa15e05f4fabe4373ebac053778abb1c89201c6cf0c
 AUX gam-server-0.1.10-armel-features.patch 1490 BLAKE2B 5fa50ed67cd357e5108db27e298f76f0b864f390a4b25d58c968697b67a46e6ad54ef4b799a448e86e44fddd61c90239745f7cbf56deb60e05371e85191fd5b1 SHA512 fe6365489428ca9206a36b8dea495d5c4beb381fe43dd49aa2fa022f8ea34d8068275ce42f41211ef7ce8bb2c1dce952673d4b2e72eec5be00161fa8f8bcb2a5
-AUX gam-server-0.1.10-crosscompile-fix.patch 764 BLAKE2B 7302b238724927ace5753b5103434533e60563e1d74d9ee9762b961d8e36ace465cb081639585dc7124be5bb0fb5c9f80832d1bfc09a3bb61869acec5abdbfca SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23
+AUX gam-server-0.1.10-crosscompile-fix.patch 691 BLAKE2B 3662bdac798177692847ba11c46df73047acf886d3d86ce6ffe40c561c317d5d995218e70f5b7e4c0cc3a53e41ee84ff6bc0877376ba029167723a0a3fd0f10b SHA512 58c49cc2414020db57eeabc07be2ea0f1c29f437335aee7b320bbc1faee43754c49fd6140ce3113abe13b2ef548f2132333da62502d4803f6dbf10d1785807f7
 AUX gam-server-0.1.10-ih_sub_cancel-deadlock.patch 2090 BLAKE2B 252b7551ca9ec48af631765ac0413c81c280c478cb9ed5b23efafc07f8c1dccd26305f4688842eed3e587c6bdc19b57c045922158026335e9c6af4abafc57287 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de
 AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75d731a18fd72c239a380a7bf97afacab65792003b433c9030e06c8d7748c0dabe84a92bbad8221d40c9fa9d33c6c00b0dd40d SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb
 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 2617 BLAKE2B 0a69d182922d3a95995eef47ac4587336258dfc983e13017e842928b16ebd6e747744acccaf922b58897b9bdcf6bf9821d5c21d84e85dd874f978c10d1833e8e SHA512 8ada6086382ff417ebe800b5de7ff0423ce920cc79ce45ec40b3d029355857d96616bccc9a8bd4aded70227c3d0fae117d27b5878ae3fdce30ad44e1dbc585dc
+EBUILD gam-server-0.1.10-r3.ebuild 2542 BLAKE2B ce994fa29c780f862e3df385726fa2d7aba22a07f49b26a6dfbb96ca43118aa9e7bbf24398a1e6c7e798564b2f6172f2d2f1cb637bf2f5f5ae844dbe2f670116 SHA512 cab5ef14a8e33d9533031f94bdc34118cee24ed315bd7dc5e9cd47812850c134499e656530243580554836438d764813d385bd8767b090bde5571f9a073a6497
 MISC metadata.xml 233 BLAKE2B 0287c5840d68d6fa00f870fb7024dee6332bef9f8f8608afa0b5b2bfe15f1fefe5dc8a2de31964f4c7b0fb2787a58a3798884fd75e0314e61cf84079475c9a39 SHA512 534aef7349f0f6243a01e578013481c76b2516382638feec7705502de825d73ea54a3ae890e7171e6238a3bf0ecc5c88c9bc48890f4116a257031bae022c7202
diff --git a/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
index ce3a15b5e160..7c08e6373b07 100644
--- a/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
+++ b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-04-26 23:00:43.445135823 +0300
-+++ configure.in	2009-04-26 23:25:04.042489243 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -389,8 +389,7 @@
  
  AC_MSG_CHECKING(abstract socket namespace)
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
new file mode 100644
index 000000000000..7a6e86629521
--- /dev/null
+++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_ORG_MODULE="gamin"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools flag-o-matic 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 kernel_linux"
+
+RDEPEND=">=dev-libs/glib-2:2
+	>=dev-libs/libgamin-0.1.10
+	!app-admin/fam
+	!<app-admin/gamin-0.1.10"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
+
+	# Fix compile warnings; bug #188923
+	eapply "${WORKDIR}/gamin-0.1.9-freebsd.patch"
+
+	# Fix file-collision due to shared library, upstream bug #530635
+	eapply "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch"
+
+	# Fix compilation with latest glib, bug #382783
+	eapply "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
+
+	# Fix crosscompilation issues, bug #267604
+	eapply "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
+
+	# Enable linux specific features on armel, upstream bug #588338
+	eapply "${FILESDIR}/${P}-armel-features.patch"
+
+	# Fix deadlocks with glib-2.32, bug #413331, upstream #667230
+	eapply "${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
+
+	eapply_user
+
+	# 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() {
+	# 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
+}