From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DF8E158094 for ; Mon, 18 Jul 2022 22:23:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2559E0D80; Mon, 18 Jul 2022 22:23:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 947D1E0D80 for ; Mon, 18 Jul 2022 22:23:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50F19340EDE for ; Mon, 18 Jul 2022 22:23:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AACE94EC for ; Mon, 18 Jul 2022 22:23:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1658182964.62c57ba88bff4041d3c8a476baa2c074fdff1e3d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libnl/libnl-3.7.0.ebuild dev-libs/libnl/libnl-9999.ebuild dev-libs/libnl/libnl-99999999.ebuild X-VCS-Directories: dev-libs/libnl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 62c57ba88bff4041d3c8a476baa2c074fdff1e3d X-VCS-Branch: master Date: Mon, 18 Jul 2022 22:23:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 27ff9fcf-86c5-48cb-bcca-e093d103d4bc X-Archives-Hash: 5116898ddd256b79e673978ad2108d38 commit: 62c57ba88bff4041d3c8a476baa2c074fdff1e3d Author: Sam James gentoo org> AuthorDate: Mon Jul 18 22:17:38 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 18 22:22:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c57ba8 dev-libs/libnl: rename live ebuild Signed-off-by: Sam James gentoo.org> dev-libs/libnl/libnl-3.7.0.ebuild | 12 ++++-- .../{libnl-99999999.ebuild => libnl-9999.ebuild} | 47 ++++++++++++---------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dev-libs/libnl/libnl-3.7.0.ebuild b/dev-libs/libnl/libnl-3.7.0.ebuild index ee24246ef92f..6b420eb95d66 100644 --- a/dev-libs/libnl/libnl-3.7.0.ebuild +++ b/dev-libs/libnl/libnl-3.7.0.ebuild @@ -14,12 +14,18 @@ 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}" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/thom311/libnl" + inherit git-r3 +else + SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + S="${WORKDIR}/${LIBNL_P}" +fi LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+debug python test utils" RESTRICT="!test? ( test )" diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-9999.ebuild similarity index 72% rename from dev-libs/libnl/libnl-99999999.ebuild rename to dev-libs/libnl/libnl-9999.ebuild index 0cfee098abde..6b420eb95d66 100644 --- a/dev-libs/libnl/libnl-99999999.ebuild +++ b/dev-libs/libnl/libnl-9999.ebuild @@ -1,35 +1,43 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 git-r3 multilib-minimal +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..10} ) +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" -EGIT_REPO_URI="https://github.com/thom311/libnl" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/thom311/libnl" + inherit git-r3 +else + SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + S="${WORKDIR}/${LIBNL_P}" +fi LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" -KEYWORDS="" IUSE="+debug python test utils" RESTRICT="!test? ( test )" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" -BDEPEND=" - ${RDEPEND} +BDEPEND="${RDEPEND} sys-devel/bison sys-devel/flex python? ( dev-lang/swig ) - test? ( dev-libs/check ) -" + test? ( dev-libs/check )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS=( ChangeLog ) - MULTILIB_WRAPPED_HEADERS=( # we do not install CLI stuff for non-native /usr/include/libnl3/netlink/cli/addr.h @@ -57,15 +65,10 @@ src_prepare() { distutils-r1_src_prepare popd > /dev/null || die fi - - # out-of-source build broken - # https://github.com/thom311/libnl/pull/58 - multilib_copy_sources } multilib_src_configure() { - econf \ - --disable-static \ + ECONF_SOURCE="${S}" econf \ $(multilib_native_use_enable utils cli) \ $(use_enable debug) } @@ -73,7 +76,7 @@ multilib_src_configure() { multilib_src_compile() { default - if multilib_is_native_abi && use python; then + if multilib_is_native_abi && use python ; then pushd python > /dev/null || die distutils-r1_src_compile popd > /dev/null || die @@ -83,7 +86,7 @@ multilib_src_compile() { multilib_src_install() { default - if multilib_is_native_abi && use python; then + if multilib_is_native_abi && use python ; then # Unset DOCS= since distutils-r1.eclass interferes local DOCS=() @@ -91,14 +94,14 @@ multilib_src_install() { 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 }