gentoo resync : 10.04.2018

6 files changed, 24 insertions, 23 deletions

diff --git a/app-admin/localepurge/Manifest b/app-admin/localepurge/Manifest
index bbb39a3603a8..ba9bb5eb2d9e 100644
--- a/app-admin/localepurge/Manifest
+++ b/app-admin/localepurge/Manifest
@@ -1,7 +1,7 @@
-AUX localepurge-0.5.4-directorysum.patch 799 BLAKE2B 730e4e23ccef05c7bad6fde407548f9092dae26245b85af328e2b036e19f6c8a99d771dd6064157763ae3a507c3e08f5f0c19159322924a35f06f8f5203b6c39 SHA512 a7ccb8b1a6963e45ebde2ff72c0612eeaae62cd248b8b5c675d0e0d5d0c91d7d5db34edc6e09ceebab83016f62e233a62a71562537d5dc2ead20274f1bfead2b
-AUX localepurge-0.5.4-evaltotal.patch 366 BLAKE2B 2ad03d55aecefcb16853eb964c8562056bcf1f7f17b0f5a158134bd9bed8c4cdf811f3c80da11524d2cf52797377903a4bd39493f581855c0e91714d85f09a9c SHA512 81c10dae3222fee74ab814966745fcf6793aee4601ce3686d19c3ad6a602edb237fe877c94462cdfc5abfd71ce53cfa2fd439c453f38f98335147b1134cc843d
-AUX localepurge-0.5.4-parentdir.patch 730 BLAKE2B c5346f90b1d3a3a5369447dc0cc53390b02c74fee52f6372ebc2a0f2e7af35545af5276d465b10935fbcf0e774834a4db7ff81d72d0c8996e475ae79a6b8795f SHA512 f46501a92fb37645c49d7ed50265cb739b7f0ca0f88be0586aae25f4672caf097ce60d6808c545b2dda31e295e596f58fba501f4470b7ea96c8fe11a1de0f0cb
-AUX localepurge-0.5.4-prefix.patch 2872 BLAKE2B 6f6bc5ae8a3bfb973eff58e5175c67e42635a278013e41e42812d336e5b3ec1ca507170d3e233f1d359506e1ec7e2370ddea531adac034702c351e84a3458627 SHA512 994050265349b6fd91d6759368250a25122d207ec3356dc5d7902a4d897012dadf2fead83d7aa36f98191ed309ce0019d8f21a445c7d56139355a9bd471e1ad6
+AUX localepurge-0.5.4-directorysum.patch 726 BLAKE2B ededf92eb7b11dce7b1b7a46ce879f180ccfef64d2b6e503391350d32af7e502f0ebf27341f3e4345e0d944184e291b8df12daf0d863af9c11126b30dda309a1 SHA512 2b7c2284d26ad2ab254faf9c976ee2d53e0b5e46bf3696164e21772304ae28a8de13662099f492146674e50a8dfc49b799a4be25a3e8e0c42a6e47a085dfd522
+AUX localepurge-0.5.4-evaltotal.patch 289 BLAKE2B 05029aebc3e5a808b42188f0759b45c5bff534dd962374986fb49e7713c70353e7607c91ef8e045f89185dbc6cd24b672824c53e3f7b9f8b096843e1f8c40390 SHA512 d3326631ada71ed930aae1b7e9338fdff2e216d9130a735b431d37f0da5691f087d57e8cb5851b27514a43bf5b00cf3881e1e02f5d8899da186baa2cb771cf4f
+AUX localepurge-0.5.4-parentdir.patch 657 BLAKE2B ace728b65f9e1ce6f8c449f75cdec0313c3ba6168e5baeb64adf7a76fe7cd92774e7a8d345492c4f4c633854672278f91a4c3eb0cab8d30817a3b4af3ed6dc2d SHA512 246d7865eb0645e71b607a523c49d9ae39a31b3371d7042045dadaf4939b6c5a7dd1bc13bc9eabef46ebdebabdb07669b3636a498e9e8059196206b32c38484e
+AUX localepurge-0.5.4-prefix.patch 2799 BLAKE2B 167d9fae44e9351526a103b6fe2d91b0a825a9aa096f02cbede29ddb72a1c42acf849b1a0f19afce0b303e2966668ecdfaa23b9a99a49ef3ca0971eb46723563 SHA512 cdff18f4387919f1ac1376f843b3ce65645cb6c4837401d00bbb3293108833ceded1a5f0e02b23f4024164ee10d2d03fe798d3ce591401a2816c8b61a9999c21
 DIST localepurge-0.5.4.tbz2 5038 BLAKE2B 32a2155761d3cc8d8c1b0ad62ef324b7c7c768d75395ba6d4d6100382e83becba1d69fa15ac2839dabeeae15f1d2bb3bb947c62d5cbcb3d496cf68b140ae2bc8 SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e
-EBUILD localepurge-0.5.4-r2.ebuild 1005 BLAKE2B 71d45f91e4f81507178a5f727e37908b756f8f4785fd5fc19134ca3244ecc8b0afc92b846ce3cc6a53f526d4df7e4b4bf6cb1a786df3ce5e671461b48f177355 SHA512 c182cadf66486da8bbcca3c6cd74343bb4b873a16ecee8195e2c64cce143daa3befaf499d78886681dbbafa357c019ed018c6fcbd1619e557437690003f9446a
+EBUILD localepurge-0.5.4-r2.ebuild 1014 BLAKE2B 6e65605b6e478bc8e1cc09c01cbd65f5af572566cf7a741cf7591f332246c7f36f9f1c5aaa057e8ab62052c2c9ed502c73f5e708eb6662d08acccb873a4610a9 SHA512 8c00d1fe5b1ee8d95b6666e27e43b43d3dd32682d99f8c9f5f81f12f438cd4cb2d787dbf6fd818d903b44fd049a3138daaf5b0fd1a31f51fcb9b5c9d9715c756
 MISC metadata.xml 295 BLAKE2B b7de6495b5128fc39975ccef8917e8b997649cfb1d96bce9c969b1cc99d1aa01de5ad9b3992594c3e26a4753f9cb83ba87e33c0d5ffbd2c3b341e993c2e6825d SHA512 1828b9bd1dc81e15ab98d4dd17aa1dd165739824cd3c56c32872cee9b42ea6a4d4a110be9dcc21df889341402d1b1bc74c71e84572aa7892f81321e8a74d9cf5
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 f837d2845d54..ebca3b755aec 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 df80a7f9c8a6..aed408283343 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 2b052ddf4d99..2d8d6dac5720 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 66ebbf09ac96..488871381aed 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 cb6dca5900aa..2375b29b4a0a 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}
 }