commit: 480bdd8b4ef31eabeb180ec28309596bee0156c4 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Jul 13 18:38:12 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Thu Jul 14 16:05:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480bdd8b
app-portage/cfg-update: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/1883 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> .../cfg-update/files/cfg-update-1.8.2-bashrc.patch | 51 ---------------------- .../files/cfg-update-1.8.2-xxdiff-to-beediff.patch | 45 ------------------- 2 files changed, 96 deletions(-) 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 deleted file mode 100644 index 73fe9b8..0000000 --- a/app-portage/cfg-update/files/cfg-update-1.8.2-bashrc.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- cfg-update-1.8.2-r1/cfg-update -+++ cfg-update-1.8.2-r1/cfg-update -@@ -538,9 +538,9 @@ - local $ENV{LC_ALL}="C"; - if (`grep '^.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { - local $ENV{LC_ALL}="C"; -- if (`grep '^#.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { -+ if (`grep ': cfg-update.*--index' $portage_hook` =~ /cfg-update/) { - &root_only("Can't enable the Portage hook if you're not root..."); -- `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`; -+ `perl -p -i -e 's/: (cfg-update.*--index)/\$1/;' $portage_hook`; - if ($opt_d >= 1) { print "$tab"."Enabled Portage hook in $portage_hook...\n"; } - } else { - if ($opt_d >= 1) { print "$tab"."Portage hook is already enabled...\n"; } -@@ -549,16 +549,17 @@ - &root_only("Can't add the Portage hook if you're not root..."); - `echo >> $portage_hook`; - `echo "# This hook is neccesary for automatic updating of the cfg-update index, please do not modify it!" >> $portage_hook`; -- `echo "if [ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" ] && [ -e \\"/usr/bin/cfg-update\\" ]; then cfg-update --index; fi" >> $portage_hook`; -- `echo >> $portage_hook`; -+ `echo "pre_pkg_setup() {" >> $portage_hook`; -+ `echo " [[ \\\$ROOT = / ]] && cfg-update --index" >> $portage_hook`; -+ `echo "}" >> $portage_hook`; - if ($opt_d >= 1) { print "$tab"."Added Portage hook in $portage_hook...\n"; } - } - } else { - &root_only("Can't create the Portage hook if you're not root..."); -- `echo >> $portage_hook`; - `echo "# This hook is neccesary for automatic updating of the cfg-update index, please do not modify it!" >> $portage_hook`; -- `echo "if [ \\"\\\$EBUILD_PHASE\\" = \\"setup\\" ] && [ -e \\"/usr/bin/cfg-update\\" ]; then cfg-update --index; fi" >> $portage_hook`; -- `echo >> $portage_hook`; -+ `echo "pre_pkg_setup() {" >> $portage_hook`; -+ `echo " [[ \\\$ROOT = / ]] && cfg-update --index" >> $portage_hook`; -+ `echo "}" >> $portage_hook`; - if ($opt_d >= 1) { print "$tab"."Created Portage hook in $portage_hook...\n"; } - } - } -@@ -2209,11 +2210,11 @@ - local $ENV{LC_ALL}="C"; - if (`grep '^.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { - local $ENV{LC_ALL}="C"; -- if (`grep '^#.*cfg-update.*--index' $portage_hook` =~ /cfg-update/) { -+ if (`grep ': cfg-update.*--index' $portage_hook` =~ /cfg-update/) { - if ($opt_ebuild == 0) { print "$tab"." Portage hook is already disabled...\n"; } - } else { - &root_only("Can't disable the Portage hook if you're not root..."); -- `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`; -+ `perl -p -i -e 's/cfg-update.*--index/: \$&/;' $portage_hook`; - if ($opt_ebuild == 0) { print "$tab"." Disabled Portage hook in $portage_hook...\n"; } - } - } else { 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 deleted file mode 100644 index b1d2416..0000000 --- a/app-portage/cfg-update/files/cfg-update-1.8.2-xxdiff-to-beediff.patch +++ /dev/null @@ -1,45 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=300216 -http://bugs.gentoo.org/show_bug.cgi?id=303199 - ---- cfg-update.conf -+++ cfg-update.conf -@@ -1,10 +1,10 @@ - # +----------+ - # | MERGETOOL \ - # +------------+-------------------------------------------------------------+ --# | The recommended tool for merging is xxdiff but you can also use other | --# | tools if you don't like xxdiff. The Supported tools are listed below: | -+# | The recommended tool for merging is beediff but you can also use other | -+# | tools if you don't like beediff. The Supported tools are listed below: | - # +----------+-----+--------------------------+------------------------------+ --# | xxdiff | GUI | KDE (or Gnome with QT) | | -+# | beediff | GUI | QT | | - # | kdiff3 | GUI | KDE (or Gnome with QT) | | - # | meld | GUI | Gnome (or KDE with GTK) | | - # | gtkdiff | GUI | Gnome (or KDE with GTK) | STAGE 3 not supported! | -@@ -14,7 +14,7 @@ - # | sdiff | CLI | Systems without X | STAGE 3 not supported! | - # | imediff2 | CLI | Systems without X | STAGE 3 not supported! | - # +----------+-----+--------------------------+------------------------------+ --MERGE_TOOL = /usr/bin/xxdiff -+MERGE_TOOL = /usr/bin/beediff - - - # +--------+ -@@ -64,7 +64,7 @@ - # | If a merge-conflict has been detected in STAGE 2, you can now solve it | - # | manually in the MERGETOOL. Simply select the line(s) you need. When you | - # | are done, cfg-update will replace the current configuration file with the| --# | merged result. Stage 3 works with xxdiff, kdiff3, meld, tkdiff, gtkdiff. | -+# | merged result. Stage 3 works with beediff, kdiff3, meld, tkdiff, gtkdiff.| - # +--------------------------------------------------------------------------+ - ENABLE_STAGE3 = yes - -@@ -145,7 +145,6 @@ - # INDEX_FILE = /var/lib/cfg-update/checksum.index # this file contains all MD5 checksums for the host - # PKG_DB = /var/db/pkg # this directory contains the CONTENTS files (you can change it when your system uses another location) - # HOSTS_FILE = /etc/cfg-update.hosts # this file contains all sshfs-mount settings for updating remote machines from a single location --# XXDIFF_STYLE = "--style Keramik" # this variable controls the style of xxdiff - # - ############################################################################## - # IF YOU CHANGE THE FILENAME FORMAT VARIABLES, CFG-UPDATE WILL BE BROKEN! #
