Fix runtime problem with Emacs 24.4, bug 532358.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

diff --git a/app-emacs/css-mode/ChangeLog b/app-emacs/css-mode/ChangeLog
index 0de24afbd0b500d5364b8f7c0adb7b6759d658c6..f7c72cf80cdfdec3ffb5880e4dca9922c80281b6 100644 (file)
--- a/app-emacs/css-mode/ChangeLog
+++ b/app-emacs/css-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/css-mode
 # Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/css-mode/ChangeLog,v 1.11 2014/02/21 00:10:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/css-mode/ChangeLog,v 1.12 2014/12/12 23:47:02 ulm Exp $
+
+*css-mode-0.11-r1 (12 Dec 2014)
+
+  12 Dec 2014; Ulrich Müller <ulm@gentoo.org> +css-mode-0.11-r1.ebuild,
+  +files/css-mode-0.11-no-compat-kbd.patch:
+  Fix runtime problem with Emacs 24.4, bug 532358.
 
   21 Feb 2014; Ulrich Müller <ulm@gentoo.org> css-mode-0.11.ebuild:
   Update ebuild to EAPI 5. Specify LICENSE more precisely.

diff --git a/app-emacs/css-mode/Manifest b/app-emacs/css-mode/Manifest
index a86bc05db902203e2f11c0f3853f40d3f6c9459f..67aed816f740a9a9e1b51f597c2958d6d3f18360 100644 (file)
--- a/app-emacs/css-mode/Manifest
+++ b/app-emacs/css-mode/Manifest
@@ -2,21 +2,23 @@
 Hash: SHA256
 
 AUX 50css-mode-gentoo.el 171 SHA256 1f48e8d470f9a8e8de545a5c10529beb7a9265f17671bd45018455783d1ec8d2 SHA512 18713c42439aa4d076b7154035ba369060bfc8a0e98e845b7140e137b05ed0aacc2a25ec93612e950fe930c5605d6ea909d5d1ed79433d1472f357bc272ce96e WHIRLPOOL c9c97b77bd3f8aa00522be5f7b6e752ad2061f5c32bf6d2d5813fa2e8cc5862e93795fa442f9934272bf70499b2679d204ed11b373bf541499db68e25fddc8ff
+AUX css-mode-0.11-no-compat-kbd.patch 875 SHA256 7147b881d77e7af38d84e5ff679a1614f7a9e5e9a6967dc17d11fdb6bddc195a SHA512 27f298f89cc15c2104fe27712f0a02676074fcdd8417ec8cc515ab461e27aec63d6325fdfe4c269c4212fa4c2e12975dcfe7d7eb345b2f31a4d12dc0189c523b WHIRLPOOL 06bec50319f8b7df3d23a895658c5cfa2a92515e320485b4740d00d401703297d9f4aada7489c86af8cfe313817bb1eff6bf1520dc8ff264a59912d6b9301168
 DIST css-mode-0.11.tar.bz2 6848 SHA256 f7980d13a2d5ba2ac6873fdc2c7b54db5c13e93294a2c1068b4b04e7b6a2f7d4 SHA512 b93574fde8bb24ffc4dac6ddda20db3ec3c1834c1201f250f24805d31c7972edc2ffc157e7717327e7baac5c71a1d943a9d80bc7bec96be99c44cd2ab16e0e03 WHIRLPOOL e9036b4ef8604025aa123fc56c51b2171f0027d493134b89a96d2eceef3b0de3668c5ced5396c684b3ff8cfa595eb21d3ddd491a3c2b45f486955cee4f020b30
+EBUILD css-mode-0.11-r1.ebuild 771 SHA256 fc552c27af5d9221b3e3caffddceed7fb3468e1d4d3a8733c39f8399bf0c4a77 SHA512 8214490de7cd2b133e066cdd2062c9a43b823ba75b7011fa39190a7b077d5fa9d102ae84a44b0583f1af7a0ccef18ba55a3a6c9f68fd08e658984137795a66b9 WHIRLPOOL a7fba0335e06c5d0fcfb7f54a6c4fbd94b7cc951b38d1601807aa3a5d84fdeabeb13f1378293d4b51334ddd4a357eded66542b464c27dfc4e8d386b333f389cd
 EBUILD css-mode-0.11.ebuild 705 SHA256 116b93f10ae4e58ffd06e70031986bfef44cf8df40cc1950bec3f0c6485d67ae SHA512 39651313e542ef7c0c9b814c811e2f04eb6637445cd15d5932be5c3fc34bcd76d3451ae499aaac5324dc4aeed285e453a36a6960d36c9d32dfab6aeb9c854f98 WHIRLPOOL 37d0e752cc78f9ff8b4195e66971d2cd769615358641fc6d7a798dc12265e5fa47c966b2598631c500a9c16fb166fa3cd475ad32e3e105576505a374f807a1c0
