public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: dev-libs/libgamin/
@ 2017-09-05 13:39 Anthony G. Basile
  0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2017-09-05 13:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0252002fcf425475a3c7a830d07ccaf43e984d44
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Mon Sep  4 07:19:33 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Sep  5 13:39:29 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=0252002f

dev-libs/libgamin: drop -r99 suffix, sync with tree

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 dev-libs/libgamin/Manifest                            |  2 +-
 ...in-0.1.10-r99.ebuild => libgamin-0.1.10-r5.ebuild} | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 58e61e6..c33e13a 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -10,5 +10,5 @@ DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 WHIRLPOOL 3efbf3781a55f44f383e573db4a3b3df731e9f77608d73db4ff3027eae0bda6abb6eae022c094735c0d8d2a85e224a980436d8557f9350bb1558b40d99280701
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
-EBUILD libgamin-0.1.10-r99.ebuild 3945 SHA256 23ddb38715adc92c1fbcf87e45e91bc47173f80fdf06dbf646386827af2bd9a2 SHA512 73c0fea2c0f6dc89bce00a805ea41ea7ad261a5f3aaae70babd7ac046102c07d109e78bfd6c2f2c9cba3316b841f3bf3807345036b5406c665e02c9c412b4319 WHIRLPOOL 709f54a8183bba382e1fb5e618c9e331273856314e90db6976a1af30f7cc6b82db3e094a7f92aff4374b2b3e5944cea780479e67454a9d7b6ce71c8aebec0573
+EBUILD libgamin-0.1.10-r5.ebuild 4135 SHA256 d098064d66b4f0d63b27d90baa7ab8d1a6a8ea9d8d87298bbc981c00ee21c177 SHA512 27975ede174551e5bbc64c3782a2cf77c8f73088f82d06053dc24c616f70786434a899c7215250528be9c9b43566cf4ce4efc78551ba6e78c2475400d5ccfba4 WHIRLPOOL 6dff364e9205f016249cb7979c26db0956bb78dacf7f43086dadc28bbed95ff08d1d9edeecc85b6d6fa1a9ed6bd8402b7665c0e4f6e534cd3af7f874c9e79d5b
 MISC metadata.xml 224 SHA256 154bec891472fe5526579d16d7e5e5e9eb3f352512a17555a459aa6029bcbbb2 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 WHIRLPOOL 541aeaf2a7c858734aaae366846865ff70e6c898204bbfc9f39f58fbdb53d9b37dc8c898c23870859a9d4f5596e7898e21874c9ef529a447953a35e4d7bc13e5

diff --git a/dev-libs/libgamin/libgamin-0.1.10-r99.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
similarity index 85%
rename from dev-libs/libgamin/libgamin-0.1.10-r99.ebuild
rename to dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index bb9add6..aa51395 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r99.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 GNOME_ORG_MODULE="gamin"
 GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools eutils flag-o-matic libtool python-r1 gnome.org multilib-minimal
 
 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
+HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
 SRC_URI="${SRC_URI}
 	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
-	http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+	https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
+	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" # needs gam-server
 
-RDEPEND="!app-admin/fam
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	!app-admin/fam
 	!<app-admin/gamin-0.1.10"
 DEPEND="${RDEPEND}"
 
@@ -97,7 +100,7 @@ multilib_src_configure() {
 			econf "${myconf[@]}" --with-python
 		}
 
-		python_parallel_foreach_impl python_configure
+		python_foreach_impl python_configure
 	fi
 }
 


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/musl:master commit in: dev-libs/libgamin/
@ 2021-02-10 20:09 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-02-10 20:09 UTC (permalink / raw
  To: gentoo-commits

commit:     5618fccd6a7dd3c063d20b0819f6c1ac70363d2a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 20:02:24 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 20:02:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=5618fccd

dev-libs/libgamin: drop Python bindings (python 2.7 only)

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-0.1.10-r5.ebuild => libgamin-0.1.10-r6.ebuild} | 70 ++++------------------
 1 file changed, 13 insertions(+), 57 deletions(-)

diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
similarity index 63%
rename from dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
rename to dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index be1bc2c..74ec6d9 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PYTHON_COMPAT=( python2_7 )
 GNOME_ORG_MODULE="gamin"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools eutils flag-o-matic libtool python-r1 gnome.org multilib-minimal
+inherit autotools epatch flag-o-matic libtool ltprune gnome.org multilib-minimal
 
 DESCRIPTION="Library providing the FAM File Alteration Monitor API"
 HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
@@ -18,19 +17,18 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="debug kernel_linux python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug kernel_linux static-libs"
 
 RESTRICT="test" # needs gam-server
 
 RDEPEND="
-	python? ( ${PYTHON_DEPS} )
 	!app-admin/fam
 	!<app-admin/gamin-0.1.10"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
 	mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
 
 	# Fix QA warnings, bug #257281, upstream #466791
