summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-emacs/magit/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-emacs/magit/files')
-rw-r--r--app-emacs/magit/files/50magit-gentoo.el2
-rw-r--r--app-emacs/magit/files/magit-1.2.0-delete-directory.patch33
2 files changed, 35 insertions, 0 deletions
diff --git a/app-emacs/magit/files/50magit-gentoo.el b/app-emacs/magit/files/50magit-gentoo.el
new file mode 100644
index 000000000000..87586cc7317d
--- /dev/null
+++ b/app-emacs/magit/files/50magit-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'magit-status "magit" nil t)
diff --git a/app-emacs/magit/files/magit-1.2.0-delete-directory.patch b/app-emacs/magit/files/magit-1.2.0-delete-directory.patch
new file mode 100644
index 000000000000..6c85345e9460
--- /dev/null
+++ b/app-emacs/magit/files/magit-1.2.0-delete-directory.patch
@@ -0,0 +1,33 @@
+Fix byte-compile failure with Emacs 24.3.91.
+
+The upstream git repo has a more complicated fix which we don't use,
+because the Gentoo package need not care about Emacs 22 and XEmacs
+compatibility. Instead, always define magit-delete-directory as an
+alias of delete-directory. This will work for all supported Emacs
+versions.
+
+--- magit-1.2.0-orig/magit.el
++++ magit-1.2.0/magit.el
+@@ -775,21 +775,7 @@
+ after-change-functions)
+ ,@body)))))
+
+- (if (>= (magit-max-args-internal 'delete-directory) 2)
+- (defalias 'magit-delete-directory 'delete-directory)
+- (defun magit-delete-directory (directory &optional recursive)
+- "Deletes a directory named DIRECTORY. If RECURSIVE is non-nil,
+-recursively delete all of DIRECTORY's contents as well.
+-
+-Does not follow symlinks."
+- (if (or (file-symlink-p directory)
+- (not (file-directory-p directory)))
+- (delete-file directory)
+- (if recursive
+- ;; `directory-files-no-dot-files-regex' borrowed from Emacs 23
+- (dolist (file (directory-files directory 'full "\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
+- (magit-delete-directory file recursive)))
+- (delete-directory directory)))))
++ (defalias 'magit-delete-directory 'delete-directory))
+
+ ;;; Utilities
+