From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 30ED913888F for ; Fri, 23 Oct 2015 20:34:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98E2EE0801; Fri, 23 Oct 2015 20:34:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27204E0801 for ; Fri, 23 Oct 2015 20:34:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A81F340AC9 for ; Fri, 23 Oct 2015 20:34:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61A4916BD for ; Fri, 23 Oct 2015 20:34:32 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1445632223.e1e847effe28be1582eee2d842133abb55c61cde.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: e1e847effe28be1582eee2d842133abb55c61cde X-VCS-Branch: master Date: Fri, 23 Oct 2015 20:34:32 +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: 21c200be-6e5d-429b-a654-057042b34b02 X-Archives-Hash: 78b7789668ecdb0ca43f0234da8f653a commit: e1e847effe28be1582eee2d842133abb55c61cde Author: Jason Zaman gentoo org> AuthorDate: Fri Oct 23 20:24:19 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Fri Oct 23 20:30:23 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e847ef sys-fs/zfs: update live ebuild - update to git-r3 eclass - install bash-completion unconditionally and add alias for zpool command - update src_uri to use release tarballs - add python3.5 compatibility sys-fs/zfs/zfs-9999.ebuild | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 8bb60aa..ecfe2e0 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -3,32 +3,25 @@ # $Id$ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit python-r1 linux-info - -AT_M4DIR="config" -AUTOTOOLS_AUTORECONF="1" -AUTOTOOLS_IN_SOURCE_BUILD="1" +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) if [ ${PV} == "9999" ] ; then - inherit git-2 linux-mod + inherit git-r3 linux-mod + AUTOTOOLS_AUTORECONF="1" EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" else - inherit eutils versionator - SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" + SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~ppc ~ppc64" fi -inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd +inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="http://zfsonlinux.org/" -LICENSE="BSD-2 CDDL bash-completion? ( MIT )" +LICENSE="BSD-2 CDDL MIT" SLOT="0" -IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" +IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" @@ -62,6 +55,9 @@ RDEPEND="${COMMON_DEPEND} !>=sys-fs/udev-init-scripts-28 " +AT_M4DIR="config" +AUTOTOOLS_IN_SOURCE_BUILD="1" + pkg_setup() { if use kernel_linux && use test-suite; then linux-info_pkg_setup @@ -126,7 +122,8 @@ src_install() { gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core use test-suite || rm -rf "${ED}usr/share/zfs" - use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs + newbashcomp "${FILESDIR}/bash-completion-r1" zfs + bashcomp_alias zfs zpool exeinto /usr/libexec doexe "${T}/zfs-init.sh" @@ -134,7 +131,6 @@ src_install() { } pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] then einfo "Adding ${P} to the module database to ensure that the"