commit: 2fa99908795c6b9bd4248b461dba8070a65122d9 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> AuthorDate: Fri Apr 6 12:31:38 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 7 15:35:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa99908
app-admin/localepurge: EAPI bump, epatch->eapply Removed eutils and switched epatch's to PATCH=() array. Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7843 .../files/localepurge-0.5.4-directorysum.patch | 4 ++-- .../files/localepurge-0.5.4-evaltotal.patch | 4 ++-- .../files/localepurge-0.5.4-parentdir.patch | 4 ++-- .../files/localepurge-0.5.4-prefix.patch | 4 ++-- app-admin/localepurge/localepurge-0.5.4-r2.ebuild | 21 +++++++++++---------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch index f837d2845d5..ebca3b755ae 100644 --- a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch +++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch @@ -1,5 +1,5 @@ ---- localepurge.orig 2012-12-04 23:15:29.422756767 +0100 -+++ localepurge 2012-12-04 23:16:13.313756491 +0100 +--- a/localepurge ++++ b/localepurge @@ -198,7 +198,7 @@ if [ "$SHOWFREEDSPACE" = "enabled" ]; then diff --git a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch index df80a7f9c8a..aed40828334 100644 --- a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch +++ b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch @@ -1,5 +1,5 @@ ---- localepurge.original 2012-12-02 18:32:35.000000000 +0400 -+++ localepurge 2013-01-14 19:31:35.327821252 +0400 +--- a/localepurge ++++ b/localepurge @@ -254,7 +254,7 @@ # Calculating and reporting total disk space freed: diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch index 2b052ddf4d9..2d8d6dac572 100644 --- a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch +++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch @@ -1,5 +1,5 @@ ---- localepurge.orig 2012-12-04 23:08:17.754765708 +0100 -+++ localepurge 2012-12-04 23:09:02.397765264 +0100 +--- a/localepurge ++++ b/localepurge @@ -165,7 +165,14 @@ ${ACTION} `find ${REMOVEPATH} -type f -o -type l` diff --git a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch index 66ebbf09ac9..488871381ae 100644 --- a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch +++ b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch @@ -1,5 +1,5 @@ ---- localepurge.orig 2012-12-02 19:56:18.000000000 +0100 -+++ localepurge 2012-12-02 20:00:38.000000000 +0100 +--- a/localepurge ++++ b/localepurge @@ -1,14 +1,14 @@ -#!/bin/bash +#!@GENTOO_PORTAGE_EPREFIX@/bin/bash diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild index cb6dca5900a..2375b29b4a0 100644 --- a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild +++ b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit eutils prefix +inherit prefix DESCRIPTION="Script to recover diskspace on unneeded locale files & localized man pages" HOMEPAGE="https://gentoo.org @@ -20,14 +20,15 @@ RDEPEND="app-shells/bash" S=${WORKDIR}/${PN} +PATCHES=( + "${FILESDIR}"/${PN}-0.5.4-prefix.patch + "${FILESDIR}"/${PN}-0.5.4-directorysum.patch # 164544 + "${FILESDIR}"/${PN}-0.5.4-parentdir.patch #445910 + "${FILESDIR}"/${PN}-0.5.4-evaltotal.patch #452208 +) + src_prepare() { - epatch "${FILESDIR}"/${P}-prefix.patch - # 164544 - epatch "${FILESDIR}"/${P}-directorysum.patch - # 445910 - epatch "${FILESDIR}"/${P}-parentdir.patch - # 452208 - epatch "${FILESDIR}"/${P}-evaltotal.patch + default eprefixify ${PN} }
