Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/localepurge/files/, app-admin/localepurge/
Date: Sat, 07 Apr 2018 15:36:17
Message-Id: 1523115334.2fa99908795c6b9bd4248b461dba8070a65122d9.asturm@gentoo
1 commit: 2fa99908795c6b9bd4248b461dba8070a65122d9
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Fri Apr 6 12:31:38 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 7 15:35:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa99908
7
8 app-admin/localepurge: EAPI bump, epatch->eapply
9
10 Removed eutils and switched epatch's to PATCH=() array.
11
12 Package-Manager: Portage-2.3.28, Repoman-2.3.9
13 Closes: https://github.com/gentoo/gentoo/pull/7843
14
15 .../files/localepurge-0.5.4-directorysum.patch | 4 ++--
16 .../files/localepurge-0.5.4-evaltotal.patch | 4 ++--
17 .../files/localepurge-0.5.4-parentdir.patch | 4 ++--
18 .../files/localepurge-0.5.4-prefix.patch | 4 ++--
19 app-admin/localepurge/localepurge-0.5.4-r2.ebuild | 21 +++++++++++----------
20 5 files changed, 19 insertions(+), 18 deletions(-)
21
22 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
23 index f837d2845d5..ebca3b755ae 100644
24 --- a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
25 +++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
26 @@ -1,5 +1,5 @@
27 ---- localepurge.orig 2012-12-04 23:15:29.422756767 +0100
28 -+++ localepurge 2012-12-04 23:16:13.313756491 +0100
29 +--- a/localepurge
30 ++++ b/localepurge
31 @@ -198,7 +198,7 @@
32
33 if [ "$SHOWFREEDSPACE" = "enabled" ]; then
34
35 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
36 index df80a7f9c8a..aed40828334 100644
37 --- a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
38 +++ b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
39 @@ -1,5 +1,5 @@
40 ---- localepurge.original 2012-12-02 18:32:35.000000000 +0400
41 -+++ localepurge 2013-01-14 19:31:35.327821252 +0400
42 +--- a/localepurge
43 ++++ b/localepurge
44 @@ -254,7 +254,7 @@
45
46 # Calculating and reporting total disk space freed:
47
48 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
49 index 2b052ddf4d9..2d8d6dac572 100644
50 --- a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
51 +++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
52 @@ -1,5 +1,5 @@
53 ---- localepurge.orig 2012-12-04 23:08:17.754765708 +0100
54 -+++ localepurge 2012-12-04 23:09:02.397765264 +0100
55 +--- a/localepurge
56 ++++ b/localepurge
57 @@ -165,7 +165,14 @@
58 ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
59
60
61 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
62 index 66ebbf09ac9..488871381ae 100644
63 --- a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
64 +++ b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
65 @@ -1,5 +1,5 @@
66 ---- localepurge.orig 2012-12-02 19:56:18.000000000 +0100
67 -+++ localepurge 2012-12-02 20:00:38.000000000 +0100
68 +--- a/localepurge
69 ++++ b/localepurge
70 @@ -1,14 +1,14 @@
71 -#!/bin/bash
72 +#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
73
74 diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
75 index cb6dca5900a..2375b29b4a0 100644
76 --- a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
77 +++ b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
78 @@ -1,9 +1,9 @@
79 -# Copyright 1999-2017 Gentoo Foundation
80 +# Copyright 1999-2018 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82
83 -EAPI=4
84 +EAPI=6
85
86 -inherit eutils prefix
87 +inherit prefix
88
89 DESCRIPTION="Script to recover diskspace on unneeded locale files & localized man pages"
90 HOMEPAGE="https://gentoo.org
91 @@ -20,14 +20,15 @@ RDEPEND="app-shells/bash"
92
93 S=${WORKDIR}/${PN}
94
95 +PATCHES=(
96 + "${FILESDIR}"/${PN}-0.5.4-prefix.patch
97 + "${FILESDIR}"/${PN}-0.5.4-directorysum.patch # 164544
98 + "${FILESDIR}"/${PN}-0.5.4-parentdir.patch #445910
99 + "${FILESDIR}"/${PN}-0.5.4-evaltotal.patch #452208
100 +)
101 +
102 src_prepare() {
103 - epatch "${FILESDIR}"/${P}-prefix.patch
104 - # 164544
105 - epatch "${FILESDIR}"/${P}-directorysum.patch
106 - # 445910
107 - epatch "${FILESDIR}"/${P}-parentdir.patch
108 - # 452208
109 - epatch "${FILESDIR}"/${P}-evaltotal.patch
110 + default
111 eprefixify ${PN}
112 }