Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-libs/libgamin/
Date: Wed, 10 Feb 2021 20:09:27
Message-Id: 1612987344.5618fccd6a7dd3c063d20b0819f6c1ac70363d2a.sam@gentoo
1 commit: 5618fccd6a7dd3c063d20b0819f6c1ac70363d2a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 10 20:02:24 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 10 20:02:24 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5618fccd
7
8 dev-libs/libgamin: drop Python bindings (python 2.7 only)
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 ...-0.1.10-r5.ebuild => libgamin-0.1.10-r6.ebuild} | 70 ++++------------------
14 1 file changed, 13 insertions(+), 57 deletions(-)
15
16 diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
17 similarity index 63%
18 rename from dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
19 rename to dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
20 index be1bc2c..74ec6d9 100644
21 --- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
22 +++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
23 @@ -1,13 +1,12 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2021 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI="5"
29 +EAPI="6"
30
31 -PYTHON_COMPAT=( python2_7 )
32 GNOME_ORG_MODULE="gamin"
33 GNOME_TARBALL_SUFFIX="bz2"
34
35 -inherit autotools eutils flag-o-matic libtool python-r1 gnome.org multilib-minimal
36 +inherit autotools epatch flag-o-matic libtool ltprune gnome.org multilib-minimal
37
38 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
39 HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
40 @@ -18,19 +17,18 @@ SRC_URI="${SRC_URI}
41
42 LICENSE="LGPL-2"
43 SLOT="0"
44 -KEYWORDS="amd64 arm arm64 ~mips ppc x86"
45 -IUSE="debug kernel_linux python static-libs"
46 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
47 +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
48 +IUSE="debug kernel_linux static-libs"
49
50 RESTRICT="test" # needs gam-server
51
52 RDEPEND="
53 - python? ( ${PYTHON_DEPS} )
54 !app-admin/fam
55 !<app-admin/gamin-0.1.10"
56 DEPEND="${RDEPEND}"
57
58 src_prepare() {
59 + default
60 mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
61
62 # Fix QA warnings, bug #257281, upstream #466791
63 @@ -61,20 +59,18 @@ src_prepare() {
64 # Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
65 epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
66
67 + # Fix build on musl
68 + epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
69 +
70 # Drop DEPRECATED flags
71 sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
72
73 - # Build only shared version of Python module.
74 - epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
75 -
76 - # Fix build on musl
77 - epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
78 -
79 sed -i \
80 -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
81 -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
82 configure.in || die #466962
83
84 + mv configure.in configure.ac || die
85 # autoconf is required as the user-cflags patch modifies configure.in
86 # however, elibtoolize is also required, so when the above patch is
87 # removed, replace the following call with a call to elibtoolize
88 @@ -93,52 +89,12 @@ multilib_src_configure() {
89 local ECONF_SOURCE=${S}
90
91 econf "${myconf[@]}"
92 - if multilib_is_native_abi && use python; then
93 - python_configure() {
94 - mkdir -p "${BUILD_DIR}" || die
95 - cd "${BUILD_DIR}" || die
96 - econf "${myconf[@]}" --with-python
97 - }
98 -
99 - python_foreach_impl python_configure
100 - fi
101 -}
102 -
103 -multilib_src_compile() {
104 - default
105 -
106 - if multilib_is_native_abi && use python; then
107 - local native_builddir=${BUILD_DIR}
108 -
109 - python_compile() {
110 - emake -C "${BUILD_DIR}"/python \
111 - VPATH="${native_builddir}/python:${S}/python" \
112 - _gamin_la_LIBADD="${native_builddir}/libgamin/libgamin-1.la"
113 - }
114 -
115 - python_foreach_impl python_compile
116 - fi
117 -}
118 -
119 -multilib_src_install() {
120 - emake DESTDIR="${D}" install
121 -
122 - if multilib_is_native_abi && use python; then
123 - local native_builddir=${BUILD_DIR}
124 -
125 - python_install() {
126 - emake -C "${BUILD_DIR}"/python \
127 - DESTDIR="${D}" install \
128 - VPATH="${native_builddir}/python:${S}/python"
129 - }
130 -
131 - python_foreach_impl python_install
132 - fi
133 }
134
135 multilib_src_install_all() {
136 - dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
137 - dohtml doc/*
138 + DOCS=( AUTHORS ChangeLog README TODO NEWS doc/*txt )
139 + HTML_DOCS=( doc/*.{html,gif} )
140 + einstalldocs
141
142 prune_libtool_files --all
143 }