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 8C580138330 for ; Tue, 9 Jan 2018 08:47:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABA4FE099C; Tue, 9 Jan 2018 08:47:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 89379E099C for ; Tue, 9 Jan 2018 08:47:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 29ED5335C43 for ; Tue, 9 Jan 2018 08:47:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C92CE1A7 for ; Tue, 9 Jan 2018 08:47:34 +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: <1515487429.30f0bdf1d1c8422d31d8a5c68ee6d40568289d63.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: 30f0bdf1d1c8422d31d8a5c68ee6d40568289d63 X-VCS-Branch: master Date: Tue, 9 Jan 2018 08:47:34 +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-Archives-Salt: ef2fd25d-9d38-4df9-8f9d-d7372a5b7651 X-Archives-Hash: 4dfa09442630ffa6cab8ff213836d6bd commit: 30f0bdf1d1c8422d31d8a5c68ee6d40568289d63 Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 9 08:43:49 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Jan 9 08:43:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f0bdf1 sys-apps/kmod: Synced live ebuild. Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/kmod/kmod-9999.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 3a82094b051..1ffba7ee85c 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit bash-completion-r1 eutils multilib python-r1 +inherit bash-completion-r1 ltprune multilib python-r1 if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit autotools git-2 + inherit autotools git-r3 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" @@ -55,6 +55,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS="NEWS README TODO" src_prepare() { + default + if [ ! -e configure ]; then if use doc; then gtkdocize --copy --docdir libkmod/docs || die @@ -75,15 +77,15 @@ src_prepare() { src_configure() { local myeconfargs=( --bindir="${EPREFIX}/bin" - --with-rootlibdir="${EPREFIX}/$(get_libdir)" --enable-shared - $(use_enable static-libs static) - $(use_enable tools) + --with-bashcompletiondir="$(get_bashcompdir)" + --with-rootlibdir="${EPREFIX}/$(get_libdir)" $(use_enable debug) $(use_enable doc gtk-doc) + $(use_enable static-libs static) + $(use_enable tools) $(use_with lzma xz) $(use_with zlib) - --with-bashcompletiondir="$(get_bashcompdir)" ) local ECONF_SOURCE="${S}"