gentoo resync : 14.07.2018

3 files changed, 28 insertions, 0 deletions

diff --git a/app-emacs/quilt-el/files/50quilt-el-gentoo.el b/app-emacs/quilt-el/files/50quilt-el-gentoo.el
new file mode 100644
index 000000000000..ccdd69d19ab9
--- /dev/null
+++ b/app-emacs/quilt-el/files/50quilt-el-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'quilt-mode "quilt"
+  "Toggle quilt-mode. With positive arg, enable quilt-mode." t)
+(autoload 'quilt-hook "quilt"
+  "Enable quilt mode for quilt-controlled files.")
+(add-hook 'find-file-hooks 'quilt-hook)
+(add-hook 'after-revert-hook 'quilt-hook)
diff --git a/app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch b/app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch
new file mode 100644
index 000000000000..b2f532617f76
--- /dev/null
+++ b/app-emacs/quilt-el/files/quilt-el-0.45.4-header-window.patch
@@ -0,0 +1,10 @@
+--- quilt-el.orig/quilt.el
++++ quilt-el/quilt.el
+@@ -399,6 +399,7 @@
+     (cd quilt-header-directory)
+     (shell-command (concat "EDITOR=cat quilt -r header <" tmp))
+     (kill-buffer (current-buffer))
++    (delete-window)
+     (delete-file tmp)))
+ 
+ (defvar quilt-header-mode-map (make-keymap))
diff --git a/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch b/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch
new file mode 100644
index 000000000000..aa1bf5c97e8d
--- /dev/null
+++ b/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch
@@ -0,0 +1,11 @@
+--- quilt-el-0.48.0-orig/quilt.el
++++ quilt-el-0.48.0/quilt.el
+@@ -49,7 +49,7 @@
+ 
+ (defun quilt-find-dir (fn)
+   "Return the top level dir of quilt from FN."
+-  (if (or (not fn) (equal fn "/"))
++  (if (or (not fn) (equal fn (file-name-directory fn)))
+       nil
+     (let ((d (file-name-directory fn)))
+       (if (file-accessible-directory-p (concat d "/.pc"))