public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap-ng/files/, sys-libs/libcap-ng/
@ 2016-02-17 16:04 Mike Frysinger
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger @ 2016-02-17 16:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8c69c05cabd3207eb37a135eac0525fd886ad845
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 07:21:25 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 16:03:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c69c05c

sys-libs/libcap-ng: drop old <0.7.7 versions

 sys-libs/libcap-ng/Manifest                        |   5 -
 .../files/libcap-ng-0.7.5-add-unistd_h.patch       |  20 ----
 sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild          | 117 ---------------------
 sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild          | 115 --------------------
 sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild          |  92 ----------------
 sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild          |  93 ----------------
 sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild          |  93 ----------------
 7 files changed, 535 deletions(-)

diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 52418a0..1f99af6 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,6 +1 @@
-DIST libcap-ng-0.6.6.tar.gz 367231 SHA256 89589a29a6b19068edd650dd4f626c10e84bfe63eacae7b1fd1f98f3ac8ea00d SHA512 383aaa9e315e2498c779a17bef35df6aee072c42598d07d92bdd7a2328a3bcd22d5ec46d600babc467aa4d1b01e9dd660493dafba3b06c7ac81f35df9d4d6e3e WHIRLPOOL c1a72480d545b45ae385065449098f0878f8c8d138f1d9bd9b3445d1146fd6a227bb9b0ac0148542995c5b6683c7c5998d0cd61a369b9f5c84fb39a9dc5cf8a3
-DIST libcap-ng-0.7.3.tar.gz 392613 SHA256 5ca441c8d3a1e4cfe8a8151907977662679457311ccaa7eaac91447c33a35bb1 SHA512 f03a35c54b5998ef2e712540caa1f4ade37f9abe60992a1e727142b26815a4b8a7ce86ea94466fe692e4798c7297e5e1bbd338e5afe05689905ee9e0c0f16ef2 WHIRLPOOL 7752a70ea348dfc52537f67d5dccab03d598a112a7263a8811987453b53cda58643e938b4651c5cd8d0ea02f20fddc10bff2ac8bc23f68f97c9ab8c5791429ab
-DIST libcap-ng-0.7.4.tar.gz 407007 SHA256 48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b SHA512 443b92f44cffd4b436a2651eb3539c560382102d918faf63f993d3b6627c03e80f7b4a5105ddb040890ef82122a42ca6881795ab0639de337f693705f5506cf0 WHIRLPOOL 3d62f26fad8c9e7756374022982a4f2fcdde5af5532474dfa7eb6ba1bc7f97984691bdda8975ef32423b8e86af2462ef672ba3175a3121a484c46096cc8f10b2
-DIST libcap-ng-0.7.5.tar.gz 409426 SHA256 7ba01e73c027e4f17bff6cdd77c01b25987e58ed14e422a437e14df6e2dbca31 SHA512 947ec84037c6c383e47d7e15168058b01a0a6eddf73c94cea7e1d4c8b27af1d646b483abdf14d3aa8ecb35fda2ead803f8596aed023a7e5ff9396690313c24a1 WHIRLPOOL 8dc79529034f5ad2c4c8cc514157adfd9097b902647240134be82bd2bc2eb590adadb74c71f4324788702a0694d612ab0f5bdb9c0ddfc688407505ad23a39132
-DIST libcap-ng-0.7.6.tar.gz 417329 SHA256 9de3caebcc6248f3e9f8c278068253dee89c39d7ffcd284a10fc6ce2b06a2dff SHA512 838b8731d10c4adcfbc5fd1199d60f831dcb4e69cb3a645bd9e5c284c883ddbdc48289d696ecbed47a782112403210b685816935d2eec38f344adc1051d357fe WHIRLPOOL 3863f22d74e22cdfd88fc329a8f616fda1e846ed8489dcfe3a5bceeb76d847fce4b7fc3ac4166429b1e1c37691ac5b085e08c790b1c274b52551678797b7d4c3
 DIST libcap-ng-0.7.7.tar.gz 420178 SHA256 615549ce39b333f6b78baee0c0b4ef18bc726c6bf1cca123dfd89dd963f6d06b SHA512 eb049b29fdd31aa31c6c14ca023df62c2910504c1edd1242dba13579d0befae5b98249c22c145517bd5451969a0b186390dc11b2269e58001336e10c855e920c WHIRLPOOL 5d376b8d12ed8c19ca649095297e6016e86e5ad6112fd12685929bdd5f3c34bbcdf9c1c61cad44f44d3784192ca37df1a77c478e5fc15dacb20a2561ee945652

diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch b/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch
deleted file mode 100644
index bfeef6e..0000000
--- a/sys-libs/libcap-ng/files/libcap-ng-0.7.5-add-unistd_h.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-utils/proc-llist.c: include <unistd.h>
-
-proc-llist.c references pid_t and uid_t types but does not include <unistd.h>.  This
-works on glibc and uClibc because of the way their headers stack, but on musl (and
-possible other libc) this fails.  POSIX mandates that <unistd.h> provides these.  See
-Issue 6 at http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/unistd.h.html.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Nuar libcap-ng-0.7.5.orig/utils/proc-llist.c libcap-ng-0.7.5/utils/proc-llist.c
---- libcap-ng-0.7.5.orig/utils/proc-llist.c	2015-02-18 17:13:33.000000000 -0500
-+++ libcap-ng-0.7.5/utils/proc-llist.c	2015-05-25 13:39:32.196624248 -0400
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include "proc-llist.h"
- 
- void list_create(llist *l)

diff --git a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
deleted file mode 100644
index 5de6541..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.6.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit autotools flag-o-matic python
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="python static-libs"
-
-RDEPEND="sys-apps/attr
-	python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	# Disable byte-compilation of Python modules.
-	>py-compile
-
-	# Python bindings are built/tested/installed manually.
-	sed -i -e "/^SUBDIRS/s/ python//" bindings/Makefile.am || die
-
-	eautoreconf
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources bindings/python
-
-		building() {
-			emake \
-				CFLAGS="${CFLAGS}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir bindings/python building
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	default
-
-	if use python; then
-		testing() {
-			emake \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
-				check
-		}
-		python_execute_function -s --source-dir bindings/python testing
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir bindings/python installation
-
-		python_clean_installation_image
-	fi
-
-	dodoc AUTHORS ChangeLog README
-
-	rm -f "${ED}"/usr/lib*/${PN}.la
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize capng.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup capng.py
-}

diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
deleted file mode 100644
index 9d49df9..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit autotools flag-o-matic python
-
-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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
-IUSE="python static-libs"
-
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	# Disable byte-compilation of Python modules.
-	>py-compile
-
-	# Python bindings are built/tested/installed manually.
-	sed -i -e "/^SUBDIRS/s/ python//" bindings/Makefile.am || die
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources bindings/python
-
-		building() {
-			emake \
-				CFLAGS="${CFLAGS}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir bindings/python building
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	default
-
-	if use python; then
-		testing() {
-			emake \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
-				check
-		}
-		python_execute_function -s --source-dir bindings/python testing
-	fi
-}
-
-src_install() {
-	default
-
-	if use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir bindings/python installation
-
-		python_clean_installation_image
-	fi
-
-	rm -f "${ED}"/usr/lib*/${PN}.la
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize capng.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup capng.py
-}

diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
deleted file mode 100644
index 642fdc2..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic 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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	autotools-utils_src_prepare
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python
-	)
-
-	# set up the library build
-	autotools-utils_src_configure
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_compile() {
-			local CFLAGS=${CFLAGS}
-
-			python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
-			emake "${@}" \
-				-C "${BUILD_DIR}"/bindings/python
-		}
-
-		# help build system find the right objects
-		python_foreach_impl python_compile \
-			VPATH="${BUILD_DIR}"/bindings/python \
-			LIBS="${BUILD_DIR}"/src/libcap-ng.la
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	autotools-utils_src_test
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_compile -C bindings/python check \
-			VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_install -C bindings/python \
-			VPATH="${BUILD_DIR}"/bindings/python
-	fi
-}

diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
deleted file mode 100644
index 8dcd469..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic 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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-unistd_h.patch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	autotools-utils_src_prepare
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python
-	)
-
-	# set up the library build
-	autotools-utils_src_configure
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_compile() {
-			local CFLAGS=${CFLAGS}
-
-			python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
-			emake "${@}" \
-				-C "${BUILD_DIR}"/bindings/python
-		}
-
-		# help build system find the right objects
-		python_foreach_impl python_compile \
-			VPATH="${BUILD_DIR}"/bindings/python \
-			LIBS="${BUILD_DIR}"/src/libcap-ng.la
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	autotools-utils_src_test
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_compile -C bindings/python check \
-			VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_install -C bindings/python \
-			VPATH="${BUILD_DIR}"/bindings/python
-	fi
-}

diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
deleted file mode 100644
index df1d0b4..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic 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="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-add-unistd_h.patch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	autotools-utils_src_prepare
-
-	use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python
-	)
-
-	# set up the library build
-	autotools-utils_src_configure
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_configure --with-python
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		python_compile() {
-			local CFLAGS=${CFLAGS}
-
-			python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
-			emake "${@}" \
-				-C "${BUILD_DIR}"/bindings/python
-		}
-
-		# help build system find the right objects
-		python_foreach_impl python_compile \
-			VPATH="${BUILD_DIR}"/bindings/python \
-			LIBS="${BUILD_DIR}"/src/libcap-ng.la
-	fi
-}
-
-src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions."
-		return
-	fi
-
-	autotools-utils_src_test
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_compile -C bindings/python check \
-			VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use python; then
-		python_foreach_impl \
-			autotools-utils_src_install -C bindings/python \
-			VPATH="${BUILD_DIR}"/bindings/python
-	fi
-}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap-ng/files/, sys-libs/libcap-ng/
@ 2024-04-04 16:48 Mike Gilbert
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2024-04-04 16:48 UTC (permalink / raw
  To: gentoo-commits

commit:     971cbaa931df4aa0c40b10438808ed83d3a62879
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Apr  4 14:48:49 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:48:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971cbaa9

sys-libs/libcap-ng: link using libcap-ng.la

Closes: https://bugs.gentoo.org/928450
Upstream-PR: https://github.com/stevegrubb/libcap-ng/pull/52
Upstream-Commit: https://github.com/stevegrubb/libcap-ng/commit/75fe3714a8da28f0e2939c4402527782014401dd
Signed-off-by: orbea <orbea <AT> riseup.net>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../libcap-ng/files/libcap-ng-0.8.4-slibtool.patch | 32 ++++++++++++++++++++++
 sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild       |  8 ++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch b/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch
new file mode 100644
index 000000000000..d69f986875e3
--- /dev/null
+++ b/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch
@@ -0,0 +1,32 @@
+https://github.com/stevegrubb/libcap-ng/commit/75fe3714a8da28f0e2939c4402527782014401dd
+https://github.com/stevegrubb/libcap-ng/pull/52
+
+From b7d21b473badb349bc0d6246b3804a8a2d329f36 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 3 Apr 2024 17:32:04 -0700
+Subject: [PATCH] utils: link using libcap-ng.la
+
+When linking internal dependencies that were linked using $(LIBTOOL) the
+ideal method is to use the generated libtool archive (.la) file. This
+fixes the build with slibtool which doesn't find -lcap-ng during the
+build and explicitly requires the .la file to be used.
+
+Gentoo Issue: https://bugs.gentoo.org/928450
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ utils/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index f430454..97aa021 100644
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -25,7 +25,7 @@ CONFIG_CLEAN_FILES = *.loT *.rej *.orig
+ AUTOMAKE_OPTIONS = no-dependencies
+ EXTRA_DIST = $(man_MANS)
+ AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/src
+-LIBS = -L${top_builddir}/src -lcap-ng
++LDADD = ${top_builddir}/src/libcap-ng.la
+ AM_CFLAGS = -W -Wall -Wshadow ${WFLAGS} -Wundef -D_GNU_SOURCE
+ bin_PROGRAMS = pscap netcap filecap captest
+ man_MANS = pscap.8 netcap.8 filecap.8 captest.8

diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild
index f69c5049ed83..b2bf31f448fc 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild
@@ -27,17 +27,19 @@ BDEPEND="python? ( >=dev-lang/swig-2 )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-swig.patch
+	# https://bugs.gentoo.org/928450
+	"${FILESDIR}"/${P}-slibtool.patch
 )
 
 src_prepare() {
 	default
 
 	if use prefix ; then
-		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
 		# bug #668722
-		eautomake
+		sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die
 	fi
-	elibtoolize
+
+	eautoreconf
 }
 
 src_configure() {


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

end of thread, other threads:[~2024-04-04 16:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-17 16:04 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap-ng/files/, sys-libs/libcap-ng/ Mike Frysinger
  -- strict thread matches above, loose matches on Subject: below --
2024-04-04 16:48 Mike Gilbert

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