commit: 3779cde67f5530c11bd607ac75dedf698340f91c Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh> AuthorDate: Mon Sep 12 21:36:38 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> 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 }
