diff options
Diffstat (limited to 'app-admin/gam-server')
| -rw-r--r-- | app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch | 4 | ||||
| -rw-r--r-- | app-admin/gam-server/gam-server-0.1.10-r3.ebuild (renamed from app-admin/gam-server/gam-server-0.1.10-r2.ebuild) | 30 | ||||
| -rw-r--r-- | app-admin/gam-server/metadata.xml | 2 |
3 files changed, 17 insertions, 19 deletions
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-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild index 18a07d6a7eb0..1c47d6fb1349 100644 --- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild +++ b/app-admin/gam-server/gam-server-0.1.10-r3.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 GNOME_ORG_MODULE="gamin" GNOME_TARBALL_SUFFIX="bz2" -inherit autotools epatch flag-o-matic multilib gnome.org + +inherit autotools flag-o-matic gnome.org DESCRIPTION="Library providing the FAM File Alteration Monitor API" HOMEPAGE="https://www.gnome.org/~veillard/gamin/" @@ -15,8 +16,8 @@ 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" -IUSE="debug kernel_linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="debug" RDEPEND=">=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 @@ -25,28 +26,26 @@ RDEPEND=">=dev-libs/glib-2:2 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" + eapply "${WORKDIR}/gamin-0.1.9-freebsd.patch" # Fix file-collision due to shared library, upstream bug #530635 - epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch" + eapply "${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" + eapply "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch" # Fix crosscompilation issues, bug #267604 - epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" + eapply "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" # Enable linux specific features on armel, upstream bug #588338 - epatch "${FILESDIR}/${P}-armel-features.patch" + eapply "${FILESDIR}/${P}-armel-features.patch" # Fix deadlocks with glib-2.32, bug #413331, upstream #667230 - epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch" + eapply "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch" # Drop DEPRECATED flags sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die @@ -56,6 +55,8 @@ src_prepare() { -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 @@ -63,9 +64,6 @@ src_prepare() { } 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 diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml index f3cab85cf603..d0b58801b31a 100644 --- a/app-admin/gam-server/metadata.xml +++ b/app-admin/gam-server/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>freedesktop-bugs@gentoo.org</email> |