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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2616138350 for ; Wed, 19 Feb 2020 09:49:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BCB9E09D8; Wed, 19 Feb 2020 09:48:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1ECBE09D8 for ; Wed, 19 Feb 2020 09:48:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C31B34ED73 for ; Wed, 19 Feb 2020 09:48:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E002145 for ; Wed, 19 Feb 2020 09:48:51 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1582105719.7f14a2d9d6f14424478b4f376478cb1a78097b53.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/kmod/kmod-9999.ebuild X-VCS-Directories: sys-apps/kmod/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 7f14a2d9d6f14424478b4f376478cb1a78097b53 X-VCS-Branch: master Date: Wed, 19 Feb 2020 09:48:51 +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: 5ab77270-c1d6-49ba-a25e-68990b594942 X-Archives-Hash: a9a5ec3bb27dd5366bf17cd11fd5452c commit: 7f14a2d9d6f14424478b4f376478cb1a78097b53 Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 19 09:48:39 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Feb 19 09:48:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f14a2d9 sys-apps/kmod: Synced live ebuild Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kmod/kmod-9999.ebuild | 46 ++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 1ba782da271..e0a5eee807d 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,19 +1,19 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) -inherit bash-completion-r1 multilib python-r1 +inherit autotools bash-completion-r1 multilib python-r1 if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-r3 + inherit git-r3 else SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - inherit libtool + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + #inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -41,14 +41,19 @@ RDEPEND="!sys-apps/module-init-tools libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 -DEPEND="${RDEPEND} - doc? ( dev-util/gtk-doc ) +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + dev-util/gtk-doc + dev-util/gtk-doc-am + ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[${PYTHON_USEDEP}] virtual/pkgconfig ) - zlib? ( virtual/pkgconfig )" + zlib? ( virtual/pkgconfig ) +" if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} dev-libs/libxslt" @@ -61,8 +66,9 @@ DOCS="NEWS README TODO" src_prepare() { default - if [[ ! -e configure ]] ; then + if [[ ! -e configure ]] || use doc ; then if use doc; then + cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die gtkdocize --copy --docdir libkmod/docs || die else touch libkmod/docs/gtk-doc.make @@ -85,7 +91,7 @@ src_configure() { --with-bashcompletiondir="$(get_bashcompdir)" --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) - $(use_enable doc gtk-doc) + $(usex doc '--enable-gtk-doc' '') $(use_enable static-libs static) $(use_enable tools) $(use_with lzma xz) @@ -143,7 +149,7 @@ src_install() { python_foreach_impl python_install fi - find "${ED}" -name "*.la" -delete || die + find "${ED}" -type f -name "*.la" -delete || die if use tools; then local cmd @@ -169,23 +175,23 @@ src_install() { } pkg_postinst() { - if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then + if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then ewarn "Removing old conflicting static-nodes init script from the boot runlevel" - rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes + rm -f "${EROOT}"/etc/runlevels/boot/static-nodes fi # Add kmod to the runlevel automatically if this is the first install of this package. if [[ -z ${REPLACING_VERSIONS} ]]; then - if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${EROOT%/}"/etc/runlevels/sysinit + if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then + mkdir -p "${EROOT}"/etc/runlevels/sysinit fi - if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes + if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then + ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes fi fi - if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then - if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then + if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then + if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then ewarn ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" ewarn "kernel modules to have required static nodes!"