1 |
commit: 43e9593fa071b60031f644cece815245252f0931 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 13 18:55:29 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 13 18:55:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e9593f |
7 |
|
8 |
sys-apps/baselayout-prefix: drop unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
.../files/baselayout-1.12.5-prefix-chaining.patch | 83 ---------------------- |
13 |
.../baselayout-1.12.5-prefix-no-consoletype.patch | 11 --- |
14 |
2 files changed, 94 deletions(-) |
15 |
|
16 |
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining.patch |
17 |
deleted file mode 100644 |
18 |
index f17d1bb3936..00000000000 |
19 |
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-chaining.patch |
20 |
+++ /dev/null |
21 |
@@ -1,83 +0,0 @@ |
22 |
-diff -ru baselayout-1.12.5.orig/etc/profile baselayout-1.12.5/etc/profile |
23 |
---- baselayout-1.12.5.orig/etc/profile 2009-03-24 08:18:37.000000000 +0100 |
24 |
-+++ baselayout-1.12.5/etc/profile 2009-03-24 11:50:57.000000000 +0100 |
25 |
-@@ -4,6 +4,40 @@ |
26 |
- # environment for login shells. |
27 |
- # |
28 |
- |
29 |
-+# |
30 |
-+# for prefix-chaining, the very first thing to do is to load |
31 |
-+# the profiles for all chained instances above. |
32 |
-+# |
33 |
-+# TODO: is it safe in any case to shell source make.conf? |
34 |
-+# don't do any recursive expansion here. if the parent can |
35 |
-+# use READONLY_EPREFIX's, it has to have the same profile as |
36 |
-+# we have here, and thus it will source parents before |
37 |
-+# evaluating anything from itself. |
38 |
-+# |
39 |
-+_ro_root=$(. "@GENTOO_PORTAGE_EPREFIX@"/etc/make.conf && echo $READONLY_EPREFIX) |
40 |
-+_ro_deps=${_ro_root#*:} |
41 |
-+_ro_root=${_ro_root%:*} |
42 |
-+if [ -n "${_ro_root}" -a -f "${_ro_root}"/etc/profile ]; then |
43 |
-+ . "${_ro_root}"/etc/profile |
44 |
-+fi |
45 |
-+ |
46 |
-+# |
47 |
-+# With prefix-chaining we want another set of variables that |
48 |
-+# should be retained for all prefixes. for example it is ok |
49 |
-+# to retain PKG_CONFIG_PATH if the parent of the chain can |
50 |
-+# be used to resolve RDEPEND... |
51 |
-+# |
52 |
-+if [[ -n "${_ro_root}" ]]; then |
53 |
-+ _ro_chained_path_vars="PATH MANPATH" |
54 |
-+ |
55 |
-+ [[ ${_ro_deps} == *RDEPEND* ]] && |
56 |
-+ _ro_chained_path_vars="${_ro_chained_path_vars} PKG_CONFIG_PATH" |
57 |
-+ |
58 |
-+ for var in ${_ro_chained_path_vars}; do |
59 |
-+ eval "_ro_backupenv_paths_${var}=\${${var}}" |
60 |
-+ done |
61 |
-+fi |
62 |
-+ |
63 |
- # Load environment settings from profile.env, which is created by |
64 |
- # env-update from the files in /etc/env.d |
65 |
- if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then |
66 |
-@@ -21,10 +55,17 @@ |
67 |
- # It is intentional in the following line to use || instead of -o. |
68 |
- # This way the evaluation can be short-circuited and calling whoami is |
69 |
- # avoided. |
70 |
-+# |
71 |
-+# system directories are only appended if this prefix is the last |
72 |
-+# one in a chain of prefixes (or the only prefix in the chain), so |
73 |
-+# that they don't end up in the middle of multiple different prefix |
74 |
-+# paths (profile is recursive now, see above!) |
75 |
- if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then |
76 |
-- PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin" |
77 |
-+ PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}" |
78 |
-+ [[ -z "${_ro_root}" ]] && PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin" |
79 |
- else |
80 |
-- PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin" |
81 |
-+ PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}" |
82 |
-+ [[ -z "${_ro_root}" ]] && PATH="$PATH:/usr/bin:/bin" |
83 |
- fi |
84 |
- export PATH |
85 |
- unset ROOTPATH |
86 |
-@@ -63,3 +104,18 @@ |
87 |
- fi |
88 |
- done |
89 |
- unset sh |
90 |
-+ |
91 |
-+# |
92 |
-+# finally chain the save variables for previous prefixes in the chain. |
93 |
-+# |
94 |
-+if [[ -n "${_ro_chained_path_vars}" ]]; then |
95 |
-+ for var in ${_ro_chained_path_vars}; do |
96 |
-+ eval "export ${var}=\${${var}}:\${_ro_backupenv_paths_${var}}" |
97 |
-+ eval "unset _ro_backupenv_paths_${var}" |
98 |
-+ done |
99 |
-+fi |
100 |
-+ |
101 |
-+unset _ro_root |
102 |
-+unset _ro_deps |
103 |
-+unset _ro_chained_path_vars |
104 |
-+ |
105 |
|
106 |
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-no-consoletype.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-no-consoletype.patch |
107 |
deleted file mode 100644 |
108 |
index 442dea3543e..00000000000 |
109 |
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-prefix-no-consoletype.patch |
110 |
+++ /dev/null |
111 |
@@ -1,11 +0,0 @@ |
112 |
---- baselayout-1.12.5/src/Makefile 2007-10-17 21:22:08 +0400 |
113 |
-+++ baselayout-1.12.5/src/Makefile 2007-10-17 21:22:23 +0400 |
114 |
-@@ -9,7 +9,7 @@ |
115 |
- LIBDIR = lib |
116 |
- |
117 |
- BIN_TARGETS = |
118 |
--SBIN_TARGETS = consoletype runscript start-stop-daemon |
119 |
-+SBIN_TARGETS = runscript start-stop-daemon |
120 |
- SYS_WHITELIST = env_whitelist |
121 |
- |
122 |
- TARGET = $(BIN_TARGETS) $(SBIN_TARGETS) |