| 1 |
commit: 480bdd8b4ef31eabeb180ec28309596bee0156c4 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Jul 13 18:38:12 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 14 16:05:48 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480bdd8b |
| 7 |
|
| 8 |
app-portage/cfg-update: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/1883 |
| 11 |
|
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
.../cfg-update/files/cfg-update-1.8.2-bashrc.patch | 51 ---------------------- |
| 15 |
.../files/cfg-update-1.8.2-xxdiff-to-beediff.patch | 45 ------------------- |
| 16 |
2 files changed, 96 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-portage/cfg-update/files/cfg-update-1.8.2-bashrc.patch b/app-portage/cfg-update/files/cfg-update-1.8.2-bashrc.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index 73fe9b8..0000000 |
| 21 |
--- a/app-portage/cfg-update/files/cfg-update-1.8.2-bashrc.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,51 +0,0 @@ |
| 24 |
---- cfg-update-1.8.2-r1/cfg-update |
| 25 |
-+++ cfg-update-1.8.2-r1/cfg-update |
| 26 |
-@@ -538,9 +538,9 @@ |
| 27 |
- local $ENV{LC_ALL}="C"; |
| 28 |
- if (`grep '^.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { |
| 29 |
- local $ENV{LC_ALL}="C"; |
| 30 |
-- if (`grep '^#.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { |
| 31 |
-+ if (`grep ': cfg-update.*--index' $portage_hook` =~ /cfg-update/) { |
| 32 |
- &root_only("Can't enable the Portage hook if you're not root..."); |
| 33 |
-- `perl -p -i -e 's/#if \\[ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" \\] && \\[ -e \\"\\/usr\\/bin\\/cfg-update\\" \\]; then cfg-update --index; fi/if \\[ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" \\] && \\[ -e \\"\\/usr\\/bin\\/cfg-update\\" \\]; then cfg-update --index; fi/;' $portage_hook`; |
| 34 |
-+ `perl -p -i -e 's/: (cfg-update.*--index)/\$1/;' $portage_hook`; |
| 35 |
- if ($opt_d >= 1) { print "$tab"."Enabled Portage hook in $portage_hook...\n"; } |
| 36 |
- } else { |
| 37 |
- if ($opt_d >= 1) { print "$tab"."Portage hook is already enabled...\n"; } |
| 38 |
-@@ -549,16 +549,17 @@ |
| 39 |
- &root_only("Can't add the Portage hook if you're not root..."); |
| 40 |
- `echo >> $portage_hook`; |
| 41 |
- `echo "# This hook is neccesary for automatic updating of the cfg-update index, please do not modify it!" >> $portage_hook`; |
| 42 |
-- `echo "if [ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" ] && [ -e \\"/usr/bin/cfg-update\\" ]; then cfg-update --index; fi" >> $portage_hook`; |
| 43 |
-- `echo >> $portage_hook`; |
| 44 |
-+ `echo "pre_pkg_setup() {" >> $portage_hook`; |
| 45 |
-+ `echo " [[ \\\$ROOT = / ]] && cfg-update --index" >> $portage_hook`; |
| 46 |
-+ `echo "}" >> $portage_hook`; |
| 47 |
- if ($opt_d >= 1) { print "$tab"."Added Portage hook in $portage_hook...\n"; } |
| 48 |
- } |
| 49 |
- } else { |
| 50 |
- &root_only("Can't create the Portage hook if you're not root..."); |
| 51 |
-- `echo >> $portage_hook`; |
| 52 |
- `echo "# This hook is neccesary for automatic updating of the cfg-update index, please do not modify it!" >> $portage_hook`; |
| 53 |
-- `echo "if [ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" ] && [ -e \\"/usr/bin/cfg-update\\" ]; then cfg-update --index; fi" >> $portage_hook`; |
| 54 |
-- `echo >> $portage_hook`; |
| 55 |
-+ `echo "pre_pkg_setup() {" >> $portage_hook`; |
| 56 |
-+ `echo " [[ \\\$ROOT = / ]] && cfg-update --index" >> $portage_hook`; |
| 57 |
-+ `echo "}" >> $portage_hook`; |
| 58 |
- if ($opt_d >= 1) { print "$tab"."Created Portage hook in $portage_hook...\n"; } |
| 59 |
- } |
| 60 |
- } |
| 61 |
-@@ -2209,11 +2210,11 @@ |
| 62 |
- local $ENV{LC_ALL}="C"; |
| 63 |
- if (`grep '^.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { |
| 64 |
- local $ENV{LC_ALL}="C"; |
| 65 |
-- if (`grep '^#.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { |
| 66 |
-+ if (`grep ': cfg-update.*--index' $portage_hook` =~ /cfg-update/) { |
| 67 |
- if ($opt_ebuild == 0) { print "$tab"." Portage hook is already disabled...\n"; } |
| 68 |
- } else { |
| 69 |
- &root_only("Can't disable the Portage hook if you're not root..."); |
| 70 |
-- `perl -p -i -e 's/^if \\[ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" \\] && \\[ -e \\"\\/usr\\/bin\\/cfg-update\\" \\]; then cfg-update --index; fi/#if \\[ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" \\] && \\[ -e \\"\\/usr\\/bin\\/cfg-update\\" \\]; then cfg-update --index; fi/;' $portage_hook`; |
| 71 |
-+ `perl -p -i -e 's/cfg-update.*--index/: \$&/;' $portage_hook`; |
| 72 |
- if ($opt_ebuild == 0) { print "$tab"." Disabled Portage hook in $portage_hook...\n"; } |
| 73 |
- } |
| 74 |
- } else { |
| 75 |
|
| 76 |
diff --git a/app-portage/cfg-update/files/cfg-update-1.8.2-xxdiff-to-beediff.patch b/app-portage/cfg-update/files/cfg-update-1.8.2-xxdiff-to-beediff.patch |
| 77 |
deleted file mode 100644 |
| 78 |
index b1d2416..0000000 |
| 79 |
--- a/app-portage/cfg-update/files/cfg-update-1.8.2-xxdiff-to-beediff.patch |
| 80 |
+++ /dev/null |
| 81 |
@@ -1,45 +0,0 @@ |
| 82 |
-http://bugs.gentoo.org/show_bug.cgi?id=300216 |
| 83 |
-http://bugs.gentoo.org/show_bug.cgi?id=303199 |
| 84 |
- |
| 85 |
---- cfg-update.conf |
| 86 |
-+++ cfg-update.conf |
| 87 |
-@@ -1,10 +1,10 @@ |
| 88 |
- # +----------+ |
| 89 |
- # | MERGETOOL \ |
| 90 |
- # +------------+-------------------------------------------------------------+ |
| 91 |
--# | The recommended tool for merging is xxdiff but you can also use other | |
| 92 |
--# | tools if you don't like xxdiff. The Supported tools are listed below: | |
| 93 |
-+# | The recommended tool for merging is beediff but you can also use other | |
| 94 |
-+# | tools if you don't like beediff. The Supported tools are listed below: | |
| 95 |
- # +----------+-----+--------------------------+------------------------------+ |
| 96 |
--# | xxdiff | GUI | KDE (or Gnome with QT) | | |
| 97 |
-+# | beediff | GUI | QT | | |
| 98 |
- # | kdiff3 | GUI | KDE (or Gnome with QT) | | |
| 99 |
- # | meld | GUI | Gnome (or KDE with GTK) | | |
| 100 |
- # | gtkdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! | |
| 101 |
-@@ -14,7 +14,7 @@ |
| 102 |
- # | sdiff | CLI | Systems without X | STAGE 3 not supported! | |
| 103 |
- # | imediff2 | CLI | Systems without X | STAGE 3 not supported! | |
| 104 |
- # +----------+-----+--------------------------+------------------------------+ |
| 105 |
--MERGE_TOOL = /usr/bin/xxdiff |
| 106 |
-+MERGE_TOOL = /usr/bin/beediff |
| 107 |
- |
| 108 |
- |
| 109 |
- # +--------+ |
| 110 |
-@@ -64,7 +64,7 @@ |
| 111 |
- # | If a merge-conflict has been detected in STAGE 2, you can now solve it | |
| 112 |
- # | manually in the MERGETOOL. Simply select the line(s) you need. When you | |
| 113 |
- # | are done, cfg-update will replace the current configuration file with the| |
| 114 |
--# | merged result. Stage 3 works with xxdiff, kdiff3, meld, tkdiff, gtkdiff. | |
| 115 |
-+# | merged result. Stage 3 works with beediff, kdiff3, meld, tkdiff, gtkdiff.| |
| 116 |
- # +--------------------------------------------------------------------------+ |
| 117 |
- ENABLE_STAGE3 = yes |
| 118 |
- |
| 119 |
-@@ -145,7 +145,6 @@ |
| 120 |
- # INDEX_FILE = /var/lib/cfg-update/checksum.index # this file contains all MD5 checksums for the host |
| 121 |
- # PKG_DB = /var/db/pkg # this directory contains the CONTENTS files (you can change it when your system uses another location) |
| 122 |
- # HOSTS_FILE = /etc/cfg-update.hosts # this file contains all sshfs-mount settings for updating remote machines from a single location |
| 123 |
--# XXDIFF_STYLE = "--style Keramik" # this variable controls the style of xxdiff |
| 124 |
- # |
| 125 |
- ############################################################################## |
| 126 |
- # IF YOU CHANGE THE FILENAME FORMAT VARIABLES, CFG-UPDATE WILL BE BROKEN! # |
Archives