diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2014-11-19 17:27:15 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2014-11-19 17:27:15 +0000 |
| commit | 68f14c84aaf070ab92762e5422648bd8731faae1 (patch) | |
| tree | 09bea9cb198ce6773ff71a904e4036be94b9c2a8 /app-emacs | |
| parent | clean old python impl, add pypy3 support (diff) | |
| download | historical-68f14c84aaf070ab92762e5422648bd8731faae1.tar.gz historical-68f14c84aaf070ab92762e5422648bd8731faae1.tar.bz2 historical-68f14c84aaf070ab92762e5422648bd8731faae1.zip | |
Fix build failure with Emacs 24.4, bug 528374.
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/csharp-mode/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emacs/csharp-mode/Manifest | 25 | ||||
| -rw-r--r-- | app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch | 15 |
4 files changed, 35 insertions, 14 deletions
diff --git a/app-emacs/csharp-mode/ChangeLog b/app-emacs/csharp-mode/ChangeLog index 0650ffbddc66..2c7cd3a2a70e 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.14 2014/06/07 11:07:02 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.15 2014/11/19 17:27:02 ulm Exp $ + + 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: + Fix build failure with Emacs 24.4, bug 528374. 07 Jun 2014; Ulrich Müller <ulm@gentoo.org> csharp-mode-0.7.0-r1.ebuild: Remove redundant NEED_EMACS assignment. diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest index 7f6cb179b5c6..cd43be02b46f 100644 --- a/app-emacs/csharp-mode/Manifest +++ b/app-emacs/csharp-mode/Manifest @@ -2,21 +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 DIST csharp-mode-0.7.0.tar.bz2 6254 SHA256 e72a17972283691c33080aaa60d8060576d2951f1e374da223cf76468bd2eeec SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9 WHIRLPOOL 58816ec16158adb4de40fe27540a3734813012ecd7f345fc048faa4807d85ecef9617d82e30f945ad7dfb1452ef066a1ed3e38c3e792e43940e23464ba70c552 -EBUILD csharp-mode-0.7.0-r1.ebuild 509 SHA256 5da323b6c95c35a7fe145c0ccba50f2bf535b8c64229e2e67b653a46d780792f SHA512 73c1cffe4babe2c84d4615e6c9407f99ae72340d15b6916a10697e5e7bec85c50cadf49a35dc29b572ff61a60f3f90886f2b5c14f64ed4fe23c25fb5a70662c5 WHIRLPOOL 45fd22a4266410b842ada1ae172b4f6e5b5d73ed008b90d4c4bad929637c13293d0429162ab6e6a1dddedf85eb7b7e6095a308ac19101f26145ccccce8aa4c3b -MISC ChangeLog 2421 SHA256 c5b732eb1c5e9183b49fb2c84f2274c9288882b18a99f550058f72ccfc459190 SHA512 f01340b3ff37fb6f4ef973b129cd636c750994d664243200c7ab89a19ea1a5d29c3c385b1177158a4770c83aaa41ec390a0260b313012d9361dd407b1722fbd0 WHIRLPOOL a70ed006558a1b4fdbe660fa151988d0ac51b59f1f4f383da91a46676afdd96f767994932d98d4b0ad9ef9956691bda425265c6c76ecded49f8e2f2517d05e07 +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 metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQGcBAEBCAAGBQJTkvKVAAoJEJQzkH1pP7W4CrYL/iKlDryLgkSE6gaCkRWzvi9t -Guwte+lOsK6X0BiNn9VM7/wdoYirmIVOwM18WOTyRyzsCYLehfvb3PP4qp3og0gv -rBziVtyF7o4v3j3w1EZ+Jp1obbPDwC48CRatZFRAqLX8huBwg1mn4orPg8f6deNt -kmFoWxM8zhp8hpZnuZZOzwUNDt0jyN7ai/Wn36oCQECtEeNLySxK2bNq4TvUxy6k -cZpEcYGLABQxUknmduovg5lJhgDCYPNHYOcCsgt6OpKImAO16mksMo5wjPx+KcdE -Te3DsxdyS92p3dFZ6wShBX1TiT/X7i1nV85QDRVczKElhFl4zeUwqrqhorM/m4db -w9IFG5b8++NdpIwsBv+fqxiD+6PATyuECOXjHLnYSySU5Sjashy+jf92PKnqY+mE -lTOT8zf64/oYzNYNKIjUof7IZc+78aU+tmvsaCOk0CNeUjbKss26RHf4DQrRtdCt -EhFTEooJM9V63lB4tyHqKBBfbGBfxbUyNRCYIgxl1g== -=iC3A +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 -----END PGP SIGNATURE----- diff --git a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild index 44dd0268d9d3..1f64f123085e 100644 --- a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild +++ b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild,v 1.4 2014/06/07 11:07:02 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild,v 1.5 2014/11/19 17:27:02 ulm Exp $ EAPI=5 @@ -14,4 +14,5 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~ppc x86" +ELISP_PATCHES="${P}-emacs-24.4.patch" SITEFILE="50${PN}-gentoo.el" 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 new file mode 100644 index 000000000000..1bbc0d2d3a45 --- /dev/null +++ b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/528374 + +--- a/csharp-mode.el ++++ b/csharp-mode.el +@@ -125,6 +125,10 @@ + (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) ++ (require 'cl)) + (load "cc-mode" nil t) + (load "cc-fonts" nil t) + (load "cc-langs" nil t))) |