1 |
commit: 6515622be101ba8eb562417902a599bd347f6740 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Mar 1 17:31:04 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 4 03:13:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6515622b |
7 |
|
8 |
app-admin/perl-cleaner: remove unused patch(es) |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/11193 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
.../files/perl-cleaner-2.20-prefix.patch | 111 --------------------- |
15 |
1 file changed, 111 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch b/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch |
18 |
deleted file mode 100644 |
19 |
index 27d5b1dd73d..00000000000 |
20 |
--- a/app-admin/perl-cleaner/files/perl-cleaner-2.20-prefix.patch |
21 |
+++ /dev/null |
22 |
@@ -1,111 +0,0 @@ |
23 |
-add Prefix and Darwin support |
24 |
- |
25 |
---- perl-cleaner |
26 |
-+++ perl-cleaner |
27 |
-@@ -1,4 +1,4 @@ |
28 |
--#!/bin/bash |
29 |
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash |
30 |
- # vim: set et sw=4 sts=4 tw=80: |
31 |
- # Copyright 2005-2014 Gentoo Foundation |
32 |
- # Distributed under the terms of the GNU General Public License v2 |
33 |
-@@ -22,13 +22,13 @@ |
34 |
- PKGS_EXCEPTIONS="dev-lang/perl sys-devel/libperl app-emulation/emul-linux-x86-baselibs" |
35 |
- PKGS_MANUAL="" |
36 |
- |
37 |
--PKG_DBDIR=/var/db/pkg |
38 |
-+PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg" |
39 |
- |
40 |
- # See bug 504116 for details |
41 |
--if [ -e /lib/gentoo/functions.sh ]; then |
42 |
-- . /lib/gentoo/functions.sh |
43 |
--elif [ -e /etc/init.d/functions.sh ]; then |
44 |
-- . /etc/init.d/functions.sh |
45 |
-+if [ -e "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" ]; then |
46 |
-+ . "@GENTOO_PORTAGE_EPREFIX@/lib/gentoo/functions.sh" |
47 |
-+elif [ -e "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" ]; then |
48 |
-+ . "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh" |
49 |
- else |
50 |
- echo "$0: Unable to find functions.sh" |
51 |
- exit 1 |
52 |
-@@ -157,7 +157,7 @@ |
53 |
- |
54 |
- veinfo 1 "Locating ph files for removal" |
55 |
- eindent "" |
56 |
-- for i in /usr/lib{,64,x32}/perl5 ; do |
57 |
-+ for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/lib{,64,x32}/perl5 ; do |
58 |
- [[ ! -d ${i} ]] && continue |
59 |
- veinfo 4 "...in ${i}" |
60 |
- while IFS= read -r -d $'\0' file ; do |
61 |
-@@ -183,13 +183,13 @@ |
62 |
- veinfo 1 "Pretend. Nothing to do." |
63 |
- return |
64 |
- fi |
65 |
-- pushd /usr/include > /dev/null |
66 |
-+ pushd "@GENTOO_PORTAGE_EPREFIX@"/usr/include > /dev/null |
67 |
- if [[ ${version} =~ ^5.(8|10) ]] ; then |
68 |
- eindent |
69 |
-- veinfo 2 "...in /usr/include" |
70 |
-+ veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include" |
71 |
- h2ph ${option} * 2>/dev/null |
72 |
- for dir in sys arpa netinet bits security asm gnu linux ; do |
73 |
-- veinfo 2 "...in /usr/include/$dir/" |
74 |
-+ veinfo 2 "...in @GENTOO_PORTAGE_EPREFIX@/usr/include/$dir/" |
75 |
- h2ph ${option} -r $dir/* |
76 |
- done |
77 |
- eoutdent |
78 |
-@@ -220,13 +220,16 @@ |
79 |
- veinfo 1 "Locating ebuilds linked against libperl" |
80 |
- fi |
81 |
- |
82 |
-+ local scanelf=scanelf |
83 |
-+ [[ -e "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.dylib ]] \ |
84 |
-+ && scanelf=scanmacho |
85 |
- if ${LIBPERL} ; then |
86 |
-- if ! type -P scanelf >/dev/null 2>&1; then |
87 |
-- ewarn "scanelf not found! Install app-misc/pax-utils." |
88 |
-+ if ! type -P ${scanelf} >/dev/null 2>&1; then |
89 |
-+ ewarn "${scanelf} not found! Install app-misc/pax-utils." |
90 |
- ewarn "--libperl is disbled." |
91 |
- LIBPERL=false |
92 |
- else |
93 |
-- SONAME="$(scanelf -qBS "$(realpath /usr/lib/libperl.so 2>/dev/null )" | awk '{ print $1 }')" |
94 |
-+ SONAME="$(${scanelf} -qBS "$(realpath "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libperl.{so,dylib} 2>/dev/null )" | awk '{ print $1 }')" |
95 |
- veinfo 4 SONAME="${SONAME}" |
96 |
- fi |
97 |
- fi |
98 |
-@@ -268,7 +271,7 @@ |
99 |
- while read -r type file ; do |
100 |
- shopt -s extglob |
101 |
- [[ ${type} == obj ]] || [[ ${type} == sym ]] || continue |
102 |
-- [[ ${file} =~ ^/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue |
103 |
-+ [[ ${file} =~ ^"@GENTOO_PORTAGE_EPREFIX@"/usr/(share|lib(32|64|x32)?)/perl5 ]] || continue |
104 |
- file=${file% +(!([[:space:]])) +([[:digit:]])} |
105 |
- shopt -u extglob |
106 |
- if ${FORCE} || outdated_path "${file}" ; then |
107 |
-@@ -302,7 +305,7 @@ |
108 |
- |
109 |
- if ${LIBPERL} ; then |
110 |
- # We assume the broken libs have all bin or lib in their path |
111 |
-- broken_libs="$(scanelf -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.so\.[0-9.]*' | sort -u )" |
112 |
-+ broken_libs="$(${scanelf} -qBn < <(awk '/^(obj|sym) [^ ]*\/(s?bin|lib(32|64|x32)?)\// && ! /^obj [^ ]*\/usr\/lib\/debug\//{ print $2 }' ${content} ) | grep -o 'libperl\.\(so\|dylib\)\.[0-9.]*' | sort -u )" |
113 |
- if [[ -n "${broken_libs}" ]] ; then |
114 |
- if ${FORCE} || [[ ${broken_libs} != ${SONAME} ]] ; then |
115 |
- PKGS_TO_REMERGE+=" ${CATPKGVER}" |
116 |
-@@ -327,7 +330,7 @@ |
117 |
- exit $? |
118 |
- fi |
119 |
- |
120 |
-- if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x /usr/bin/portageq ]] ; then |
121 |
-+ if [[ ${PMS_COMMAND[${PMS_INDEX}]} == emerge && -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq ]] ; then |
122 |
- # Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS |
123 |
- emerge_default_opts="" |
124 |
- for option in $(portageq envvar EMERGE_DEFAULT_OPTS ) ; do |
125 |
-@@ -383,7 +386,7 @@ |
126 |
- veinfo 1 "or edited. This script cannot deal with them." |
127 |
- vecho 1 |
128 |
- |
129 |
-- for i in /usr/{share,lib{,32,64,x32}}/perl5 ; do |
130 |
-+ for i in "@GENTOO_PORTAGE_EPREFIX@"/usr/{share,lib{,32,64,x32}}/perl5 ; do |
131 |
- [[ -d $i ]] && perlpath[${#perlpath[*]}]="$(realpath $i 2>/dev/null )" |
132 |
- done |
133 |
- [[ ${#perlpath[*]} == 0 ]] && return |