From 85f9944fb8d1a15c1b0ecab9cf1a9930d68820d9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 16 Sep 2021 22:41:38 +0200 Subject: [PATCH] dev-libs/libdnet: Apply Flatcar modifications --- .../coreos-overlay/dev-libs/libdnet/README.md | 6 +++ .../dev-libs/libdnet/libdnet-1.14-r2.ebuild | 38 +++++-------------- 2 files changed, 15 insertions(+), 29 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/README.md b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/README.md new file mode 100644 index 0000000000..a99664f330 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/README.md @@ -0,0 +1,6 @@ +This is a fork of gentoo package. It's a dependency of the +open-vm-tools which is installed in the oem partition. We have it in +overlay, because: + +- We drop python stuff from the package. +- We change the prefix and sbindir. diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.14-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.14-r2.ebuild index f8a7f4031b..8c64e16bb7 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.14-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/libdnet/libdnet-1.14-r2.ebuild @@ -4,9 +4,8 @@ EAPI=7 AT_M4DIR="config" -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 + +inherit autotools DESCRIPTION="simplified, portable interface to several low-level networking routines" HOMEPAGE="https://github.com/ofalk/libdnet" @@ -16,16 +15,13 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="test" +REQUIRED_USE="" RESTRICT="!test? ( test )" -DEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="" RDEPEND="${DEPEND}" BDEPEND=" - python? ( - dev-python/cython[${PYTHON_USEDEP}] - ) " DOCS=( README.md THANKS ) @@ -50,35 +46,19 @@ src_prepare() { Makefile.am || die eautoreconf - - if use python; then - cd python || die - distutils-r1_src_prepare - fi } src_configure() { + # Install into OEM, don't bother with a sbin directory. econf \ + --prefix=/usr/share/oem \ + --sbindir=/usr/share/oem/bin \ --disable-static \ - $(use_with python) -} - -src_compile() { - default - if use python; then - cd python || die - distutils-r1_src_compile - fi + --without-python } src_install() { default - if use python; then - cd python || die - unset DOCS - distutils-r1_src_install - fi - find "${ED}" -name '*.la' -delete || die }