From 4c2b70adc6484c35ff05e412de08a7b7f50cfb34 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 30 Apr 2024 00:00:01 +0100 Subject: gentoo auto-resync : 30:04:2024 - 00:00:01 --- sys-libs/libcap-ng/Manifest | 7 +- .../libcap-ng/files/libcap-ng-0.8.5-python.patch | 23 +++++ sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild | 109 --------------------- sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild | 100 ------------------- sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild | 101 +++++++++++++++++++ 5 files changed, 127 insertions(+), 213 deletions(-) create mode 100644 sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch delete mode 100644 sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild delete mode 100644 sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild create mode 100644 sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild (limited to 'sys-libs/libcap-ng') diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest index e5032bd63f8a..4211eb1a56e8 100644 --- a/sys-libs/libcap-ng/Manifest +++ b/sys-libs/libcap-ng/Manifest @@ -1,9 +1,8 @@ AUX libcap-ng-0.8.4-slibtool.patch 1294 BLAKE2B 7234f8d137570f68d3de9ab0020c3d8d7626d31d8651c4588be74d2762126ed5559004c16a5cbb256a52155c48d61c42117c1164cae9397454467a4f6e76a6a3 SHA512 157fd91974350adc89ca2a08561bb40d01d7a615e94b82e1f002f10d479138e311f6b653e7026182514f52706319269996c3c37054ccf4c73a89e2ef7870146e AUX libcap-ng-0.8.4-swig.patch 873 BLAKE2B 8ec0c99cfaef7885ece5cb11a17ee09bf3903f3bf9ba99f507c2f93f39fd27d5bd497fe967acc735c012ad2a086913257cb0001971e9c86731c44184fa64ec01 SHA512 d68fe855d2c50ed8a46376c5b388b543658e2726e54c190098849b74f6993f1cf9f5d08505ece7ce44220547d6c42ee963cb67cf35be4998b2262069ce4fabd3 -DIST libcap-ng-0.8.2-apply-disable.patch 723 BLAKE2B 70d9959c55119c02bbc4ea605251491c04c477511c20b9fe93e6527ffd3fe2f35a72fabab5ca149c4aaf536c6cd8dceb15375297158f8827a0c676744381bbc1 SHA512 8c9317bdd4fde7d6a4618ec613bce46bed7646891bd16bc3fa307e9a814e38601bf3c6ad13102389d4596d9ed6a7ad853cca58624e724fe07383007e386c51f8 -DIST libcap-ng-0.8.3.tar.gz 455383 BLAKE2B c54dd753e0ef6dd21bcf6af7b003f85ded9faf2fbf1ea834cda6b181b165ff4b11a0284c23c73d0e6f97a810b3e6a63fceeb57ff583a2b32f23924bdee597ef5 SHA512 0ef9bc7bc6b7b59991f43b79aa6cde3e8d2c22c4b9ced2af8deae501e01d51e893033d109cb8aa0fdcba190140110993089245346334d7b114d18f1bb1b55b97 +AUX libcap-ng-0.8.5-python.patch 861 BLAKE2B 748386a5d03adf88ceb84e6c866e46df1d7336d114ec01fe38f0f70e0670eca3ec5f43561b082fdaffbecf825fc093f28fb8665236c56738e0c0cec4889c49d7 SHA512 b51bdf7738a882373408fbdc9919b87791919082964af3e6c6a887577f46f76c7679fe1985fd0c3a2ca01b2573ad794a8a172f0b8533439d1522eecd4f5158e7 DIST libcap-ng-0.8.4.tar.gz 453749 BLAKE2B 523480281cfa544e77e30932968b4b18424286dbced06bb4645d536cf19d4cc0f7c73de82006ffc329aa7ef208e0cf8e3379f1b20e1e8e4e90e422ed736f6c44 SHA512 f4f3499d592e8583c2bdb8d700981a7930bd545f0889bc02f49acecf17e3bc600b100cd4f64e9326e5bac0a07a02a1ac4b7e83e919563066665a3d67cbe6871e -EBUILD libcap-ng-0.8.3.ebuild 2805 BLAKE2B e24c4fa5f972c5b42d24e9a0a644beef2d00e2d17615feafbf111268b6289fd5df5089b93fe58d74bbfa4692ba48e55eed162a5cd30d19dacf17dfaab2fe07ff SHA512 c18382cab33d64744a15bad7499288fc1227fd815ffbabd461fe5dfeec7ef01130a8494383ef34e075ffa35ba9eefc02c229999d824585605d4594d1ad8850cc +DIST libcap-ng-0.8.5.tar.gz 460149 BLAKE2B ce0fc4ebceaa66d6f888f8b752e501bed7513d45231425054340016a6215ce52f0cd81b3a4a54c7c9ec0b623965002d66316c6c37844f0bd132b186ff7c6a41f SHA512 89fb86454847f354c012411ecdc7e17f07bb40d7e9719ca0b93ea81c436113685bbbb5c1b9cb1b7ac92d216c105c687285304135beb156aedd55ab1c61e4f269 EBUILD libcap-ng-0.8.4-r1.ebuild 2302 BLAKE2B d7ad850929c5155d09d24c6cc4c7cea68eda3a1c13d5cbed659942e25e4a764a17695e4e4a018b91105a4da1da0b242abaffcb8602b7f2449cff8a7add0f7ad1 SHA512 9351f765fbe922c962b175c0a2a5be4500b2502d700760d70d26455e83710b572ab9d2d457b4131a6dffeec253981947fdf97aa044e1683abf2022d9d894bbbb -EBUILD libcap-ng-0.8.4.ebuild 2236 BLAKE2B 56edf7cd1f7c39acfbd8bdbdae3f2c300ef04f8db86707d32357ba73dbb2153640ac5621ca0a8c010c11303041b3d9b7a4dce872b87ea0046e48b74039e7627d SHA512 81e894250bf2f0d5ebca68ce050a01f7d3171f267d086a7b29facca9cafab6ca0960c553ae8a2f3123b73cb4d76f5ac39b55cf26ed30221e2072187c0f0be810 +EBUILD libcap-ng-0.8.5.ebuild 2243 BLAKE2B f381e40eed415a3fdd094c49991d914399de9fc5a4ed841485951a153f0b08f10d95debf7fa3d905f21164112f9d2e92623bd6ade498885e5c1bbf0671fddc09 SHA512 292d0fa31c8db09029433fdca8fca62de2d0014e56832e726fe9752f1fc6f997e58ccdce98de212ebb57120a5d8ed105618a3246c1f2544c61f5a632e13b3ed3 MISC metadata.xml 743 BLAKE2B 76f6f5e1f041c4609c640c0ad15363124e7e4adcf013180aa965a2b45da54de2d9574b21c8d1c7c1504c06df1bd7c34c765a44261da99e3080f0f92d89584e33 SHA512 c674b44010c80273ca64554911408e9533a29152d8cff2dcee7a5554c8269e32214e406d04082b267f9d958a53f3bd7f653af7a004a487aa6dd2d253314c2f25 diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch b/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch new file mode 100644 index 000000000000..ddad5ff49d7a --- /dev/null +++ b/sys-libs/libcap-ng/files/libcap-ng-0.8.5-python.patch @@ -0,0 +1,23 @@ +https://github.com/stevegrubb/libcap-ng/commit/1fe7c1cfeea00ba4eb903fbb39b74361594d4835 + +From 1fe7c1cfeea00ba4eb903fbb39b74361594d4835 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Wed, 10 Apr 2024 21:30:51 +0200 +Subject: [PATCH] Fix python path when invoking py-compile (#54) + +48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard +AM_PATH_PYTHON macro. Makefile however still referred to old one. +There's no need to set PYTHON explicitly anymore so drop it. + +Fixes #53 +--- a/bindings/python3/Makefile.am ++++ b/bindings/python3/Makefile.am +@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES) + LIBS = ${top_builddir}/src/libcap-ng.la + SWIG_FLAGS = -python + SWIG_INCLUDES = ${AM_CPPFLAGS} +-PYTHON = $(PYTHON3) + pyexec_PYTHON = capng.py + pyexec_LTLIBRARIES = _capng.la + pyexec_SOLIBRARIES = _capng.so + diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild deleted file mode 100644 index ffb59a372613..000000000000 --- a/sys-libs/libcap-ng/libcap-ng-0.8.3.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches -# Same maintainer in Fedora as upstream -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic out-of-source-utils python-r1 - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" -# Patch works around / reverts a behaviour change because not all consumers were ready. -# Keep this patch for a bit longer until Fedora stop shipping it (not clear what else -# other than gnome-keyring was broken by it: bug #759550) -# Fedora 0.8.2 https://src.fedoraproject.org/rpms/libcap-ng/c/a5b0f536df1132d8e7afa4c0ce07b630e7970cad?branch=master -SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz - https://src.fedoraproject.org/rpms/libcap-ng/raw/a5b0f536df1132d8e7afa4c0ce07b630e7970cad/f/libcap-ng-0.8.2-apply-disable.patch" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - sys-kernel/linux-headers" -BDEPEND="python? ( >=dev-lang/swig-2 )" - -PATCHES=( - "${DISTDIR}"/libcap-ng-0.8.2-apply-disable.patch -) - -src_prepare() { - default - - if use prefix ; then - sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die - # bug #668722 - eautomake - fi -} - -src_configure() { - use sparc && replace-flags -O? -O0 - - local ECONF_SOURCE="${S}" - - local myconf=( - $(use_enable static-libs static) - ) - - local pythonconf=( - --without-python - --without-python3 - ) - - # Set up python bindings build(s) - if use python ; then - setup_python_flags_configure() { - pythonconf=( - --without-python - --with-python3 - ) - - run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" - } - - python_foreach_impl setup_python_flags_configure - else - local BUILD_DIR="${WORKDIR}"/build - run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" - fi -} - -src_compile() { - if use python ; then - python_foreach_impl run_in_build_dir emake - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" - fi -} - -src_test() { - if [[ "${EUID}" -eq 0 ]] ; then - ewarn "Skipping tests due to root permissions." - return - fi - - if use python ; then - python_foreach_impl run_in_build_dir emake check - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" check - fi -} - -src_install() { - if use python ; then - python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild deleted file mode 100644 index cffaa6067dc7..000000000000 --- a/sys-libs/libcap-ng/libcap-ng-0.8.4.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches -# Same maintainer in Fedora as upstream -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools flag-o-matic out-of-source-utils python-r1 - -DESCRIPTION="POSIX 1003.1e capabilities" -HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" -SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" -IUSE="python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND=" - ${RDEPEND} - sys-kernel/linux-headers -" -BDEPEND="python? ( >=dev-lang/swig-2 )" - -src_prepare() { - default - - if use prefix ; then - sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die - # bug #668722 - eautomake - fi -} - -src_configure() { - use sparc && replace-flags -O? -O0 - - local ECONF_SOURCE="${S}" - - local myconf=( - $(use_enable static-libs static) - ) - - local pythonconf=( - --without-python3 - ) - - # Set up python bindings build(s) - if use python ; then - setup_python_flags_configure() { - pythonconf=( - --with-python3 - ) - - run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" - } - - python_foreach_impl setup_python_flags_configure - else - local BUILD_DIR="${WORKDIR}"/build - run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" - fi -} - -src_compile() { - if use python ; then - python_foreach_impl run_in_build_dir emake - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" - fi -} - -src_test() { - if [[ "${EUID}" -eq 0 ]] ; then - ewarn "Skipping tests due to root permissions." - return - fi - - if use python ; then - python_foreach_impl run_in_build_dir emake check - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" check - fi -} - -src_install() { - if use python ; then - python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install - else - local BUILD_DIR="${WORKDIR}"/build - emake -C "${BUILD_DIR}" DESTDIR="${D}" install - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild new file mode 100644 index 000000000000..cdbc9bd9b5c8 --- /dev/null +++ b/sys-libs/libcap-ng/libcap-ng-0.8.5.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Keep an eye on Fedora's packaging (https://src.fedoraproject.org/rpms/libcap-ng/tree/rawhide) for patches +# Same maintainer in Fedora as upstream +PYTHON_COMPAT=( python3_{10..12} ) +inherit autotools flag-o-matic out-of-source-utils python-r1 + +DESCRIPTION="POSIX 1003.1e capabilities" +HOMEPAGE="https://people.redhat.com/sgrubb/libcap-ng/" +SRC_URI="https://people.redhat.com/sgrubb/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" +IUSE="python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND=" + ${RDEPEND} + sys-kernel/linux-headers +" +BDEPEND="python? ( >=dev-lang/swig-2 )" + +PATCHES=( + "${FILESDIR}"/${P}-python.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + use sparc && replace-flags -O? -O0 + + local ECONF_SOURCE="${S}" + + local myconf=( + $(use_enable static-libs static) + --with-capability_header="${ESYSROOT}"/usr/include/linux/capability.h + ) + + local pythonconf=( + --without-python3 + ) + + # Set up python bindings build(s) + if use python ; then + setup_python_flags_configure() { + pythonconf=( + --with-python3 + ) + + run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" + } + + python_foreach_impl setup_python_flags_configure + else + local BUILD_DIR="${WORKDIR}"/build + run_in_build_dir econf "${pythonconf[@]}" "${myconf[@]}" + fi +} + +src_compile() { + if use python ; then + python_foreach_impl run_in_build_dir emake + else + local BUILD_DIR="${WORKDIR}"/build + emake -C "${BUILD_DIR}" + fi +} + +src_test() { + if [[ "${EUID}" -eq 0 ]] ; then + ewarn "Skipping tests due to root permissions." + return + fi + + if use python ; then + python_foreach_impl run_in_build_dir emake check + else + local BUILD_DIR="${WORKDIR}"/build + emake -C "${BUILD_DIR}" check + fi +} + +src_install() { + if use python ; then + python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install + else + local BUILD_DIR="${WORKDIR}"/build + emake -C "${BUILD_DIR}" DESTDIR="${D}" install + fi + + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3