-MISC ChangeLog 1162 SHA256 8f0df2d11ced4341266bd23eaccfeb9ee1b0ade80e6ecf8f2c2a90934def800a SHA512 4acbe48fcc6c9838ef52ce084ef259873cc2207c33cd61555ea3e463560ecc55d250cd7ac6ab67dc39b70407f49baf814a9b70ad6efb8a58c147b52df73a56d9 WHIRLPOOL df298f1a9e6c8f574a58ec69d9122808592b94b8c014d76a0cb878e480dbd7570cb7ddf129e6eccbf55020f6726ee9e2d0ba4c9a1b4fd79d4e41b13f47825675
+MISC ChangeLog 1364 SHA256 1d71133b96e060d9f2397494c36fd001a6c3ed8fbdec7132598962b4b863d09e SHA512 9e8ac0b55220b6966fd385b2defdaf1053bed31c6c43465df336e51bb96ff8179ae0d10fe3d8105cbd15960c8c642dbfdc55ccfd27517fd9f2ac9acfd7ada151 WHIRLPOOL 8c848d25f07e86a5b6a54836d6e125b29c9941a9e44b04e0c1cbeb91c94773fd6a5ad1c712cb1c7b26ac9068d3020a76561456da7d68547a05b8e40cc47956e3
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTBpmkAAoJEJQzkH1pP7W4qdML/iXeff6d+SCR4vCJ8s700pLV
-Gpjx8CKow5ev4zamXKltUe0w3zLA3klWiFM8DhaYUqIkwyINFeasRZmKeMkviPpP
-EVrWyC5m8EZyfm1PSz6j/I57zbVQSLGpJ+Wwz/WYdaRbiPY9oBn3lCSfvIiUc2ro
-vTZj9n9m0ESTKjQSUVbwdZpbA9IezGBzRIzw5Ye6KFGxgPdznvQftgm0bVSAhQ1H
-P0JLrdCatn2sLSYNmO70SLIrY1h3Rw5VCP1pCTsZDRL0qftIhbn2zvwSmiLbf3WJ
-DNVcqfDVr6AGaUSsDxLLbeFyH96FlyGLDd9FVldUgcjJaxHpCqY9xcTJzDcI92gy
-YtwsA5+nuL3GHIHVKbEB8X7MSYIXMSqTWM58dTfr8CT5PacVIYo+LBJ9QcC885ru
-GIYYAu8Fzgkb0gEIVMSQ2PuAC7uGtiQGMwx1QkUcuxwQOZa7oK1x82MUCdFuDzgj
-CqF9NTsdWACJPXwvQ0/sJqK4y01RWjfy10lCr+WmeA==
-=rWfW
+iQGcBAEBCAAGBQJUi3+MAAoJEJQzkH1pP7W4qFML/1/XzMRaRNCRKquElu/XLzlY
+XNrRu0n55npe1b9Nb6pj9kRliUR0ypSThSbBWaVsuhGJ6+f7U4MuLKpKtFjG3Ku0
+bFrGVwXKb6HmC7d7M/3TOJvPBlSaMvJxTdSzMiiImTyNb+SF9zgiNGti0+R8n2VU
+Acp/pveVQa3GbRX+jA59dcPzF+ZfehRLZAWlBs67Pf2OgRY9NjD2bSbO2uVqfHOb
+ZYFGty5Vo1zIwWtl0+k7MPWfu3n8BOKTmZe4iLR2K/FZjvgOJ9uQgYPN4yyAInen
+tX4D++4KDzHlrbtbF5yh/5HGP5PV6h6+7elyPPCOAq+eejgTuMa2pSG7kMI+54Zz
+TMkdHVdlyXyzdLlWMbCuBkZc7pKfMOhSQoMyuDpSnAqxobmrhWNDWyuN7nyP9MGX
+5c8m6rVIcHcgM4Vs0b+boZFe8t1dIURvmFxDKFCKvq8c2HscZPHOGDwOp4DzENW6
+zG4hsV9WqAjmZ/tLW0rOnoLdvGI4QHEh8uzvjm8m7Q==
+=Hal7
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/css-mode/css-mode-0.11-r1.ebuild b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
new file mode 100644 (file)
index 0000000..e852c4f
--- /dev/null
+++ b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/css-mode/css-mode-0.11-r1.ebuild,v 1.1 2014/12/12 23:47:02 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing Cascading Style Sheets (CSS)"
+HOMEPAGE="http://www.garshol.priv.no/download/software/css-mode/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+ELISP_PATCHES="${P}-no-compat-kbd.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+       elisp_src_prepare
+       # Fix documentation
+       sed -i -e 's,HREF="/visuals/standard.css",HREF="standard.css",' doco.html
+}
+
+src_install() {
+       elisp_src_install
+       dohtml -A css doco.html standard.css
+}

diff --git a/app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch b/app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch
new file mode 100644 (file)
index 0000000..858cb23
--- /dev/null
+++ b/app-emacs/css-mode/files/css-mode-0.11-no-compat-kbd.patch
@@ -0,0 +1,24 @@
+Function "apropos-macrop" apparently no longer exists in Emacs 24.4.
+Simply remove the code using it, since it was only needed for backwards
+compatibility with Emacs 19 (the "kbd" macro appeared in Emacs 20.1).
+https://bugs.gentoo.org/532358
+
+--- css-mode-0.11-orig/css-mode.el
++++ css-mode-0.11/css-mode.el
+@@ -166,16 +166,6 @@
+   (define-key cssm-mode-map (read-kbd-macro "}") 'cssm-insert-right-brace-and-indent)
+   (define-key cssm-mode-map (read-kbd-macro "M-TAB") 'cssm-complete-property))
+ 
+-;;; Cross-version compatibility layer
+-
+-(when (not (or (apropos-macrop 'kbd)
+-           (fboundp 'kbd)))
+-    (defmacro kbd (keys)
+-      "Convert KEYS to the internal Emacs key representation.
+-KEYS should be a string constant in the format used for
+-saving keyboard macros (see `insert-kbd-macro')."
+-      (read-kbd-macro keys)))
+-
+ ;;; Auto-indentation support
+ 
+ ; internal