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 96E31139089 for ; Wed, 21 Dec 2016 10:46:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40916234016; Wed, 21 Dec 2016 10:46:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CFD82241B8 for ; Wed, 21 Dec 2016 10:46:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6684C341026 for ; Wed, 21 Dec 2016 10:46:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAB0324BA for ; Wed, 21 Dec 2016 10:46:27 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1482317160.3779cde67f5530c11bd607ac75dedf698340f91c.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/crossdev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/crossdev/crossdev-20160602-r1.ebuild sys-devel/crossdev/crossdev-99999999.ebuild X-VCS-Directories: sys-devel/crossdev/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 3779cde67f5530c11bd607ac75dedf698340f91c X-VCS-Branch: master Date: Wed, 21 Dec 2016 10:46:27 +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: 2c7bb772-1305-45a0-8525-dc70383923cf X-Archives-Hash: 2c561040afeae42412c049cb0b00fc13 commit: 3779cde67f5530c11bd607ac75dedf698340f91c Author: Bertrand Jacquin jacquin bzh> AuthorDate: Mon Sep 12 21:36:38 2016 +0000 Commit: Patrice Clement gentoo org> CommitDate: Wed Dec 21 10:46:00 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3779cde6 sys-devel/crossdev: Move to EAPI 6 and git-r3. Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/2317 ...ossdev-99999999.ebuild => crossdev-20160602-r1.ebuild} | 15 ++++++--------- sys-devel/crossdev/crossdev-99999999.ebuild | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-20160602-r1.ebuild similarity index 78% copy from sys-devel/crossdev/crossdev-99999999.ebuild copy to sys-devel/crossdev/crossdev-20160602-r1.ebuild index d9e3862..459e55e 100644 --- a/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sys-devel/crossdev/crossdev-20160602-r1.ebuild @@ -2,14 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -inherit eutils +EAPI="6" if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" else SRC_URI="mirror://gentoo/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" @@ -30,13 +27,13 @@ RDEPEND=">=sys-apps/portage-2.1 !sys-devel/crossdev-wrappers" DEPEND="app-arch/xz-utils" -src_prepare() { - epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch -} +PATCHES=( + "${FILESDIR}"/use-new-path-for-functions.sh.patch +) src_install() { default if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die fi } diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild index d9e3862..459e55e 100644 --- a/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sys-devel/crossdev/crossdev-99999999.ebuild @@ -2,14 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -inherit eutils +EAPI="6" if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" else SRC_URI="mirror://gentoo/${P}.tar.xz https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" @@ -30,13 +27,13 @@ RDEPEND=">=sys-apps/portage-2.1 !sys-devel/crossdev-wrappers" DEPEND="app-arch/xz-utils" -src_prepare() { - epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch -} +PATCHES=( + "${FILESDIR}"/use-new-path-for-functions.sh.patch +) src_install() { default if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die fi }