From 034070e2093803797a3184d7896c89a514d500ab Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 25 Apr 2022 03:48:53 +0100 Subject: dev-libs/libnl: wrap additional multilib CLI header Closes: https://bugs.gentoo.org/840299 Signed-off-by: Sam James --- dev-libs/libnl/libnl-3.6.0-r1.ebuild | 108 +++++++++++++++++++++++++++++++++++ dev-libs/libnl/libnl-3.6.0.ebuild | 107 ---------------------------------- dev-libs/libnl/libnl-99999999.ebuild | 7 +-- 3 files changed, 110 insertions(+), 112 deletions(-) create mode 100644 dev-libs/libnl/libnl-3.6.0-r1.ebuild delete mode 100644 dev-libs/libnl/libnl-3.6.0.ebuild (limited to 'dev-libs/libnl') diff --git a/dev-libs/libnl/libnl-3.6.0-r1.ebuild b/dev-libs/libnl/libnl-3.6.0-r1.ebuild new file mode 100644 index 000000000000..57e88da16908 --- /dev/null +++ b/dev-libs/libnl/libnl-3.6.0-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_OPTIONAL=1 +inherit autotools distutils-r1 multilib-minimal + +LIBNL_P=${P/_/-} +LIBNL_DIR=${PV/_/} +LIBNL_DIR=${LIBNL_DIR//./_} + +DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" +HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" +SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" +S="${WORKDIR}/${LIBNL_P}" + +LICENSE="LGPL-2.1 utils? ( GPL-2 )" +SLOT="3" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+debug python test utils" +RESTRICT="!test? ( test )" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + python? ( dev-lang/swig ) + test? ( dev-libs/check )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +MULTILIB_WRAPPED_HEADERS=( + # we do not install CLI stuff for non-native + /usr/include/libnl3/netlink/cli/addr.h + /usr/include/libnl3/netlink/cli/class.h + /usr/include/libnl3/netlink/cli/cls.h + /usr/include/libnl3/netlink/cli/ct.h + /usr/include/libnl3/netlink/cli/exp.h + /usr/include/libnl3/netlink/cli/link.h + /usr/include/libnl3/netlink/cli/mdb.h + /usr/include/libnl3/netlink/cli/neigh.h + /usr/include/libnl3/netlink/cli/qdisc.h + /usr/include/libnl3/netlink/cli/route.h + /usr/include/libnl3/netlink/cli/rule.h + /usr/include/libnl3/netlink/cli/tc.h + /usr/include/libnl3/netlink/cli/utils.h +) + +PATCHES=( + "${FILESDIR}"/${P}-static-tests.patch + "${FILESDIR}"/${P}-test-fixes-sandbox.patch +) + +src_prepare() { + default + + eautoreconf + + if use python; then + pushd "${S}"/python > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + $(multilib_native_use_enable utils cli) \ + $(use_enable debug) +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use python ; then + pushd python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi +} + +multilib_src_install() { + default + + if multilib_is_native_abi && use python ; then + # Unset DOCS= since distutils-r1.eclass interferes + local DOCS=() + + pushd python > /dev/null || die + + distutils-r1_src_install + + # For no obvious reason this is not done automatically + python_foreach_impl python_optimize + + popd > /dev/null || die + fi +} + +multilib_src_install_all() { + DOCS=( ChangeLog ) + + einstalldocs + + find "${ED}" -name '*.la' -delete || die +} diff --git a/dev-libs/libnl/libnl-3.6.0.ebuild b/dev-libs/libnl/libnl-3.6.0.ebuild deleted file mode 100644 index ab759e51347b..000000000000 --- a/dev-libs/libnl/libnl-3.6.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 multilib-minimal - -LIBNL_P=${P/_/-} -LIBNL_DIR=${PV/_/} -LIBNL_DIR=${LIBNL_DIR//./_} - -DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl" -SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" -S="${WORKDIR}/${LIBNL_P}" - -LICENSE="LGPL-2.1 utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+debug python test utils" -RESTRICT="!test? ( test )" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND}" -BDEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex - python? ( dev-lang/swig ) - test? ( dev-libs/check )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -MULTILIB_WRAPPED_HEADERS=( - # we do not install CLI stuff for non-native - /usr/include/libnl3/netlink/cli/addr.h - /usr/include/libnl3/netlink/cli/class.h - /usr/include/libnl3/netlink/cli/cls.h - /usr/include/libnl3/netlink/cli/ct.h - /usr/include/libnl3/netlink/cli/exp.h - /usr/include/libnl3/netlink/cli/link.h - /usr/include/libnl3/netlink/cli/neigh.h - /usr/include/libnl3/netlink/cli/qdisc.h - /usr/include/libnl3/netlink/cli/route.h - /usr/include/libnl3/netlink/cli/rule.h - /usr/include/libnl3/netlink/cli/tc.h - /usr/include/libnl3/netlink/cli/utils.h -) - -PATCHES=( - "${FILESDIR}"/${P}-static-tests.patch - "${FILESDIR}"/${P}-test-fixes-sandbox.patch -) - -src_prepare() { - default - - eautoreconf - - if use python; then - pushd "${S}"/python > /dev/null || die - distutils-r1_src_prepare - popd > /dev/null || die - fi -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(multilib_native_use_enable utils cli) \ - $(use_enable debug) -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - pushd python > /dev/null || die - distutils-r1_src_compile - popd > /dev/null || die - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use python ; then - # Unset DOCS= since distutils-r1.eclass interferes - local DOCS=() - - pushd python > /dev/null || die - - distutils-r1_src_install - - # For no obvious reason this is not done automatically - python_foreach_impl python_optimize - - popd > /dev/null || die - fi -} - -multilib_src_install_all() { - DOCS=( ChangeLog ) - - einstalldocs - - find "${ED}" -name '*.la' -delete || die -} diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild index 0afdbd9d360f..0cfee098abde 100644 --- a/dev-libs/libnl/libnl-99999999.ebuild +++ b/dev-libs/libnl/libnl-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -38,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libnl3/netlink/cli/ct.h /usr/include/libnl3/netlink/cli/exp.h /usr/include/libnl3/netlink/cli/link.h + /usr/include/libnl3/netlink/cli/mdb.h /usr/include/libnl3/netlink/cli/neigh.h /usr/include/libnl3/netlink/cli/qdisc.h /usr/include/libnl3/netlink/cli/route.h @@ -46,10 +47,6 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/libnl3/netlink/cli/utils.h ) -PATCHES=( - "${FILESDIR}"/${PN}-99999999-2to3.patch -) - src_prepare() { default -- cgit v1.2.3-65-gdbad