@@ -61,20 +59,18 @@ src_prepare() {
 	# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
 	epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
 
+        # Fix build on musl
+        epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
+
 	# Drop DEPRECATED flags
 	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
 
-	# Build only shared version of Python module.
-	epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
-
-	# Fix build on musl
-	epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
-
 	sed -i \
 		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
 		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
 		configure.in || die #466962
 
+	mv configure.in configure.ac || die
 	# 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
@@ -93,52 +89,12 @@ multilib_src_configure() {
 	local ECONF_SOURCE=${S}
 
 	econf "${myconf[@]}"
-	if multilib_is_native_abi && use python; then
-		python_configure() {
-			mkdir -p "${BUILD_DIR}" || die
-			cd "${BUILD_DIR}" || die
-			econf "${myconf[@]}" --with-python
-		}
-
-		python_foreach_impl python_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}"/python \
-				VPATH="${native_builddir}/python:${S}/python" \
-				_gamin_la_LIBADD="${native_builddir}/libgamin/libgamin-1.la"
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}"/python \
-				DESTDIR="${D}" install \
-				VPATH="${native_builddir}/python:${S}/python"
-		}
-
-		python_foreach_impl python_install
-	fi
 }
 
 multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
-	dohtml doc/*
+	DOCS=( AUTHORS ChangeLog README TODO NEWS doc/*txt )
+	HTML_DOCS=( doc/*.{html,gif} )
+	einstalldocs
 
 	prune_libtool_files --all
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/musl:master commit in: dev-libs/libgamin/
@ 2021-04-29 18:24 Dave Hughes
  0 siblings, 0 replies; 4+ messages in thread
From: Dave Hughes @ 2021-04-29 18:24 UTC (permalink / raw
  To: gentoo-commits

commit:     d53bafc2b6c18a155de401a94396f3f7837e8fed
Author:     Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 29 18:24:16 2021 +0000
Commit:     Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Thu Apr 29 18:24:16 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d53bafc2

dev-libs/libgamin: fix manifest

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>

 dev-libs/libgamin/Manifest | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 7a05560..94ac1dc 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -1,25 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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 libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
------BEGIN PGP SIGNATURE-----
-
-iQKTBAEBCAB9FiEEZdLCSnfk9z83VSkfsaMsEcx8U7oFAmBMxFRfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY1
-RDJDMjRBNzdFNEY3M0YzNzU1MjkxRkIxQTMyQzExQ0M3QzUzQkEACgkQsaMsEcx8
-U7pZ4g/8D/9GaMPPy3CHUTWjurzOTi/xzLHYj4KkhgZsTJzpw2QoxTUS90F0vbIn
-GrzCCO9Pk/4trclsk4iQ5S0XNv9eR59r4fEJZ/JMQg5otOH/Y2skZH7F84E0fQG4
-ymcz/rjvbfNceFweQZSPD2pd1XLTYurgNe1oFYaW/kI0D1vodyCMjOtvCO6rHlMu
-OFQJpriN/yfQo8ddwTdNyvN/cbIH3DNZk7WIv31Mh0DmtKAdTWdZw2kFoGz1xAyA
-jclJx9+sMBshhpXosLIT4DXFu5QQ7SVUjjGkB0A806gP6qw6jTm7r+H0VKVE17lm
-RoUXjqAxC6lNLhe9EsdTTXMBi+Q5S87tcd+RPcWvkCPfx6PPUuec/axtP6gQWSpV
-clDiuBZaai91nnPdRja0vt2fiICyoe3aR0p/yL4YWaNTfbawVkT3zwkVxLfO7Hbb
-d9NX+jhsgHW0gX1wxgIq4lQ7w6rfjMaHA9vhmGEF/VHADpTaxO1/7VB7UXX3qqUV
-xhwlEXmF5AnqQwBmFDpp363PCFTbv7f8+wFe0pBXgD81D1+TXBYGzhJvwlzaRnT+
-4ziep5r8tDGDRKlb61tS3sCMF0B9EbdUhm8cXRmRJpBCyzR13ZAbbOHd7hCS7WUJ
-yYv/KCRKVp3eHVIphWdBa7cSKrA8KS5W1kt8/0SY6HsoC7PUVk4=
-=Yi40
------END PGP SIGNATURE-----


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/musl:master commit in: dev-libs/libgamin/
@ 2021-04-29 19:27 Dave Hughes
  0 siblings, 0 replies; 4+ messages in thread
From: Dave Hughes @ 2021-04-29 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     01f57e5d8f4a5a84b1282d76170799d62f7c899c
Author:     Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 29 19:27:21 2021 +0000
Commit:     Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Thu Apr 29 19:27:21 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=01f57e5d

dev-libs/libgamin: move patch behind elibc_musl

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>

 dev-libs/libgamin/libgamin-0.1.10-r6.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
index 74ec6d9..f8315d4 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r6.ebuild
@@ -59,8 +59,10 @@ src_prepare() {
 	# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
 	epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
 
-        # Fix build on musl
-        epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
+	# Fix build on musl
+	if use elibc_musl ; then
+		epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
+	fi
 
 	# Drop DEPRECATED flags
 	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-04-29 19:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 13:39 [gentoo-commits] proj/musl:master commit in: dev-libs/libgamin/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2021-02-10 20:09 Sam James
2021-04-29 18:24 Dave Hughes
2021-04-29 19:27 Dave Hughes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox