summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2015-08-08 12:32:08 +0000
committerUlrich Müller <ulm@gentoo.org>2015-08-08 12:32:08 +0000
commitc140ec7e8846b6f0c574bfc7281a6c2eb678a451 (patch)
tree608455368ba4c845e22a402564d74f2d75009902
parentVersion bump. Remove old. (diff)
downloadhistorical-c140ec7e8846b6f0c574bfc7281a6c2eb678a451.tar.gz
historical-c140ec7e8846b6f0c574bfc7281a6c2eb678a451.tar.bz2
historical-c140ec7e8846b6f0c574bfc7281a6c2eb678a451.zip
Fix build failure with Emacs 24.5, bug 557002.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
-rw-r--r--app-emacs/csharp-mode/ChangeLog8
-rw-r--r--app-emacs/csharp-mode/Manifest24
-rw-r--r--app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch5
3 files changed, 20 insertions, 17 deletions
diff --git a/app-emacs/csharp-mode/ChangeLog b/app-emacs/csharp-mode/ChangeLog
index 2c7cd3a2a70e..d0fe04cd02a4 100644
--- a/app-emacs/csharp-mode/ChangeLog
+++ b/app-emacs/csharp-mode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/csharp-mode
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.15 2014/11/19 17:27:02 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.16 2015/08/08 12:31:56 ulm Exp $
+
+ 08 Aug 2015; Ulrich Müller <ulm@gentoo.org>
+ files/csharp-mode-0.7.0-emacs-24.4.patch:
+ Fix build failure with Emacs 24.5, bug 557002.
19 Nov 2014; Ulrich Müller <ulm@gentoo.org> csharp-mode-0.7.0-r1.ebuild,
+files/csharp-mode-0.7.0-emacs-24.4.patch:
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index cd43be02b46f..16a670fb7af6 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -2,22 +2,22 @@
Hash: SHA256
AUX 50csharp-mode-gentoo.el 171 SHA256 205c5bb8a8333f0f77ae7b59e90838f5364f5f0213b483e3053137b87fba2cc4 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a WHIRLPOOL a0975e5244ec3e6e87d92d04ed0e608a2f8678435a7f86b62b1c913bed196443da43ab8d3fb7efd980ce46448a3a12a0f88641eed469b2a2f3050ee6321e64b3
-AUX csharp-mode-0.7.0-emacs-24.4.patch 428 SHA256 6638ca4d0020b44092c73caf985ff54392daee35eec12becb653045314f8a41b SHA512 ebe9cdcd386a576a0a0d896762f12715d915f9423c6c4bb214850d402dca873814ac94e99a5376ab9accb0d1355fe4604e447a342b946d988cc939e1277e0f7e WHIRLPOOL de3da12f1feea2121939dbdae86ce0742f1c6a2ae6c8aeb27c0f3f1522eedbae8cf116aa6225ca32e340b6008151d5975c9e0d6886a370f06e67240a27c6e777
+AUX csharp-mode-0.7.0-emacs-24.4.patch 393 SHA256 e29d47d1fe0c9891fefb44c331caac370e8efbea052c06fe1e8d1068e3aa4ec4 SHA512 b7b0a337a1b0d615f92b86ad27c09274ec63e87795629778b9091307fa6fa7bdaea2efe01cacadff2b47ccafd43ee0445f883f2f8a0b8f225fb727488c5752e3 WHIRLPOOL 6d5cb1138ba33bb712687328228a72f081f9818f6b13b826b67ed29649d6fadef52fed298e8bb54cdf6be18119364e0fd3b96d9c4e1457bddaa67f822334f15e
DIST csharp-mode-0.7.0.tar.bz2 6254 SHA256 e72a17972283691c33080aaa60d8060576d2951f1e374da223cf76468bd2eeec SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9 WHIRLPOOL 58816ec16158adb4de40fe27540a3734813012ecd7f345fc048faa4807d85ecef9617d82e30f945ad7dfb1452ef066a1ed3e38c3e792e43940e23464ba70c552
EBUILD csharp-mode-0.7.0-r1.ebuild 547 SHA256 84b2b767f0736865e892d44b44b2eb0b67d6c98aa22b9383534c00036166a7e2 SHA512 09bd68c03692d1abf04d0a41cf3bdebb0d437d0d2f1c1fb57b07fdd9e7a755854fd0c19fa8276fcf578f63bda296f10a3da70577a524e68c9fa61070a5584fce WHIRLPOOL af88a6b46f09cab650b7ffc803f4ae3ebd7deefa9dcc2c9aec16990a4aeb1e77d3b2c58f2b6827c83ede044cbab4abdff40632bba26e041e413a4f419a4c7e3c
-MISC ChangeLog 2592 SHA256 e07e23b20ab273b1ccc0824a5903d9cf3757cc69eb5ff3cf3ba0953376a66631 SHA512 a8a2300ebc254729b8d18d4741dc1666479abac18764cd11cd085766f5de3d8da1438955ac788c771c8f5c6afe4a6498826fa778931273d40a40b83370a328ec WHIRLPOOL be724d09243adee2209b843892d4828098ed8176429eb7e911acc82d8e0a05fc1a1a9e041e5556d21fc2abf8ae67c665f9943e1051f0f7b6a8a489109bdb60c0
+MISC ChangeLog 2733 SHA256 3ef022ad46d385b05e71f24344509b37c10335db00aec5d16fd89d44b3255084 SHA512 1066cf3064b9ff56b266b08b08001790772e557b5d9086d29049eef179bb05e67608897330d8549588a304969fd6a37033b7b7a67b52f3ecb78241e6e66f811c WHIRLPOOL 2665b28feb854336671871a32f3b710c44959c63c047251ab62d22903e17b6daa32b063ee115f581a954bba117e0140817f373bf40e71615c0fdee9315c7e734
MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQGcBAEBCAAGBQJUbNPEAAoJEJQzkH1pP7W4Gg0L/2BX50bzd+CumN/wFCXN/sts
-SW8jfvA/q9WTMGRyUn9jh3GZ8hGBjiqwhqpkYEc9zFvgAYxalcYHMJAg4ZUSI7af
-Hq7F4OcCbcc9y4NJunz3+XKrrf1gyZiwrNzbh26B+vrNomS9gzyuU4TW9nfEwKrZ
-QSMNWZXPttHK1lbwM2r8nHSdrKsEIQxwPtYvylpbBHaHX3A1Z8u5cUhiP8bZrZ+e
-I47CwiLvp60izC7iBNTdpcaoVkSDWrh9I1/MdZaNjCJ1UY8FYSU9Oted1x/5gZhe
-HEjdCxxPmzPef2bQTGl2VhFnolVspeRXrg757mUV22hKEhO8IN02n0KT013NOyGs
-k7zwILO8Ol2fKb8vzum2D/qO0FYOeWeof/JkdvYamiXcHl8/l3zN3dE6qTpGkqQb
-16L3PThe5VGLgCfKebCv03smX24NKfhTEXP/xtqihulu8E8J+TQ7C2ujPDXJ8+Uf
-Try9ai6puM5V4A1H6ibTdCcJK/kJGM8l1swagCRs5w==
-=zqP8
+iQGcBAEBCAAGBQJVxfaZAAoJEJQzkH1pP7W4juIL/ivdmiiY4doyN+vzEf1f+9rG
+Nz51F62kDLWPK1nKRL9JaIOtmMmHrrPTNSHgxNsgvkpL3KW7v+8frdSpG0aiPKfD
+8hYdHu4F1JH1JSVbfANG/dsuoZGzCvi5Mj1YLEY8y/UdSgOq9/NLeylOHL3XyFUT
+S8Hb1NfCZIyG/G64V8DhPUNWs/4lIV9yLkEEzNeslnhJGQ9h2RJG2GYf43Je+YfQ
+fu2CpbKiJQmNMzuhlOf2OlrL4FIA8kE00vrbQPhtP1ucuukZO41mlPfuIQ1Cv2YZ
+VdxSO1GqE4ca9ox+x+Bv2eULasPBKmr0EOqISqZNKsM2rxqDj5rxKmdJG7Gcnw5p
+p7yBAW4UTYQPLBUERrSdotGY3x7Ga6zrkH0BBMjFHdr8awyzG6Ht9gPmOzhKnT8r
+fCTAevFwqtmw2DQ5Z+QnSYTGSfE9ruJoIR381KGwIbx1MPzhWc92YVekvTUFmLuT
+O7tgyAilvHZ90QadjW866u2aTMy7gYtng3MnEISBUA==
+=HzCQ
-----END PGP SIGNATURE-----
diff --git a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
index 1bbc0d2d3a45..c3f73201cbae 100644
--- a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
+++ b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
@@ -2,13 +2,12 @@ https://bugs.gentoo.org/528374
--- a/csharp-mode.el
+++ b/csharp-mode.el
-@@ -125,6 +125,10 @@
+@@ -125,6 +125,9 @@
(stringp byte-compile-dest-file))
(cons (file-name-directory byte-compile-dest-file) load-path)
load-path)))
+ (and (= emacs-major-version 24)
-+ (= emacs-minor-version 4)
-+ (null emacs-repository-version)
++ (>= emacs-minor-version 4)
+ (require 'cl))
(load "cc-mode" nil t)
(load "cc-fonts" nil t)