Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/localepurge/, app-admin/localepurge/files/, profiles/
Date: Tue, 11 Dec 2018 14:01:20
Message-Id: 1544536592.e9fdf5659da268d8d7f2a81c440637081ae70dc6.mgorny@gentoo
1 commit: e9fdf5659da268d8d7f2a81c440637081ae70dc6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 11 13:56:32 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 11 13:56:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fdf565
7
8 app-admin/localepurge: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/183273
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 app-admin/localepurge/Manifest | 1 -
14 .../files/localepurge-0.5.4-directorysum.patch | 20 --------
15 .../files/localepurge-0.5.4-evaltotal.patch | 11 ----
16 .../files/localepurge-0.5.4-parentdir.patch | 18 -------
17 .../files/localepurge-0.5.4-prefix.patch | 58 ----------------------
18 app-admin/localepurge/localepurge-0.5.4-r2.ebuild | 43 ----------------
19 app-admin/localepurge/metadata.xml | 7 ---
20 profiles/package.mask | 7 ---
21 8 files changed, 165 deletions(-)
22
23 diff --git a/app-admin/localepurge/Manifest b/app-admin/localepurge/Manifest
24 deleted file mode 100644
25 index 47e46640bb5..00000000000
26 --- a/app-admin/localepurge/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST localepurge-0.5.4.tbz2 5038 BLAKE2B 32a2155761d3cc8d8c1b0ad62ef324b7c7c768d75395ba6d4d6100382e83becba1d69fa15ac2839dabeeae15f1d2bb3bb947c62d5cbcb3d496cf68b140ae2bc8 SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e
30
31 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
32 deleted file mode 100644
33 index ebca3b755ae..00000000000
34 --- a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
35 +++ /dev/null
36 @@ -1,20 +0,0 @@
37 ---- a/localepurge
38 -+++ b/localepurge
39 -@@ -198,7 +198,7 @@
40 -
41 - if [ "$SHOWFREEDSPACE" = "enabled" ]; then
42 - if test $SPACETMP -gt 0 ; then
43 -- LOCALETOTAL=$SPACETMP
44 -+ LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
45 - einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
46 - fi
47 - SPACETMP=0
48 -@@ -230,7 +230,7 @@
49 -
50 - if [ "$SHOWFREEDSPACE" = "enabled" ]; then
51 - if test $SPACETMP -gt 0 ; then
52 -- MANTOTAL=$SPACETMP
53 -+ MANTOTAL=$(($MANTOTAL + $SPACETMP))
54 - einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
55 - fi
56 - SPACETMP=0
57
58 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
59 deleted file mode 100644
60 index aed40828334..00000000000
61 --- a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
62 +++ /dev/null
63 @@ -1,11 +0,0 @@
64 ---- a/localepurge
65 -+++ b/localepurge
66 -@@ -254,7 +254,7 @@
67 -
68 - # Calculating and reporting total disk space freed:
69 - if [ "$SHOWFREEDSPACE" = "enabled" ]; then
70 -- let TOTAL=$LOCALETOTAL+$MANTOTAL
71 -+ TOTAL=$(($LOCALETOTAL+$MANTOTAL))
72 - if test $TOTAL -lt 0; then
73 - TOTAL=0
74 - fi
75
76 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
77 deleted file mode 100644
78 index 2d8d6dac572..00000000000
79 --- a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
80 +++ /dev/null
81 @@ -1,18 +0,0 @@
82 ---- a/localepurge
83 -+++ b/localepurge
84 -@@ -165,7 +165,14 @@
85 - ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
86 -
87 - if [ "$SHOWFREEDSPACE" = "enabled" ]; then
88 -- SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
89 -+ # if symlink, REMOVEPATH could be removed
90 -+ # check from parentdir then
91 -+ if [ -d ${REMOVEPATH} ]; then
92 -+ SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
93 -+ else
94 -+ SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
95 -+ fi
96 -+
97 - SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
98 -
99 - if test $SPACESUM -gt 0 ; then
100
101 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
102 deleted file mode 100644
103 index 488871381ae..00000000000
104 --- a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
105 +++ /dev/null
106 @@ -1,58 +0,0 @@
107 ---- a/localepurge
108 -+++ b/localepurge
109 -@@ -1,14 +1,14 @@
110 --#!/bin/bash
111 -+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
112 -
113 - # Deleting all locale files on system
114 - # *not* listed in /etc/locale.nopurge
115 -
116 - set -e
117 -
118 --LOCALEDIRS="/usr/share/locale /usr/local/share/locale /usr/kde/?.?/share/locale /opt/sun-jdk-*/jre/lib/locale /opt/sun-jre-bin-*/lib/locale /usr/lib/locale /usr/share/binutils-data/*/*/locale /usr/share/gcc-data/*/*/locale"
119 --MANPAGEDIRS="/usr/share/man /usr/man /usr/local/share/man /usr/kde/?.?/share/man /usr/kde/?.?/man /opt/sun-jdk-*/man /opt/sun-jre-bin-*/man"
120 --LOCALELIST="/var/cache/localepurge/localelist"
121 --CONFIGFILE="/etc/locale.nopurge"
122 -+LOCALEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/local/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/jre/lib/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/binutils-data/*/*/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/gcc-data/*/*/locale"
123 -+MANPAGEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/man @GENTOO_PORTAGE_EPREFIX@/usr/man @GENTOO_PORTAGE_EPREFIX@/usr/local/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/man"
124 -+LOCALELIST="@GENTOO_PORTAGE_EPREFIX@/var/cache/localepurge/localelist"
125 -+CONFIGFILE="@GENTOO_PORTAGE_EPREFIX@/etc/locale.nopurge"
126 - VERSION="0.5.4"
127 -
128 - LOCALETOTAL=0
129 -@@ -23,7 +23,7 @@
130 - BRACKET=$'\e[34;01m'
131 - BOLD=$'\e[1m'
132 -
133 --ACTION="/bin/rm -vf"
134 -+ACTION="@GENTOO_PORTAGE_EPREFIX@/bin/rm -vf"
135 -
136 - eerror () {
137 - echo -e " ${BAD}*${NORMAL} $*" 2> /dev/stderr
138 -@@ -43,7 +43,7 @@
139 - print() {
140 - for x in $@; do
141 - if [ "${x}" = "" ]; then return 0
142 -- else /bin/echo $x
143 -+ else @GENTOO_PORTAGE_EPREFIX@/bin/echo $x
144 - fi
145 - done
146 - }
147 -@@ -184,7 +184,7 @@
148 - einfo "localepurge: processing locale files in ${LOCALEDIR} ..."
149 - fi
150 -
151 -- for LOCALE in `/bin/ls ${LOCALEDIR}`; do
152 -+ for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${LOCALEDIR}`; do
153 - if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
154 - if [ -d ${LOCALEDIR}/${LOCALE}/LC_MESSAGES ]; then
155 - if [ "${LIST}" = "enabled" ]; then
156 -@@ -216,7 +216,7 @@
157 - einfo "localepurge: processing man pages in ${MANPAGEDIR} ..."
158 - fi
159 -
160 -- for LOCALE in `/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
161 -+ for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
162 - if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
163 - if [ -d ${MANPAGEDIR}/${LOCALE} ]; then
164 - if [ "${LIST}" = "enabled" ]; then
165
166 diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
167 deleted file mode 100644
168 index 7e0fc8d34a9..00000000000
169 --- a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
170 +++ /dev/null
171 @@ -1,43 +0,0 @@
172 -# Copyright 1999-2018 Gentoo Foundation
173 -# Distributed under the terms of the GNU General Public License v2
174 -
175 -EAPI=6
176 -
177 -inherit prefix
178 -
179 -DESCRIPTION="Script to recover diskspace on unneeded locale files & localized man pages"
180 -HOMEPAGE="https://gentoo.org
181 -https://cgit.gentoo.org/proj/localepurge.git"
182 -SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tbz2"
183 -
184 -LICENSE="GPL-2"
185 -SLOT="0"
186 -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
187 -IUSE=""
188 -
189 -DEPEND=""
190 -RDEPEND="app-shells/bash"
191 -
192 -S=${WORKDIR}/${PN}
193 -
194 -PATCHES=(
195 - "${FILESDIR}"/${PN}-0.5.4-prefix.patch
196 - "${FILESDIR}"/${PN}-0.5.4-directorysum.patch # 164544
197 - "${FILESDIR}"/${PN}-0.5.4-parentdir.patch #445910
198 - "${FILESDIR}"/${PN}-0.5.4-evaltotal.patch #452208
199 -)
200 -
201 -src_prepare() {
202 - default
203 - eprefixify ${PN}
204 -}
205 -
206 -src_install() {
207 - insinto /var/cache/${PN}
208 - doins defaultlist
209 - dosym defaultlist /var/cache/${PN}/localelist
210 - insinto /etc
211 - doins locale.nopurge
212 - dobin ${PN}
213 - doman ${PN}.8
214 -}
215
216 diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
217 deleted file mode 100644
218 index 779ea9e0804..00000000000
219 --- a/app-admin/localepurge/metadata.xml
220 +++ /dev/null
221 @@ -1,7 +0,0 @@
222 -<?xml version="1.0" encoding="UTF-8"?>
223 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
224 -<pkgmetadata>
225 -<!-- maintainer-needed -->
226 -<longdescription>Just a simple tool to erase all uneeded locale and man files
227 -usually generated for USE="nls"</longdescription>
228 -</pkgmetadata>
229
230 diff --git a/profiles/package.mask b/profiles/package.mask
231 index cae14e73b56..0b518930baf 100644
232 --- a/profiles/package.mask
233 +++ b/profiles/package.mask
234 @@ -154,13 +154,6 @@ x11-libs/libgksu
235 dev-java/ant-nodeps
236 dev-java/ant-trax
237
238 -# Pacho Ramos <pacho@g.o> (11 Nov 2018)
239 -# Unmaintained for years, buggy (#183273, #491010, #605544). You can rely on
240 -# INSTALL_MASK to skip unwanted locales and install only foo locale:
241 -# INSTALL_MASK="/usr/share/locale -/usr/share/locale/foo"
242 -# Removal in a month.
243 -app-admin/localepurge
244 -
245 # Pacho Ramos <pacho@g.o> (11 Nov 2018)
246 # Fails to build (#662000), not compatible with kernel-4, use kernel driver rtsx_pci
247 # instead. Removal in a month.